@rocicorp/zero 0.3.2024102800 → 0.5.2024103100

package/out/zql/src/zql/builder/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAE9D,OAAO,KAAK,EACV,GAAG,EAEH,QAAQ,EAGT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,uCAAuC,CAAC;AAC/D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;AAG7E,OAAO,KAAK,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAK7C,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,EAAE,GAAG,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,GACvD,KAAK,CAMP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OAqCzD;AA8DD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAWN"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAE9D,OAAO,KAAK,EACV,GAAG,EAKH,QAAQ,EAIT,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,uCAAuC,CAAC;AAC/D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;AAK7E,OAAO,KAAK,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAK7C,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,cAAc,EAAE,GAAG,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAEjD;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,eAAe,EACzB,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,GACvD,KAAK,CAMP;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EACR,qBAAqB,EAAE,qBAAqB,GAAG,SAAS,OA8CzD;AAgHD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAWN"}

package/out/zql/src/zql/builder/builder.js

@@ -1,5 +1,7 @@
 import { assert } from '../../../../shared/src/asserts.js';
 import { must } from '../../../../shared/src/must.js';
+import { FanIn } from '../ivm/fan-in.js';
+import { FanOut } from '../ivm/fan-out.js';
 import { Filter } from '../ivm/filter.js';
 import { Join } from '../ivm/join.js';
 import { Skip } from '../ivm/skip.js';
