@tanstack/db 0.5.27 → 0.5.29

package/src/query/predicate-utils.ts

@@ -87,6 +87,24 @@ function isWhereSubsetInternal(
     )
   }
 
+  // Handle OR in subset: (A OR B) ⊆ C only if both A ⊆ C and B ⊆ C.
+  // Must be checked before OR superset so that or(A, B) ⊆ or(C, D)
+  // decomposes the subset first: A ⊆ or(C, D) AND B ⊆ or(C, D).
+  if (subset.type === `func` && subset.name === `or`) {
+    return subset.args.every((arg) =>
+      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset),
+    )
+  }
+
+  // Handle OR in superset: subset ⊆ (A OR B) if subset ⊆ A or subset ⊆ B.
+  // Must be checked before decomposing AND subsets so that and(A, B) can
+  // match a structurally equal disjunct via areExpressionsEqual.
+  if (superset.type === `func` && superset.name === `or`) {
+    return superset.args.some((arg) =>
+      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>),
+    )
+  }
+
   // Handle subset being an AND: (A AND B) implies both A and B
   if (subset.type === `func` && subset.name === `and`) {
     // For (A AND B) ⊆ C, since (A AND B) implies A, we check if any conjunct implies C
@@ -111,22 +129,6 @@ function isWhereSubsetInternal(
     }
   }
 
-  // Handle OR in subset: (A OR B) is subset of C only if both A and B are subsets of C
-  if (subset.type === `func` && subset.name === `or`) {
-    return subset.args.every((arg) =>
-      isWhereSubsetInternal(arg as BasicExpression<boolean>, superset),
-    )
-  }
-
-  // Handle OR in superset: subset ⊆ (A OR B) if subset ⊆ A or subset ⊆ B
-  // (A OR B) as superset means data can satisfy A or B
-  // If subset is contained in any disjunct, it's contained in the union
-  if (superset.type === `func` && superset.name === `or`) {
-    return superset.args.some((arg) =>
-      isWhereSubsetInternal(subset, arg as BasicExpression<boolean>),
-    )
-  }
-
   // Handle comparison operators on the same field
   if (subset.type === `func` && superset.type === `func`) {
     const subsetFunc = subset as Func