@rocicorp/zero 1.11.0-canary.3 → 1.11.0-canary.31

package/out/zql/src/builder/correlated-predicate-pushdown.js

@@ -0,0 +1,161 @@
+import { deepEqual } from "../../../shared/src/json.js";
+import { simplifyCondition } from "../query/expression.js";
+/**
+* Copies a parent's condition on a correlation column into the child
+* subquery, renamed to the matching child column. For example,
+* `user.where('user_id', X).related('reading')` becomes
+* `user.where('user_id', X).related('reading', r => r.where('user_id', X))`.
+*
+* The result is the same. Only child rows that cannot join to a parent that
+* matters are removed. But a push that climbs the tree then fetches parents
+* with SQL that includes the ancestor's condition, and a change to a child row
+* that cannot match stops at the child's source.
+*
+* Conditions are copied only when they are true for every parent row where
+* the edge can affect the result:
+* - for `related`, the top-level AND conjuncts of the parent's `where`;
+* - for EXISTS and NOT EXISTS, the conjuncts of every AND on the path from
+*   the root of `where` to the subquery condition. An OR adds no facts.
+*
+* A condition is copied when it is `column = literal`, `column IS literal`, or
+* `column IN literal-list` (at most {@link MAX_PUSHED_IN_VALUES} values), the
+* column is a `parentField` of the correlation, and the parent and child
+* columns have the same Zero type, which is not `json`.
+*
+* A condition is not copied when the child already has the same condition as
+* a conjunct. So the pass does not change an AST that it already pushed.
+*
+* Does not change its input. Returns the same object for every part of the
+* AST that it does not change.
+*
+* @param pushed When given, receives each child conjunct that is a copy of a
+* parent condition: the copies that the pass adds, and the child's own
+* conjuncts that equal a copy. The parent's condition implies each of them
+* wherever the join binds its column, so the planner ignores them there.
+*/
+function pushDownCorrelatedPredicates(ast, columnsOf, pushed) {
+	function visit(ast) {
+		const where = ast.where && visitCondition(ast.where, ast.table, []);
+		const facts = where ? simpleConjuncts(where) : [];
+		const related = ast.related && mapShared(ast.related, (csq) => {
+			const subquery = visit(pushInto(csq, facts, ast.table));
+			return subquery === csq.subquery ? csq : {
+				...csq,
+				subquery
+			};
+		});
+		if (where === ast.where && related === ast.related) return ast;
+		return {
+			...ast,
+			where,
+			related
+		};
+	}
+	function visitCondition(c, table, facts) {
+		switch (c.type) {
+			case "simple": return c;
+			case "and": return visitConjunction(c, table, [...facts, ...simpleConjuncts(c)]);
+			case "or": {
+				const conditions = mapShared(c.conditions, (x) => visitCondition(x, table, facts));
+				return conditions === c.conditions ? c : {
+					...c,
+					conditions
+				};
+			}
+			case "correlatedSubquery": {
+				const subquery = visit(pushInto(c.related, facts, table));
+				return subquery === c.related.subquery ? c : {
+					...c,
+					related: {
+						...c.related,
+						subquery
+					}
+				};
+			}
+		}
+	}
+	function visitConjunction(c, table, facts) {
+		const conditions = mapShared(c.conditions, (x) => x.type === "and" ? visitConjunction(x, table, facts) : visitCondition(x, table, facts));
+		return conditions === c.conditions ? c : {
+			...c,
+			conditions
+		};
+	}
+	function pushInto(csq, facts, parentTable) {
+		const { parentField, childField } = csq.correlation;
+		const { subquery } = csq;
+		const conjuncts = subquery.where ? simpleConjuncts(subquery.where) : [];
+		const added = [];
+		for (const fact of facts) {
+			if (!isPushable(fact)) continue;
+			for (let i = 0; i < parentField.length; i++) if (parentField[i] === fact.left.name && haveSameScalarType(columnsOf(parentTable)[parentField[i]], columnsOf(subquery.table)[childField[i]])) {
+				const copy = {
+					...fact,
+					left: {
+						type: "column",
+						name: childField[i]
+					}
+				};
+				const same = conjuncts.find((c) => isSameCondition(c, copy));
+				if (same) pushed?.add(same);
+				else {
+					conjuncts.push(copy);
+					added.push(copy);
+					pushed?.add(copy);
+				}
+			}
+		}
+		if (added.length === 0) return subquery;
+		return {
+			...subquery,
+			where: simplifyCondition({
+				type: "and",
+				conditions: subquery.where ? [subquery.where, ...added] : added
+			})
+		};
+	}
+	return visit(ast);
+}
+/**
+* The simple conditions that are conjuncts of `c`, including those of ANDs
+* nested in ANDs.
+*/
+function simpleConjuncts(c) {
+	switch (c.type) {
+		case "simple": return [c];
+		case "and": return c.conditions.flatMap(simpleConjuncts);
+		default: return [];
+	}
+}
+function isPushable(c) {
+	if (c.left.type !== "column" || c.right.type !== "literal") return false;
+	switch (c.op) {
+		case "=":
+		case "IS": return true;
+		case "IN": return Array.isArray(c.right.value) && c.right.value.length <= 32;
+		default: return false;
+	}
+}
+function isSameCondition(a, b) {
+	return a.op === b.op && a.left.type === "column" && b.left.type === "column" && a.left.name === b.left.name && a.right.type === "literal" && b.right.type === "literal" && deepEqual(a.right.value, b.right.value);
+}
+function haveSameScalarType(parent, child) {
+	return parent !== void 0 && child !== void 0 && parent.type === child.type && parent.type !== "json";
+}
+/**
+* Like `Array.prototype.map`, but returns `arr` itself when `f` returns every
+* element unchanged.
+*/
+function mapShared(arr, f) {
+	let result;
+	for (let i = 0; i < arr.length; i++) {
+		const x = f(arr[i]);
+		if (result === void 0 && x !== arr[i]) result = arr.slice(0, i);
+		result?.push(x);
+	}
+	return result ?? arr;
+}
+//#endregion
+export { pushDownCorrelatedPredicates };
+
+//# sourceMappingURL=correlated-predicate-pushdown.js.map