@@ -38,10 +40,7 @@ export function bindStaticParameters(ast, staticQueryParameters) {
         if (node.where) {
             return {
                 ...node,
-                where: node.where.map(condition => ({
-                    ...condition,
-                    value: bindValue(condition.value),
-                })),
+                where: bindCondition(node.where),
                 related: node.related?.map(sq => ({
                     ...sq,
                     subquery: visit(sq.subquery),
@@ -50,6 +49,17 @@ export function bindStaticParameters(ast, staticQueryParameters) {
         }
         return node;
     };
+    function bindCondition(condition) {
+        return condition.type === 'simple'
+            ? {
+                ...condition,
+                value: bindValue(condition.value),
+            }
+            : {
+                ...condition,
+                conditions: condition.conditions.map(bindCondition),
+            };
+    }
     const bindValue = (value) => {
         if (isParameter(value)) {
             const anchor = must(staticQueryParameters, 'Static query params do not exist')[value.anchor];
@@ -73,16 +83,14 @@ function buildPipelineInternal(ast, delegate, staticQueryParameters, partitionKe
     if (!source) {
         throw new Error(`Source not found: ${ast.table}`);
     }
-    const conn = source.connect(must(ast.orderBy), ast.where ?? []);
+    const conn = source.connect(must(ast.orderBy), ast.where);
     let end = conn;
     const { appliedFilters } = conn;
     if (ast.start) {
         end = new Skip(end, ast.start);
     }
     if (ast.where) {
-        for (const condition of ast.where) {
-            end = new Filter(end, appliedFilters ? 'push-only' : 'all', createPredicate(condition));
-        }
+        end = applyWhere(end, ast.where, appliedFilters);
     }
     if (ast.limit) {
         end = new Take(end, delegate.createStorage(), ast.limit, partitionKey);
@@ -104,6 +112,39 @@ function buildPipelineInternal(ast, delegate, staticQueryParameters, partitionKe
     }
     return end;
 }
+function applyWhere(input, condition, 
+// Remove `appliedFilter`
+// Each branch can `fetch` with different filters from the same source.
+// Or we do the union of queries approach and retain this `appliedFilters` and `sourceConnect` behavior.
+// Downside of that being unbounded memory usage.
+appliedFilters) {
+    switch (condition.type) {
+        case 'and':
+            return applyAnd(input, condition, appliedFilters);
+        case 'or':
+            return applyOr(input, condition, appliedFilters);
+        default:
+            return applySimpleCondition(input, condition, appliedFilters);
+    }
+}
+function applyAnd(input, condition, appliedFilters) {
+    for (const subCondition of condition.conditions) {
+        input = applyWhere(input, subCondition, appliedFilters);
+    }
+    return input;
+}
+function applyOr(input, condition, appliedFilters) {
+    const fanOut = new FanOut(input);
+    const branches = [];
+    for (const subCondition of condition.conditions) {
+        branches.push(applyWhere(fanOut, subCondition, appliedFilters));
+    }
+    assert(branches.length > 0, 'Or condition must have at least one branch');
+    return new FanIn(fanOut, branches);
+}
+function applySimpleCondition(input, condition, appliedFilters) {
+    return new Filter(input, appliedFilters ? 'push-only' : 'all', createPredicate(condition));
+}
 export function assertOrderingIncludesPK(ordering, pk) {
     const orderingFields = ordering.map(([field]) => field);
     const missingFields = pk.filter(pkField => !orderingFields.includes(pkField));

package/out/zql/src/zql/builder/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAEzD,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AAUpD,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AA0B5C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,aAAa,CAC3B,GAAQ,EACR,QAAyB,EACzB,qBAAwD;IAExD,OAAO,qBAAqB,CAC1B,oBAAoB,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAChD,QAAQ,EACR,qBAAqB,CACtB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,GAAQ,EACR,qBAAwD;IAExD,MAAM,KAAK,GAAG,CAAC,IAAS,EAAO,EAAE;QAC/B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,GAAG,IAAI;gBACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;oBAClC,GAAG,SAAS;oBACZ,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC;iBAClC,CAAC,CAAC;gBACH,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBAChC,GAAG,EAAE;oBACL,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;iBAC7B,CAAC,CAAC;aACJ,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,KAAoB,EAAgB,EAAE;QACvD,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CACjB,qBAAqB,EACrB,kCAAkC,CACnC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,sBAAsB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,kCAAkC;YAClC,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,qBAAqB,EAAE,CAAC;YACpC,CAAC;YACD,OAAO,aAA6B,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC;AACxE,CAAC;AAED,SAAS,qBAAqB,CAC5B,GAAQ,EACR,QAAyB,EACzB,qBAAwD,EACxD,YAAiC;IAEjC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,GAAG,GAAU,IAAI,CAAC;IACtB,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC;IAE9B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,KAAK,MAAM,SAAS,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;YAClC,GAAG,GAAG,IAAI,MAAM,CACd,GAAG,EACH,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EACpC,eAAe,CAAC,SAAS,CAAC,CAC3B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,qBAAqB,CACjC,EAAE,CAAC,QAAQ,EACX,QAAQ,EACR,qBAAqB,EACrB,EAAE,CAAC,WAAW,CAAC,UAAU,CAC1B,CAAC;YACF,GAAG,GAAG,IAAI,IAAI,CAAC;gBACb,MAAM,EAAE,GAAG;gBACX,KAAK;gBACL,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAE;gBACjC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW;gBACrC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU;gBACnC,gBAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;gBACnC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK;aAC3B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAkB,EAClB,EAAc;IAEd,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE9E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,0DAA0D,aAAa,CAAC,IAAI,CAC1E,IAAI,CACL,EAAE,CACJ,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAEzD,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AAcpD,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AA0B5C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,aAAa,CAC3B,GAAQ,EACR,QAAyB,EACzB,qBAAwD;IAExD,OAAO,qBAAqB,CAC1B,oBAAoB,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAChD,QAAQ,EACR,qBAAqB,CACtB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,GAAQ,EACR,qBAAwD;IAExD,MAAM,KAAK,GAAG,CAAC,IAAS,EAAO,EAAE;QAC/B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,GAAG,IAAI;gBACP,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;gBAChC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBAChC,GAAG,EAAE;oBACL,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC;iBAC7B,CAAC,CAAC;aACJ,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,SAAS,aAAa,CAAC,SAAoB;QACzC,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ;YAChC,CAAC,CAAC;gBACE,GAAG,SAAS;gBACZ,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC;aAClC;YACH,CAAC,CAAC;gBACE,GAAG,SAAS;gBACZ,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC;aACpD,CAAC;IACR,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,KAAoB,EAAgB,EAAE;QACvD,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CACjB,qBAAqB,EACrB,kCAAkC,CACnC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,sBAAsB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACnE,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,kCAAkC;YAClC,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,qBAAqB,EAAE,CAAC;YACpC,CAAC;YACD,OAAO,aAA6B,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC;AACxE,CAAC;AAED,SAAS,qBAAqB,CAC5B,GAAQ,EACR,QAAyB,EACzB,qBAAwD,EACxD,YAAiC;IAEjC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAC1D,IAAI,GAAG,GAAU,IAAI,CAAC;IACtB,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC;IAE9B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;YACzD,MAAM,KAAK,GAAG,qBAAqB,CACjC,EAAE,CAAC,QAAQ,EACX,QAAQ,EACR,qBAAqB,EACrB,EAAE,CAAC,WAAW,CAAC,UAAU,CAC1B,CAAC;YACF,GAAG,GAAG,IAAI,IAAI,CAAC;gBACb,MAAM,EAAE,GAAG;gBACX,KAAK;gBACL,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAE;gBACjC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW;gBACrC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU;gBACnC,gBAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;gBACnC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,KAAK;aAC3B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CACjB,KAAY,EACZ,SAAoB;AACpB,yBAAyB;AACzB,uEAAuE;AACvE,wGAAwG;AACxG,iDAAiD;AACjD,cAAuB;IAEvB,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACpD,KAAK,IAAI;YACP,OAAO,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACnD;YACE,OAAO,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CACf,KAAY,EACZ,SAAsB,EACtB,cAAuB;IAEvB,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAChD,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CACd,KAAY,EACZ,SAAsB,EACtB,cAAuB;IAEvB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAY,EAAE,CAAC;IAC7B,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,4CAA4C,CAAC,CAAC;IAC1E,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,QAA+B,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,oBAAoB,CAC3B,KAAY,EACZ,SAA0B,EAC1B,cAAuB;IAEvB,OAAO,IAAI,MAAM,CACf,KAAK,EACL,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EACpC,eAAe,CAAC,SAAS,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAkB,EAClB,EAAc;IAEd,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE9E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,0DAA0D,aAAa,CAAC,IAAI,CAC1E,IAAI,CACL,EAAE,CACJ,CAAC;IACJ,CAAC;AACH,CAAC"}

package/out/zql/src/zql/builder/filter.d.ts

@@ -1,6 +1,6 @@
-import type { Condition } from '../../../../zero-protocol/src/ast.js';
+import type { SimpleCondition } from '../../../../zero-protocol/src/ast.js';
 import type { Row, Value } from '../../../../zero-protocol/src/data.js';
 export type NonNullValue = Exclude<Value, null | undefined>;
 export type SimplePredicate = (rhs: NonNullValue) => boolean;
-export declare function createPredicate(condition: Condition): (row: Row) => boolean;
+export declare function createPredicate(condition: SimpleCondition): (row: Row) => boolean;
 //# sourceMappingURL=filter.d.ts.map

package/out/zql/src/zql/builder/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EAGV,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,uCAAuC,CAAC;AAGtE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC;AAE7D,wBAAgB,eAAe,CAAC,SAAS,EAAE,SAAS,SAKrC,GAAG,aAOjB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,uCAAuC,CAAC;AAGtE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC,CAAC;AAC5D,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC;AAE7D,wBAAgB,eAAe,CAAC,SAAS,EAAE,eAAe,SAK3C,GAAG,aAOjB"}

package/out/zql/src/zql/builder/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAOzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAK3C,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,MAAM,IAAI,GAAG,mBAAmB,CAC9B,SAAS,CAAC,KAAqB,EAC/B,SAAS,CAAC,EAAE,CACb,CAAC;IACF,OAAO,CAAC,GAAQ,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAA2C,EAC3C,QAAwB;IAExB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC;QAC5B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC;QAC5B,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;QAC1B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;QAC3B,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;QAC1B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;QAC3B,KAAK,MAAM;YACT,OAAO,gBAAgB,CAAC,GAAmB,EAAE,EAAE,CAAC,CAAC;QACnD,KAAK,UAAU;YACb,OAAO,GAAG,CAAC,gBAAgB,CAAC,GAAmB,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,KAAK,OAAO;YACV,OAAO,gBAAgB,CAAC,GAAmB,EAAE,GAAG,CAAC,CAAC;QACpD,KAAK,WAAW;YACd,OAAO,GAAG,CAAC,gBAAgB,CAAC,GAAmB,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD;YACE,QAAwB,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,SAAS,GAAG,CAAI,CAAsB;IACpC,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAOzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAK3C,MAAM,UAAU,eAAe,CAAC,SAA0B;IACxD,MAAM,IAAI,GAAG,mBAAmB,CAC9B,SAAS,CAAC,KAAqB,EAC/B,SAAS,CAAC,EAAE,CACb,CAAC;IACF,OAAO,CAAC,GAAQ,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAA2C,EAC3C,QAAwB;IAExB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC;QAC5B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC;QAC5B,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;QAC1B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;QAC3B,KAAK,GAAG;YACN,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;QAC1B,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC;QAC3B,KAAK,MAAM;YACT,OAAO,gBAAgB,CAAC,GAAmB,EAAE,EAAE,CAAC,CAAC;QACnD,KAAK,UAAU;YACb,OAAO,GAAG,CAAC,gBAAgB,CAAC,GAAmB,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,KAAK,OAAO;YACV,OAAO,gBAAgB,CAAC,GAAmB,EAAE,GAAG,CAAC,CAAC;QACpD,KAAK,WAAW;YACd,OAAO,GAAG,CAAC,gBAAgB,CAAC,GAAmB,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,KAAK,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD;YACE,QAAwB,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,SAAS,GAAG,CAAI,CAAsB;IACpC,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}

package/out/zql/src/zql/builder/like.js

@@ -55,6 +55,6 @@ function patternToRegExp(source, flags = '') {
                 break;
         }
     }
-    return new RegExp(pattern + '$', flags);
+    return new RegExp(pattern + '$', flags + 'm');
 }
 //# sourceMappingURL=like.js.map

package/out/zql/src/zql/builder/like.js.map

@@ -1 +1 @@
-{"version":3,"file":"like.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/like.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAG/D,MAAM,UAAU,gBAAgB,CAC9B,OAAqB,EACrB,KAAe;IAEf,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAiB,EAAE,EAAE;QAC3B,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAe;IACjD,4EAA4E;IAC5E,+DAA+D;IAC/D,iDAAiD;IACjD,2CAA2C;IAC3C,0CAA0C;IAE1C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YACvC,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;QACzD,CAAC;QACD,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC;IAC1C,CAAC;IACD,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAE5C,SAAS,eAAe,CAAC,MAAc,EAAE,QAAkB,EAAE;IAC3D,yBAAyB;IACzB,UAAU;IACV,SAAS;IACT,iDAAiD;IACjD,gDAAgD;IAChD,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAClB,QAAQ,CAAC,EAAE,CAAC;YACV,KAAK,GAAG;gBACN,OAAO,IAAI,IAAI,CAAC;gBAChB,MAAM;YACR,KAAK,GAAG;gBACN,OAAO,IAAI,GAAG,CAAC;gBACf,MAAM;YAER,+BAA+B;YAC/B,KAAK,IAAI;gBACP,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,CAAC;gBACD,CAAC,EAAE,CAAC;gBACJ,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAEhB,eAAe;YACf;gBACE,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,OAAO,IAAI,IAAI,CAAC;gBAClB,CAAC;gBACD,OAAO,IAAI,CAAC,CAAC;gBAEb,MAAM;QACV,CAAC;IACH,CAAC;IACD,OAAO,IAAI,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"like.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/builder/like.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAG/D,MAAM,UAAU,gBAAgB,CAC9B,OAAqB,EACrB,KAAe;IAEf,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAiB,EAAE,EAAE;QAC3B,YAAY,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,OAAe,EAAE,KAAe;IACjD,4EAA4E;IAC5E,+DAA+D;IAC/D,iDAAiD;IACjD,2CAA2C;IAC3C,0CAA0C;IAE1C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;YACvC,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;QACzD,CAAC;QACD,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC;IAC1C,CAAC;IACD,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAW,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAE5C,SAAS,eAAe,CAAC,MAAc,EAAE,QAAkB,EAAE;IAC3D,yBAAyB;IACzB,UAAU;IACV,SAAS;IACT,iDAAiD;IACjD,gDAAgD;IAChD,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAClB,QAAQ,CAAC,EAAE,CAAC;YACV,KAAK,GAAG;gBACN,OAAO,IAAI,IAAI,CAAC;gBAChB,MAAM;YACR,KAAK,GAAG;gBACN,OAAO,IAAI,GAAG,CAAC;gBACf,MAAM;YAER,+BAA+B;YAC/B,KAAK,IAAI;gBACP,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,CAAC;gBACD,CAAC,EAAE,CAAC;gBACJ,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAEhB,eAAe;YACf;gBACE,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3B,OAAO,IAAI,IAAI,CAAC;gBAClB,CAAC;gBACD,OAAO,IAAI,CAAC,CAAC;gBAEb,MAAM;QACV,CAAC;IACH,CAAC;IACD,OAAO,IAAI,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC;AAChD,CAAC"}

package/out/zql/src/zql/ivm/fan-in.d.ts

@@ -0,0 +1,31 @@
+import type { Change } from './change.js';
+import type { Node } from './data.js';
+import type { FanOut } from './fan-out.js';
+import type { FetchRequest, Input, Operator, Output } from './operator.js';
+import type { TableSchema } from './schema.js';
+import type { Stream } from './stream.js';
+/**
+ * The FanIn operator merges multiple streams into one.
+ * It eliminates duplicates and must be paired with a fan-out operator
+ * somewhere upstream of the fan-in.
+ *
+ *  issue
+ *    |
+ * fan-out
+ * /      \
+ * a      b
+ *  \    /
+ * fan-in
+ *   |
+ */
+export declare class FanIn implements Operator {
+    #private;
+    constructor(fanOut: FanOut, inputs: [Input, ...Input[]]);
+    setOutput(output: Output): void;
+    destroy(): void;
+    getSchema(): TableSchema;
+    fetch(req: FetchRequest): Stream<Node>;
+    cleanup(req: FetchRequest): Stream<Node>;
+    push(change: Change): void;
+}
+//# sourceMappingURL=fan-in.d.ts.map

package/out/zql/src/zql/ivm/fan-in.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fan-in.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/fan-in.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC;;;;;;;;;;;;;GAaG;AACH,qBAAa,KAAM,YAAW,QAAQ;;gBAMxB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC;IAgBvD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,OAAO,IAAI,IAAI;IAMf,SAAS;IAIT,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;IAItC,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;IAexC,IAAI,CAAC,MAAM,EAAE,MAAM;CAIpB"}

package/out/zql/src/zql/ivm/fan-in.js

@@ -0,0 +1,61 @@
+import { assert } from '../../../../shared/src/asserts.js';
+import { mergeIterables } from '../../../../shared/src/iterables.js';
+import { deepEqual, } from '../../../../shared/src/json.js';
+import { must } from '../../../../shared/src/must.js';
+/**
+ * The FanIn operator merges multiple streams into one.
+ * It eliminates duplicates and must be paired with a fan-out operator
+ * somewhere upstream of the fan-in.
+ *
+ *  issue
+ *    |
+ * fan-out
+ * /      \
+ * a      b
+ *  \    /
+ * fan-in
+ *   |
+ */
+export class FanIn {
+    #inputs;
+    #fanOut;
+    #output;
+    #schema;
+    constructor(fanOut, inputs) {
+        this.#inputs = inputs;
+        this.#schema = inputs[0].getSchema();
+        this.#fanOut = fanOut;
+        for (const input of inputs) {
+            input.setOutput(this);
+            assert(deepEqual(this.#schema, input.getSchema()), `Schema mismatch in fan-in`);
+        }
+    }
+    setOutput(output) {
+        this.#output = output;
+    }
+    destroy() {
+        for (const input of this.#inputs) {
+            input.destroy();
+        }
+    }
+    getSchema() {
+        return this.#inputs[0].getSchema();
+    }
+    fetch(req) {
+        return this.#fetchOrCleanup(input => input.fetch(req));
+    }
+    cleanup(req) {
+        return this.#fetchOrCleanup(input => input.cleanup(req));
+    }
+    *#fetchOrCleanup(streamProvider) {
+        const iterables = this.#inputs.map(input => streamProvider(input));
+        for (const node of mergeIterables(iterables, (l, r) => must(this.#schema).compareRows(l.row, r.row), true)) {
+            yield node;
+        }
+    }
+    push(change) {
+        this.#fanOut.onFanInReceivedPush();
+        this.#output?.push(change);
+    }
+}
+//# sourceMappingURL=fan-in.js.map

package/out/zql/src/zql/ivm/fan-in.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fan-in.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/fan-in.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AACnE,OAAO,EACL,SAAS,GAEV,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AAQpD;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,KAAK;IACP,OAAO,CAAmB;IAC1B,OAAO,CAAS;IACzB,OAAO,CAAqB;IAC5B,OAAO,CAA0B;IAEjC,YAAY,MAAc,EAAE,MAA2B;QACrD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACtB,MAAM,CACJ,SAAS,CACP,IAAI,CAAC,OAAuC,EAC5C,KAAK,CAAC,SAAS,EAAkC,CAClD,EACD,2BAA2B,CAC5B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,OAAO;QACL,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,GAAiB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,CAAC,GAAiB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,CAAC,eAAe,CAAC,cAA8C;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QACnE,KAAK,MAAM,IAAI,IAAI,cAAc,CAC/B,SAAS,EACT,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EACtD,IAAI,CACL,EAAE,CAAC;YACF,MAAM,IAAI,CAAC;QACb,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACF"}

package/out/zql/src/zql/ivm/fan-out.d.ts

@@ -0,0 +1,19 @@
+import type { Change } from './change.js';
+import type { FetchRequest, Input, Operator, Output } from './operator.js';
+/**
+ * Forks a stream into multiple streams.
+ * Is meant to be paired with a `FanIn` operator which will
+ * later merge the forks back together.
+ */
+export declare class FanOut implements Operator {
+    #private;
+    constructor(input: Input);
+    setOutput(output: Output): void;
+    destroy(): void;
+    getSchema(): import("./schema.js").TableSchema;
+    fetch(req: FetchRequest): import("./stream.js").Stream<import("./data.js").Node>;
+    cleanup(req: FetchRequest): import("./stream.js").Stream<import("./data.js").Node>;
+    onFanInReceivedPush(): void;
+    push(change: Change): void;
+}
+//# sourceMappingURL=fan-out.d.ts.map

package/out/zql/src/zql/ivm/fan-out.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fan-out.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/fan-out.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAEzE;;;;GAIG;AACH,qBAAa,MAAO,YAAW,QAAQ;;gBAMzB,KAAK,EAAE,KAAK;IAQxB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,OAAO,IAAI,IAAI;IAWf,SAAS;IAIT,KAAK,CAAC,GAAG,EAAE,YAAY;IAIvB,OAAO,CAAC,GAAG,EAAE,YAAY;IAIzB,mBAAmB;IAInB,IAAI,CAAC,MAAM,EAAE,MAAM;CASpB"}

package/out/zql/src/zql/ivm/fan-out.js

@@ -0,0 +1,54 @@
+/**
+ * Forks a stream into multiple streams.
+ * Is meant to be paired with a `FanIn` operator which will
+ * later merge the forks back together.
+ */
+export class FanOut {
+    #input;
+    #outputs;
+    #fanInReceivedPush;
+    #destroyCount;
+    constructor(input) {
+        this.#input = input;
+        this.#input.setOutput(this);
+        this.#outputs = [];
+        this.#fanInReceivedPush = false;
+        this.#destroyCount = 0;
+    }
+    setOutput(output) {
+        this.#outputs.push(output);
+    }
+    destroy() {
+        if (this.#destroyCount < this.#outputs.length) {
+            if (this.#destroyCount === 0) {
+                this.#input.destroy();
+            }
+            ++this.#destroyCount;
+        }
+        else {
+            throw new Error('FanOut already destroyed once for each output');
+        }
+    }
+    getSchema() {
+        return this.#input.getSchema();
+    }
+    fetch(req) {
+        return this.#input.fetch(req);
+    }
+    cleanup(req) {
+        return this.#input.cleanup(req);
+    }
+    onFanInReceivedPush() {
+        this.#fanInReceivedPush = true;
+    }
+    push(change) {
+        this.#fanInReceivedPush = false;
+        for (const out of this.#outputs) {
+            out.push(change);
+            if (this.#fanInReceivedPush) {
+                return;
+            }
+        }
+    }
+}
+//# sourceMappingURL=fan-out.js.map

package/out/zql/src/zql/ivm/fan-out.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fan-out.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/fan-out.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,OAAO,MAAM;IACR,MAAM,CAAQ;IACd,QAAQ,CAAW;IAC5B,kBAAkB,CAAU;IAC5B,aAAa,CAAS;IAEtB,YAAY,KAAY;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACxB,CAAC;YACD,EAAE,IAAI,CAAC,aAAa,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAiB;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,GAAiB;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjB,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/out/zql/src/zql/ivm/filter.d.ts

@@ -3,7 +3,6 @@ import type { Change } from './change.js';
 import type { Node } from './data.js';
 import type { FetchRequest, Input, Operator, Output } from './operator.js';
 import type { TableSchema } from './schema.js';
-import type { Stream } from './stream.js';
 /**
  * Apply filter to all data flowing through, or just pushes. Pipeline builder
  * can hoist some filters up to source, so it will tell Filter to apply only to
@@ -22,7 +21,7 @@ export declare class Filter implements Operator {
     destroy(): void;
     getSchema(): TableSchema;
     fetch(req: FetchRequest): Generator<Node, void, unknown>;
-    cleanup(req: FetchRequest): Stream<Node>;
+    cleanup(req: FetchRequest): Generator<Node, void, unknown>;
     push(change: Change): void;
 }
 //# sourceMappingURL=filter.d.ts.map

package/out/zql/src/zql/ivm/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,uCAAuC,CAAC;AAC/D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;AAEvC;;;;GAIG;AACH,qBAAa,MAAO,YAAW,QAAQ;;gBAOzB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO;IAOtE,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,OAAO,IAAI,IAAI;IAIf,SAAS,IAAI,WAAW;IAIvB,KAAK,CAAC,GAAG,EAAE,YAAY;IAQxB,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;IAIxC,IAAI,CAAC,MAAM,EAAE,MAAM;CAsBpB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/filter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,uCAAuC,CAAC;AAC/D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAG7C;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;AAEvC;;;;GAIG;AACH,qBAAa,MAAO,YAAW,QAAQ;;gBAOzB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO;IAOtE,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,OAAO,IAAI,IAAI;IAIf,SAAS,IAAI,WAAW;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY;IAIvB,OAAO,CAAC,GAAG,EAAE,YAAY;IAYzB,IAAI,CAAC,MAAM,EAAE,MAAM;CAsBpB"}

package/out/zql/src/zql/ivm/filter.js

@@ -25,16 +25,19 @@ export class Filter {
     getSchema() {
         return this.#input.getSchema();
     }
-    *fetch(req) {
-        for (const node of this.#input.fetch(req)) {
+    fetch(req) {
+        return this.#filter(this.#input.fetch(req));
+    }
+    cleanup(req) {
+        return this.#filter(this.#input.cleanup(req));
+    }
+    *#filter(stream) {
+        for (const node of stream) {
             if (this.#mode === 'push-only' || this.#predicate(node.row)) {
                 yield node;
             }
         }
     }
-    cleanup(req) {
-        return this.fetch(req);
-    }
     push(change) {
         assert(this.#output, 'Output not set');
         switch (change.type) {

package/out/zql/src/zql/ivm/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,mCAAmC,CAAC;AAItE,OAAO,EAAC,2BAA2B,EAAC,MAAM,uCAAuC,CAAC;AAYlF;;;;GAIG;AACH,MAAM,OAAO,MAAM;IACR,MAAM,CAAQ;IACd,KAAK,CAAO;IACZ,UAAU,CAAwB;IAE3C,OAAO,CAAqB;IAE5B,YAAY,KAAY,EAAE,IAAU,EAAE,SAAgC;QACpE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;IAED,CAAC,KAAK,CAAC,GAAiB;QACtB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,KAAK,KAAK,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAI,CAAC;YACb,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAiB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEvC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,KAAK,CAAC;YACX,KAAK,QAAQ;gBACX,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,KAAK,OAAO;gBACV,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM;YACR;gBACE,WAAW,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,mCAAmC,CAAC;AAItE,OAAO,EAAC,2BAA2B,EAAC,MAAM,uCAAuC,CAAC;AAYlF;;;;GAIG;AACH,MAAM,OAAO,MAAM;IACR,MAAM,CAAQ;IACd,KAAK,CAAO;IACZ,UAAU,CAAwB;IAE3C,OAAO,CAAqB;IAE5B,YAAY,KAAY,EAAE,IAAU,EAAE,SAAgC;QACpE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAiB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,GAAiB;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,CAAC,OAAO,CAAC,MAAoB;QAC3B,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,KAAK,KAAK,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAI,CAAC;YACb,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEvC,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,KAAK,CAAC;YACX,KAAK,QAAQ;gBACX,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,KAAK,OAAO;gBACV,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnE,MAAM;YACR;gBACE,WAAW,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}

package/out/zql/src/zql/ivm/memory-source.d.ts

@@ -1,4 +1,4 @@
-import type { Ordering, SimpleCondition } from '../../../../zero-protocol/src/ast.js';
+import type { Condition, Ordering, SimpleCondition } from '../../../../zero-protocol/src/ast.js';
 import type { Row } from '../../../../zero-protocol/src/data.js';
 import type { PrimaryKey } from '../../../../zero-protocol/src/primary-key.js';
 import { type Comparator, type Node } from './data.js';
@@ -25,7 +25,7 @@ export declare class MemorySource implements Source {
         columns: Record<string, SchemaValue>;
         primaryKey: readonly [string, ...string[]];
     };
-    connect(sort: Ordering, optionalFilters?: SimpleCondition[] | undefined): SourceInput;
+    connect(sort: Ordering, optionalFilters?: Condition | undefined): SourceInput;
     getIndexKeys(): string[];
     push(change: SourceChange): void;
 }
@@ -53,7 +53,7 @@ export declare function generateWithStart(it: Iterator<Node>, req: FetchRequest,
  * @param compare - the comparator to use to find the position for the overlay
  */
 export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, compare: Comparator): Generator<{
-    row: Record<string, string | number | boolean | null | undefined>;
+    row: Record<string, import("../../../../shared/src/json.js").ReadonlyJSONValue | undefined>;
     relationships: {};
 }, void, unknown>;
 export { overlayForStartAt as overlayForStartAtForTest };
@@ -61,7 +61,25 @@ declare function overlayForStartAt(overlay: Overlay | undefined, startAt: Row, c
 export { overlayForConstraint as overlayForConstraintForTest };
 declare function overlayForConstraint(overlay: Overlay | undefined, constraint: Constraint): Overlay | undefined;
 export declare function generateWithOverlayInner(rowIterator: Iterable<Row>, overlays: [Overlay | undefined, Overlay | undefined], compare: (r1: Row, r2: Row) => number): Generator<{
-    row: Record<string, string | number | boolean | null | undefined>;
+    row: Record<string, import("../../../../shared/src/json.js").ReadonlyJSONValue | undefined>;
     relationships: {};
 }, void, unknown>;
+/**
+ * Only returns optional filters if:
+ * 1. It's a simple condition
+ * 2. It's an `and` condition with only simple conditions inside of it
+ * 3. It's an `or` that is a no-op.
+ *
+ * Otherwise the filters are dropped.
+ *
+ * This is a short term solution until we update `fetch` to pass
+ * the constraints rather than making them static in `connect`.
+ *
+ * The below way of doing things over-fetches as the optional filters
+ * are widened to cover all branches of the pipeline.
+ */
+export declare function filteredOptionalFilters(optionalFilters: Condition | undefined): {
+    filters: SimpleCondition[];
+    allApplied: boolean;
+};
 //# sourceMappingURL=memory-source.d.ts.map

package/out/zql/src/zql/ivm/memory-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/memory-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,EAER,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,uCAAuC,CAAC;AACtE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;AAI7E,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,IAAI,EAEV,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAC,WAAW,EAAc,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EAEZ,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAgBF;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,MAAM;;gBAWvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,UAAU;IAgBxB,aAAa;;;;;IAoBb,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,eAAe,CAAC,EAAE,eAAe,EAAE,GAAG,SAAS,GAC9C,WAAW;IAoFd,YAAY,IAAI,MAAM,EAAE;IAiJxB,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAwEjC;AAyBD;;;;;;;;;GASG;AACH,wBAAiB,iBAAiB,CAChC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAClB,GAAG,EAAE,YAAY,EACjB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM,GACpC,MAAM,CAAC,IAAI,CAAC,CA0Bd;AAED;;;;;;;;;;;GAWG;AACH,wBAAiB,mBAAmB,CAClC,OAAO,EAAE,GAAG,GAAG,SAAS,EACxB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EACnB,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,UAAU;;;kBAIpB;AAoCD,OAAO,EAAC,iBAAiB,IAAI,wBAAwB,EAAC,CAAC;AAEvD,iBAAS,iBAAiB,CACxB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,SAAS,CAQrB;AAED,OAAO,EAAC,oBAAoB,IAAI,2BAA2B,EAAC,CAAC;AAE7D,iBAAS,oBAAoB,CAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,UAAU,EAAE,UAAU,GACrB,OAAO,GAAG,SAAS,CASrB;AAyBD,wBAAiB,wBAAwB,CACvC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAC1B,QAAQ,EAAE,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC,EACpD,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM;;;kBAkCtC"}
+{"version":3,"file":"memory-source.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/ivm/memory-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EAER,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAQ,MAAM,uCAAuC,CAAC;AACtE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,8CAA8C,CAAC;AAI7E,OAAO,EACL,KAAK,UAAU,EAGf,KAAK,IAAI,EAEV,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAC,UAAU,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAC,WAAW,EAAc,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EAEZ,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,MAAM,OAAO,GAAG;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAgBF;;;;;;GAMG;AACH,qBAAa,YAAa,YAAW,MAAM;;gBAWvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACpC,UAAU,EAAE,UAAU;IAgBxB,aAAa;;;;;IAoBb,OAAO,CACL,IAAI,EAAE,QAAQ,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,SAAS,GACtC,WAAW;IAwFd,YAAY,IAAI,MAAM,EAAE;IAiJxB,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAwEjC;AAyBD;;;;;;;;;GASG;AACH,wBAAiB,iBAAiB,CAChC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAClB,GAAG,EAAE,YAAY,EACjB,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM,GACpC,MAAM,CAAC,IAAI,CAAC,CA0Bd;AAED;;;;;;;;;;;GAWG;AACH,wBAAiB,mBAAmB,CAClC,OAAO,EAAE,GAAG,GAAG,SAAS,EACxB,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EACnB,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,UAAU;;;kBAIpB;AAoCD,OAAO,EAAC,iBAAiB,IAAI,wBAAwB,EAAC,CAAC;AAEvD,iBAAS,iBAAiB,CACxB,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,UAAU,GAClB,OAAO,GAAG,SAAS,CAQrB;AAED,OAAO,EAAC,oBAAoB,IAAI,2BAA2B,EAAC,CAAC;AAE7D,iBAAS,oBAAoB,CAC3B,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,UAAU,EAAE,UAAU,GACrB,OAAO,GAAG,SAAS,CASrB;AAyBD,wBAAiB,wBAAwB,CACvC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAC1B,QAAQ,EAAE,CAAC,OAAO,GAAG,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC,EACpD,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,KAAK,MAAM;;;kBAkCtC;AA+CD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,SAAS,GAAG,SAAS,GACrC;IAAC,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAC,CAqCnD"}

package/out/zql/src/zql/ivm/memory-source.js

@@ -64,12 +64,13 @@ export class MemorySource {
             },
             appliedFilters: false,
         };
+        const predicates = filteredOptionalFilters(optionalFilters).filters.map(c => createPredicate(c));
         const connection = {
             input,
             output: undefined,
             sort,
             compareRows: makeComparator(sort),
-            optionalFilters: (optionalFilters ?? []).map(f => createPredicate(f)),
+            optionalFilters: predicates,
         };
         assertOrderingIncludesPK(sort, this.#primaryKey);
         this.#connections.push(connection);
@@ -507,4 +508,50 @@ function compareBounds(a, b) {
     }
     return compareValues(a, b);
 }
+/**
+ * Only returns optional filters if:
+ * 1. It's a simple condition
+ * 2. It's an `and` condition with only simple conditions inside of it
+ * 3. It's an `or` that is a no-op.
+ *
+ * Otherwise the filters are dropped.
+ *
+ * This is a short term solution until we update `fetch` to pass
+ * the constraints rather than making them static in `connect`.
+ *
+ * The below way of doing things over-fetches as the optional filters
+ * are widened to cover all branches of the pipeline.
+ */
+export function filteredOptionalFilters(optionalFilters) {
+    let ret = {
+        filters: [],
+        allApplied: false,
+    };
+    if (optionalFilters) {
+        if (optionalFilters.type === 'or' &&
+            optionalFilters.conditions.length === 1) {
+            optionalFilters = optionalFilters.conditions[0];
+        }
+        if (optionalFilters.type === 'and') {
+            const filters = optionalFilters.conditions.filter(c => c.type === 'simple');
+            ret = {
+                filters,
+                allApplied: filters.length === optionalFilters.conditions.length,
+            };
+        }
+        else if (optionalFilters.type === 'simple') {
+            ret = {
+                filters: [optionalFilters],
+                allApplied: true,
+            };
+        }
+        else {
+            return { filters: [], allApplied: false };
+        }
+    }
+    else {
+        ret.allApplied = true;
+    }
+    return ret;
+}
 //# sourceMappingURL=memory-source.js.map