From f09d1f215048e7823a6eb6ad969f3df99122f13b Mon Sep 17 00:00:00 2001
From: Nickolas de Luca Alberton <nickolasdeluca@live.com>
Date: Thu, 11 Jun 2026 14:24:27 -0300
Subject: [PATCH] Add NullableCondition extension for Condition

Introduce a NullableCondition<T> extension on Condition<T>? providing and(Condition<T>) and or(Condition<T>) helpers. These methods return the provided condition when the receiver is null, or delegate to the existing and/or logic otherwise, simplifying conditional accumulation of query conditions and removing boilerplate null checks. Doc examples included to demonstrate usage when building queries.
---
 objectbox/lib/src/native/query/query.dart | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/objectbox/lib/src/native/query/query.dart b/objectbox/lib/src/native/query/query.dart
index 067fa32f..ecf6dea6 100644
--- a/objectbox/lib/src/native/query/query.dart
+++ b/objectbox/lib/src/native/query/query.dart
@@ -540,6 +540,34 @@ abstract class Condition<EntityT> {
   }
 }
 
+/// Extension on nullable [Condition] to simplify building queries
+/// where conditions are accumulated conditionally.
+extension NullableCondition<T> on Condition<T>? {
+  /// Combines this condition with [other] using AND.
+  /// If this is null, returns [other] directly.
+  ///
+  /// Useful when building queries where conditions are applied selectively:
+  /// ```dart
+  /// Condition<City>? condition;
+  /// condition = condition.and(City_.district.equals(id));
+  /// condition = condition.and(City_.name.contains(name));
+  /// query = box.query(condition).build();
+  /// ```
+  Condition<T> and(Condition<T> other) => this?.and(other) ?? other;
+
+  /// Combines this condition with [other] using OR.
+  /// If this is null, returns [other] directly.
+  ///
+  /// Useful when building queries where conditions are applied selectively:
+  /// ```dart
+  /// Condition<City>? condition;
+  /// condition = condition.or(City_.district.equals(id));
+  /// condition = condition.or(City_.name.contains(name));
+  /// query = box.query(condition).build();
+  /// ```
+  Condition<T> or(Condition<T> other) => this?.or(other) ?? other;
+}
+
 class _NullCondition<EntityT, DartType> extends Condition<EntityT> {
   final QueryProperty<EntityT, DartType> _property;
   final _ConditionOp _op;