package/out/zql/src/builder/correlated-predicate-pushdown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"correlated-predicate-pushdown.js","names":[],"sources":["../../../../../zql/src/builder/correlated-predicate-pushdown.ts"],"sourcesContent":["import {deepEqual} from '../../../shared/src/json.ts';\nimport type {\n  AST,\n  Condition,\n  Conjunction,\n  CorrelatedSubquery,\n  SimpleCondition,\n} from '../../../zero-protocol/src/ast.ts';\nimport type {SchemaValue} from '../../../zero-types/src/schema-value.ts';\nimport {simplifyCondition} from '../query/expression.ts';\n\n/**\n * The longest `IN` list that is copied into a child. `IN` compiles to\n * `IN (SELECT value FROM json_each(?))`, and every per-parent fetch of the\n * child carries the whole list.\n */\nexport const MAX_PUSHED_IN_VALUES = 32;\n\ntype ColumnCondition = SimpleCondition & {\n  readonly left: {readonly type: 'column'; readonly name: string};\n};\n\n/**\n * Copies a parent's condition on a correlation column into the child\n * subquery, renamed to the matching child column. For example,\n * `user.where('user_id', X).related('reading')` becomes\n * `user.where('user_id', X).related('reading', r => r.where('user_id', X))`.\n *\n * The result is the same. Only child rows that cannot join to a parent that\n * matters are removed. But a push that climbs the tree then fetches parents\n * with SQL that includes the ancestor's condition, and a change to a child row\n * that cannot match stops at the child's source.\n *\n * Conditions are copied only when they are true for every parent row where\n * the edge can affect the result:\n * - for `related`, the top-level AND conjuncts of the parent's `where`;\n * - for EXISTS and NOT EXISTS, the conjuncts of every AND on the path from\n *   the root of `where` to the subquery condition. An OR adds no facts.\n *\n * A condition is copied when it is `column = literal`, `column IS literal`, or\n * `column IN literal-list` (at most {@link MAX_PUSHED_IN_VALUES} values), the\n * column is a `parentField` of the correlation, and the parent and child\n * columns have the same Zero type, which is not `json`.\n *\n * A condition is not copied when the child already has the same condition as\n * a conjunct. So the pass does not change an AST that it already pushed.\n *\n * Does not change its input. Returns the same object for every part of the\n * AST that it does not change.\n *\n * @param pushed When given, receives each child conjunct that is a copy of a\n * parent condition: the copies that the pass adds, and the child's own\n * conjuncts that equal a copy. The parent's condition implies each of them\n * wherever the join binds its column, so the planner ignores them there.\n */\nexport function pushDownCorrelatedPredicates(\n  ast: AST,\n  columnsOf: (table: string) => Record<string, SchemaValue>,\n  pushed?: Set<SimpleCondition> | undefined,\n): AST {\n  function visit(ast: AST): AST {\n    const where = ast.where && visitCondition(ast.where, ast.table, []);\n    const facts = where ? simpleConjuncts(where) : [];\n    const related =\n      ast.related &&\n      mapShared(ast.related, csq => {\n        const subquery = visit(pushInto(csq, facts, ast.table));\n        return subquery === csq.subquery ? csq : {...csq, subquery};\n      });\n    if (where === ast.where && related === ast.related) {\n      return ast;\n    }\n    return {...ast, where, related};\n  }\n\n  function visitCondition(\n    c: Condition,\n    table: string,\n    facts: readonly SimpleCondition[],\n  ): Condition {\n    switch (c.type) {\n      case 'simple':\n        return c;\n      case 'and':\n        return visitConjunction(c, table, [...facts, ...simpleConjuncts(c)]);\n      case 'or': {\n        const conditions = mapShared(c.conditions, x =>\n          visitCondition(x, table, facts),\n        );\n        return conditions === c.conditions ? c : {...c, conditions};\n      }\n      case 'correlatedSubquery': {\n        const subquery = visit(pushInto(c.related, facts, table));\n        return subquery === c.related.subquery\n          ? c\n          : {...c, related: {...c.related, subquery}};\n      }\n    }\n  }\n\n  // `facts` already holds the simple conjuncts of `c` and of the ANDs nested\n  // directly in it, so nested ANDs must not add them again.\n  function visitConjunction(\n    c: Conjunction,\n    table: string,\n    facts: readonly SimpleCondition[],\n  ): Conjunction {\n    const conditions = mapShared(c.conditions, x =>\n      x.type === 'and'\n        ? visitConjunction(x, table, facts)\n        : visitCondition(x, table, facts),\n    );\n    return conditions === c.conditions ? c : {...c, conditions};\n  }\n\n  function pushInto(\n    csq: CorrelatedSubquery,\n    facts: readonly SimpleCondition[],\n    parentTable: string,\n  ): AST {\n    const {parentField, childField} = csq.correlation;\n    const {subquery} = csq;\n    const conjuncts = subquery.where ? simpleConjuncts(subquery.where) : [];\n    const added: SimpleCondition[] = [];\n    for (const fact of facts) {\n      if (!isPushable(fact)) {\n        continue;\n      }\n      for (let i = 0; i < parentField.length; i++) {\n        if (\n          parentField[i] === fact.left.name &&\n          haveSameScalarType(\n            columnsOf(parentTable)[parentField[i]],\n            columnsOf(subquery.table)[childField[i]],\n          )\n        ) {\n          const copy: SimpleCondition = {\n            ...fact,\n            left: {type: 'column', name: childField[i]},\n          };\n          const same = conjuncts.find(c => isSameCondition(c, copy));\n          if (same) {\n            pushed?.add(same);\n          } else {\n            conjuncts.push(copy);\n            added.push(copy);\n            pushed?.add(copy);\n          }\n        }\n      }\n    }\n    if (added.length === 0) {\n      return subquery;\n    }\n    return {\n      ...subquery,\n      where: simplifyCondition({\n        type: 'and',\n        conditions: subquery.where ? [subquery.where, ...added] : added,\n      }),\n    };\n  }\n\n  return visit(ast);\n}\n\n/**\n * The simple conditions that are conjuncts of `c`, including those of ANDs\n * nested in ANDs.\n */\nfunction simpleConjuncts(c: Condition): SimpleCondition[] {\n  switch (c.type) {\n    case 'simple':\n      return [c];\n    case 'and':\n      return c.conditions.flatMap(simpleConjuncts);\n    default:\n      return [];\n  }\n}\n\nfunction isPushable(c: SimpleCondition): c is ColumnCondition {\n  if (c.left.type !== 'column' || c.right.type !== 'literal') {\n    return false;\n  }\n  switch (c.op) {\n    case '=':\n    case 'IS':\n      return true;\n    case 'IN':\n      return (\n        Array.isArray(c.right.value) &&\n        c.right.value.length <= MAX_PUSHED_IN_VALUES\n      );\n    default:\n      return false;\n  }\n}\n\nfunction isSameCondition(a: SimpleCondition, b: SimpleCondition): boolean {\n  return (\n    a.op === b.op &&\n    a.left.type === 'column' &&\n    b.left.type === 'column' &&\n    a.left.name === b.left.name &&\n    a.right.type === 'literal' &&\n    b.right.type === 'literal' &&\n    deepEqual(a.right.value, b.right.value)\n  );\n}\n\nfunction haveSameScalarType(\n  parent: SchemaValue | undefined,\n  child: SchemaValue | undefined,\n): boolean {\n  return (\n    parent !== undefined &&\n    child !== undefined &&\n    parent.type === child.type &&\n    parent.type !== 'json'\n  );\n}\n\n/**\n * Like `Array.prototype.map`, but returns `arr` itself when `f` returns every\n * element unchanged.\n */\nfunction mapShared<T>(arr: readonly T[], f: (x: T) => T): readonly T[] {\n  let result: T[] | undefined;\n  for (let i = 0; i < arr.length; i++) {\n    const x = f(arr[i]);\n    if (result === undefined && x !== arr[i]) {\n      result = arr.slice(0, i);\n    }\n    result?.push(x);\n  }\n  return result ?? arr;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuDA,SAAgB,6BACd,KACA,WACA,QACK;CACL,SAAS,MAAM,KAAe;EAC5B,MAAM,QAAQ,IAAI,SAAS,eAAe,IAAI,OAAO,IAAI,OAAO,CAAC,CAAC;EAClE,MAAM,QAAQ,QAAQ,gBAAgB,KAAK,IAAI,CAAC;EAChD,MAAM,UACJ,IAAI,WACJ,UAAU,IAAI,UAAS,QAAO;GAC5B,MAAM,WAAW,MAAM,SAAS,KAAK,OAAO,IAAI,KAAK,CAAC;GACtD,OAAO,aAAa,IAAI,WAAW,MAAM;IAAC,GAAG;IAAK;GAAQ;EAC5D,CAAC;EACH,IAAI,UAAU,IAAI,SAAS,YAAY,IAAI,SACzC,OAAO;EAET,OAAO;GAAC,GAAG;GAAK;GAAO;EAAO;CAChC;CAEA,SAAS,eACP,GACA,OACA,OACW;EACX,QAAQ,EAAE,MAAV;GACE,KAAK,UACH,OAAO;GACT,KAAK,OACH,OAAO,iBAAiB,GAAG,OAAO,CAAC,GAAG,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC;GACrE,KAAK,MAAM;IACT,MAAM,aAAa,UAAU,EAAE,aAAY,MACzC,eAAe,GAAG,OAAO,KAAK,CAChC;IACA,OAAO,eAAe,EAAE,aAAa,IAAI;KAAC,GAAG;KAAG;IAAU;GAC5D;GACA,KAAK,sBAAsB;IACzB,MAAM,WAAW,MAAM,SAAS,EAAE,SAAS,OAAO,KAAK,CAAC;IACxD,OAAO,aAAa,EAAE,QAAQ,WAC1B,IACA;KAAC,GAAG;KAAG,SAAS;MAAC,GAAG,EAAE;MAAS;KAAQ;IAAC;GAC9C;EACF;CACF;CAIA,SAAS,iBACP,GACA,OACA,OACa;EACb,MAAM,aAAa,UAAU,EAAE,aAAY,MACzC,EAAE,SAAS,QACP,iBAAiB,GAAG,OAAO,KAAK,IAChC,eAAe,GAAG,OAAO,KAAK,CACpC;EACA,OAAO,eAAe,EAAE,aAAa,IAAI;GAAC,GAAG;GAAG;EAAU;CAC5D;CAEA,SAAS,SACP,KACA,OACA,aACK;EACL,MAAM,EAAC,aAAa,eAAc,IAAI;EACtC,MAAM,EAAC,aAAY;EACnB,MAAM,YAAY,SAAS,QAAQ,gBAAgB,SAAS,KAAK,IAAI,CAAC;EACtE,MAAM,QAA2B,CAAC;EAClC,KAAK,MAAM,QAAQ,OAAO;GACxB,IAAI,CAAC,WAAW,IAAI,GAClB;GAEF,KAAK,IAAI,IAAI,GAAG,IAAI,YAAY,QAAQ,KACtC,IACE,YAAY,OAAO,KAAK,KAAK,QAC7B,mBACE,UAAU,WAAW,EAAE,YAAY,KACnC,UAAU,SAAS,KAAK,EAAE,WAAW,GACvC,GACA;IACA,MAAM,OAAwB;KAC5B,GAAG;KACH,MAAM;MAAC,MAAM;MAAU,MAAM,WAAW;KAAE;IAC5C;IACA,MAAM,OAAO,UAAU,MAAK,MAAK,gBAAgB,GAAG,IAAI,CAAC;IACzD,IAAI,MACF,QAAQ,IAAI,IAAI;SACX;KACL,UAAU,KAAK,IAAI;KACnB,MAAM,KAAK,IAAI;KACf,QAAQ,IAAI,IAAI;IAClB;GACF;EAEJ;EACA,IAAI,MAAM,WAAW,GACnB,OAAO;EAET,OAAO;GACL,GAAG;GACH,OAAO,kBAAkB;IACvB,MAAM;IACN,YAAY,SAAS,QAAQ,CAAC,SAAS,OAAO,GAAG,KAAK,IAAI;GAC5D,CAAC;EACH;CACF;CAEA,OAAO,MAAM,GAAG;AAClB;;;;;AAMA,SAAS,gBAAgB,GAAiC;CACxD,QAAQ,EAAE,MAAV;EACE,KAAK,UACH,OAAO,CAAC,CAAC;EACX,KAAK,OACH,OAAO,EAAE,WAAW,QAAQ,eAAe;EAC7C,SACE,OAAO,CAAC;CACZ;AACF;AAEA,SAAS,WAAW,GAA0C;CAC5D,IAAI,EAAE,KAAK,SAAS,YAAY,EAAE,MAAM,SAAS,WAC/C,OAAO;CAET,QAAQ,EAAE,IAAV;EACE,KAAK;EACL,KAAK,MACH,OAAO;EACT,KAAK,MACH,OACE,MAAM,QAAQ,EAAE,MAAM,KAAK,KAC3B,EAAE,MAAM,MAAM,UAAA;EAElB,SACE,OAAO;CACX;AACF;AAEA,SAAS,gBAAgB,GAAoB,GAA6B;CACxE,OACE,EAAE,OAAO,EAAE,MACX,EAAE,KAAK,SAAS,YAChB,EAAE,KAAK,SAAS,YAChB,EAAE,KAAK,SAAS,EAAE,KAAK,QACvB,EAAE,MAAM,SAAS,aACjB,EAAE,MAAM,SAAS,aACjB,UAAU,EAAE,MAAM,OAAO,EAAE,MAAM,KAAK;AAE1C;AAEA,SAAS,mBACP,QACA,OACS;CACT,OACE,WAAW,KAAA,KACX,UAAU,KAAA,KACV,OAAO,SAAS,MAAM,QACtB,OAAO,SAAS;AAEpB;;;;;AAMA,SAAS,UAAa,KAAmB,GAA8B;CACrE,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;EACnC,MAAM,IAAI,EAAE,IAAI,EAAE;EAClB,IAAI,WAAW,KAAA,KAAa,MAAM,IAAI,IACpC,SAAS,IAAI,MAAM,GAAG,CAAC;EAEzB,QAAQ,KAAK,CAAC;CAChB;CACA,OAAO,UAAU;AACnB"}

