@rocicorp/zero 0.25.0-canary.11 → 0.25.0-canary.13

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

@@ -1,9 +1,9 @@
-import { drainStreams } from "./data.js";
+import "compare-utf8";
 const throwFilterOutput = {
   push(_change) {
     throw new Error("Output not set");
   },
-  filter(_node, _cleanup) {
+  filter(_node) {
     throw new Error("Output not set");
   },
   beginFilter() {
@@ -32,27 +32,19 @@ class FilterStart {
   }
   *fetch(req) {
     this.#output.beginFilter();
-    for (const node of this.#input.fetch(req)) {
-      if (node === "yield") {
-        yield node;
-        continue;
-      }
-      if (this.#output.filter(node, false)) {
-        yield node;
-      }
-    }
-    this.#output.endFilter();
-  }
-  *cleanup(req) {
-    this.#output.beginFilter();
-    for (const node of this.#input.cleanup(req)) {
-      if (this.#output.filter(node, true)) {
-        yield node;
-      } else {
-        drainStreams(node);
+    try {
+      for (const node of this.#input.fetch(req)) {
+        if (node === "yield") {
+          yield node;
+          continue;
+        }
+        if (this.#output.filter(node)) {
+          yield node;
+        }
       }
+    } finally {
+      this.#output.endFilter();
     }
-    this.#output.endFilter();
   }
 }
 class FilterEnd {
@@ -73,12 +65,7 @@ class FilterEnd {
   }
   endFilter() {
   }
-  *cleanup(req) {
-    for (const node of this.#start.cleanup(req)) {
-      yield node;
-    }
-  }
-  filter(_node, _cleanup) {
+  filter(_node) {
     return true;
   }
   setOutput(output) {

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

@@ -1 +1 @@
-{"version":3,"file":"filter-operators.js","sources":["../../../../../zql/src/ivm/filter-operators.ts"],"sourcesContent":["import type {FetchRequest, Input, InputBase, Output} from './operator.ts';\nimport {drainStreams, type Node} from './data.ts';\nimport type {Change} from './change.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\nimport type {BuilderDelegate} from '../builder/builder.ts';\n\n/**\n * The `where` clause of a ZQL query is implemented using a sub-graph of\n * `FilterOperators`.  This sub-graph starts with a `FilterStart` operator,\n * that adapts from the normal `Operator` `Output`, to the\n * `FilterOperator` `FilterInput`, and ends with a `FilterEnd` operator that\n * adapts from a `FilterOperator` `FilterOutput` to a normal `Operator` `Input`.\n * `FilterOperator'`s do not have `fetch` or `cleanup` instead they have a\n * `filter(node: Node, cleanup: boolean): boolean` method.\n * They also have `push` which is just like normal `Operator` push.\n * Not having a `fetch` means these `FilterOperator`'s cannot modify\n * `Node` `row`s or `relationship`s, but they shouldn't, they should just\n * filter.\n *\n * This `FilterOperator` abstraction enables much more efficient processing of\n * `fetch` for `where` clauses containing OR conditions.\n *\n * See https://github.com/rocicorp/mono/pull/4339\n */\n\nexport interface FilterInput extends InputBase {\n  /** Tell the input where to send its output. */\n  setFilterOutput(output: FilterOutput): void;\n}\n\nexport interface FilterOutput extends Output {\n  // Lets the operator know that we're in a loop of filtering\n  // nodes. E.g., so the operator can cache results for the\n  // duration of the loop.\n  beginFilter(): void;\n  filter(node: Node, cleanup: boolean): boolean;\n  endFilter(): void;\n}\n\nexport interface FilterOperator extends FilterInput, FilterOutput {}\n\n/**\n * An implementation of FilterOutput that throws if push or filter is called.\n * It is used as the initial value for for an operator's output before it is\n * set.\n */\nexport const throwFilterOutput: FilterOutput = {\n  push(_change: Change): void {\n    throw new Error('Output not set');\n  },\n\n  filter(_node: Node, _cleanup): boolean {\n    throw new Error('Output not set');\n  },\n\n  beginFilter() {},\n  endFilter() {},\n};\n\nexport class FilterStart implements FilterInput, Output {\n  readonly #input: Input;\n  #output: FilterOutput = throwFilterOutput;\n\n  constructor(input: Input) {\n    this.#input = input;\n    input.setOutput(this);\n  }\n\n  setFilterOutput(output: FilterOutput) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    this.#output.push(change, this);\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    this.#output.beginFilter();\n    for (const node of this.#input.fetch(req)) {\n      if (node === 'yield') {\n        yield node;\n        continue;\n      }\n      if (this.#output.filter(node, false)) {\n        yield node;\n      }\n    }\n    this.#output.endFilter();\n  }\n\n  *cleanup(req: FetchRequest): Stream<Node> {\n    this.#output.beginFilter();\n    for (const node of this.#input.cleanup(req)) {\n      if (this.#output.filter(node, true)) {\n        yield node;\n      } else {\n        drainStreams(node);\n      }\n    }\n    this.#output.endFilter();\n  }\n}\n\nexport class FilterEnd implements Input, FilterOutput {\n  readonly #start: FilterStart;\n  readonly #input: FilterInput;\n\n  #output: Output = throwFilterOutput;\n\n  constructor(start: FilterStart, input: FilterInput) {\n    this.#start = start;\n    this.#input = input;\n    input.setFilterOutput(this);\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    for (const node of this.#start.fetch(req)) {\n      yield node;\n    }\n  }\n\n  beginFilter() {}\n  endFilter() {}\n\n  *cleanup(req: FetchRequest): Stream<Node> {\n    for (const node of this.#start.cleanup(req)) {\n      yield node;\n    }\n  }\n\n  filter(_node: Node, _cleanup: boolean) {\n    return true;\n  }\n\n  setOutput(output: Output) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    this.#output.push(change, this);\n  }\n}\n\nexport function buildFilterPipeline(\n  input: Input,\n  delegate: BuilderDelegate,\n  pipeline: (filterInput: FilterInput) => FilterInput,\n): Input {\n  const filterStart = new FilterStart(input);\n  delegate.addEdge(input, filterStart);\n  const middle = pipeline(filterStart);\n  delegate.addEdge(filterStart, middle);\n  const filterEnd = new FilterEnd(filterStart, middle);\n  delegate.addEdge(middle, filterEnd);\n  return filterEnd;\n}\n"],"names":[],"mappings":";AA+CO,MAAM,oBAAkC;AAAA,EAC7C,KAAK,SAAuB;AAC1B,UAAM,IAAI,MAAM,gBAAgB;AAAA,EAClC;AAAA,EAEA,OAAO,OAAa,UAAmB;AACrC,UAAM,IAAI,MAAM,gBAAgB;AAAA,EAClC;AAAA,EAEA,cAAc;AAAA,EAAC;AAAA,EACf,YAAY;AAAA,EAAC;AACf;AAEO,MAAM,YAA2C;AAAA,EAC7C;AAAA,EACT,UAAwB;AAAA,EAExB,YAAY,OAAc;AACxB,SAAK,SAAS;AACd,UAAM,UAAU,IAAI;AAAA,EACtB;AAAA,EAEA,gBAAgB,QAAsB;AACpC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,SAAK,QAAQ,KAAK,QAAQ,IAAI;AAAA,EAChC;AAAA,EAEA,CAAC,MAAM,KAA2C;AAChD,SAAK,QAAQ,YAAA;AACb,eAAW,QAAQ,KAAK,OAAO,MAAM,GAAG,GAAG;AACzC,UAAI,SAAS,SAAS;AACpB,cAAM;AACN;AAAA,MACF;AACA,UAAI,KAAK,QAAQ,OAAO,MAAM,KAAK,GAAG;AACpC,cAAM;AAAA,MACR;AAAA,IACF;AACA,SAAK,QAAQ,UAAA;AAAA,EACf;AAAA,EAEA,CAAC,QAAQ,KAAiC;AACxC,SAAK,QAAQ,YAAA;AACb,eAAW,QAAQ,KAAK,OAAO,QAAQ,GAAG,GAAG;AAC3C,UAAI,KAAK,QAAQ,OAAO,MAAM,IAAI,GAAG;AACnC,cAAM;AAAA,MACR,OAAO;AACL,qBAAa,IAAI;AAAA,MACnB;AAAA,IACF;AACA,SAAK,QAAQ,UAAA;AAAA,EACf;AACF;AAEO,MAAM,UAAyC;AAAA,EAC3C;AAAA,EACA;AAAA,EAET,UAAkB;AAAA,EAElB,YAAY,OAAoB,OAAoB;AAClD,SAAK,SAAS;AACd,SAAK,SAAS;AACd,UAAM,gBAAgB,IAAI;AAAA,EAC5B;AAAA,EAEA,CAAC,MAAM,KAA2C;AAChD,eAAW,QAAQ,KAAK,OAAO,MAAM,GAAG,GAAG;AACzC,YAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,cAAc;AAAA,EAAC;AAAA,EACf,YAAY;AAAA,EAAC;AAAA,EAEb,CAAC,QAAQ,KAAiC;AACxC,eAAW,QAAQ,KAAK,OAAO,QAAQ,GAAG,GAAG;AAC3C,YAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,OAAO,OAAa,UAAmB;AACrC,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,QAAgB;AACxB,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,SAAK,QAAQ,KAAK,QAAQ,IAAI;AAAA,EAChC;AACF;AAEO,SAAS,oBACd,OACA,UACA,UACO;AACP,QAAM,cAAc,IAAI,YAAY,KAAK;AACzC,WAAS,QAAQ,OAAO,WAAW;AACnC,QAAM,SAAS,SAAS,WAAW;AACnC,WAAS,QAAQ,aAAa,MAAM;AACpC,QAAM,YAAY,IAAI,UAAU,aAAa,MAAM;AACnD,WAAS,QAAQ,QAAQ,SAAS;AAClC,SAAO;AACT;"}
+{"version":3,"file":"filter-operators.js","sources":["../../../../../zql/src/ivm/filter-operators.ts"],"sourcesContent":["import type {FetchRequest, Input, InputBase, Output} from './operator.ts';\nimport {type Node} from './data.ts';\nimport type {Change} from './change.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\nimport type {BuilderDelegate} from '../builder/builder.ts';\n\n/**\n * The `where` clause of a ZQL query is implemented using a sub-graph of\n * `FilterOperators`.  This sub-graph starts with a `FilterStart` operator,\n * that adapts from the normal `Operator` `Output`, to the\n * `FilterOperator` `FilterInput`, and ends with a `FilterEnd` operator that\n * adapts from a `FilterOperator` `FilterOutput` to a normal `Operator` `Input`.\n * `FilterOperator`'s do not have `fetch` instead they have a\n * `filter(node: Node): boolean` method.\n * They also have `push` which is just like normal `Operator` push.\n * Not having a `fetch` means these `FilterOperator`'s cannot modify\n * `Node` `row`s or `relationship`s, but they shouldn't, they should just\n * filter.\n *\n * This `FilterOperator` abstraction enables much more efficient processing of\n * `fetch` for `where` clauses containing OR conditions.\n *\n * See https://github.com/rocicorp/mono/pull/4339\n */\n\nexport interface FilterInput extends InputBase {\n  /** Tell the input where to send its output. */\n  setFilterOutput(output: FilterOutput): void;\n}\n\nexport interface FilterOutput extends Output {\n  // Lets the operator know that we're in a loop of filtering\n  // nodes. E.g., so the operator can cache results for the\n  // duration of the loop.\n  beginFilter(): void;\n  filter(node: Node): boolean;\n  endFilter(): void;\n}\n\nexport interface FilterOperator extends FilterInput, FilterOutput {}\n\n/**\n * An implementation of FilterOutput that throws if push or filter is called.\n * It is used as the initial value for for an operator's output before it is\n * set.\n */\nexport const throwFilterOutput: FilterOutput = {\n  push(_change: Change): void {\n    throw new Error('Output not set');\n  },\n\n  filter(_node: Node): boolean {\n    throw new Error('Output not set');\n  },\n\n  beginFilter() {},\n  endFilter() {},\n};\n\nexport class FilterStart implements FilterInput, Output {\n  readonly #input: Input;\n  #output: FilterOutput = throwFilterOutput;\n\n  constructor(input: Input) {\n    this.#input = input;\n    input.setOutput(this);\n  }\n\n  setFilterOutput(output: FilterOutput) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    this.#output.push(change, this);\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    this.#output.beginFilter();\n    try {\n      for (const node of this.#input.fetch(req)) {\n        if (node === 'yield') {\n          yield node;\n          continue;\n        }\n        if (this.#output.filter(node)) {\n          yield node;\n        }\n      }\n    } finally {\n      // finally is important if an exception is thrown or\n      // if the stream is not fully consumed.\n      this.#output.endFilter();\n    }\n  }\n}\n\nexport class FilterEnd implements Input, FilterOutput {\n  readonly #start: FilterStart;\n  readonly #input: FilterInput;\n\n  #output: Output = throwFilterOutput;\n\n  constructor(start: FilterStart, input: FilterInput) {\n    this.#start = start;\n    this.#input = input;\n    input.setFilterOutput(this);\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    for (const node of this.#start.fetch(req)) {\n      yield node;\n    }\n  }\n\n  beginFilter() {}\n  endFilter() {}\n\n  filter(_node: Node) {\n    return true;\n  }\n\n  setOutput(output: Output) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    this.#output.push(change, this);\n  }\n}\n\nexport function buildFilterPipeline(\n  input: Input,\n  delegate: BuilderDelegate,\n  pipeline: (filterInput: FilterInput) => FilterInput,\n): Input {\n  const filterStart = new FilterStart(input);\n  delegate.addEdge(input, filterStart);\n  const middle = pipeline(filterStart);\n  delegate.addEdge(filterStart, middle);\n  const filterEnd = new FilterEnd(filterStart, middle);\n  delegate.addEdge(middle, filterEnd);\n  return filterEnd;\n}\n"],"names":[],"mappings":";AA+CO,MAAM,oBAAkC;AAAA,EAC7C,KAAK,SAAuB;AAC1B,UAAM,IAAI,MAAM,gBAAgB;AAAA,EAClC;AAAA,EAEA,OAAO,OAAsB;AAC3B,UAAM,IAAI,MAAM,gBAAgB;AAAA,EAClC;AAAA,EAEA,cAAc;AAAA,EAAC;AAAA,EACf,YAAY;AAAA,EAAC;AACf;AAEO,MAAM,YAA2C;AAAA,EAC7C;AAAA,EACT,UAAwB;AAAA,EAExB,YAAY,OAAc;AACxB,SAAK,SAAS;AACd,UAAM,UAAU,IAAI;AAAA,EACtB;AAAA,EAEA,gBAAgB,QAAsB;AACpC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,SAAK,QAAQ,KAAK,QAAQ,IAAI;AAAA,EAChC;AAAA,EAEA,CAAC,MAAM,KAA2C;AAChD,SAAK,QAAQ,YAAA;AACb,QAAI;AACF,iBAAW,QAAQ,KAAK,OAAO,MAAM,GAAG,GAAG;AACzC,YAAI,SAAS,SAAS;AACpB,gBAAM;AACN;AAAA,QACF;AACA,YAAI,KAAK,QAAQ,OAAO,IAAI,GAAG;AAC7B,gBAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF,UAAA;AAGE,WAAK,QAAQ,UAAA;AAAA,IACf;AAAA,EACF;AACF;AAEO,MAAM,UAAyC;AAAA,EAC3C;AAAA,EACA;AAAA,EAET,UAAkB;AAAA,EAElB,YAAY,OAAoB,OAAoB;AAClD,SAAK,SAAS;AACd,SAAK,SAAS;AACd,UAAM,gBAAgB,IAAI;AAAA,EAC5B;AAAA,EAEA,CAAC,MAAM,KAA2C;AAChD,eAAW,QAAQ,KAAK,OAAO,MAAM,GAAG,GAAG;AACzC,YAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,cAAc;AAAA,EAAC;AAAA,EACf,YAAY;AAAA,EAAC;AAAA,EAEb,OAAO,OAAa;AAClB,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,QAAgB;AACxB,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,SAAK,QAAQ,KAAK,QAAQ,IAAI;AAAA,EAChC;AACF;AAEO,SAAS,oBACd,OACA,UACA,UACO;AACP,QAAM,cAAc,IAAI,YAAY,KAAK;AACzC,WAAS,QAAQ,OAAO,WAAW;AACnC,QAAM,SAAS,SAAS,WAAW;AACnC,WAAS,QAAQ,aAAa,MAAM;AACpC,QAAM,YAAY,IAAI,UAAU,aAAa,MAAM;AACnD,WAAS,QAAQ,QAAQ,SAAS;AAClC,SAAO;AACT;"}

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

@@ -13,7 +13,7 @@ export declare class Filter implements FilterOperator {
     constructor(input: FilterInput, predicate: (row: Row) => boolean);
     beginFilter(): void;
     endFilter(): void;
-    filter(node: Node, cleanup: boolean): boolean;
+    filter(node: Node): boolean;
     setFilterOutput(output: FilterOutput): void;
     destroy(): void;
     getSchema(): SourceSchema;

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

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAC,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,MAAO,YAAW,cAAc;;gBAM/B,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO;IAMhE,WAAW,IAAI,IAAI;IAEnB,SAAS,IAAI,IAAI;IAEjB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO;IAI7C,eAAe,CAAC,MAAM,EAAE,YAAY;IAIpC,OAAO,IAAI,IAAI;IAIf,SAAS,IAAI,YAAY;IAIzB,IAAI,CAAC,MAAM,EAAE,MAAM;CAGpB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAC,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,MAAO,YAAW,cAAc;;gBAM/B,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO;IAMhE,WAAW,IAAI,IAAI;IAInB,SAAS,IAAI,IAAI;IAIjB,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAI3B,eAAe,CAAC,MAAM,EAAE,YAAY;IAIpC,OAAO,IAAI,IAAI;IAIf,SAAS,IAAI,YAAY;IAIzB,IAAI,CAAC,MAAM,EAAE,MAAM;CAGpB"}

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

@@ -11,11 +11,13 @@ class Filter {
     input.setFilterOutput(this);
   }
   beginFilter() {
+    this.#output.beginFilter();
   }
   endFilter() {
+    this.#output.endFilter();
   }
-  filter(node, cleanup) {
-    return this.#predicate(node.row) && this.#output.filter(node, cleanup);
+  filter(node) {
+    return this.#predicate(node.row) && this.#output.filter(node);
   }
   setFilterOutput(output) {
     this.#output = output;

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

@@ -1 +1 @@
-{"version":3,"file":"filter.js","sources":["../../../../../zql/src/ivm/filter.ts"],"sourcesContent":["import type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {\n  throwFilterOutput,\n  type FilterInput,\n  type FilterOperator,\n  type FilterOutput,\n} from './filter-operators.ts';\nimport {filterPush} from './filter-push.ts';\nimport {type Node} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\n\n/**\n * The Filter operator filters data through a predicate. It is stateless.\n *\n * The predicate must be pure.\n */\nexport class Filter implements FilterOperator {\n  readonly #input: FilterInput;\n  readonly #predicate: (row: Row) => boolean;\n\n  #output: FilterOutput = throwFilterOutput;\n\n  constructor(input: FilterInput, predicate: (row: Row) => boolean) {\n    this.#input = input;\n    this.#predicate = predicate;\n    input.setFilterOutput(this);\n  }\n\n  beginFilter(): void {}\n\n  endFilter(): void {}\n\n  filter(node: Node, cleanup: boolean): boolean {\n    return this.#predicate(node.row) && this.#output.filter(node, cleanup);\n  }\n\n  setFilterOutput(output: FilterOutput) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    filterPush(change, this.#output, this, this.#predicate);\n  }\n}\n"],"names":[],"mappings":";;;AAiBO,MAAM,OAAiC;AAAA,EACnC;AAAA,EACA;AAAA,EAET,UAAwB;AAAA,EAExB,YAAY,OAAoB,WAAkC;AAChE,SAAK,SAAS;AACd,SAAK,aAAa;AAClB,UAAM,gBAAgB,IAAI;AAAA,EAC5B;AAAA,EAEA,cAAoB;AAAA,EAAC;AAAA,EAErB,YAAkB;AAAA,EAAC;AAAA,EAEnB,OAAO,MAAY,SAA2B;AAC5C,WAAO,KAAK,WAAW,KAAK,GAAG,KAAK,KAAK,QAAQ,OAAO,MAAM,OAAO;AAAA,EACvE;AAAA,EAEA,gBAAgB,QAAsB;AACpC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,eAAW,QAAQ,KAAK,SAAS,MAAM,KAAK,UAAU;AAAA,EACxD;AACF;"}
+{"version":3,"file":"filter.js","sources":["../../../../../zql/src/ivm/filter.ts"],"sourcesContent":["import type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {\n  throwFilterOutput,\n  type FilterInput,\n  type FilterOperator,\n  type FilterOutput,\n} from './filter-operators.ts';\nimport {filterPush} from './filter-push.ts';\nimport {type Node} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\n\n/**\n * The Filter operator filters data through a predicate. It is stateless.\n *\n * The predicate must be pure.\n */\nexport class Filter implements FilterOperator {\n  readonly #input: FilterInput;\n  readonly #predicate: (row: Row) => boolean;\n\n  #output: FilterOutput = throwFilterOutput;\n\n  constructor(input: FilterInput, predicate: (row: Row) => boolean) {\n    this.#input = input;\n    this.#predicate = predicate;\n    input.setFilterOutput(this);\n  }\n\n  beginFilter(): void {\n    this.#output.beginFilter();\n  }\n\n  endFilter(): void {\n    this.#output.endFilter();\n  }\n\n  filter(node: Node): boolean {\n    return this.#predicate(node.row) && this.#output.filter(node);\n  }\n\n  setFilterOutput(output: FilterOutput) {\n    this.#output = output;\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  push(change: Change) {\n    filterPush(change, this.#output, this, this.#predicate);\n  }\n}\n"],"names":[],"mappings":";;;AAiBO,MAAM,OAAiC;AAAA,EACnC;AAAA,EACA;AAAA,EAET,UAAwB;AAAA,EAExB,YAAY,OAAoB,WAAkC;AAChE,SAAK,SAAS;AACd,SAAK,aAAa;AAClB,UAAM,gBAAgB,IAAI;AAAA,EAC5B;AAAA,EAEA,cAAoB;AAClB,SAAK,QAAQ,YAAA;AAAA,EACf;AAAA,EAEA,YAAkB;AAChB,SAAK,QAAQ,UAAA;AAAA,EACf;AAAA,EAEA,OAAO,MAAqB;AAC1B,WAAO,KAAK,WAAW,KAAK,GAAG,KAAK,KAAK,QAAQ,OAAO,IAAI;AAAA,EAC9D;AAAA,EAEA,gBAAgB,QAAsB;AACpC,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,UAAgB;AACd,SAAK,OAAO,QAAA;AAAA,EACd;AAAA,EAEA,YAA0B;AACxB,WAAO,KAAK,OAAO,UAAA;AAAA,EACrB;AAAA,EAEA,KAAK,QAAgB;AACnB,eAAW,QAAQ,KAAK,SAAS,MAAM,KAAK,UAAU;AAAA,EACxD;AACF;"}

package/out/zql/src/ivm/flipped-join.d.ts

@@ -27,7 +27,6 @@ export declare class FlippedJoin implements Input {
     setOutput(output: Output): void;
     getSchema(): SourceSchema;
     fetch(req: FetchRequest): Stream<Node | 'yield'>;
-    cleanup(_req: FetchRequest): Stream<Node>;
 }
 export {};
 //# sourceMappingURL=flipped-join.d.ts.map

package/out/zql/src/ivm/flipped-join.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flipped-join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/flipped-join.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAI3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAOpC,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAQ,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IAEb,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IAEtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,KAAK;;gBAY3B,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAkCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAQxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;IAmMhD,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;CAkK3C"}
+{"version":3,"file":"flipped-join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/flipped-join.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAI3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAOpC,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAQ,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IAEb,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IAEtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,KAAK;;gBAY3B,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAkCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAQxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;CAmWlD"}

package/out/zql/src/ivm/flipped-join.js

@@ -222,8 +222,6 @@ class FlippedJoin {
       }
     }
   }
-  *cleanup(_req) {
-  }
   #pushChild(change) {
     const pushChildChange = (exists) => {
       this.#inprogressChildChange = {

package/out/zql/src/ivm/flipped-join.js.map

@@ -1 +1 @@
-{"version":3,"file":"flipped-join.js","sources":["../../../../../zql/src/ivm/flipped-join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {binarySearch} from '../../../shared/src/binary-search.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Writable} from '../../../shared/src/writable.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Value} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {constraintsAreCompatible, type Constraint} from './constraint.ts';\nimport type {Node} from './data.ts';\nimport {\n  generateWithOverlayNoYield,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  skipYields,\n  type FetchRequest,\n  type Input,\n  type Output,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {first, type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  // The nth key in childKey corresponds to the nth key in parentKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * An *inner* join which fetches nodes from its child input first and then\n * fetches their related nodes from its parent input.  Output nodes are the\n * nodes from parent input (in parent input order), which have at least one\n * related child.  These output nodes have a new relationship added to them,\n * which has the name `relationshipName`. The value of the relationship is a\n * stream of related nodes from the child input (in child input order).\n */\nexport class FlippedJoin implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#child.destroy();\n    this.#parent.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  // TODO: When parentKey is the parent's primary key (or more\n  // generally when the parent cardinality is expected to be small) a different\n  // algorithm should be used:  For each child node, fetch all parent nodes\n  // eagerly and then sort using quicksort.\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    // Translate constraints for the parent on parts of the join key to\n    // constraints for the child.\n    const childConstraint: Record<string, Value> = {};\n    let hasChildConstraint = false;\n    if (req.constraint) {\n      for (const [key, value] of Object.entries(req.constraint)) {\n        const index = this.#parentKey.indexOf(key);\n        if (index !== -1) {\n          hasChildConstraint = true;\n          childConstraint[this.#childKey[index]] = value;\n        }\n      }\n    }\n\n    const childNodes: Node[] = [];\n    for (const node of this.#child.fetch(\n      hasChildConstraint ? {constraint: childConstraint} : {},\n    )) {\n      if (node === 'yield') {\n        yield node;\n        continue;\n      }\n      childNodes.push(node);\n    }\n\n    // FlippedJoin's split-push change overlay logic is largely\n    // the same as Join's with the exception of remove.  For remove,\n    // the change is undone here, and then re-applied to parents with order\n    // less than or equal to change.position below.  This is necessary\n    // because if the removed node was the last related child, the\n    // related parents with position greater than change.position\n    // (which should not yet have the node removed), would not even\n    // be fetched here, and would be absent from the output all together.\n    if (this.#inprogressChildChange?.change.type === 'remove') {\n      const removedNode = this.#inprogressChildChange.change.node;\n      const compare = this.#child.getSchema().compareRows;\n      const insertPos = binarySearch(childNodes.length, i =>\n        compare(removedNode.row, childNodes[i].row),\n      );\n      childNodes.splice(insertPos, 0, removedNode);\n    }\n    const parentIterators: Iterator<Node | 'yield'>[] = [];\n    let threw = false;\n    try {\n      for (const childNode of childNodes) {\n        // TODO: consider adding the ability to pass a set of\n        // ids to fetch, and have them applied to sqlite using IN.\n        const constraintFromChild: Writable<Constraint> = {};\n        for (let i = 0; i < this.#parentKey.length; i++) {\n          constraintFromChild[this.#parentKey[i]] =\n            childNode.row[this.#childKey[i]];\n        }\n        if (\n          req.constraint &&\n          !constraintsAreCompatible(constraintFromChild, req.constraint)\n        ) {\n          parentIterators.push(emptyArray[Symbol.iterator]());\n        } else {\n          const stream = this.#parent.fetch({\n            ...req,\n            constraint: {\n              ...req.constraint,\n              ...constraintFromChild,\n            },\n          });\n          const iterator = stream[Symbol.iterator]();\n          parentIterators.push(iterator);\n        }\n      }\n      const nextParentNodes: (Node | null)[] = [];\n      for (let i = 0; i < parentIterators.length; i++) {\n        const iter = parentIterators[i];\n        let result = iter.next();\n        // yield yields when initializing\n        while (!result.done && result.value === 'yield') {\n          yield result.value;\n          result = iter.next();\n        }\n        nextParentNodes[i] = result.done ? null : (result.value as Node);\n      }\n\n      while (true) {\n        let minParentNode = null;\n        let minParentNodeChildIndexes: number[] = [];\n        for (let i = 0; i < nextParentNodes.length; i++) {\n          const parentNode = nextParentNodes[i];\n          if (parentNode === null) {\n            continue;\n          }\n          if (minParentNode === null) {\n            minParentNode = parentNode;\n            minParentNodeChildIndexes.push(i);\n          } else {\n            const compareResult =\n              this.#schema.compareRows(parentNode.row, minParentNode.row) *\n              (req.reverse ? -1 : 1);\n            if (compareResult === 0) {\n              minParentNodeChildIndexes.push(i);\n            } else if (compareResult < 0) {\n              minParentNode = parentNode;\n              minParentNodeChildIndexes = [i];\n            }\n          }\n        }\n        if (minParentNode === null) {\n          return;\n        }\n        const relatedChildNodes: Node[] = [];\n        for (const minParentNodeChildIndex of minParentNodeChildIndexes) {\n          relatedChildNodes.push(childNodes[minParentNodeChildIndex]);\n          const iter = parentIterators[minParentNodeChildIndex];\n          let result = iter.next();\n          // yield yields when advancing\n          while (!result.done && result.value === 'yield') {\n            yield result.value;\n            result = iter.next();\n          }\n          nextParentNodes[minParentNodeChildIndex] = result.done\n            ? null\n            : (result.value as Node);\n        }\n        let overlaidRelatedChildNodes = relatedChildNodes;\n        if (\n          this.#inprogressChildChange &&\n          this.#inprogressChildChange.position &&\n          isJoinMatch(\n            this.#inprogressChildChange.change.node.row,\n            this.#childKey,\n            minParentNode.row,\n            this.#parentKey,\n          )\n        ) {\n          const hasInprogressChildChangeBeenPushedForMinParentNode =\n            this.#parent\n              .getSchema()\n              .compareRows(\n                minParentNode.row,\n                this.#inprogressChildChange.position,\n              ) <= 0;\n          if (this.#inprogressChildChange.change.type === 'remove') {\n            if (hasInprogressChildChangeBeenPushedForMinParentNode) {\n              // Remove form relatedChildNodes since the removed child\n              // was inserted into childNodes above.\n              overlaidRelatedChildNodes = relatedChildNodes.filter(\n                n => n !== this.#inprogressChildChange?.change.node,\n              );\n            }\n          } else if (!hasInprogressChildChangeBeenPushedForMinParentNode) {\n            overlaidRelatedChildNodes = [\n              ...generateWithOverlayNoYield(\n                relatedChildNodes,\n                this.#inprogressChildChange.change,\n                this.#child.getSchema(),\n              ),\n            ];\n          }\n        }\n\n        // yield node if after the overlay it still has relationship nodes\n        if (overlaidRelatedChildNodes.length > 0) {\n          yield {\n            ...minParentNode,\n            relationships: {\n              ...minParentNode.relationships,\n              [this.#relationshipName]: () => overlaidRelatedChildNodes,\n            },\n          };\n        }\n      }\n    } catch (e) {\n      threw = true;\n      for (const iter of parentIterators) {\n        try {\n          iter.throw?.(e);\n        } catch (_cleanupError) {\n          // error in the iter.throw cleanup,\n          // catch so other iterators are cleaned up\n        }\n      }\n      throw e;\n    } finally {\n      if (!threw) {\n        for (const iter of parentIterators) {\n          try {\n            iter.return?.();\n          } catch (_cleanupError) {\n            // error in the iter.return cleanup,\n            // catch so other iterators are cleaned up\n          }\n        }\n      }\n    }\n  }\n\n  *cleanup(_req: FetchRequest): Stream<Node> {}\n\n  #pushChild(change: Change): void {\n    const pushChildChange = (exists?: boolean) => {\n      this.#inprogressChildChange = {\n        change,\n        position: undefined,\n      };\n      try {\n        const parentNodeStream = this.#parent.fetch({\n          constraint: Object.fromEntries(\n            this.#parentKey.map((key, i) => [\n              key,\n              change.node.row[this.#childKey[i]],\n            ]),\n          ),\n        });\n        for (const parentNode of skipYields(parentNodeStream)) {\n          this.#inprogressChildChange = {\n            change,\n            position: parentNode.row,\n          };\n          const childNodeStream = () =>\n            this.#child.fetch({\n              constraint: Object.fromEntries(\n                this.#childKey.map((key, i) => [\n                  key,\n                  parentNode.row[this.#parentKey[i]],\n                ]),\n              ),\n            });\n          if (!exists) {\n            for (const childNode of skipYields(childNodeStream())) {\n              if (\n                this.#child\n                  .getSchema()\n                  .compareRows(childNode.row, change.node.row) !== 0\n              ) {\n                exists = true;\n                break;\n              }\n            }\n          }\n          if (exists) {\n            this.#output.push(\n              {\n                type: 'child',\n                node: {\n                  ...parentNode,\n                  relationships: {\n                    ...parentNode.relationships,\n                    [this.#relationshipName]: childNodeStream,\n                  },\n                },\n                child: {\n                  relationshipName: this.#relationshipName,\n                  change,\n                },\n              },\n              this,\n            );\n          } else {\n            this.#output.push(\n              {\n                ...change,\n                node: {\n                  ...parentNode,\n                  relationships: {\n                    ...parentNode.relationships,\n                    [this.#relationshipName]: () => [change.node],\n                  },\n                },\n              },\n              this,\n            );\n          }\n        }\n      } finally {\n        this.#inprogressChildChange = undefined;\n      }\n    };\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        pushChildChange();\n        break;\n      case 'edit': {\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#childKey,\n          ),\n          `Child edit must not change relationship.`,\n        );\n        pushChildChange(true);\n        break;\n      }\n      case 'child':\n        pushChildChange(true);\n        break;\n    }\n  }\n\n  #pushParent(change: Change): void {\n    const childNodeStream = (node: Node) => () =>\n      this.#child.fetch({\n        constraint: Object.fromEntries(\n          this.#childKey.map((key, i) => [key, node.row[this.#parentKey[i]]]),\n        ),\n      });\n\n    const flip = (node: Node) => ({\n      ...node,\n      relationships: {\n        ...node.relationships,\n        [this.#relationshipName]: childNodeStream(node),\n      },\n    });\n\n    // If no related child don't push as this is an inner join.\n    if (first(skipYields(childNodeStream(change.node)())) === undefined) {\n      return;\n    }\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n      case 'child': {\n        this.#output.push(\n          {\n            ...change,\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      case 'edit': {\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#output.push(\n          {\n            type: 'edit',\n            oldNode: flip(change.oldNode),\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"flipped-join.js","sources":["../../../../../zql/src/ivm/flipped-join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {binarySearch} from '../../../shared/src/binary-search.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Writable} from '../../../shared/src/writable.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Value} from '../../../zero-protocol/src/data.ts';\nimport type {Change} from './change.ts';\nimport {constraintsAreCompatible, type Constraint} from './constraint.ts';\nimport type {Node} from './data.ts';\nimport {\n  generateWithOverlayNoYield,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  skipYields,\n  type FetchRequest,\n  type Input,\n  type Output,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {first, type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  // The nth key in childKey corresponds to the nth key in parentKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * An *inner* join which fetches nodes from its child input first and then\n * fetches their related nodes from its parent input.  Output nodes are the\n * nodes from parent input (in parent input order), which have at least one\n * related child.  These output nodes have a new relationship added to them,\n * which has the name `relationshipName`. The value of the relationship is a\n * stream of related nodes from the child input (in child input order).\n */\nexport class FlippedJoin implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#child.destroy();\n    this.#parent.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  // TODO: When parentKey is the parent's primary key (or more\n  // generally when the parent cardinality is expected to be small) a different\n  // algorithm should be used:  For each child node, fetch all parent nodes\n  // eagerly and then sort using quicksort.\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    // Translate constraints for the parent on parts of the join key to\n    // constraints for the child.\n    const childConstraint: Record<string, Value> = {};\n    let hasChildConstraint = false;\n    if (req.constraint) {\n      for (const [key, value] of Object.entries(req.constraint)) {\n        const index = this.#parentKey.indexOf(key);\n        if (index !== -1) {\n          hasChildConstraint = true;\n          childConstraint[this.#childKey[index]] = value;\n        }\n      }\n    }\n\n    const childNodes: Node[] = [];\n    for (const node of this.#child.fetch(\n      hasChildConstraint ? {constraint: childConstraint} : {},\n    )) {\n      if (node === 'yield') {\n        yield node;\n        continue;\n      }\n      childNodes.push(node);\n    }\n\n    // FlippedJoin's split-push change overlay logic is largely\n    // the same as Join's with the exception of remove.  For remove,\n    // the change is undone here, and then re-applied to parents with order\n    // less than or equal to change.position below.  This is necessary\n    // because if the removed node was the last related child, the\n    // related parents with position greater than change.position\n    // (which should not yet have the node removed), would not even\n    // be fetched here, and would be absent from the output all together.\n    if (this.#inprogressChildChange?.change.type === 'remove') {\n      const removedNode = this.#inprogressChildChange.change.node;\n      const compare = this.#child.getSchema().compareRows;\n      const insertPos = binarySearch(childNodes.length, i =>\n        compare(removedNode.row, childNodes[i].row),\n      );\n      childNodes.splice(insertPos, 0, removedNode);\n    }\n    const parentIterators: Iterator<Node | 'yield'>[] = [];\n    let threw = false;\n    try {\n      for (const childNode of childNodes) {\n        // TODO: consider adding the ability to pass a set of\n        // ids to fetch, and have them applied to sqlite using IN.\n        const constraintFromChild: Writable<Constraint> = {};\n        for (let i = 0; i < this.#parentKey.length; i++) {\n          constraintFromChild[this.#parentKey[i]] =\n            childNode.row[this.#childKey[i]];\n        }\n        if (\n          req.constraint &&\n          !constraintsAreCompatible(constraintFromChild, req.constraint)\n        ) {\n          parentIterators.push(emptyArray[Symbol.iterator]());\n        } else {\n          const stream = this.#parent.fetch({\n            ...req,\n            constraint: {\n              ...req.constraint,\n              ...constraintFromChild,\n            },\n          });\n          const iterator = stream[Symbol.iterator]();\n          parentIterators.push(iterator);\n        }\n      }\n      const nextParentNodes: (Node | null)[] = [];\n      for (let i = 0; i < parentIterators.length; i++) {\n        const iter = parentIterators[i];\n        let result = iter.next();\n        // yield yields when initializing\n        while (!result.done && result.value === 'yield') {\n          yield result.value;\n          result = iter.next();\n        }\n        nextParentNodes[i] = result.done ? null : (result.value as Node);\n      }\n\n      while (true) {\n        let minParentNode = null;\n        let minParentNodeChildIndexes: number[] = [];\n        for (let i = 0; i < nextParentNodes.length; i++) {\n          const parentNode = nextParentNodes[i];\n          if (parentNode === null) {\n            continue;\n          }\n          if (minParentNode === null) {\n            minParentNode = parentNode;\n            minParentNodeChildIndexes.push(i);\n          } else {\n            const compareResult =\n              this.#schema.compareRows(parentNode.row, minParentNode.row) *\n              (req.reverse ? -1 : 1);\n            if (compareResult === 0) {\n              minParentNodeChildIndexes.push(i);\n            } else if (compareResult < 0) {\n              minParentNode = parentNode;\n              minParentNodeChildIndexes = [i];\n            }\n          }\n        }\n        if (minParentNode === null) {\n          return;\n        }\n        const relatedChildNodes: Node[] = [];\n        for (const minParentNodeChildIndex of minParentNodeChildIndexes) {\n          relatedChildNodes.push(childNodes[minParentNodeChildIndex]);\n          const iter = parentIterators[minParentNodeChildIndex];\n          let result = iter.next();\n          // yield yields when advancing\n          while (!result.done && result.value === 'yield') {\n            yield result.value;\n            result = iter.next();\n          }\n          nextParentNodes[minParentNodeChildIndex] = result.done\n            ? null\n            : (result.value as Node);\n        }\n        let overlaidRelatedChildNodes = relatedChildNodes;\n        if (\n          this.#inprogressChildChange &&\n          this.#inprogressChildChange.position &&\n          isJoinMatch(\n            this.#inprogressChildChange.change.node.row,\n            this.#childKey,\n            minParentNode.row,\n            this.#parentKey,\n          )\n        ) {\n          const hasInprogressChildChangeBeenPushedForMinParentNode =\n            this.#parent\n              .getSchema()\n              .compareRows(\n                minParentNode.row,\n                this.#inprogressChildChange.position,\n              ) <= 0;\n          if (this.#inprogressChildChange.change.type === 'remove') {\n            if (hasInprogressChildChangeBeenPushedForMinParentNode) {\n              // Remove form relatedChildNodes since the removed child\n              // was inserted into childNodes above.\n              overlaidRelatedChildNodes = relatedChildNodes.filter(\n                n => n !== this.#inprogressChildChange?.change.node,\n              );\n            }\n          } else if (!hasInprogressChildChangeBeenPushedForMinParentNode) {\n            overlaidRelatedChildNodes = [\n              ...generateWithOverlayNoYield(\n                relatedChildNodes,\n                this.#inprogressChildChange.change,\n                this.#child.getSchema(),\n              ),\n            ];\n          }\n        }\n\n        // yield node if after the overlay it still has relationship nodes\n        if (overlaidRelatedChildNodes.length > 0) {\n          yield {\n            ...minParentNode,\n            relationships: {\n              ...minParentNode.relationships,\n              [this.#relationshipName]: () => overlaidRelatedChildNodes,\n            },\n          };\n        }\n      }\n    } catch (e) {\n      threw = true;\n      for (const iter of parentIterators) {\n        try {\n          iter.throw?.(e);\n        } catch (_cleanupError) {\n          // error in the iter.throw cleanup,\n          // catch so other iterators are cleaned up\n        }\n      }\n      throw e;\n    } finally {\n      if (!threw) {\n        for (const iter of parentIterators) {\n          try {\n            iter.return?.();\n          } catch (_cleanupError) {\n            // error in the iter.return cleanup,\n            // catch so other iterators are cleaned up\n          }\n        }\n      }\n    }\n  }\n\n  #pushChild(change: Change): void {\n    const pushChildChange = (exists?: boolean) => {\n      this.#inprogressChildChange = {\n        change,\n        position: undefined,\n      };\n      try {\n        const parentNodeStream = this.#parent.fetch({\n          constraint: Object.fromEntries(\n            this.#parentKey.map((key, i) => [\n              key,\n              change.node.row[this.#childKey[i]],\n            ]),\n          ),\n        });\n        for (const parentNode of skipYields(parentNodeStream)) {\n          this.#inprogressChildChange = {\n            change,\n            position: parentNode.row,\n          };\n          const childNodeStream = () =>\n            this.#child.fetch({\n              constraint: Object.fromEntries(\n                this.#childKey.map((key, i) => [\n                  key,\n                  parentNode.row[this.#parentKey[i]],\n                ]),\n              ),\n            });\n          if (!exists) {\n            for (const childNode of skipYields(childNodeStream())) {\n              if (\n                this.#child\n                  .getSchema()\n                  .compareRows(childNode.row, change.node.row) !== 0\n              ) {\n                exists = true;\n                break;\n              }\n            }\n          }\n          if (exists) {\n            this.#output.push(\n              {\n                type: 'child',\n                node: {\n                  ...parentNode,\n                  relationships: {\n                    ...parentNode.relationships,\n                    [this.#relationshipName]: childNodeStream,\n                  },\n                },\n                child: {\n                  relationshipName: this.#relationshipName,\n                  change,\n                },\n              },\n              this,\n            );\n          } else {\n            this.#output.push(\n              {\n                ...change,\n                node: {\n                  ...parentNode,\n                  relationships: {\n                    ...parentNode.relationships,\n                    [this.#relationshipName]: () => [change.node],\n                  },\n                },\n              },\n              this,\n            );\n          }\n        }\n      } finally {\n        this.#inprogressChildChange = undefined;\n      }\n    };\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        pushChildChange();\n        break;\n      case 'edit': {\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#childKey,\n          ),\n          `Child edit must not change relationship.`,\n        );\n        pushChildChange(true);\n        break;\n      }\n      case 'child':\n        pushChildChange(true);\n        break;\n    }\n  }\n\n  #pushParent(change: Change): void {\n    const childNodeStream = (node: Node) => () =>\n      this.#child.fetch({\n        constraint: Object.fromEntries(\n          this.#childKey.map((key, i) => [key, node.row[this.#parentKey[i]]]),\n        ),\n      });\n\n    const flip = (node: Node) => ({\n      ...node,\n      relationships: {\n        ...node.relationships,\n        [this.#relationshipName]: childNodeStream(node),\n      },\n    });\n\n    // If no related child don't push as this is an inner join.\n    if (first(skipYields(childNodeStream(change.node)())) === undefined) {\n      return;\n    }\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n      case 'child': {\n        this.#output.push(\n          {\n            ...change,\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      case 'edit': {\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#output.push(\n          {\n            type: 'edit',\n            oldNode: flip(change.oldNode),\n            node: flip(change.node),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

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

@@ -1,14 +1,11 @@
 import type { CompoundKey, System } from '../../../zero-protocol/src/ast.ts';
-import type { Row, Value } from '../../../zero-protocol/src/data.ts';
-import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
 import type { Node } from './data.ts';
-import { type FetchRequest, type Input, type Output, type Storage } from './operator.ts';
+import { type FetchRequest, type Input, type Output } from './operator.ts';
 import type { SourceSchema } from './schema.ts';
 import { type Stream } from './stream.ts';
 type Args = {
     parent: Input;
     child: Input;
-    storage: Storage;
     parentKey: CompoundKey;
     childKey: CompoundKey;
     relationshipName: string;
@@ -27,21 +24,11 @@ type Args = {
  */
 export declare class Join implements Input {
     #private;
-    constructor({ parent, child, storage, parentKey, childKey, relationshipName, hidden, system, }: Args);
+    constructor({ parent, child, parentKey, childKey, relationshipName, hidden, system, }: Args);
     destroy(): void;
     setOutput(output: Output): void;
     getSchema(): SourceSchema;
     fetch(req: FetchRequest): Stream<Node | 'yield'>;
-    cleanup(req: FetchRequest): Stream<Node>;
 }
-/** Exported for testing. */
-export declare function makeStorageKeyForValues(values: readonly Value[]): string;
-/** Exported for testing. */
-export declare function makeStorageKeyPrefix(row: Row, key: CompoundKey): string;
-/** Exported for testing.
- * This storage key tracks the primary keys seen for each unique
- * value joined on. This is used to know when to cleanup a child's state.
- */
-export declare function makeStorageKey(key: CompoundKey, primaryKey: PrimaryKey, row: Row): string;
 export {};
 //# sourceMappingURL=join.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAOpC,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAO,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAE9C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;gBAapB,EACV,MAAM,EACN,KAAK,EACL,OAAO,EACP,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAmCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;IAchD,OAAO,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC;CAuP1C;AAID,4BAA4B;AAC5B,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,GAAG,MAAM,CAGxE;AAED,4BAA4B;AAC5B,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,GAAG,MAAM,CAEvE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,WAAW,EAChB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,GACP,MAAM,CAMR"}
+{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/join.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAG3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAOpC,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AAExC,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IAEb,SAAS,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;gBAYpB,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,GACP,EAAE,IAAI;IAkCP,OAAO,IAAI,IAAI;IAKf,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,YAAY;IAIxB,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;CA0MlD"}

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

@@ -1,11 +1,9 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { rowEqualsForCompoundKey, isJoinMatch, generateWithOverlay } from "./join-utils.js";
 import { throwOutput, skipYields } from "./operator.js";
-import { take } from "./stream.js";
 class Join {
   #parent;
   #child;
-  #storage;
   #parentKey;
   #childKey;
   #relationshipName;
@@ -15,7 +13,6 @@ class Join {
   constructor({
     parent,
     child,
-    storage,
     parentKey,
     childKey,
     relationshipName,
@@ -29,7 +26,6 @@ class Join {
     );
     this.#parent = parent;
     this.#child = child;
-    this.#storage = storage;
     this.#parentKey = parentKey;
     this.#childKey = childKey;
     this.#relationshipName = relationshipName;
@@ -69,20 +65,7 @@ class Join {
         yield parentNode;
         continue;
       }
-      yield this.#processParentNode(
-        parentNode.row,
-        parentNode.relationships,
-        "fetch"
-      );
-    }
-  }
-  *cleanup(req) {
-    for (const parentNode of this.#parent.cleanup(req)) {
-      yield this.#processParentNode(
-        parentNode.row,
-        parentNode.relationships,
-        "cleanup"
-      );
+      yield this.#processParentNode(parentNode.row, parentNode.relationships);
     }
   }
   #pushParent(change) {
@@ -93,8 +76,7 @@ class Join {
             type: "add",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             )
           },
           this
@@ -106,8 +88,7 @@ class Join {
             type: "remove",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "cleanup"
+              change.node.relationships
             )
           },
           this
@@ -119,8 +100,7 @@ class Join {
             type: "child",
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             ),
             child: change.child
           },
@@ -141,13 +121,11 @@ class Join {
             type: "edit",
             oldNode: this.#processParentNode(
               change.oldNode.row,
-              change.oldNode.relationships,
-              "cleanup"
+              change.oldNode.relationships
             ),
             node: this.#processParentNode(
               change.node.row,
-              change.node.relationships,
-              "fetch"
+              change.node.relationships
             )
           },
           this
@@ -186,8 +164,7 @@ class Join {
             type: "child",
             node: this.#processParentNode(
               parentNode.row,
-              parentNode.relationships,
-              "fetch"
+              parentNode.relationships
             ),
             child: {
               relationshipName: this.#relationshipName,
@@ -222,41 +199,8 @@ class Join {
         unreachable();
     }
   }
-  #processParentNode(parentNodeRow, parentNodeRelations, mode) {
-    let method = mode;
-    let storageUpdated = false;
+  #processParentNode(parentNodeRow, parentNodeRelations) {
     const childStream = () => {
-      if (!storageUpdated) {
-        if (mode === "cleanup") {
-          this.#storage.del(
-            makeStorageKey(
-              this.#parentKey,
-              this.#parent.getSchema().primaryKey,
-              parentNodeRow
-            )
-          );
-          const empty = [
-            ...take(
-              this.#storage.scan({
-                prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey)
-              }),
-              1
-            )
-          ].length === 0;
-          method = empty ? "cleanup" : "fetch";
-        }
-        storageUpdated = true;
-        if (mode === "fetch") {
-          this.#storage.set(
-            makeStorageKey(
-              this.#parentKey,
-              this.#parent.getSchema().primaryKey,
-              parentNodeRow
-            ),
-            true
-          );
-        }
-      }
       let anyNull = false;
       const constraint = Object.fromEntries(
         this.#childKey.map((key, i) => {
@@ -267,7 +211,7 @@ class Join {
           return [key, value];
         })
       );
-      const stream = anyNull ? [] : this.#child[method]({
+      const stream = anyNull ? [] : this.#child.fetch({
         constraint
       });
       if (this.#inprogressChildChange && isJoinMatch(
@@ -296,24 +240,7 @@ class Join {
     };
   }
 }
-function makeStorageKeyForValues(values) {
-  const json = JSON.stringify(["pKeySet", ...values]);
-  return json.substring(1, json.length - 1) + ",";
-}
-function makeStorageKeyPrefix(row, key) {
-  return makeStorageKeyForValues(key.map((k) => row[k]));
-}
-function makeStorageKey(key, primaryKey, row) {
-  const values = key.map((k) => row[k]);
-  for (const key2 of primaryKey) {
-    values.push(row[key2]);
-  }
-  return makeStorageKeyForValues(values);
-}
 export {
-  Join,
-  makeStorageKey,
-  makeStorageKeyForValues,
-  makeStorageKeyPrefix
+  Join
 };
 //# sourceMappingURL=join.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"join.js","sources":["../../../../../zql/src/ivm/join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\nimport type {Change, ChildChange} from './change.ts';\nimport type {Node} from './data.ts';\nimport {\n  generateWithOverlay,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  skipYields,\n  type FetchRequest,\n  type Input,\n  type Output,\n  type Storage,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {take, type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  storage: Storage;\n  // The nth key in parentKey corresponds to the nth key in childKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * The Join operator joins the output from two upstream inputs. Zero's join\n * is a little different from SQL's join in that we output hierarchical data,\n * not a flat table. This makes it a lot more useful for UI programming and\n * avoids duplicating tons of data like left join would.\n *\n * The Nodes output from Join have a new relationship added to them, which has\n * the name #relationshipName. The value of the relationship is a stream of\n * child nodes which are the corresponding values from the child source.\n */\nexport class Join implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #storage: Storage;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    storage,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#storage = storage;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    for (const parentNode of this.#parent.fetch(req)) {\n      if (parentNode === 'yield') {\n        yield parentNode;\n        continue;\n      }\n      yield this.#processParentNode(\n        parentNode.row,\n        parentNode.relationships,\n        'fetch',\n      );\n    }\n  }\n\n  *cleanup(req: FetchRequest): Stream<Node> {\n    for (const parentNode of this.#parent.cleanup(req)) {\n      yield this.#processParentNode(\n        parentNode.row,\n        parentNode.relationships,\n        'cleanup',\n      );\n    }\n  }\n\n  #pushParent(change: Change): void {\n    switch (change.type) {\n      case 'add':\n        this.#output.push(\n          {\n            type: 'add',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n          },\n          this,\n        );\n        break;\n      case 'remove':\n        this.#output.push(\n          {\n            type: 'remove',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'cleanup',\n            ),\n          },\n          this,\n        );\n        break;\n      case 'child':\n        this.#output.push(\n          {\n            type: 'child',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n            child: change.child,\n          },\n          this,\n        );\n        break;\n      case 'edit': {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#output.push(\n          {\n            type: 'edit',\n            oldNode: this.#processParentNode(\n              change.oldNode.row,\n              change.oldNode.relationships,\n              'cleanup',\n            ),\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n              'fetch',\n            ),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  #pushChild(change: Change): void {\n    const pushChildChange = (childRow: Row, change: Change) => {\n      this.#inprogressChildChange = {\n        change,\n        position: undefined,\n      };\n      try {\n        let anyNull = false;\n        const constraint = Object.fromEntries(\n          this.#parentKey.map((key, i) => {\n            const value = childRow[this.#childKey[i]];\n            if (value === null) {\n              anyNull = true;\n            }\n            return [key, value];\n          }),\n        );\n        const parentNodes = anyNull\n          ? []\n          : skipYields(\n              this.#parent.fetch({\n                constraint,\n              }),\n            );\n\n        for (const parentNode of parentNodes) {\n          this.#inprogressChildChange.position = parentNode.row;\n          const childChange: ChildChange = {\n            type: 'child',\n            node: this.#processParentNode(\n              parentNode.row,\n              parentNode.relationships,\n              'fetch',\n            ),\n            child: {\n              relationshipName: this.#relationshipName,\n              change,\n            },\n          };\n          this.#output.push(childChange, this);\n        }\n      } finally {\n        this.#inprogressChildChange = undefined;\n      }\n    };\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'child':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'edit': {\n        const childRow = change.node.row;\n        const oldChildRow = change.oldNode.row;\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),\n          'Child edit must not change relationship.',\n        );\n        pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node | 'yield'>>,\n    mode: ProcessParentMode,\n  ): Node {\n    let method: ProcessParentMode = mode;\n    let storageUpdated = false;\n    const childStream = () => {\n      if (!storageUpdated) {\n        if (mode === 'cleanup') {\n          this.#storage.del(\n            makeStorageKey(\n              this.#parentKey,\n              this.#parent.getSchema().primaryKey,\n              parentNodeRow,\n            ),\n          );\n          const empty =\n            [\n              ...take(\n                this.#storage.scan({\n                  prefix: makeStorageKeyPrefix(parentNodeRow, this.#parentKey),\n                }),\n                1,\n              ),\n            ].length === 0;\n          method = empty ? 'cleanup' : 'fetch';\n        }\n\n        storageUpdated = true;\n        // Defer the work to update storage until the child stream\n        // is actually accessed\n        if (mode === 'fetch') {\n          this.#storage.set(\n            makeStorageKey(\n              this.#parentKey,\n              this.#parent.getSchema().primaryKey,\n              parentNodeRow,\n            ),\n            true,\n          );\n        }\n      }\n\n      let anyNull = false;\n      const constraint = Object.fromEntries(\n        this.#childKey.map((key, i) => {\n          const value = parentNodeRow[this.#parentKey[i]];\n          if (value === null) {\n            anyNull = true;\n          }\n          return [key, value];\n        }),\n      );\n      const stream = anyNull\n        ? []\n        : this.#child[method]({\n            constraint,\n          });\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange.change.node.row,\n          this.#childKey,\n        ) &&\n        this.#inprogressChildChange.position &&\n        this.#schema.compareRows(\n          parentNodeRow,\n          this.#inprogressChildChange.position,\n        ) > 0\n      ) {\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange.change,\n          this.#child.getSchema(),\n        );\n      }\n      return stream;\n    };\n\n    return {\n      row: parentNodeRow,\n      relationships: {\n        ...parentNodeRelations,\n        [this.#relationshipName]: childStream,\n      },\n    };\n  }\n}\n\ntype ProcessParentMode = 'fetch' | 'cleanup';\n\n/** Exported for testing. */\nexport function makeStorageKeyForValues(values: readonly Value[]): string {\n  const json = JSON.stringify(['pKeySet', ...values]);\n  return json.substring(1, json.length - 1) + ',';\n}\n\n/** Exported for testing. */\nexport function makeStorageKeyPrefix(row: Row, key: CompoundKey): string {\n  return makeStorageKeyForValues(key.map(k => row[k]));\n}\n\n/** Exported for testing.\n * This storage key tracks the primary keys seen for each unique\n * value joined on. This is used to know when to cleanup a child's state.\n */\nexport function makeStorageKey(\n  key: CompoundKey,\n  primaryKey: PrimaryKey,\n  row: Row,\n): string {\n  const values: Value[] = key.map(k => row[k]);\n  for (const key of primaryKey) {\n    values.push(row[key]);\n  }\n  return makeStorageKeyForValues(values);\n}\n"],"names":["change","key"],"mappings":"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"}
+{"version":3,"file":"join.js","sources":["../../../../../zql/src/ivm/join.ts"],"sourcesContent":["import {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey, System} from '../../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {Change, ChildChange} from './change.ts';\nimport type {Node} from './data.ts';\nimport {\n  generateWithOverlay,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n  type JoinChangeOverlay,\n} from './join-utils.ts';\nimport {\n  throwOutput,\n  skipYields,\n  type FetchRequest,\n  type Input,\n  type Output,\n} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {type Stream} from './stream.ts';\n\ntype Args = {\n  parent: Input;\n  child: Input;\n  // The nth key in parentKey corresponds to the nth key in childKey.\n  parentKey: CompoundKey;\n  childKey: CompoundKey;\n  relationshipName: string;\n  hidden: boolean;\n  system: System;\n};\n\n/**\n * The Join operator joins the output from two upstream inputs. Zero's join\n * is a little different from SQL's join in that we output hierarchical data,\n * not a flat table. This makes it a lot more useful for UI programming and\n * avoids duplicating tons of data like left join would.\n *\n * The Nodes output from Join have a new relationship added to them, which has\n * the name #relationshipName. The value of the relationship is a stream of\n * child nodes which are the corresponding values from the child source.\n */\nexport class Join implements Input {\n  readonly #parent: Input;\n  readonly #child: Input;\n  readonly #parentKey: CompoundKey;\n  readonly #childKey: CompoundKey;\n  readonly #relationshipName: string;\n  readonly #schema: SourceSchema;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: JoinChangeOverlay | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n  }: Args) {\n    assert(parent !== child, 'Parent and child must be different operators');\n    assert(\n      parentKey.length === childKey.length,\n      'The parentKey and childKey keys must have same length',\n    );\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n\n    const parentSchema = parent.getSchema();\n    const childSchema = child.getSchema();\n    this.#schema = {\n      ...parentSchema,\n      relationships: {\n        ...parentSchema.relationships,\n        [relationshipName]: {\n          ...childSchema,\n          isHidden: hidden,\n          system,\n        },\n      },\n    };\n\n    parent.setOutput({\n      push: (change: Change) => this.#pushParent(change),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n    });\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  getSchema(): SourceSchema {\n    return this.#schema;\n  }\n\n  *fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    for (const parentNode of this.#parent.fetch(req)) {\n      if (parentNode === 'yield') {\n        yield parentNode;\n        continue;\n      }\n      yield this.#processParentNode(parentNode.row, parentNode.relationships);\n    }\n  }\n\n  #pushParent(change: Change): void {\n    switch (change.type) {\n      case 'add':\n        this.#output.push(\n          {\n            type: 'add',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      case 'remove':\n        this.#output.push(\n          {\n            type: 'remove',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      case 'child':\n        this.#output.push(\n          {\n            type: 'child',\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n            child: change.child,\n          },\n          this,\n        );\n        break;\n      case 'edit': {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change.oldNode.row,\n            change.node.row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#output.push(\n          {\n            type: 'edit',\n            oldNode: this.#processParentNode(\n              change.oldNode.row,\n              change.oldNode.relationships,\n            ),\n            node: this.#processParentNode(\n              change.node.row,\n              change.node.relationships,\n            ),\n          },\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  #pushChild(change: Change): void {\n    const pushChildChange = (childRow: Row, change: Change) => {\n      this.#inprogressChildChange = {\n        change,\n        position: undefined,\n      };\n      try {\n        let anyNull = false;\n        const constraint = Object.fromEntries(\n          this.#parentKey.map((key, i) => {\n            const value = childRow[this.#childKey[i]];\n            if (value === null) {\n              anyNull = true;\n            }\n            return [key, value];\n          }),\n        );\n        const parentNodes = anyNull\n          ? []\n          : skipYields(\n              this.#parent.fetch({\n                constraint,\n              }),\n            );\n\n        for (const parentNode of parentNodes) {\n          this.#inprogressChildChange.position = parentNode.row;\n          const childChange: ChildChange = {\n            type: 'child',\n            node: this.#processParentNode(\n              parentNode.row,\n              parentNode.relationships,\n            ),\n            child: {\n              relationshipName: this.#relationshipName,\n              change,\n            },\n          };\n          this.#output.push(childChange, this);\n        }\n      } finally {\n        this.#inprogressChildChange = undefined;\n      }\n    };\n\n    switch (change.type) {\n      case 'add':\n      case 'remove':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'child':\n        pushChildChange(change.node.row, change);\n        break;\n      case 'edit': {\n        const childRow = change.node.row;\n        const oldChildRow = change.oldNode.row;\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(oldChildRow, childRow, this.#childKey),\n          'Child edit must not change relationship.',\n        );\n        pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node | 'yield'>>,\n  ): Node {\n    const childStream = () => {\n      let anyNull = false;\n      const constraint = Object.fromEntries(\n        this.#childKey.map((key, i) => {\n          const value = parentNodeRow[this.#parentKey[i]];\n          if (value === null) {\n            anyNull = true;\n          }\n          return [key, value];\n        }),\n      );\n      const stream = anyNull\n        ? []\n        : this.#child.fetch({\n            constraint,\n          });\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange.change.node.row,\n          this.#childKey,\n        ) &&\n        this.#inprogressChildChange.position &&\n        this.#schema.compareRows(\n          parentNodeRow,\n          this.#inprogressChildChange.position,\n        ) > 0\n      ) {\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange.change,\n          this.#child.getSchema(),\n        );\n      }\n      return stream;\n    };\n\n    return {\n      row: parentNodeRow,\n      relationships: {\n        ...parentNodeRelations,\n        [this.#relationshipName]: childStream,\n      },\n    };\n  }\n}\n"],"names":["change"],"mappings":"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"}

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

@@ -11,7 +11,7 @@ import { type Input, type Output, type Start } from './operator.ts';
 import type { Source, SourceChange, SourceInput } from './source.ts';
 import type { Stream } from './stream.ts';
 export type Overlay = {
-    outputIndex: number;
+    epoch: number;
     change: SourceChange;
 };
 export type Overlays = {
@@ -29,6 +29,7 @@ export type Connection = {
         predicate: (row: Row) => boolean;
     } | undefined;
     readonly debug?: DebugDelegate | undefined;
+    lastPushedEpoch: number;
 };
 /**
  * A `MemorySource` is a source that provides data to the pipeline from an
@@ -52,7 +53,7 @@ export declare class MemorySource implements Source {
     push(change: SourceChange): void;
     genPush(change: SourceChange): Generator<undefined, void, unknown>;
 }
-export declare function genPushAndWriteWithSplitEdit(connections: readonly Connection[], change: SourceChange, exists: (row: Row) => boolean, setOverlay: (o: Overlay | undefined) => Overlay | undefined, writeChange: (c: SourceChange) => void): Generator<undefined, void, unknown>;
+export declare function genPushAndWriteWithSplitEdit(connections: readonly Connection[], change: SourceChange, exists: (row: Row) => boolean, setOverlay: (o: Overlay | undefined) => Overlay | undefined, writeChange: (c: SourceChange) => void, getNextEpoch: () => number): Generator<undefined, void, unknown>;
 export declare function generateWithStart(nodes: Iterable<Node | 'yield'>, start: Start | undefined, compare: (r1: Row, r2: Row) => number): Stream<Node | 'yield'>;
 /**
  * Takes an iterator and overlay.
@@ -66,7 +67,7 @@ export declare function generateWithStart(nodes: Iterable<Node | 'yield'>, start
  * @param overlay - the overlay values to splice in
  * @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, connectionIndex: number, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
+export declare function generateWithOverlay(startAt: Row | undefined, rows: Iterable<Row>, constraint: Constraint | undefined, overlay: Overlay | undefined, lastPushedEpoch: number, compare: Comparator, filterPredicate?: (row: Row) => boolean | undefined): Generator<{
     row: Readonly<Record<string, import("../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
     relationships: {};
 }, void, unknown>;