package/out/zql/src/builder/debug-delegate.d.ts

@@ -20,7 +20,12 @@ export interface DebugDelegate {
 }
 export declare class Debug implements DebugDelegate {
     #private;
-    constructor();
+    /**
+     * @param collectRows Whether to keep the vended rows.
+     * @param maxRowsPerQuery Maximum number of rows kept per table/query. Rows
+     *   past this are still counted but not kept.
+     */
+    constructor(collectRows: boolean, maxRowsPerQuery?: number);
     getVendedRowCounts(): RowCountsBySource;
     getVendedRows(): RowsBySource;
     getNVisitCounts(): RowCountsBySource;

package/out/zql/src/builder/debug-delegate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug-delegate.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/debug-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iBAAiB,EAEjB,YAAY,EACb,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAC,KAAK,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAE5D,eAAO,MAAM,iBAAiB;IAC5B,oBAAoB;IACpB,eAAe;CAChB,CAAC;AAEF,KAAK,UAAU,GAAG,MAAM,CAAC;AACzB,KAAK,GAAG,GAAG,MAAM,CAAC;AAElB,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAAC;IAC/C,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IACzD,kBAAkB,IAAI,iBAAiB,CAAC;IACxC,aAAa,IAAI,YAAY,CAAC;IAC9B,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAClE,eAAe,IAAI,iBAAiB,CAAC;IACrC,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACnE,cAAc,IAAI,WAAW,CAAC;IAE9B,KAAK,IAAI,IAAI,CAAC;CACf;AAED,qBAAa,KAAM,YAAW,aAAa;;IAMzC,cAKC;IAED,kBAAkB,IAAI,iBAAiB,CAEtC;IAED,aAAa,IAAI,YAAY,CAE5B;IAED,eAAe,IAAI,iBAAiB,CAEnC;IAED,cAAc,IAAI,WAAW,CAE5B;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAO7C;IAED,KAAK,IAAI,IAAI,CAKZ;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAQvD;IAED,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAUhE;IAED,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAElE;CAiBF"}
+{"version":3,"file":"debug-delegate.d.ts","sourceRoot":"","sources":["../../../../../zql/src/builder/debug-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,iBAAiB,EAEjB,YAAY,EACb,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAC,KAAK,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAE5D,eAAO,MAAM,iBAAiB;IAC5B,oBAAoB;IACpB,eAAe;CAChB,CAAC;AAEF,KAAK,UAAU,GAAG,MAAM,CAAC;AACzB,KAAK,GAAG,GAAG,MAAM,CAAC;AAElB,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;AAEhD,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAAC;IAC/C,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC;IACzD,kBAAkB,IAAI,iBAAiB,CAAC;IACxC,aAAa,IAAI,YAAY,CAAC;IAC9B,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAClE,eAAe,IAAI,iBAAiB,CAAC;IACrC,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACnE,cAAc,IAAI,WAAW,CAAC;IAE9B,KAAK,IAAI,IAAI,CAAC;CACf;AAED,qBAAa,KAAM,YAAW,aAAa;;IAQzC;;;;OAIG;IACH,YAAY,WAAW,EAAE,OAAO,EAAE,eAAe,SAAW,EAO3D;IAED,kBAAkB,IAAI,iBAAiB,CAEtC;IAED,aAAa,IAAI,YAAY,CAE5B;IAED,eAAe,IAAI,iBAAiB,CAEnC;IAED,cAAc,IAAI,WAAW,CAE5B;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAO7C;IAED,KAAK,IAAI,IAAI,CAKZ;IAED,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAWvD;IAED,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAUhE;IAED,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAElE;CAiBF"}

package/out/zql/src/builder/debug-delegate.js

@@ -9,7 +9,16 @@ var Debug = class {
 	#rowsBySource;
 	#nvisitBySource;
 	#plans;
-	constructor() {
+	#collectRows;
+	#maxRowsPerQuery;
+	/**
+	* @param collectRows Whether to keep the vended rows.
+	* @param maxRowsPerQuery Maximum number of rows kept per table/query. Rows
+	*   past this are still counted but not kept.
+	*/
+	constructor(collectRows, maxRowsPerQuery = Infinity) {
+		this.#collectRows = collectRows;
+		this.#maxRowsPerQuery = maxRowsPerQuery;
 		this.#rowCountsBySource = {};
 		this.#rowsBySource = {};
 		this.#nvisitBySource = {};
@@ -42,7 +51,10 @@ var Debug = class {
 	rowVended(table, query, row) {
 		const { counts, rows } = this.#getRowStats(table);
 		if (counts) counts[query] = (counts[query] ?? 0) + 1;
-		if (rows) (rows[query] ??= []).push(row);
+		if (this.#collectRows) {
+			const queryRows = rows[query] ??= [];
+			if (queryRows.length < this.#maxRowsPerQuery) queryRows.push(row);
+		}
 	}
 	recordNVisit(table, query, nvisit) {
 		let nvisitCounts = this.#nvisitBySource[table];

package/out/zql/src/builder/debug-delegate.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-delegate.js","names":["#rowCountsBySource","#rowsBySource","#nvisitBySource","#plans","#getRowStats"],"sources":["../../../../../zql/src/builder/debug-delegate.ts"],"sourcesContent":["import type {\n  RowCountsByQuery,\n  RowCountsBySource,\n  RowsByQuery,\n  RowsBySource,\n} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport {type Row} from '../../../zero-protocol/src/data.ts';\n\nexport const runtimeDebugFlags = {\n  trackRowCountsVended: false,\n  trackRowsVended: false,\n};\n\ntype SourceName = string;\ntype SQL = string;\n\nexport type SQLitePlans = Record<SQL, string[]>;\n\nexport interface DebugDelegate {\n  initQuery(table: SourceName, query: SQL): void;\n  rowVended(table: SourceName, query: SQL, row: Row): void;\n  getVendedRowCounts(): RowCountsBySource;\n  getVendedRows(): RowsBySource;\n  recordNVisit(table: SourceName, query: SQL, nvisit: number): void;\n  getNVisitCounts(): RowCountsBySource;\n  recordExplain(table: SourceName, query: SQL, plan: string[]): void;\n  getSQLitePlans(): SQLitePlans;\n  // clears all internal state\n  reset(): void;\n}\n\nexport class Debug implements DebugDelegate {\n  #rowCountsBySource: RowCountsBySource;\n  #rowsBySource: RowsBySource;\n  #nvisitBySource: RowCountsBySource;\n  #plans: SQLitePlans;\n\n  constructor() {\n    this.#rowCountsBySource = {};\n    this.#rowsBySource = {};\n    this.#nvisitBySource = {};\n    this.#plans = {};\n  }\n\n  getVendedRowCounts(): RowCountsBySource {\n    return this.#rowCountsBySource;\n  }\n\n  getVendedRows(): RowsBySource {\n    return this.#rowsBySource;\n  }\n\n  getNVisitCounts(): RowCountsBySource {\n    return this.#nvisitBySource;\n  }\n\n  getSQLitePlans(): SQLitePlans {\n    return this.#plans;\n  }\n\n  initQuery(table: SourceName, query: SQL): void {\n    const {counts} = this.#getRowStats(table);\n    if (counts) {\n      if (!counts[query]) {\n        counts[query] = 0;\n      }\n    }\n  }\n\n  reset(): void {\n    this.#rowCountsBySource = {};\n    this.#rowsBySource = {};\n    this.#nvisitBySource = {};\n    this.#plans = {};\n  }\n\n  rowVended(table: SourceName, query: SQL, row: Row): void {\n    const {counts, rows} = this.#getRowStats(table);\n    if (counts) {\n      counts[query] = (counts[query] ?? 0) + 1;\n    }\n    if (rows) {\n      (rows[query] ??= []).push(row);\n    }\n  }\n\n  recordNVisit(table: SourceName, query: SQL, nvisit: number): void {\n    let nvisitCounts = this.#nvisitBySource[table];\n    if (!nvisitCounts) {\n      nvisitCounts = {};\n      this.#nvisitBySource[table] = nvisitCounts;\n    }\n    if (!nvisitCounts[query]) {\n      nvisitCounts[query] = 0;\n    }\n    nvisitCounts[query] += nvisit;\n  }\n\n  recordExplain(_table: SourceName, query: SQL, plan: string[]): void {\n    this.#plans[query] = plan;\n  }\n\n  #getRowStats(source: SourceName) {\n    let counts: RowCountsByQuery | undefined;\n    let rows: RowsByQuery | undefined;\n    counts = this.#rowCountsBySource[source];\n    if (!counts) {\n      counts = {};\n      this.#rowCountsBySource[source] = counts;\n    }\n    rows = this.#rowsBySource[source];\n    if (!rows) {\n      rows = {};\n      this.#rowsBySource[source] = rows;\n    }\n    return {counts, rows};\n  }\n}\n"],"mappings":";;AAQA,IAAa,oBAAoB;CAC/B,sBAAsB;CACtB,iBAAiB;AACnB;AAoBA,IAAa,QAAb,MAA4C;CAC1C;CACA;CACA;CACA;CAEA,cAAc;EACZ,KAAKA,qBAAqB,CAAC;EAC3B,KAAKC,gBAAgB,CAAC;EACtB,KAAKC,kBAAkB,CAAC;EACxB,KAAKC,SAAS,CAAC;CACjB;CAEA,qBAAwC;EACtC,OAAO,KAAKH;CACd;CAEA,gBAA8B;EAC5B,OAAO,KAAKC;CACd;CAEA,kBAAqC;EACnC,OAAO,KAAKC;CACd;CAEA,iBAA8B;EAC5B,OAAO,KAAKC;CACd;CAEA,UAAU,OAAmB,OAAkB;EAC7C,MAAM,EAAC,WAAU,KAAKC,aAAa,KAAK;EACxC,IAAI;OACE,CAAC,OAAO,QACV,OAAO,SAAS;EAAA;CAGtB;CAEA,QAAc;EACZ,KAAKJ,qBAAqB,CAAC;EAC3B,KAAKC,gBAAgB,CAAC;EACtB,KAAKC,kBAAkB,CAAC;EACxB,KAAKC,SAAS,CAAC;CACjB;CAEA,UAAU,OAAmB,OAAY,KAAgB;EACvD,MAAM,EAAC,QAAQ,SAAQ,KAAKC,aAAa,KAAK;EAC9C,IAAI,QACF,OAAO,UAAU,OAAO,UAAU,KAAK;EAEzC,IAAI,MACF,CAAC,KAAK,WAAW,CAAC,GAAG,KAAK,GAAG;CAEjC;CAEA,aAAa,OAAmB,OAAY,QAAsB;EAChE,IAAI,eAAe,KAAKF,gBAAgB;EACxC,IAAI,CAAC,cAAc;GACjB,eAAe,CAAC;GAChB,KAAKA,gBAAgB,SAAS;EAChC;EACA,IAAI,CAAC,aAAa,QAChB,aAAa,SAAS;EAExB,aAAa,UAAU;CACzB;CAEA,cAAc,QAAoB,OAAY,MAAsB;EAClE,KAAKC,OAAO,SAAS;CACvB;CAEA,aAAa,QAAoB;EAC/B,IAAI;EACJ,IAAI;EACJ,SAAS,KAAKH,mBAAmB;EACjC,IAAI,CAAC,QAAQ;GACX,SAAS,CAAC;GACV,KAAKA,mBAAmB,UAAU;EACpC;EACA,OAAO,KAAKC,cAAc;EAC1B,IAAI,CAAC,MAAM;GACT,OAAO,CAAC;GACR,KAAKA,cAAc,UAAU;EAC/B;EACA,OAAO;GAAC;GAAQ;EAAI;CACtB;AACF"}
+{"version":3,"file":"debug-delegate.js","names":["#collectRows","#maxRowsPerQuery","#rowCountsBySource","#rowsBySource","#nvisitBySource","#plans","#getRowStats"],"sources":["../../../../../zql/src/builder/debug-delegate.ts"],"sourcesContent":["import type {\n  RowCountsByQuery,\n  RowCountsBySource,\n  RowsByQuery,\n  RowsBySource,\n} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport {type Row} from '../../../zero-protocol/src/data.ts';\n\nexport const runtimeDebugFlags = {\n  trackRowCountsVended: false,\n  trackRowsVended: false,\n};\n\ntype SourceName = string;\ntype SQL = string;\n\nexport type SQLitePlans = Record<SQL, string[]>;\n\nexport interface DebugDelegate {\n  initQuery(table: SourceName, query: SQL): void;\n  rowVended(table: SourceName, query: SQL, row: Row): void;\n  getVendedRowCounts(): RowCountsBySource;\n  getVendedRows(): RowsBySource;\n  recordNVisit(table: SourceName, query: SQL, nvisit: number): void;\n  getNVisitCounts(): RowCountsBySource;\n  recordExplain(table: SourceName, query: SQL, plan: string[]): void;\n  getSQLitePlans(): SQLitePlans;\n  // clears all internal state\n  reset(): void;\n}\n\nexport class Debug implements DebugDelegate {\n  #rowCountsBySource: RowCountsBySource;\n  #rowsBySource: RowsBySource;\n  #nvisitBySource: RowCountsBySource;\n  #plans: SQLitePlans;\n  readonly #collectRows: boolean;\n  readonly #maxRowsPerQuery: number;\n\n  /**\n   * @param collectRows Whether to keep the vended rows.\n   * @param maxRowsPerQuery Maximum number of rows kept per table/query. Rows\n   *   past this are still counted but not kept.\n   */\n  constructor(collectRows: boolean, maxRowsPerQuery = Infinity) {\n    this.#collectRows = collectRows;\n    this.#maxRowsPerQuery = maxRowsPerQuery;\n    this.#rowCountsBySource = {};\n    this.#rowsBySource = {};\n    this.#nvisitBySource = {};\n    this.#plans = {};\n  }\n\n  getVendedRowCounts(): RowCountsBySource {\n    return this.#rowCountsBySource;\n  }\n\n  getVendedRows(): RowsBySource {\n    return this.#rowsBySource;\n  }\n\n  getNVisitCounts(): RowCountsBySource {\n    return this.#nvisitBySource;\n  }\n\n  getSQLitePlans(): SQLitePlans {\n    return this.#plans;\n  }\n\n  initQuery(table: SourceName, query: SQL): void {\n    const {counts} = this.#getRowStats(table);\n    if (counts) {\n      if (!counts[query]) {\n        counts[query] = 0;\n      }\n    }\n  }\n\n  reset(): void {\n    this.#rowCountsBySource = {};\n    this.#rowsBySource = {};\n    this.#nvisitBySource = {};\n    this.#plans = {};\n  }\n\n  rowVended(table: SourceName, query: SQL, row: Row): void {\n    const {counts, rows} = this.#getRowStats(table);\n    if (counts) {\n      counts[query] = (counts[query] ?? 0) + 1;\n    }\n    if (this.#collectRows) {\n      const queryRows = (rows[query] ??= []);\n      if (queryRows.length < this.#maxRowsPerQuery) {\n        queryRows.push(row);\n      }\n    }\n  }\n\n  recordNVisit(table: SourceName, query: SQL, nvisit: number): void {\n    let nvisitCounts = this.#nvisitBySource[table];\n    if (!nvisitCounts) {\n      nvisitCounts = {};\n      this.#nvisitBySource[table] = nvisitCounts;\n    }\n    if (!nvisitCounts[query]) {\n      nvisitCounts[query] = 0;\n    }\n    nvisitCounts[query] += nvisit;\n  }\n\n  recordExplain(_table: SourceName, query: SQL, plan: string[]): void {\n    this.#plans[query] = plan;\n  }\n\n  #getRowStats(source: SourceName) {\n    let counts: RowCountsByQuery | undefined;\n    let rows: RowsByQuery | undefined;\n    counts = this.#rowCountsBySource[source];\n    if (!counts) {\n      counts = {};\n      this.#rowCountsBySource[source] = counts;\n    }\n    rows = this.#rowsBySource[source];\n    if (!rows) {\n      rows = {};\n      this.#rowsBySource[source] = rows;\n    }\n    return {counts, rows};\n  }\n}\n"],"mappings":";;AAQA,IAAa,oBAAoB;CAC/B,sBAAsB;CACtB,iBAAiB;AACnB;AAoBA,IAAa,QAAb,MAA4C;CAC1C;CACA;CACA;CACA;CACA;CACA;;;;;;CAOA,YAAY,aAAsB,kBAAkB,UAAU;EAC5D,KAAKA,eAAe;EACpB,KAAKC,mBAAmB;EACxB,KAAKC,qBAAqB,CAAC;EAC3B,KAAKC,gBAAgB,CAAC;EACtB,KAAKC,kBAAkB,CAAC;EACxB,KAAKC,SAAS,CAAC;CACjB;CAEA,qBAAwC;EACtC,OAAO,KAAKH;CACd;CAEA,gBAA8B;EAC5B,OAAO,KAAKC;CACd;CAEA,kBAAqC;EACnC,OAAO,KAAKC;CACd;CAEA,iBAA8B;EAC5B,OAAO,KAAKC;CACd;CAEA,UAAU,OAAmB,OAAkB;EAC7C,MAAM,EAAC,WAAU,KAAKC,aAAa,KAAK;EACxC,IAAI;OACE,CAAC,OAAO,QACV,OAAO,SAAS;EAAA;CAGtB;CAEA,QAAc;EACZ,KAAKJ,qBAAqB,CAAC;EAC3B,KAAKC,gBAAgB,CAAC;EACtB,KAAKC,kBAAkB,CAAC;EACxB,KAAKC,SAAS,CAAC;CACjB;CAEA,UAAU,OAAmB,OAAY,KAAgB;EACvD,MAAM,EAAC,QAAQ,SAAQ,KAAKC,aAAa,KAAK;EAC9C,IAAI,QACF,OAAO,UAAU,OAAO,UAAU,KAAK;EAEzC,IAAI,KAAKN,cAAc;GACrB,MAAM,YAAa,KAAK,WAAW,CAAC;GACpC,IAAI,UAAU,SAAS,KAAKC,kBAC1B,UAAU,KAAK,GAAG;EAEtB;CACF;CAEA,aAAa,OAAmB,OAAY,QAAsB;EAChE,IAAI,eAAe,KAAKG,gBAAgB;EACxC,IAAI,CAAC,cAAc;GACjB,eAAe,CAAC;GAChB,KAAKA,gBAAgB,SAAS;EAChC;EACA,IAAI,CAAC,aAAa,QAChB,aAAa,SAAS;EAExB,aAAa,UAAU;CACzB;CAEA,cAAc,QAAoB,OAAY,MAAsB;EAClE,KAAKC,OAAO,SAAS;CACvB;CAEA,aAAa,QAAoB;EAC/B,IAAI;EACJ,IAAI;EACJ,SAAS,KAAKH,mBAAmB;EACjC,IAAI,CAAC,QAAQ;GACX,SAAS,CAAC;GACV,KAAKA,mBAAmB,UAAU;EACpC;EACA,OAAO,KAAKC,cAAc;EAC1B,IAAI,CAAC,MAAM;GACT,OAAO,CAAC;GACR,KAAKA,cAAc,UAAU;EAC/B;EACA,OAAO;GAAC;GAAQ;EAAI;CACtB;AACF"}

package/out/zql/src/ivm/array-view.d.ts

@@ -23,7 +23,36 @@ export declare class ArrayView<V extends View> implements Output, TypedView<V> {
     addListener(listener: Listener<V>): () => void;
     destroy(): void;
     push(change: Change): readonly never[];
+    /**
+     * Keep exposing the current snapshot, whatever is pushed in the meantime,
+     * until {@link releaseData} or the next {@link flush}. Result type
+     * notifications are held back until that flush.
+     *
+     * A transaction is normally one synchronous task, so nobody can look at a
+     * view between its pushes and its flush. Deferred pipelines are different:
+     * they are hydrated over several tasks and flushed together (see
+     * `QueryDelegate.onPipelinesReady`), and a view that already has its rows
+     * must not show them early.
+     */
+    holdData(): void;
+    /**
+     * Make `data` current again without notifying anyone yet; listeners are
+     * still only called by the next {@link flush}. Views released together get
+     * this called on all of them before any is flushed, so a listener of one
+     * that reads another sees its rows too.
+     */
+    releaseData(): void;
     flush(): void;
     updateTTL(ttl: TTL): void;
+    /**
+     * The store holds the server-confirmed complete result of this query from a
+     * previous sync (the persisted got-queries key exists, pre-authoritative).
+     * Never downgrades 'complete'/'error', and never resolves anything that
+     * waits on 'complete' — freshness stays a promise only the connection can
+     * keep.
+     */
+    markCached(): void;
+    /** The got key was deleted (eviction) while still pre-authoritative. */
+    unmarkCached(): void;
 }
 //# sourceMappingURL=array-view.d.ts.map

package/out/zql/src/ivm/array-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,EAAC,QAAQ,EAAc,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAG5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,MAAM,EAAC,MAAM,eAAe,CAAC;AAGlE,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAC,MAAM,WAAW,CAAC;AA0BnD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAgBpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAcpC,YACE,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EA0B9B;IAED,IAAI,IAAI,IACmB,CAAC,CAC3B;IAMD,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,cAShC;IAYD,OAAO,SAEN;IAqBD,IAAI,CAAC,MAAM,EAAE,MAAM,oBAYlB;IAED,KAAK,SAUJ;IAED,SAAS,CAAC,GAAG,EAAE,GAAG,QAEjB;CACF"}
+{"version":3,"file":"array-view.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/array-view.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,EAAC,QAAQ,EAAc,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAG5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,MAAM,EAAC,MAAM,eAAe,CAAC;AAGlE,OAAO,KAAK,EAAQ,MAAM,EAAE,IAAI,EAAC,MAAM,WAAW,CAAC;AA0BnD;;;;;;;;;;GAUG;AACH,qBAAa,SAAS,CAAC,CAAC,SAAS,IAAI,CAAE,YAAW,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;;IAgBpE,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IAyBpC,YACE,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,EAClD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,EAmB9B;IAED,IAAI,IAAI,IAC4C,CAAC,CACpD;IAMD,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,cAShC;IAoBD,OAAO,SAEN;IAqBD,IAAI,CAAC,MAAM,EAAE,MAAM,oBAuBlB;IAED;;;;;;;;;;OAUG;IACH,QAAQ,IAAI,IAAI,CAKf;IAED;;;;;OAKG;IACH,WAAW,IAAI,IAAI,CAElB;IAED,KAAK,SAkBJ;IAED,SAAS,CAAC,GAAG,EAAE,GAAG,QAEjB;IAED;;;;;;OAMG;IACH,UAAU,IAAI,IAAI,CAIjB;IAED,wEAAwE;IACxE,YAAY,IAAI,IAAI,CAInB;CAkBF"}

package/out/zql/src/ivm/array-view.js

@@ -47,6 +47,10 @@ var ArrayView = class {
 	#root;
 	onDestroy;
 	#dirty = false;
+	#committedRoot;
+	#held = false;
+	#heldResultType = "unknown";
+	#heldError;
 	#resultType = "unknown";
 	#error;
 	#updateTTL;
@@ -61,18 +65,11 @@ var ArrayView = class {
 		else if ("error" in queryComplete) {
 			this.#resultType = "error";
 			this.#error = queryComplete;
-		} else queryComplete.then(() => {
-			this.#resultType = "complete";
-			this.#fireListeners();
-		}).catch((e) => {
-			this.#resultType = "error";
-			this.#error = e;
-			this.#fireListeners();
-		});
+		} else queryComplete.then(() => this.#setResultType("complete")).catch((e) => this.#setResultType("error", e));
 		this.#hydrate();
 	}
 	get data() {
-		return this.#root[""];
+		return (this.#committedRoot ?? this.#root)[""];
 	}
 	#getSchema() {
 		return this.#schema ??= this.#input.getSchema();
@@ -80,16 +77,26 @@ var ArrayView = class {
 	addListener(listener) {
 		assert(!this.#listeners.has(listener), "Listener already registered");
 		this.#listeners.add(listener);
-		this.#fireListener(listener);
+		listener(...this.#listenerArgs());
 		return () => {
 			this.#listeners.delete(listener);
 		};
 	}
 	#fireListeners() {
-		for (const listener of this.#listeners) this.#fireListener(listener);
+		const args = this.#listenerArgs();
+		for (const listener of this.#listeners) listener(...args);
 	}
-	#fireListener(listener) {
-		listener(this.data, this.#resultType, this.#error);
+	#listenerArgs() {
+		if (this.#committedRoot !== void 0) return [
+			this.data,
+			this.#heldResultType,
+			this.#heldError
+		];
+		return [
+			this.data,
+			this.#resultType,
+			this.#error
+		];
 	}
 	destroy() {
 		this.onDestroy?.();
@@ -103,19 +110,70 @@ var ArrayView = class {
 		this.flush();
 	}
 	push(change) {
-		this.#dirty = true;
-		this.#root = applyChange(this.#root, changeToViewChange(change), this.#getSchema(), "", this.#format, false, this.#txnDirty);
+		const newRoot = applyChange(this.#root, changeToViewChange(change), this.#getSchema(), "", this.#format, false, this.#txnDirty);
+		if (newRoot !== this.#root) {
+			this.#root = newRoot;
+			this.#dirty = true;
+		}
 		return emptyArray;
 	}
+	/**
+	* Keep exposing the current snapshot, whatever is pushed in the meantime,
+	* until {@link releaseData} or the next {@link flush}. Result type
+	* notifications are held back until that flush.
+	*
+	* A transaction is normally one synchronous task, so nobody can look at a
+	* view between its pushes and its flush. Deferred pipelines are different:
+	* they are hydrated over several tasks and flushed together (see
+	* `QueryDelegate.onPipelinesReady`), and a view that already has its rows
+	* must not show them early.
+	*/
+	holdData() {
+		this.#committedRoot = this.#root;
+		this.#held = true;
+		this.#heldResultType = this.#resultType;
+		this.#heldError = this.#error;
+	}
+	/**
+	* Make `data` current again without notifying anyone yet; listeners are
+	* still only called by the next {@link flush}. Views released together get
+	* this called on all of them before any is flushed, so a listener of one
+	* that reads another sees its rows too.
+	*/
+	releaseData() {
+		this.#committedRoot = void 0;
+	}
 	flush() {
+		this.#committedRoot = void 0;
+		this.#held = false;
 		if (!this.#dirty) return;
 		this.#dirty = false;
-		this.#fireListeners();
 		this.#txnDirty = /* @__PURE__ */ new WeakSet();
+		this.#fireListeners();
 	}
 	updateTTL(ttl) {
 		this.#updateTTL(ttl);
 	}
+	/**
+	* The store holds the server-confirmed complete result of this query from a
+	* previous sync (the persisted got-queries key exists, pre-authoritative).
+	* Never downgrades 'complete'/'error', and never resolves anything that
+	* waits on 'complete' — freshness stays a promise only the connection can
+	* keep.
+	*/
+	markCached() {
+		if (this.#resultType === "unknown") this.#setResultType("cached");
+	}
+	/** The got key was deleted (eviction) while still pre-authoritative. */
+	unmarkCached() {
+		if (this.#resultType === "cached") this.#setResultType("unknown");
+	}
+	#setResultType(resultType, error) {
+		this.#resultType = resultType;
+		this.#error = error;
+		if (this.#held) this.#dirty = true;
+		else if (!this.#dirty) this.#fireListeners();
+	}
 };
 //#endregion
 export { ArrayView };

package/out/zql/src/ivm/array-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"array-view.js","names":["#input","#listeners","#format","#updateTTL","#root","#resultType","#error","#fireListeners","#hydrate","#schema","#fireListener","#dirty","#getSchema","#txnDirty"],"sources":["../../../../../zql/src/ivm/array-view.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {Immutable} from '../../../shared/src/immutable.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {ErroredQuery} from '../../../zero-protocol/src/custom-queries.ts';\nimport type {TTL} from '../query/ttl.ts';\nimport type {Listener, ResultType, TypedView} from '../query/typed-view.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport type {Change} from './change.ts';\nimport {skipYields, type Input, type Output} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {applyChange, type ViewChange} from './view-apply-change.ts';\nimport type {Entry, Format, View} from './view.ts';\n\nfunction changeToViewChange(change: Change): ViewChange {\n  switch (change[ChangeIndex.TYPE]) {\n    case ChangeType.ADD:\n      return {type: 'add', node: change[ChangeIndex.NODE]};\n    case ChangeType.REMOVE:\n      return {type: 'remove', node: change[ChangeIndex.NODE]};\n    case ChangeType.CHILD:\n      return {\n        type: 'child',\n        node: change[ChangeIndex.NODE],\n        child: {\n          relationshipName: change[ChangeIndex.CHILD_DATA].relationshipName,\n          change: changeToViewChange(change[ChangeIndex.CHILD_DATA].change),\n        },\n      };\n    case ChangeType.EDIT:\n      return {\n        type: 'edit',\n        node: change[ChangeIndex.NODE],\n        oldNode: change[ChangeIndex.OLD_NODE],\n      };\n  }\n}\n\n/**\n * Implements a materialized view of the output of an operator.\n *\n * It might seem more efficient to use an immutable b-tree for the\n * materialization, but it's not so clear. Inserts in the middle are\n * asymptotically slower in an array, but can often be done with zero\n * allocations, where changes to the b-tree will often require several allocs.\n *\n * Also the plain array view is more convenient for consumers since you can dump\n * it into console to see what it is, rather than having to iterate it.\n */\nexport class ArrayView<V extends View> implements Output, TypedView<V> {\n  readonly #input: Input;\n  readonly #listeners = new Set<Listener<V>>();\n  // Read lazily: a DeferredInput has no schema until its pipeline is attached,\n  // and the schema is only needed once there is a change to apply.\n  #schema: SourceSchema | undefined;\n  readonly #format: Format;\n\n  // Synthetic \"root\" entry that has a single \"\" relationship, so that we can\n  // treat all changes, including the root change, generically.\n  //\n  // applyChange is immutable: it returns a new root, preserving the references\n  // of unchanged subtrees so consumers (React.memo / Solid) can skip them. We\n  // therefore reassign #root on every change rather than mutating in place.\n  #root: Entry;\n\n  onDestroy: (() => void) | undefined;\n\n  #dirty = false;\n  #resultType: ResultType = 'unknown';\n  #error: ErroredQuery | undefined;\n  readonly #updateTTL: (ttl: TTL) => void;\n\n  // Objects/arrays created or cloned during the current (un-flushed)\n  // transaction. applyChange may mutate these in place rather than copying\n  // again, since they are not yet observed by any listener. Replaced at\n  // flush(), after which the committed snapshot must be copied-on-write again.\n  // A WeakSet (not a Set) so it never extends the lifetime of transient clones.\n  #txnDirty: WeakSet<object> = new WeakSet();\n\n  constructor(\n    input: Input,\n    format: Format,\n    queryComplete: true | ErroredQuery | Promise<true>,\n    updateTTL: (ttl: TTL) => void,\n  ) {\n    this.#input = input;\n    this.#format = format;\n    this.#updateTTL = updateTTL;\n    this.#root = {'': format.singular ? undefined : []};\n    input.setOutput(this);\n\n    if (queryComplete === true) {\n      this.#resultType = 'complete';\n    } else if ('error' in queryComplete) {\n      this.#resultType = 'error';\n      this.#error = queryComplete;\n    } else {\n      void queryComplete\n        .then(() => {\n          this.#resultType = 'complete';\n          this.#fireListeners();\n        })\n        .catch(e => {\n          this.#resultType = 'error';\n          this.#error = e;\n          this.#fireListeners();\n        });\n    }\n    this.#hydrate();\n  }\n\n  get data() {\n    return this.#root[''] as V;\n  }\n\n  #getSchema(): SourceSchema {\n    return (this.#schema ??= this.#input.getSchema());\n  }\n\n  addListener(listener: Listener<V>) {\n    assert(!this.#listeners.has(listener), 'Listener already registered');\n    this.#listeners.add(listener);\n\n    this.#fireListener(listener);\n\n    return () => {\n      this.#listeners.delete(listener);\n    };\n  }\n\n  #fireListeners() {\n    for (const listener of this.#listeners) {\n      this.#fireListener(listener);\n    }\n  }\n\n  #fireListener(listener: Listener<V>) {\n    listener(this.data as Immutable<V>, this.#resultType, this.#error);\n  }\n\n  destroy() {\n    this.onDestroy?.();\n  }\n\n  #hydrate() {\n    this.#dirty = true;\n    for (const node of skipYields(this.#input.fetch({}))) {\n      this.#root = applyChange(\n        this.#root,\n        {type: 'add', node},\n        this.#getSchema(),\n        '',\n        this.#format,\n        false /* withIDs */,\n        true /* mutate: #root is freshly created and not yet observed by any\n                 consumer, so build it in place to avoid O(N^2) array copies.\n                 Every later push() is immutable, preserving reference\n                 stability for unchanged subtrees. */,\n      );\n    }\n    this.flush();\n  }\n\n  push(change: Change) {\n    this.#dirty = true;\n    this.#root = applyChange(\n      this.#root,\n      changeToViewChange(change),\n      this.#getSchema(),\n      '',\n      this.#format,\n      false /* withIDs */,\n      this.#txnDirty /* mutate: copy-on-write within this transaction */,\n    );\n    return emptyArray;\n  }\n\n  flush() {\n    if (!this.#dirty) {\n      return;\n    }\n    this.#dirty = false;\n    this.#fireListeners();\n    // The snapshot just handed to listeners is now observed; the next\n    // transaction must copy-on-write rather than mutate these objects. A fresh\n    // WeakSet drops all \"owned\" marks (WeakSet has no clear()).\n    this.#txnDirty = new WeakSet();\n  }\n\n  updateTTL(ttl: TTL) {\n    this.#updateTTL(ttl);\n  }\n}\n"],"mappings":";;;;;AAcA,SAAS,mBAAmB,QAA4B;CACtD,QAAQ,OAAO,IAAf;EACE,KAAK,GACH,OAAO;GAAC,MAAM;GAAO,MAAM,OAAO;EAAiB;EACrD,KAAK,GACH,OAAO;GAAC,MAAM;GAAU,MAAM,OAAO;EAAiB;EACxD,KAAK,GACH,OAAO;GACL,MAAM;GACN,MAAM,OAAO;GACb,OAAO;IACL,kBAAkB,OAAO,GAAwB;IACjD,QAAQ,mBAAmB,OAAO,GAAwB,MAAM;GAClE;EACF;EACF,KAAK,GACH,OAAO;GACL,MAAM;GACN,MAAM,OAAO;GACb,SAAS,OAAO;EAClB;CACJ;AACF;;;;;;;;;;;;AAaA,IAAa,YAAb,MAAuE;CACrE;CACA,6BAAsB,IAAI,IAAiB;CAG3C;CACA;CAQA;CAEA;CAEA,SAAS;CACT,cAA0B;CAC1B;CACA;CAOA,4BAA6B,IAAI,QAAQ;CAEzC,YACE,OACA,QACA,eACA,WACA;EACA,KAAKA,SAAS;EACd,KAAKE,UAAU;EACf,KAAKC,aAAa;EAClB,KAAKC,QAAQ,EAAC,IAAI,OAAO,WAAW,KAAA,IAAY,CAAC,EAAC;EAClD,MAAM,UAAU,IAAI;EAEpB,IAAI,kBAAkB,MACpB,KAAKC,cAAc;OACd,IAAI,WAAW,eAAe;GACnC,KAAKA,cAAc;GACnB,KAAKC,SAAS;EAChB,OACE,cACG,WAAW;GACV,KAAKD,cAAc;GACnB,KAAKE,eAAe;EACtB,CAAC,EACA,OAAM,MAAK;GACV,KAAKF,cAAc;GACnB,KAAKC,SAAS;GACd,KAAKC,eAAe;EACtB,CAAC;EAEL,KAAKC,SAAS;CAChB;CAEA,IAAI,OAAO;EACT,OAAO,KAAKJ,MAAM;CACpB;CAEA,aAA2B;EACzB,OAAQ,KAAKK,YAAY,KAAKT,OAAO,UAAU;CACjD;CAEA,YAAY,UAAuB;EACjC,OAAO,CAAC,KAAKC,WAAW,IAAI,QAAQ,GAAG,6BAA6B;EACpE,KAAKA,WAAW,IAAI,QAAQ;EAE5B,KAAKS,cAAc,QAAQ;EAE3B,aAAa;GACX,KAAKT,WAAW,OAAO,QAAQ;EACjC;CACF;CAEA,iBAAiB;EACf,KAAK,MAAM,YAAY,KAAKA,YAC1B,KAAKS,cAAc,QAAQ;CAE/B;CAEA,cAAc,UAAuB;EACnC,SAAS,KAAK,MAAsB,KAAKL,aAAa,KAAKC,MAAM;CACnE;CAEA,UAAU;EACR,KAAK,YAAY;CACnB;CAEA,WAAW;EACT,KAAKK,SAAS;EACd,KAAK,MAAM,QAAQ,WAAW,KAAKX,OAAO,MAAM,CAAC,CAAC,CAAC,GACjD,KAAKI,QAAQ,YACX,KAAKA,OACL;GAAC,MAAM;GAAO;EAAI,GAClB,KAAKQ,WAAW,GAChB,IACA,KAAKV,SACL,OACA,IAIF;EAEF,KAAK,MAAM;CACb;CAEA,KAAK,QAAgB;EACnB,KAAKS,SAAS;EACd,KAAKP,QAAQ,YACX,KAAKA,OACL,mBAAmB,MAAM,GACzB,KAAKQ,WAAW,GAChB,IACA,KAAKV,SACL,OACA,KAAKW,SACP;EACA,OAAO;CACT;CAEA,QAAQ;EACN,IAAI,CAAC,KAAKF,QACR;EAEF,KAAKA,SAAS;EACd,KAAKJ,eAAe;EAIpB,KAAKM,4BAAY,IAAI,QAAQ;CAC/B;CAEA,UAAU,KAAU;EAClB,KAAKV,WAAW,GAAG;CACrB;AACF"}
+{"version":3,"file":"array-view.js","names":["#input","#listeners","#format","#updateTTL","#root","#resultType","#error","#setResultType","#hydrate","#committedRoot","#schema","#listenerArgs","#heldResultType","#heldError","#dirty","#getSchema","#txnDirty","#held","#fireListeners"],"sources":["../../../../../zql/src/ivm/array-view.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {Immutable} from '../../../shared/src/immutable.ts';\nimport {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {ErroredQuery} from '../../../zero-protocol/src/custom-queries.ts';\nimport type {TTL} from '../query/ttl.ts';\nimport type {Listener, ResultType, TypedView} from '../query/typed-view.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport type {Change} from './change.ts';\nimport {skipYields, type Input, type Output} from './operator.ts';\nimport type {SourceSchema} from './schema.ts';\nimport {applyChange, type ViewChange} from './view-apply-change.ts';\nimport type {Entry, Format, View} from './view.ts';\n\nfunction changeToViewChange(change: Change): ViewChange {\n  switch (change[ChangeIndex.TYPE]) {\n    case ChangeType.ADD:\n      return {type: 'add', node: change[ChangeIndex.NODE]};\n    case ChangeType.REMOVE:\n      return {type: 'remove', node: change[ChangeIndex.NODE]};\n    case ChangeType.CHILD:\n      return {\n        type: 'child',\n        node: change[ChangeIndex.NODE],\n        child: {\n          relationshipName: change[ChangeIndex.CHILD_DATA].relationshipName,\n          change: changeToViewChange(change[ChangeIndex.CHILD_DATA].change),\n        },\n      };\n    case ChangeType.EDIT:\n      return {\n        type: 'edit',\n        node: change[ChangeIndex.NODE],\n        oldNode: change[ChangeIndex.OLD_NODE],\n      };\n  }\n}\n\n/**\n * Implements a materialized view of the output of an operator.\n *\n * It might seem more efficient to use an immutable b-tree for the\n * materialization, but it's not so clear. Inserts in the middle are\n * asymptotically slower in an array, but can often be done with zero\n * allocations, where changes to the b-tree will often require several allocs.\n *\n * Also the plain array view is more convenient for consumers since you can dump\n * it into console to see what it is, rather than having to iterate it.\n */\nexport class ArrayView<V extends View> implements Output, TypedView<V> {\n  readonly #input: Input;\n  readonly #listeners = new Set<Listener<V>>();\n  // Read lazily: a DeferredInput has no schema until its pipeline is attached,\n  // and the schema is only needed once there is a change to apply.\n  #schema: SourceSchema | undefined;\n  readonly #format: Format;\n\n  // Synthetic \"root\" entry that has a single \"\" relationship, so that we can\n  // treat all changes, including the root change, generically.\n  //\n  // applyChange is immutable: it returns a new root, preserving the references\n  // of unchanged subtrees so consumers (React.memo / Solid) can skip them. We\n  // therefore reassign #root on every change rather than mutating in place.\n  #root: Entry;\n\n  onDestroy: (() => void) | undefined;\n\n  #dirty = false;\n  // Set by holdData(): the root that `data` and newly added listeners keep\n  // seeing until releaseData() or the next flush, while pushes build up #root\n  // behind it.\n  #committedRoot: Entry | undefined;\n  // From holdData() until the next flush. Outlasts #committedRoot, which\n  // releaseData() drops first.\n  #held = false;\n  // The result type and error as of holdData(): what a listener added while\n  // held is called with, so it never sees old rows paired with a new type.\n  #heldResultType: ResultType = 'unknown';\n  #heldError: ErroredQuery | undefined;\n  #resultType: ResultType = 'unknown';\n  #error: ErroredQuery | undefined;\n  readonly #updateTTL: (ttl: TTL) => void;\n\n  // Objects/arrays created or cloned during the current (un-flushed)\n  // transaction. applyChange may mutate these in place rather than copying\n  // again, since they are not yet observed by any listener. Replaced at\n  // flush(), after which the committed snapshot must be copied-on-write again.\n  // A WeakSet (not a Set) so it never extends the lifetime of transient clones.\n  #txnDirty: WeakSet<object> = new WeakSet();\n\n  constructor(\n    input: Input,\n    format: Format,\n    queryComplete: true | ErroredQuery | Promise<true>,\n    updateTTL: (ttl: TTL) => void,\n  ) {\n    this.#input = input;\n    this.#format = format;\n    this.#updateTTL = updateTTL;\n    this.#root = {'': format.singular ? undefined : []};\n    input.setOutput(this);\n\n    if (queryComplete === true) {\n      this.#resultType = 'complete';\n    } else if ('error' in queryComplete) {\n      this.#resultType = 'error';\n      this.#error = queryComplete;\n    } else {\n      void queryComplete\n        .then(() => this.#setResultType('complete'))\n        .catch(e => this.#setResultType('error', e));\n    }\n    this.#hydrate();\n  }\n\n  get data() {\n    return (this.#committedRoot ?? this.#root)[''] as V;\n  }\n\n  #getSchema(): SourceSchema {\n    return (this.#schema ??= this.#input.getSchema());\n  }\n\n  addListener(listener: Listener<V>) {\n    assert(!this.#listeners.has(listener), 'Listener already registered');\n    this.#listeners.add(listener);\n\n    listener(...this.#listenerArgs());\n\n    return () => {\n      this.#listeners.delete(listener);\n    };\n  }\n\n  #fireListeners() {\n    // Read the snapshot once: a listener may push() synchronously, and the\n    // listeners after it must not be handed the root that push is building,\n    // which the rest of the transaction would then mutate in place.\n    const args = this.#listenerArgs();\n    for (const listener of this.#listeners) {\n      listener(...args);\n    }\n  }\n\n  #listenerArgs(): Parameters<Listener<V>> {\n    if (this.#committedRoot !== undefined) {\n      // Held rows go with the held type; after releaseData() both are current.\n      return [this.data as Immutable<V>, this.#heldResultType, this.#heldError];\n    }\n    return [this.data as Immutable<V>, this.#resultType, this.#error];\n  }\n\n  destroy() {\n    this.onDestroy?.();\n  }\n\n  #hydrate() {\n    this.#dirty = true;\n    for (const node of skipYields(this.#input.fetch({}))) {\n      this.#root = applyChange(\n        this.#root,\n        {type: 'add', node},\n        this.#getSchema(),\n        '',\n        this.#format,\n        false /* withIDs */,\n        true /* mutate: #root is freshly created and not yet observed by any\n                 consumer, so build it in place to avoid O(N^2) array copies.\n                 Every later push() is immutable, preserving reference\n                 stability for unchanged subtrees. */,\n      );\n    }\n    this.flush();\n  }\n\n  push(change: Change) {\n    const newRoot = applyChange(\n      this.#root,\n      changeToViewChange(change),\n      this.#getSchema(),\n      '',\n      this.#format,\n      false /* withIDs */,\n      this.#txnDirty /* mutate: copy-on-write within this transaction */,\n    );\n    // applyChange returns the same root when the change did not affect the\n    // view — e.g. a child change for a relationship that is not in the format,\n    // such as a whereExists subquery (zsubq_*). Only mark dirty when the root\n    // actually changed so flush() does not notify listeners with identical\n    // data. Within a transaction the root keeps its reference across a *real*\n    // change only if an earlier change in the same transaction already cloned\n    // it (copy-on-write) — and that earlier change set #dirty, so an unchanged\n    // reference here never hides a real change.\n    if (newRoot !== this.#root) {\n      this.#root = newRoot;\n      this.#dirty = true;\n    }\n    return emptyArray;\n  }\n\n  /**\n   * Keep exposing the current snapshot, whatever is pushed in the meantime,\n   * until {@link releaseData} or the next {@link flush}. Result type\n   * notifications are held back until that flush.\n   *\n   * A transaction is normally one synchronous task, so nobody can look at a\n   * view between its pushes and its flush. Deferred pipelines are different:\n   * they are hydrated over several tasks and flushed together (see\n   * `QueryDelegate.onPipelinesReady`), and a view that already has its rows\n   * must not show them early.\n   */\n  holdData(): void {\n    this.#committedRoot = this.#root;\n    this.#held = true;\n    this.#heldResultType = this.#resultType;\n    this.#heldError = this.#error;\n  }\n\n  /**\n   * Make `data` current again without notifying anyone yet; listeners are\n   * still only called by the next {@link flush}. Views released together get\n   * this called on all of them before any is flushed, so a listener of one\n   * that reads another sees its rows too.\n   */\n  releaseData(): void {\n    this.#committedRoot = undefined;\n  }\n\n  flush() {\n    this.#committedRoot = undefined;\n    this.#held = false;\n    if (!this.#dirty) {\n      return;\n    }\n    this.#dirty = false;\n    // The snapshot about to be handed to listeners becomes observed; the next\n    // transaction must copy-on-write rather than mutate these objects. A fresh\n    // WeakSet drops all \"owned\" marks (WeakSet has no clear()).\n    //\n    // Reset BEFORE notifying: a listener may throw (swallowed by\n    // ZeroContext#endTransaction) or re-enter push(). If the committed root\n    // kept its \"owned\" marks, a later transaction would mutate it in place and\n    // return an identical reference — which push() would read as \"no change\",\n    // permanently silencing the view.\n    this.#txnDirty = new WeakSet();\n    this.#fireListeners();\n  }\n\n  updateTTL(ttl: TTL) {\n    this.#updateTTL(ttl);\n  }\n\n  /**\n   * The store holds the server-confirmed complete result of this query from a\n   * previous sync (the persisted got-queries key exists, pre-authoritative).\n   * Never downgrades 'complete'/'error', and never resolves anything that\n   * waits on 'complete' — freshness stays a promise only the connection can\n   * keep.\n   */\n  markCached(): void {\n    if (this.#resultType === 'unknown') {\n      this.#setResultType('cached');\n    }\n  }\n\n  /** The got key was deleted (eviction) while still pre-authoritative. */\n  unmarkCached(): void {\n    if (this.#resultType === 'cached') {\n      this.#setResultType('unknown');\n    }\n  }\n\n  #setResultType(resultType: ResultType, error?: ErroredQuery) {\n    this.#resultType = resultType;\n    this.#error = error;\n    // A dirty view is mid-transaction: rows were pushed and not yet flushed,\n    // and the objects in #txnDirty are still mutable. Firing now would hand\n    // those to listeners and then fire again at flush() with the same data, so\n    // let the pending flush deliver the new result type instead.\n    // A held view is waiting to be exposed together with others at the next\n    // flush; that goes for its result type as much as for its rows.\n    if (this.#held) {\n      // Dirty so that the flush notifies even when no rows were pushed.\n      this.#dirty = true;\n    } else if (!this.#dirty) {\n      this.#fireListeners();\n    }\n  }\n}\n"],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import { type Change } from './change.ts';
 import type { Node } from './data.ts';
-import { type FetchRequest, type Input, type Operator, type Output, type Storage } from './operator.ts';
+import { type FetchRequest, type Input, type InputBase, type Operator, type Output, type Storage } from './operator.ts';
 import type { SourceSchema } from './schema.ts';
 import { type Stream } from './stream.ts';
 import { type PartitionKey } from './take.ts';
@@ -28,5 +28,6 @@ export declare class Cap implements Operator {
     fetch(req: FetchRequest): Stream<Node | 'yield'>;
     push(change: Change): Stream<'yield'>;
     destroy(): void;
+    reconcile(_pusher: InputBase): Stream<'yield'>;
 }
 //# sourceMappingURL=cap.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cap.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/cap.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgB,KAAK,MAAM,EAAkB,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAa,IAAI,EAAC,MAAM,WAAW,CAAC;AAChD,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,WAAW,CAAC;AAanB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,GAAI,YAAW,QAAQ;;IAUlC,YACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,YAAY,EAW5B;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE9B;IAED,SAAS,IAAI,YAAY,CAExB;IAEA,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAoChD;IAsDA,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAiFrC;IAqCD,OAAO,IAAI,IAAI,CAEd;CACF"}
+{"version":3,"file":"cap.d.ts","sourceRoot":"","sources":["../../../../../zql/src/ivm/cap.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,MAAM,EAAkB,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAa,IAAI,EAAC,MAAM,WAAW,CAAC;AAChD,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,WAAW,CAAC;AAcnB;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,GAAI,YAAW,QAAQ;;IAUlC,YACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,YAAY,EAW5B;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE9B;IAED,SAAS,IAAI,YAAY,CAExB;IAEA,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,CAyChD;IAsDA,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAiFrC;IAsCD,OAAO,IAAI,IAAI,CAGd;IAEA,SAAS,CAAC,OAAO,EAAE,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,CAI9C;CACF"}

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

@@ -1,4 +1,5 @@
 import { assert } from "../../../shared/src/asserts.js";
+import { emptyArray } from "../../../shared/src/sentinels.js";
 import { throwOutput } from "./operator.js";
 import { makeAddChange } from "./change.js";
 import { constraintMatchesPartitionKey, makePartitionKeyComparator } from "./take.js";
@@ -55,7 +56,11 @@ var Cap = class {
 		}
 		if (capState.size === 0) return;
 		for (const pk of capState.pks) {
-			const constraint = deserializePKToConstraint(pk, this.#primaryKey);
+			const pkConstraint = deserializePKToConstraint(pk, this.#primaryKey);
+			const constraint = req.constraint ? {
+				...req.constraint,
+				...pkConstraint
+			} : pkConstraint;
 			for (const inputNode of this.#input.fetch({ constraint })) {
 				if (inputNode === "yield") {
 					yield inputNode;
@@ -163,11 +168,11 @@ var Cap = class {
 			if (new Set(capState.pks).has(pk)) yield* this.#output.push(change, this);
 		}
 	}
-	*#pushEditChange(change) {
+	#pushEditChange(change) {
 		assert(!this.#partitionKeyComparator || this.#partitionKeyComparator(change[2].row, change[1].row) === 0, "Unexpected change of partition key");
 		const capStateKey = getCapStateKey(this.#partitionKey, change[2].row);
 		const capState = this.#storage.get(capStateKey);
-		if (!capState) return;
+		if (!capState) return emptyArray;
 		const oldPK = serializePK(change[2].row, this.#primaryKey);
 		if (new Set(capState.pks).has(oldPK)) {
 			const newPK = serializePK(change[1].row, this.#primaryKey);
@@ -178,11 +183,16 @@ var Cap = class {
 					pks
 				});
 			}
-			yield* this.#output.push(change, this);
+			return this.#output.push(change, this);
 		}
+		return emptyArray;
 	}
 	destroy() {
 		this.#input.destroy();
+		this.#storage.destroy();
+	}
+	*reconcile(_pusher) {
+		if (this.#output.reconcile) yield* this.#output.reconcile(this);
 	}
 };
 function getCapStateKey(partitionKey, rowOrConstraint) {