@rocicorp/zero 1.12.0-canary.3 → 1.12.0-canary.5

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

@@ -1 +1 @@
-{"version":3,"file":"join-index.js","names":["#parentKey","#primaryKey","#joinKeyIsPK","#partitionKey","#unpartitioned","#partitioned","#size","#pkOf"],"sources":["../../../../../zql/src/ivm/join-index.ts"],"sourcesContent":["import {must} from '../../../shared/src/must.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {canonicalKey} from './join-utils.ts';\n\n/**\n * The partitions of the indexed parents that share a join key, as fetch\n * constraints. An unpartitioned index reports a single `undefined`.\n */\nexport type ParentPartitions = readonly (Record<string, Value> | undefined)[];\n\nconst UNPARTITIONED: ParentPartitions = [undefined];\n\ntype Partition = {\n  readonly constraint: Record<string, Value>;\n  readonly pks: Set<string>;\n};\n\n/**\n * An in-memory index from a join key to the parent rows that have it. Join\n * and FlippedJoin look up a child change's join key here to skip the parent\n * fetch when no indexed parent can see the change.\n *\n * Parents are tracked by primary key so that adding or removing a row twice\n * is harmless. Lookups only report whether any parent has the key and, when\n * the index is partitioned, in which partitions.\n */\nexport class JoinIndex {\n  readonly #parentKey: CompoundKey;\n  readonly #primaryKey: CompoundKey;\n  /** The join key is the primary key, so one string serves as both. */\n  readonly #joinKeyIsPK: boolean;\n  readonly #partitionKey: CompoundKey | undefined;\n  readonly #unpartitioned = new Map<string, Set<string>>();\n  readonly #partitioned = new Map<string, Map<string, Partition>>();\n  #size = 0;\n\n  constructor(\n    parentKey: CompoundKey,\n    primaryKey: CompoundKey,\n    partitionKey?: CompoundKey | undefined,\n  ) {\n    this.#parentKey = parentKey;\n    this.#primaryKey = primaryKey;\n    this.#joinKeyIsPK =\n      parentKey.length === primaryKey.length &&\n      parentKey.every((k, i) => k === primaryKey[i]);\n    this.#partitionKey = partitionKey;\n  }\n\n  /** The number of parent rows in the index. */\n  get size(): number {\n    return this.#size;\n  }\n\n  add(row: Row): void {\n    const joinKey = joinKeyOf(row, this.#parentKey);\n    if (joinKey === undefined) {\n      return;\n    }\n    const pk = this.#pkOf(row, joinKey);\n    const partitionKey = this.#partitionKey;\n    if (partitionKey === undefined) {\n      let pks = this.#unpartitioned.get(joinKey);\n      if (pks === undefined) {\n        pks = new Set();\n        this.#unpartitioned.set(joinKey, pks);\n      }\n      if (!pks.has(pk)) {\n        pks.add(pk);\n        this.#size++;\n      }\n      return;\n    }\n\n    const partKey = canonicalKey(row, partitionKey);\n    let partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      partitions = new Map();\n      this.#partitioned.set(joinKey, partitions);\n    }\n    let partition = partitions.get(partKey);\n    if (partition === undefined) {\n      const constraint: Record<string, Value> = {};\n      for (const key of partitionKey) {\n        constraint[key] = row[key];\n      }\n      partition = {constraint, pks: new Set()};\n      partitions.set(partKey, partition);\n    }\n    if (!partition.pks.has(pk)) {\n      partition.pks.add(pk);\n      this.#size++;\n    }\n  }\n\n  remove(row: Row): void {\n    const joinKey = joinKeyOf(row, this.#parentKey);\n    if (joinKey === undefined) {\n      return;\n    }\n    const pk = this.#pkOf(row, joinKey);\n    const partitionKey = this.#partitionKey;\n    if (partitionKey === undefined) {\n      const pks = this.#unpartitioned.get(joinKey);\n      if (pks === undefined) {\n        return;\n      }\n      if (pks.delete(pk)) {\n        this.#size--;\n        if (pks.size === 0) {\n          this.#unpartitioned.delete(joinKey);\n        }\n      }\n      return;\n    }\n\n    const partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      return;\n    }\n    const partKey = canonicalKey(row, partitionKey);\n    const partition = partitions.get(partKey);\n    if (partition === undefined) {\n      return;\n    }\n    if (partition.pks.delete(pk)) {\n      this.#size--;\n      if (partition.pks.size === 0) {\n        partitions.delete(partKey);\n        if (partitions.size === 0) {\n          this.#partitioned.delete(joinKey);\n        }\n      }\n    }\n  }\n\n  /**\n   * The partitions of the indexed parents whose join key matches `childRow`\n   * over `childKey`, or `undefined` if there are none.\n   */\n  lookup(childRow: Row, childKey: CompoundKey): ParentPartitions | undefined {\n    const joinKey = joinKeyOf(childRow, childKey);\n    if (joinKey === undefined) {\n      return undefined;\n    }\n    if (this.#partitionKey === undefined) {\n      return this.#unpartitioned.has(joinKey) ? UNPARTITIONED : undefined;\n    }\n    const partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      return undefined;\n    }\n    return Array.from(partitions.values(), p => p.constraint);\n  }\n\n  /**\n   * The index as the operator storage entries it replaced, keyed\n   * `j\\0<joinKey>\\0[<partitionKey>\\0]<primaryKey>`. For tests.\n   */\n  entriesForTest(): Record<string, 1> {\n    const entries: Record<string, 1> = {};\n    for (const [joinKey, pks] of this.#unpartitioned) {\n      for (const pk of pks) {\n        entries[`j\\x00${joinKey}\\x00${pk}`] = 1;\n      }\n    }\n    for (const [joinKey, partitions] of this.#partitioned) {\n      const partitionKey = must(this.#partitionKey);\n      for (const {constraint, pks} of partitions.values()) {\n        const partKey = canonicalKey(constraint, partitionKey);\n        for (const pk of pks) {\n          entries[`j\\x00${joinKey}\\x00${partKey}\\x00${pk}`] = 1;\n        }\n      }\n    }\n    return entries;\n  }\n\n  #pkOf(row: Row, joinKey: string): string {\n    return this.#joinKeyIsPK ? joinKey : canonicalKey(row, this.#primaryKey);\n  }\n}\n\n/**\n * The canonical join key of `row`, or `undefined` if any part of it is null:\n * a null key cannot match anything.\n */\nfunction joinKeyOf(row: Row, key: CompoundKey): string | undefined {\n  for (const k of key) {\n    if (row[k] === null) {\n      return undefined;\n    }\n  }\n  return canonicalKey(row, key);\n}\n"],"mappings":"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"}
+{"version":3,"file":"join-index.js","names":[],"sources":["../../../../../zql/src/ivm/join-index.ts"],"sourcesContent":["import {must} from '../../../shared/src/must.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {canonicalKey} from './join-utils.ts';\n\n/**\n * The partitions of the indexed parents that share a join key, as fetch\n * constraints. An unpartitioned index reports a single `undefined`.\n */\nexport type ParentPartitions = readonly (Record<string, Value> | undefined)[];\n\nconst UNPARTITIONED: ParentPartitions = [undefined];\n\ntype Partition = {\n  readonly constraint: Record<string, Value>;\n  readonly pks: Set<string>;\n};\n\n/**\n * An in-memory index from a join key to the parent rows that have it. Join\n * and FlippedJoin look up a child change's join key here to skip the parent\n * fetch when no indexed parent can see the change.\n *\n * Parents are tracked by primary key so that adding or removing a row twice\n * is harmless. Lookups only report whether any parent has the key and, when\n * the index is partitioned, in which partitions.\n */\nexport class JoinIndex {\n  readonly #parentKey: CompoundKey;\n  readonly #primaryKey: CompoundKey;\n  /** The join key is the primary key, so one string serves as both. */\n  readonly #joinKeyIsPK: boolean;\n  readonly #partitionKey: CompoundKey | undefined;\n  readonly #unpartitioned = new Map<string, Set<string>>();\n  readonly #partitioned = new Map<string, Map<string, Partition>>();\n  #size = 0;\n\n  constructor(\n    parentKey: CompoundKey,\n    primaryKey: CompoundKey,\n    partitionKey?: CompoundKey | undefined,\n  ) {\n    this.#parentKey = parentKey;\n    this.#primaryKey = primaryKey;\n    this.#joinKeyIsPK =\n      parentKey.length === primaryKey.length &&\n      parentKey.every((k, i) => k === primaryKey[i]);\n    this.#partitionKey = partitionKey;\n  }\n\n  /** The number of parent rows in the index. */\n  get size(): number {\n    return this.#size;\n  }\n\n  add(row: Row): void {\n    const joinKey = joinKeyOf(row, this.#parentKey);\n    if (joinKey === undefined) {\n      return;\n    }\n    const pk = this.#pkOf(row, joinKey);\n    const partitionKey = this.#partitionKey;\n    if (partitionKey === undefined) {\n      let pks = this.#unpartitioned.get(joinKey);\n      if (pks === undefined) {\n        pks = new Set();\n        this.#unpartitioned.set(joinKey, pks);\n      }\n      if (!pks.has(pk)) {\n        pks.add(pk);\n        this.#size++;\n      }\n      return;\n    }\n\n    const partKey = canonicalKey(row, partitionKey);\n    let partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      partitions = new Map();\n      this.#partitioned.set(joinKey, partitions);\n    }\n    let partition = partitions.get(partKey);\n    if (partition === undefined) {\n      const constraint: Record<string, Value> = {};\n      for (const key of partitionKey) {\n        constraint[key] = row[key];\n      }\n      partition = {constraint, pks: new Set()};\n      partitions.set(partKey, partition);\n    }\n    if (!partition.pks.has(pk)) {\n      partition.pks.add(pk);\n      this.#size++;\n    }\n  }\n\n  remove(row: Row): void {\n    const joinKey = joinKeyOf(row, this.#parentKey);\n    if (joinKey === undefined) {\n      return;\n    }\n    const pk = this.#pkOf(row, joinKey);\n    const partitionKey = this.#partitionKey;\n    if (partitionKey === undefined) {\n      const pks = this.#unpartitioned.get(joinKey);\n      if (pks === undefined) {\n        return;\n      }\n      if (pks.delete(pk)) {\n        this.#size--;\n        if (pks.size === 0) {\n          this.#unpartitioned.delete(joinKey);\n        }\n      }\n      return;\n    }\n\n    const partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      return;\n    }\n    const partKey = canonicalKey(row, partitionKey);\n    const partition = partitions.get(partKey);\n    if (partition === undefined) {\n      return;\n    }\n    if (partition.pks.delete(pk)) {\n      this.#size--;\n      if (partition.pks.size === 0) {\n        partitions.delete(partKey);\n        if (partitions.size === 0) {\n          this.#partitioned.delete(joinKey);\n        }\n      }\n    }\n  }\n\n  /**\n   * The partitions of the indexed parents whose join key matches `childRow`\n   * over `childKey`, or `undefined` if there are none.\n   */\n  lookup(childRow: Row, childKey: CompoundKey): ParentPartitions | undefined {\n    const joinKey = joinKeyOf(childRow, childKey);\n    if (joinKey === undefined) {\n      return undefined;\n    }\n    if (this.#partitionKey === undefined) {\n      return this.#unpartitioned.has(joinKey) ? UNPARTITIONED : undefined;\n    }\n    const partitions = this.#partitioned.get(joinKey);\n    if (partitions === undefined) {\n      return undefined;\n    }\n    return Array.from(partitions.values(), p => p.constraint);\n  }\n\n  /**\n   * The index as the operator storage entries it replaced, keyed\n   * `j\\0<joinKey>\\0[<partitionKey>\\0]<primaryKey>`. For tests.\n   */\n  entriesForTest(): Record<string, 1> {\n    const entries: Record<string, 1> = {};\n    for (const [joinKey, pks] of this.#unpartitioned) {\n      for (const pk of pks) {\n        entries[`j\\x00${joinKey}\\x00${pk}`] = 1;\n      }\n    }\n    for (const [joinKey, partitions] of this.#partitioned) {\n      const partitionKey = must(this.#partitionKey);\n      for (const {constraint, pks} of partitions.values()) {\n        const partKey = canonicalKey(constraint, partitionKey);\n        for (const pk of pks) {\n          entries[`j\\x00${joinKey}\\x00${partKey}\\x00${pk}`] = 1;\n        }\n      }\n    }\n    return entries;\n  }\n\n  #pkOf(row: Row, joinKey: string): string {\n    return this.#joinKeyIsPK ? joinKey : canonicalKey(row, this.#primaryKey);\n  }\n}\n\n/**\n * The canonical join key of `row`, or `undefined` if any part of it is null:\n * a null key cannot match anything.\n */\nfunction joinKeyOf(row: Row, key: CompoundKey): string | undefined {\n  for (const k of key) {\n    if (row[k] === null) {\n      return undefined;\n    }\n  }\n  return canonicalKey(row, key);\n}\n"],"mappings":"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"}

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

@@ -39,19 +39,17 @@ function* generateWithOverlay(stream, overlay, schema) {
 					yieldNode = false;
 				}
 				break;
-			case 3:
-				if (schema.compareRows(overlay[1].row, node.row) === 0) {
-					applied = true;
-					yield {
-						row: node.row,
-						relationships: {
-							...node.relationships,
-							[overlay[2].relationshipName]: () => generateWithOverlay(node.relationships[overlay[2].relationshipName](), overlay[2].change, schema.relationships[overlay[2].relationshipName])
-						}
-					};
-					yieldNode = false;
-				}
-				break;
+			case 3: if (schema.compareRows(overlay[1].row, node.row) === 0) {
+				applied = true;
+				yield {
+					row: node.row,
+					relationships: {
+						...node.relationships,
+						[overlay[2].relationshipName]: () => generateWithOverlay(node.relationships[overlay[2].relationshipName](), overlay[2].change, schema.relationships[overlay[2].relationshipName])
+					}
+				};
+				yieldNode = false;
+			}
 		}
 		if (yieldNode) yield node;
 	}

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

@@ -1 +1 @@
-{"version":3,"file":"join-utils.js","names":[],"sources":["../../../../../zql/src/ivm/join-utils.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport type {Change} from './change.ts';\nimport {compareValues, valuesEqual, type Node} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\n\nexport function generateWithOverlayNoYield(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlay(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlay(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  let applied = false;\n  let editOldApplied = false;\n  let editNewApplied = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    let yieldNode = true;\n    if (!applied) {\n      switch (overlay[ChangeIndex.TYPE]) {\n        case ChangeType.ADD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.REMOVE: {\n          if (schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) < 0) {\n            applied = true;\n            yield overlay[ChangeIndex.NODE];\n          }\n          break;\n        }\n        case ChangeType.EDIT: {\n          if (\n            !editOldApplied &&\n            schema.compareRows(overlay[ChangeIndex.OLD_NODE].row, node.row) < 0\n          ) {\n            editOldApplied = true;\n            if (editNewApplied) {\n              applied = true;\n            }\n            yield overlay[ChangeIndex.OLD_NODE];\n          }\n          if (\n            !editNewApplied &&\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            editNewApplied = true;\n            if (editOldApplied) {\n              applied = true;\n            }\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.CHILD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yield {\n              row: node.row,\n              relationships: {\n                ...node.relationships,\n                [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                  generateWithOverlay(\n                    node.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ](),\n                    overlay[ChangeIndex.CHILD_DATA].change,\n                    schema.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ],\n                  ),\n              },\n            };\n            yieldNode = false;\n          }\n          break;\n        }\n      }\n    }\n    if (yieldNode) {\n      yield node;\n    }\n  }\n  if (!applied) {\n    if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n      applied = true;\n      yield overlay[ChangeIndex.NODE];\n    } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n      assert(\n        editNewApplied,\n        'edit overlay: new node must be applied before old node',\n      );\n      editOldApplied = true;\n      applied = true;\n      yield overlay[ChangeIndex.OLD_NODE];\n    }\n  }\n\n  assert(\n    applied,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function generateWithOverlayNoYieldUnordered(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlayUnordered(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlayUnordered(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  // Eager inject\n  if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n    yield overlay[ChangeIndex.NODE];\n  } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n    yield overlay[ChangeIndex.OLD_NODE];\n  }\n\n  // Stream with inline suppress\n  let suppressed = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    if (!suppressed) {\n      if (\n        overlay[ChangeIndex.TYPE] === ChangeType.ADD ||\n        overlay[ChangeIndex.TYPE] === ChangeType.EDIT\n      ) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          continue;\n        }\n      }\n      if (overlay[ChangeIndex.TYPE] === ChangeType.CHILD) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          yield {\n            row: node.row,\n            relationships: {\n              ...node.relationships,\n              [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                generateWithOverlay(\n                  node.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ](),\n                  overlay[ChangeIndex.CHILD_DATA].change,\n                  schema.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ],\n                ),\n            },\n          };\n          continue;\n        }\n      }\n    }\n    yield node;\n  }\n  assert(\n    suppressed || overlay[ChangeIndex.TYPE] === ChangeType.REMOVE,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function rowEqualsForCompoundKey(\n  a: Row,\n  b: Row,\n  key: CompoundKey,\n): boolean {\n  for (let i = 0; i < key.length; i++) {\n    if (compareValues(a[key[i]], b[key[i]]) !== 0) {\n      return false;\n    }\n  }\n  return true;\n}\n\nexport function isJoinMatch(\n  parent: Row,\n  parentKey: CompoundKey,\n  child: Row,\n  childKey: CompoundKey,\n) {\n  for (let i = 0; i < parentKey.length; i++) {\n    if (!valuesEqual(parent[parentKey[i]], child[childKey[i]])) {\n      return false;\n    }\n  }\n  return true;\n}\n\n/**\n * Builds a constraint object by mapping values from `sourceRow` using `sourceKey`\n * to keys specified by `targetKey`. Returns `undefined` if any source value is `null`,\n * since null foreign keys cannot match any rows.\n */\nexport function buildJoinConstraint(\n  sourceRow: Row,\n  sourceKey: CompoundKey,\n  targetKey: CompoundKey,\n): Record<string, Value> | undefined {\n  const constraint: Record<string, Value> = {};\n  for (let i = 0; i < targetKey.length; i++) {\n    const value = sourceRow[sourceKey[i]];\n    if (value === null) {\n      return undefined;\n    }\n    constraint[targetKey[i]] = value;\n  }\n  return constraint;\n}\n\nexport function canonicalKeyForTest(\n  record: Record<string, Value | undefined>,\n  keys: CompoundKey,\n): string {\n  return canonicalKey(record, keys);\n}\n\n/**\n * Canonical string key over `keys` of `record`. Tags values by type\n * so distinct types (e.g. 1 and \"1\") do not collide.\n */\nexport function canonicalKey(\n  record: Record<string, Value | undefined>,\n  keys: CompoundKey,\n): string {\n  if (keys.length === 1) {\n    return canonicalValue(record[keys[0]]);\n  }\n  let s = '';\n  for (let i = 0; i < keys.length; i++) {\n    if (i > 0) s += '\\x00';\n    s += canonicalValue(record[keys[i]]);\n  }\n  return s;\n}\n\nfunction canonicalValue(v: Value): string {\n  // Tag by type so we don't conflate e.g. `1` (number) with `\"1\"` (string).\n  if (v === null || v === undefined) return 'n';\n  const t = typeof v;\n  if (t === 'string') return 's' + (v as string);\n  if (t === 'number') return 'd' + (v as number);\n  if (t === 'boolean') return v ? 't' : 'f';\n  return 'j' + JSON.stringify(v);\n}\n"],"mappings":"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"}
+{"version":3,"file":"join-utils.js","names":[],"sources":["../../../../../zql/src/ivm/join-utils.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row, Value} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport type {Change} from './change.ts';\nimport {compareValues, valuesEqual, type Node} from './data.ts';\nimport type {SourceSchema} from './schema.ts';\nimport type {Stream} from './stream.ts';\n\nexport function generateWithOverlayNoYield(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlay(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlay(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  let applied = false;\n  let editOldApplied = false;\n  let editNewApplied = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    let yieldNode = true;\n    if (!applied) {\n      switch (overlay[ChangeIndex.TYPE]) {\n        case ChangeType.ADD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.REMOVE: {\n          if (schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) < 0) {\n            applied = true;\n            yield overlay[ChangeIndex.NODE];\n          }\n          break;\n        }\n        case ChangeType.EDIT: {\n          if (\n            !editOldApplied &&\n            schema.compareRows(overlay[ChangeIndex.OLD_NODE].row, node.row) < 0\n          ) {\n            editOldApplied = true;\n            if (editNewApplied) {\n              applied = true;\n            }\n            yield overlay[ChangeIndex.OLD_NODE];\n          }\n          if (\n            !editNewApplied &&\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            editNewApplied = true;\n            if (editOldApplied) {\n              applied = true;\n            }\n            yieldNode = false;\n          }\n          break;\n        }\n        case ChangeType.CHILD: {\n          if (\n            schema.compareRows(overlay[ChangeIndex.NODE].row, node.row) === 0\n          ) {\n            applied = true;\n            yield {\n              row: node.row,\n              relationships: {\n                ...node.relationships,\n                [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                  generateWithOverlay(\n                    node.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ](),\n                    overlay[ChangeIndex.CHILD_DATA].change,\n                    schema.relationships[\n                      overlay[ChangeIndex.CHILD_DATA].relationshipName\n                    ],\n                  ),\n              },\n            };\n            yieldNode = false;\n          }\n          break;\n        }\n      }\n    }\n    if (yieldNode) {\n      yield node;\n    }\n  }\n  if (!applied) {\n    if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n      applied = true;\n      yield overlay[ChangeIndex.NODE];\n    } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n      assert(\n        editNewApplied,\n        'edit overlay: new node must be applied before old node',\n      );\n      editOldApplied = true;\n      applied = true;\n      yield overlay[ChangeIndex.OLD_NODE];\n    }\n  }\n\n  assert(\n    applied,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function generateWithOverlayNoYieldUnordered(\n  stream: Stream<Node>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node> {\n  return generateWithOverlayUnordered(stream, overlay, schema) as Stream<Node>;\n}\n\nexport function* generateWithOverlayUnordered(\n  stream: Stream<Node | 'yield'>,\n  overlay: Change,\n  schema: SourceSchema,\n): Stream<Node | 'yield'> {\n  // Eager inject\n  if (overlay[ChangeIndex.TYPE] === ChangeType.REMOVE) {\n    yield overlay[ChangeIndex.NODE];\n  } else if (overlay[ChangeIndex.TYPE] === ChangeType.EDIT) {\n    yield overlay[ChangeIndex.OLD_NODE];\n  }\n\n  // Stream with inline suppress\n  let suppressed = false;\n  for (const node of stream) {\n    if (node === 'yield') {\n      yield node;\n      continue;\n    }\n    if (!suppressed) {\n      if (\n        overlay[ChangeIndex.TYPE] === ChangeType.ADD ||\n        overlay[ChangeIndex.TYPE] === ChangeType.EDIT\n      ) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          continue;\n        }\n      }\n      if (overlay[ChangeIndex.TYPE] === ChangeType.CHILD) {\n        if (\n          rowEqualsForCompoundKey(\n            overlay[ChangeIndex.NODE].row,\n            node.row,\n            schema.primaryKey,\n          )\n        ) {\n          suppressed = true;\n          yield {\n            row: node.row,\n            relationships: {\n              ...node.relationships,\n              [overlay[ChangeIndex.CHILD_DATA].relationshipName]: () =>\n                generateWithOverlay(\n                  node.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ](),\n                  overlay[ChangeIndex.CHILD_DATA].change,\n                  schema.relationships[\n                    overlay[ChangeIndex.CHILD_DATA].relationshipName\n                  ],\n                ),\n            },\n          };\n          continue;\n        }\n      }\n    }\n    yield node;\n  }\n  assert(\n    suppressed || overlay[ChangeIndex.TYPE] === ChangeType.REMOVE,\n    'overlayGenerator: overlay was never applied to any fetched node',\n  );\n}\n\nexport function rowEqualsForCompoundKey(\n  a: Row,\n  b: Row,\n  key: CompoundKey,\n): boolean {\n  for (let i = 0; i < key.length; i++) {\n    if (compareValues(a[key[i]], b[key[i]]) !== 0) {\n      return false;\n    }\n  }\n  return true;\n}\n\nexport function isJoinMatch(\n  parent: Row,\n  parentKey: CompoundKey,\n  child: Row,\n  childKey: CompoundKey,\n) {\n  for (let i = 0; i < parentKey.length; i++) {\n    if (!valuesEqual(parent[parentKey[i]], child[childKey[i]])) {\n      return false;\n    }\n  }\n  return true;\n}\n\n/**\n * Builds a constraint object by mapping values from `sourceRow` using `sourceKey`\n * to keys specified by `targetKey`. Returns `undefined` if any source value is `null`,\n * since null foreign keys cannot match any rows.\n */\nexport function buildJoinConstraint(\n  sourceRow: Row,\n  sourceKey: CompoundKey,\n  targetKey: CompoundKey,\n): Record<string, Value> | undefined {\n  const constraint: Record<string, Value> = {};\n  for (let i = 0; i < targetKey.length; i++) {\n    const value = sourceRow[sourceKey[i]];\n    if (value === null) {\n      return undefined;\n    }\n    constraint[targetKey[i]] = value;\n  }\n  return constraint;\n}\n\nexport function canonicalKeyForTest(\n  record: Record<string, Value | undefined>,\n  keys: CompoundKey,\n): string {\n  return canonicalKey(record, keys);\n}\n\n/**\n * Canonical string key over `keys` of `record`. Tags values by type\n * so distinct types (e.g. 1 and \"1\") do not collide.\n */\nexport function canonicalKey(\n  record: Record<string, Value | undefined>,\n  keys: CompoundKey,\n): string {\n  if (keys.length === 1) {\n    return canonicalValue(record[keys[0]]);\n  }\n  let s = '';\n  for (let i = 0; i < keys.length; i++) {\n    if (i > 0) s += '\\x00';\n    s += canonicalValue(record[keys[i]]);\n  }\n  return s;\n}\n\nfunction canonicalValue(v: Value): string {\n  // Tag by type so we don't conflate e.g. `1` (number) with `\"1\"` (string).\n  if (v === null || v === undefined) return 'n';\n  const t = typeof v;\n  if (t === 'string') return 's' + (v as string);\n  if (t === 'number') return 'd' + (v as number);\n  if (t === 'boolean') return v ? 't' : 'f';\n  return 'j' + JSON.stringify(v);\n}\n"],"mappings":"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"}

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;AAW3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAU1C,OAAO,EAEL,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;AACxC,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,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;IACf,kBAAkB,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC7C,aAAa,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC9C;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;IAkChC,YAAY,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,EACN,kBAAkB,EAClB,aAAa,EACb,MAAM,GACP,EAAE,IAAI,EAkDN;IAQD,OAAO,IAAI,IAAI,CAGd;IAED,IAAI,kBAAkB,IAAI,SAAS,CAElC;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,CAShD;CA0QF"}
+{"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;AAW3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAU1C,OAAO,EAEL,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;AACxC,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,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;IACf,kBAAkB,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC7C,aAAa,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC9C;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF;;;;;;;;;GASG;AACH,qBAAa,IAAK,YAAW,KAAK;;IAkChC,YAAY,EACV,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,EACR,gBAAgB,EAChB,MAAM,EACN,MAAM,EACN,kBAAkB,EAClB,aAAa,EACb,MAAM,GACP,EAAE,IAAI,EAkDN;IAQD,OAAO,IAAI,IAAI,CAGd;IAED,IAAI,kBAAkB,IAAI,SAAS,CAElC;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,CAShD;CA6QF"}

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

@@ -216,16 +216,19 @@ var Join = class {
 		if (this.#indexesParents) this.#parentIndex.remove(row);
 	}
 	#processParentNode(parentNodeRow, parentNodeRelations) {
-		const childStream = () => {
+		const childStream = (countOnly) => {
 			const constraint = buildJoinConstraint(parentNodeRow, this.#parentKey, this.#childKey);
-			const stream = constraint ? this.#child.fetch({ constraint }) : [];
 			const inPushQueue = this.#isAfterInprogressPosition(parentNodeRow) && (this.#inprogressParentFetchBounds === void 0 || isInParentFetch(this.#inprogressParentFetchBounds, parentNodeRow, this.#schema.compareRows));
 			if (this.#inprogressChildChange && isJoinMatch(parentNodeRow, this.#parentKey, this.#inprogressChildChange[1].row, this.#childKey) && inPushQueue) {
+				const stream = constraint ? this.#child.fetch({ constraint }) : [];
 				const childSchema = this.#child.getSchema();
 				if (childSchema.sort === void 0) return generateWithOverlayUnordered(stream, this.#inprogressChildChange, childSchema);
 				return generateWithOverlay(stream, this.#inprogressChildChange, childSchema);
 			}
-			return stream;
+			return constraint ? this.#child.fetch(countOnly ? {
+				constraint,
+				countOnly
+			} : { constraint }) : [];
 		};
 		return {
 			row: parentNodeRow,

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

@@ -1 +1 @@
-{"version":3,"file":"join.js","names":["#parent","#child","#parentKey","#childKey","#relationshipName","#schema","#parentIndex","#indexesParents","#qualifyingChildChange","#boundProvider","#pushParent","#reconcile","#pushChild","#output","#indexParentRow","#processParentNode","#unindexParentRow","#pushChildChange","#inprogressChildChange","#inprogressChildChangePosition","#inprogressReachedParents","#inprogressParentFetchBounds","#isAfterInprogressPosition"],"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 {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport {\n  makeAddChange,\n  makeChildChange,\n  makeEditChange,\n  makeRemoveChange,\n  type Change,\n} from './change.ts';\nimport type {Node} from './data.ts';\nimport {JoinIndex} from './join-index.ts';\nimport {\n  buildJoinConstraint,\n  canonicalKey,\n  generateWithOverlay,\n  generateWithOverlayUnordered,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n} from './join-utils.ts';\nimport {mergeSortedStreams} from './memory-source.ts';\nimport {\n  throwOutput,\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';\nimport {\n  isInParentFetch,\n  readParentFetchBounds,\n  type ParentFetchBound,\n  type TakeBoundProvider,\n} from './take-gate.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  parentPartitionKey?: CompoundKey | undefined;\n  boundProvider?: TakeBoundProvider | undefined;\n  /**\n   * Set when this join feeds an EXISTS or NOT EXISTS condition. Its parent\n   * index is then kept by a JoinIndexTap at the end of the pipeline, so it\n   * only holds the parents the pipeline emits, not every parent this join\n   * sees. A child change that misses the index is dropped unless it could\n   * make a parent pass the condition: an add for EXISTS, a remove for NOT\n   * EXISTS. Those still fetch the parents.\n   */\n  exists?: ExistsJoin | undefined;\n};\n\nexport type ExistsJoin = {\n  readonly op: 'EXISTS' | 'NOT EXISTS';\n  readonly parentIndex: JoinIndex;\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  readonly #parentIndex: JoinIndex;\n  /**\n   * Whether this join adds and removes parents in #parentIndex itself. Not\n   * so for EXISTS joins, see Args.exists.\n   */\n  readonly #indexesParents: boolean;\n  /**\n   * The child change type that is still pushed to the parents when no\n   * indexed parent has its join key. See Args.exists.\n   */\n  readonly #qualifyingChildChange: ChangeType | undefined;\n  readonly #boundProvider: TakeBoundProvider | undefined;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: Change | undefined;\n  #inprogressChildChangePosition: Row | undefined;\n  /**\n   * Primary keys of the parents #inprogressChildChange has reached so far,\n   * kept only when the parent input is unordered. An unordered stream is not\n   * in `compareRows` order (SQLite returns it in whatever order its plan\n   * visits, e.g. rowid order), so whether a parent is still in the push queue\n   * cannot be decided by comparing it to #inprogressChildChangePosition.\n   */\n  #inprogressReachedParents: Set<string> | undefined;\n  #inprogressParentFetchBounds: ParentFetchBound[] | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n    parentPartitionKey,\n    boundProvider,\n    exists,\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    assert(!exists || !parentPartitionKey, 'EXISTS joins are not partitioned');\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n    if (exists) {\n      this.#parentIndex = exists.parentIndex;\n      this.#indexesParents = false;\n      this.#qualifyingChildChange =\n        exists.op === 'EXISTS' ? ChangeType.ADD : ChangeType.REMOVE;\n    } else {\n      this.#parentIndex = new JoinIndex(\n        parentKey,\n        parent.getSchema().primaryKey,\n        parentPartitionKey,\n      );\n      this.#indexesParents = true;\n      this.#qualifyingChildChange = undefined;\n    }\n    this.#boundProvider = boundProvider;\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      reconcile: () => this.#reconcile(),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n      reconcile: () => this.#reconcile(),\n    });\n  }\n\n  *#reconcile(): Stream<'yield'> {\n    if (this.#output.reconcile) {\n      yield* this.#output.reconcile(this);\n    }\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  get parentIndexForTest(): JoinIndex {\n    return this.#parentIndex;\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      this.#indexParentRow(parentNode.row);\n      yield this.#processParentNode(parentNode.row, parentNode.relationships);\n    }\n  }\n\n  *#pushParent(change: Change): Stream<'yield'> {\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n        this.#indexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeAddChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      case ChangeType.REMOVE:\n        this.#unindexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeRemoveChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      case ChangeType.CHILD:\n        yield* this.#output.push(\n          makeChildChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n            change[ChangeIndex.CHILD_DATA],\n          ),\n          this,\n        );\n        break;\n      case ChangeType.EDIT: {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change[ChangeIndex.OLD_NODE].row,\n            change[ChangeIndex.NODE].row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#unindexParentRow(change[ChangeIndex.OLD_NODE].row);\n        this.#indexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeEditChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n            this.#processParentNode(\n              change[ChangeIndex.OLD_NODE].row,\n              change[ChangeIndex.OLD_NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChild(change: Change): Stream<'yield'> {\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n      case ChangeType.REMOVE:\n        yield* this.#pushChildChange(change[ChangeIndex.NODE].row, change);\n        break;\n      case ChangeType.CHILD:\n        yield* this.#pushChildChange(change[ChangeIndex.NODE].row, change);\n        break;\n      case ChangeType.EDIT: {\n        const childRow = change[ChangeIndex.NODE].row;\n        const oldChildRow = change[ChangeIndex.OLD_NODE].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        yield* this.#pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChildChange(childRow: Row, change: Change): Stream<'yield'> {\n    this.#inprogressChildChange = change;\n    this.#inprogressChildChangePosition = undefined;\n    this.#inprogressReachedParents =\n      this.#parent.getSchema().sort === undefined ? new Set() : undefined;\n    try {\n      const constraint = buildJoinConstraint(\n        childRow,\n        this.#childKey,\n        this.#parentKey,\n      );\n      if (constraint) {\n        const partitions = this.#parentIndex.lookup(childRow, this.#childKey);\n        let fetchConstraints: Record<string, Value>[];\n        if (partitions) {\n          fetchConstraints = partitions.map(partitionConstraint =>\n            partitionConstraint\n              ? {...constraint, ...partitionConstraint}\n              : constraint,\n          );\n        } else if (change[ChangeIndex.TYPE] === this.#qualifyingChildChange) {\n          fetchConstraints = [constraint];\n        } else {\n          return;\n        }\n\n        if (this.#boundProvider) {\n          this.#inprogressParentFetchBounds = readParentFetchBounds(\n            this.#boundProvider,\n            fetchConstraints,\n          );\n        }\n\n        let parentNodeStream: Stream<Node | 'yield'>;\n        if (fetchConstraints.length === 1) {\n          parentNodeStream = this.#parent.fetch({\n            constraint: fetchConstraints[0],\n          });\n        } else {\n          const streams = fetchConstraints.map(c =>\n            this.#parent.fetch({constraint: c}),\n          );\n          const compare = (a: Node, b: Node) =>\n            this.#schema.compareRows(a.row, b.row);\n          parentNodeStream = mergeSortedStreams(streams, compare);\n        }\n\n        for (const parentNode of parentNodeStream) {\n          if (parentNode === 'yield') {\n            yield parentNode;\n            continue;\n          }\n          this.#inprogressChildChangePosition = parentNode.row;\n          this.#inprogressReachedParents?.add(\n            canonicalKey(parentNode.row, this.#schema.primaryKey),\n          );\n          const childChange = makeChildChange(\n            this.#processParentNode(parentNode.row, parentNode.relationships),\n            {\n              relationshipName: this.#relationshipName,\n              change,\n            },\n          );\n          yield* this.#output.push(childChange, this);\n        }\n      }\n    } finally {\n      this.#inprogressChildChange = undefined;\n      this.#inprogressChildChangePosition = undefined;\n      this.#inprogressReachedParents = undefined;\n      this.#inprogressParentFetchBounds = undefined;\n    }\n  }\n\n  /**\n   * Whether the in-progress child change has yet to reach `parentNodeRow`,\n   * i.e. the row comes after #inprogressChildChangePosition in the parent\n   * stream.\n   */\n  #isAfterInprogressPosition(parentNodeRow: Row): boolean {\n    if (this.#inprogressChildChangePosition === undefined) {\n      return false;\n    }\n    if (this.#inprogressReachedParents) {\n      return !this.#inprogressReachedParents.has(\n        canonicalKey(parentNodeRow, this.#schema.primaryKey),\n      );\n    }\n    return (\n      this.#schema.compareRows(\n        parentNodeRow,\n        this.#inprogressChildChangePosition,\n      ) > 0\n    );\n  }\n\n  #indexParentRow(row: Row): void {\n    if (this.#indexesParents) {\n      this.#parentIndex.add(row);\n    }\n  }\n\n  #unindexParentRow(row: Row): void {\n    if (this.#indexesParents) {\n      this.#parentIndex.remove(row);\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node | 'yield'>>,\n  ): Node {\n    const childStream = () => {\n      const constraint = buildJoinConstraint(\n        parentNodeRow,\n        this.#parentKey,\n        this.#childKey,\n      );\n      const stream = constraint ? this.#child.fetch({constraint}) : [];\n\n      // The parent has yet to get the in-progress child change if it comes\n      // after the current position and a parent fetch of the push yields it.\n      // With a TakeGate the fetches are capped at the bounds read when they\n      // started.\n      const inPushQueue =\n        this.#isAfterInprogressPosition(parentNodeRow) &&\n        (this.#inprogressParentFetchBounds === undefined ||\n          isInParentFetch(\n            this.#inprogressParentFetchBounds,\n            parentNodeRow,\n            this.#schema.compareRows,\n          ));\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange[ChangeIndex.NODE].row,\n          this.#childKey,\n        ) &&\n        inPushQueue\n      ) {\n        const childSchema = this.#child.getSchema();\n        if (childSchema.sort === undefined) {\n          return generateWithOverlayUnordered(\n            stream,\n            this.#inprogressChildChange,\n            childSchema,\n          );\n        }\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange,\n          childSchema,\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"],"mappings":"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"}
+{"version":3,"file":"join.js","names":[],"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 {ChangeIndex} from './change-index.ts';\nimport {ChangeType} from './change-type.ts';\nimport {\n  makeAddChange,\n  makeChildChange,\n  makeEditChange,\n  makeRemoveChange,\n  type Change,\n} from './change.ts';\nimport type {Node} from './data.ts';\nimport {JoinIndex} from './join-index.ts';\nimport {\n  buildJoinConstraint,\n  canonicalKey,\n  generateWithOverlay,\n  generateWithOverlayUnordered,\n  isJoinMatch,\n  rowEqualsForCompoundKey,\n} from './join-utils.ts';\nimport {mergeSortedStreams} from './memory-source.ts';\nimport {\n  throwOutput,\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';\nimport {\n  isInParentFetch,\n  readParentFetchBounds,\n  type ParentFetchBound,\n  type TakeBoundProvider,\n} from './take-gate.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  parentPartitionKey?: CompoundKey | undefined;\n  boundProvider?: TakeBoundProvider | undefined;\n  /**\n   * Set when this join feeds an EXISTS or NOT EXISTS condition. Its parent\n   * index is then kept by a JoinIndexTap at the end of the pipeline, so it\n   * only holds the parents the pipeline emits, not every parent this join\n   * sees. A child change that misses the index is dropped unless it could\n   * make a parent pass the condition: an add for EXISTS, a remove for NOT\n   * EXISTS. Those still fetch the parents.\n   */\n  exists?: ExistsJoin | undefined;\n};\n\nexport type ExistsJoin = {\n  readonly op: 'EXISTS' | 'NOT EXISTS';\n  readonly parentIndex: JoinIndex;\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  readonly #parentIndex: JoinIndex;\n  /**\n   * Whether this join adds and removes parents in #parentIndex itself. Not\n   * so for EXISTS joins, see Args.exists.\n   */\n  readonly #indexesParents: boolean;\n  /**\n   * The child change type that is still pushed to the parents when no\n   * indexed parent has its join key. See Args.exists.\n   */\n  readonly #qualifyingChildChange: ChangeType | undefined;\n  readonly #boundProvider: TakeBoundProvider | undefined;\n\n  #output: Output = throwOutput;\n\n  #inprogressChildChange: Change | undefined;\n  #inprogressChildChangePosition: Row | undefined;\n  /**\n   * Primary keys of the parents #inprogressChildChange has reached so far,\n   * kept only when the parent input is unordered. An unordered stream is not\n   * in `compareRows` order (SQLite returns it in whatever order its plan\n   * visits, e.g. rowid order), so whether a parent is still in the push queue\n   * cannot be decided by comparing it to #inprogressChildChangePosition.\n   */\n  #inprogressReachedParents: Set<string> | undefined;\n  #inprogressParentFetchBounds: ParentFetchBound[] | undefined;\n\n  constructor({\n    parent,\n    child,\n    parentKey,\n    childKey,\n    relationshipName,\n    hidden,\n    system,\n    parentPartitionKey,\n    boundProvider,\n    exists,\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    assert(!exists || !parentPartitionKey, 'EXISTS joins are not partitioned');\n    this.#parent = parent;\n    this.#child = child;\n    this.#parentKey = parentKey;\n    this.#childKey = childKey;\n    this.#relationshipName = relationshipName;\n    if (exists) {\n      this.#parentIndex = exists.parentIndex;\n      this.#indexesParents = false;\n      this.#qualifyingChildChange =\n        exists.op === 'EXISTS' ? ChangeType.ADD : ChangeType.REMOVE;\n    } else {\n      this.#parentIndex = new JoinIndex(\n        parentKey,\n        parent.getSchema().primaryKey,\n        parentPartitionKey,\n      );\n      this.#indexesParents = true;\n      this.#qualifyingChildChange = undefined;\n    }\n    this.#boundProvider = boundProvider;\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      reconcile: () => this.#reconcile(),\n    });\n    child.setOutput({\n      push: (change: Change) => this.#pushChild(change),\n      reconcile: () => this.#reconcile(),\n    });\n  }\n\n  *#reconcile(): Stream<'yield'> {\n    if (this.#output.reconcile) {\n      yield* this.#output.reconcile(this);\n    }\n  }\n\n  destroy(): void {\n    this.#parent.destroy();\n    this.#child.destroy();\n  }\n\n  get parentIndexForTest(): JoinIndex {\n    return this.#parentIndex;\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      this.#indexParentRow(parentNode.row);\n      yield this.#processParentNode(parentNode.row, parentNode.relationships);\n    }\n  }\n\n  *#pushParent(change: Change): Stream<'yield'> {\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n        this.#indexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeAddChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      case ChangeType.REMOVE:\n        this.#unindexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeRemoveChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      case ChangeType.CHILD:\n        yield* this.#output.push(\n          makeChildChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n            change[ChangeIndex.CHILD_DATA],\n          ),\n          this,\n        );\n        break;\n      case ChangeType.EDIT: {\n        // Assert the edit could not change the relationship.\n        assert(\n          rowEqualsForCompoundKey(\n            change[ChangeIndex.OLD_NODE].row,\n            change[ChangeIndex.NODE].row,\n            this.#parentKey,\n          ),\n          `Parent edit must not change relationship.`,\n        );\n        this.#unindexParentRow(change[ChangeIndex.OLD_NODE].row);\n        this.#indexParentRow(change[ChangeIndex.NODE].row);\n        yield* this.#output.push(\n          makeEditChange(\n            this.#processParentNode(\n              change[ChangeIndex.NODE].row,\n              change[ChangeIndex.NODE].relationships,\n            ),\n            this.#processParentNode(\n              change[ChangeIndex.OLD_NODE].row,\n              change[ChangeIndex.OLD_NODE].relationships,\n            ),\n          ),\n          this,\n        );\n        break;\n      }\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChild(change: Change): Stream<'yield'> {\n    switch (change[ChangeIndex.TYPE]) {\n      case ChangeType.ADD:\n      case ChangeType.REMOVE:\n        yield* this.#pushChildChange(change[ChangeIndex.NODE].row, change);\n        break;\n      case ChangeType.CHILD:\n        yield* this.#pushChildChange(change[ChangeIndex.NODE].row, change);\n        break;\n      case ChangeType.EDIT: {\n        const childRow = change[ChangeIndex.NODE].row;\n        const oldChildRow = change[ChangeIndex.OLD_NODE].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        yield* this.#pushChildChange(childRow, change);\n        break;\n      }\n\n      default:\n        unreachable(change);\n    }\n  }\n\n  *#pushChildChange(childRow: Row, change: Change): Stream<'yield'> {\n    this.#inprogressChildChange = change;\n    this.#inprogressChildChangePosition = undefined;\n    this.#inprogressReachedParents =\n      this.#parent.getSchema().sort === undefined ? new Set() : undefined;\n    try {\n      const constraint = buildJoinConstraint(\n        childRow,\n        this.#childKey,\n        this.#parentKey,\n      );\n      if (constraint) {\n        const partitions = this.#parentIndex.lookup(childRow, this.#childKey);\n        let fetchConstraints: Record<string, Value>[];\n        if (partitions) {\n          fetchConstraints = partitions.map(partitionConstraint =>\n            partitionConstraint\n              ? {...constraint, ...partitionConstraint}\n              : constraint,\n          );\n        } else if (change[ChangeIndex.TYPE] === this.#qualifyingChildChange) {\n          fetchConstraints = [constraint];\n        } else {\n          return;\n        }\n\n        if (this.#boundProvider) {\n          this.#inprogressParentFetchBounds = readParentFetchBounds(\n            this.#boundProvider,\n            fetchConstraints,\n          );\n        }\n\n        let parentNodeStream: Stream<Node | 'yield'>;\n        if (fetchConstraints.length === 1) {\n          parentNodeStream = this.#parent.fetch({\n            constraint: fetchConstraints[0],\n          });\n        } else {\n          const streams = fetchConstraints.map(c =>\n            this.#parent.fetch({constraint: c}),\n          );\n          const compare = (a: Node, b: Node) =>\n            this.#schema.compareRows(a.row, b.row);\n          parentNodeStream = mergeSortedStreams(streams, compare);\n        }\n\n        for (const parentNode of parentNodeStream) {\n          if (parentNode === 'yield') {\n            yield parentNode;\n            continue;\n          }\n          this.#inprogressChildChangePosition = parentNode.row;\n          this.#inprogressReachedParents?.add(\n            canonicalKey(parentNode.row, this.#schema.primaryKey),\n          );\n          const childChange = makeChildChange(\n            this.#processParentNode(parentNode.row, parentNode.relationships),\n            {\n              relationshipName: this.#relationshipName,\n              change,\n            },\n          );\n          yield* this.#output.push(childChange, this);\n        }\n      }\n    } finally {\n      this.#inprogressChildChange = undefined;\n      this.#inprogressChildChangePosition = undefined;\n      this.#inprogressReachedParents = undefined;\n      this.#inprogressParentFetchBounds = undefined;\n    }\n  }\n\n  /**\n   * Whether the in-progress child change has yet to reach `parentNodeRow`,\n   * i.e. the row comes after #inprogressChildChangePosition in the parent\n   * stream.\n   */\n  #isAfterInprogressPosition(parentNodeRow: Row): boolean {\n    if (this.#inprogressChildChangePosition === undefined) {\n      return false;\n    }\n    if (this.#inprogressReachedParents) {\n      return !this.#inprogressReachedParents.has(\n        canonicalKey(parentNodeRow, this.#schema.primaryKey),\n      );\n    }\n    return (\n      this.#schema.compareRows(\n        parentNodeRow,\n        this.#inprogressChildChangePosition,\n      ) > 0\n    );\n  }\n\n  #indexParentRow(row: Row): void {\n    if (this.#indexesParents) {\n      this.#parentIndex.add(row);\n    }\n  }\n\n  #unindexParentRow(row: Row): void {\n    if (this.#indexesParents) {\n      this.#parentIndex.remove(row);\n    }\n  }\n\n  #processParentNode(\n    parentNodeRow: Row,\n    parentNodeRelations: Record<string, () => Stream<Node | 'yield'>>,\n  ): Node {\n    const childStream = (countOnly?: boolean | undefined) => {\n      const constraint = buildJoinConstraint(\n        parentNodeRow,\n        this.#parentKey,\n        this.#childKey,\n      );\n\n      // The parent has yet to get the in-progress child change if it comes\n      // after the current position and a parent fetch of the push yields it.\n      // With a TakeGate the fetches are capped at the bounds read when they\n      // started.\n      const inPushQueue =\n        this.#isAfterInprogressPosition(parentNodeRow) &&\n        (this.#inprogressParentFetchBounds === undefined ||\n          isInParentFetch(\n            this.#inprogressParentFetchBounds,\n            parentNodeRow,\n            this.#schema.compareRows,\n          ));\n\n      if (\n        this.#inprogressChildChange &&\n        isJoinMatch(\n          parentNodeRow,\n          this.#parentKey,\n          this.#inprogressChildChange[ChangeIndex.NODE].row,\n          this.#childKey,\n        ) &&\n        inPushQueue\n      ) {\n        // The overlay needs the child rows, so countOnly is not forwarded.\n        const stream = constraint ? this.#child.fetch({constraint}) : [];\n        const childSchema = this.#child.getSchema();\n        if (childSchema.sort === undefined) {\n          return generateWithOverlayUnordered(\n            stream,\n            this.#inprogressChildChange,\n            childSchema,\n          );\n        }\n        return generateWithOverlay(\n          stream,\n          this.#inprogressChildChange,\n          childSchema,\n        );\n      }\n      return constraint\n        ? this.#child.fetch(countOnly ? {constraint, countOnly} : {constraint})\n        : [];\n    };\n\n    return {\n      row: parentNodeRow,\n      relationships: {\n        ...parentNodeRelations,\n        [this.#relationshipName]: childStream,\n      },\n    };\n  }\n}\n"],"mappings":"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"}

package/out/zql/src/ivm/maybe-split-and-push-edit-change.js.map

@@ -1 +1 @@
-{"version":3,"file":"maybe-split-and-push-edit-change.js","names":[],"sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"sourcesContent":["import {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {makeAddChange, makeRemoveChange, type EditChange} from './change.ts';\nimport type {InputBase, Output} from './operator.ts';\n\n/**\n * This takes an {@link EditChange} and a predicate that determines if a row\n * should be present based on the row's data. It then splits the change and\n * pushes the appropriate changes to the output based on the predicate.\n */\nexport function maybeSplitAndPushEditChange(\n  change: EditChange,\n  predicate: (row: Row) => boolean,\n  output: Output,\n  pusher: InputBase,\n) {\n  const oldWasPresent = predicate(change[ChangeIndex.OLD_NODE].row);\n  const newIsPresent = predicate(change[ChangeIndex.NODE].row);\n\n  if (oldWasPresent && newIsPresent) {\n    return output.push(change, pusher);\n  }\n  if (oldWasPresent && !newIsPresent) {\n    return output.push(makeRemoveChange(change[ChangeIndex.OLD_NODE]), pusher);\n  }\n  if (!oldWasPresent && newIsPresent) {\n    return output.push(makeAddChange(change[ChangeIndex.NODE]), pusher);\n  }\n\n  return emptyArray;\n}\n"],"mappings":";;;;;;;;AAWA,SAAgB,4BACd,QACA,WACA,QACA,QACA;CACA,MAAM,gBAAgB,UAAU,OAAO,GAAsB,GAAG;CAChE,MAAM,eAAe,UAAU,OAAO,GAAkB,GAAG;CAE3D,IAAI,iBAAiB,cACnB,OAAO,OAAO,KAAK,QAAQ,MAAM;CAEnC,IAAI,iBAAiB,CAAC,cACpB,OAAO,OAAO,KAAK,iBAAiB,OAAO,EAAqB,GAAG,MAAM;CAE3E,IAAI,CAAC,iBAAiB,cACpB,OAAO,OAAO,KAAK,cAAc,OAAO,EAAiB,GAAG,MAAM;CAGpE,OAAO;AACT"}
+{"version":3,"file":"maybe-split-and-push-edit-change.js","names":[],"sources":["../../../../../zql/src/ivm/maybe-split-and-push-edit-change.ts"],"sourcesContent":["import {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {ChangeIndex} from './change-index.ts';\nimport {makeAddChange, makeRemoveChange, type EditChange} from './change.ts';\nimport type {InputBase, Output} from './operator.ts';\n\n/**\n * This takes an {@link EditChange} and a predicate that determines if a row\n * should be present based on the row's data. It then splits the change and\n * pushes the appropriate changes to the output based on the predicate.\n */\nexport function maybeSplitAndPushEditChange(\n  change: EditChange,\n  predicate: (row: Row) => boolean,\n  output: Output,\n  pusher: InputBase,\n) {\n  const oldWasPresent = predicate(change[ChangeIndex.OLD_NODE].row);\n  const newIsPresent = predicate(change[ChangeIndex.NODE].row);\n\n  if (oldWasPresent && newIsPresent) {\n    return output.push(change, pusher);\n  }\n  if (oldWasPresent && !newIsPresent) {\n    return output.push(makeRemoveChange(change[ChangeIndex.OLD_NODE]), pusher);\n  }\n  if (!oldWasPresent && newIsPresent) {\n    return output.push(makeAddChange(change[ChangeIndex.NODE]), pusher);\n  }\n\n  return emptyArray;\n}\n"],"mappings":";;;;;;;;AAWA,SAAgB,4BACd,QACA,WACA,QACA,QACA;CACA,MAAM,gBAAgB,UAAU,OAAO,EAAqB,CAAC,GAAG;CAChE,MAAM,eAAe,UAAU,OAAO,EAAiB,CAAC,GAAG;CAE3D,IAAI,iBAAiB,cACnB,OAAO,OAAO,KAAK,QAAQ,MAAM;CAEnC,IAAI,iBAAiB,CAAC,cACpB,OAAO,OAAO,KAAK,iBAAiB,OAAO,EAAqB,GAAG,MAAM;CAE3E,IAAI,CAAC,iBAAiB,cACpB,OAAO,OAAO,KAAK,cAAc,OAAO,EAAiB,GAAG,MAAM;CAGpE,OAAO;AACT"}

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

@@ -4,9 +4,9 @@ import { once, toSorted } from "../../../shared/src/iterables.js";
 import { must } from "../../../shared/src/must.js";
 import { skipYields } from "./skip-yields.js";
 import { makeAddChange, makeEditChange, makeRemoveChange } from "./change.js";
+import { compareValues, makeComparator, valuesEqual } from "./data.js";
 import { consume } from "./stream.js";
 import { assertOrderingIncludesPK } from "../query/complete-ordering.js";
-import { compareValues, makeComparator, valuesEqual } from "./data.js";
 import { filterPush } from "./filter-push.js";
 import { constraintMatchesPrimaryKey, constraintMatchesRow, primaryKeyConstraintFromFilters } from "./constraint.js";
 import { BTreeSet } from "../../../shared/src/btree-set.js";
@@ -166,7 +166,8 @@ var MemorySource = class MemorySource {
 			}
 			return;
 		}
-		const withConstraint = generateWithConstraint(skipYields(generateWithStart(generateWithOverlay(startAt, pkConstraint ? once(rowsIterable) : rowsIterable, req.constraint, this.#overlay, conn.lastPushedEpoch, indexComparator, connectionComparator, mergedFilterPredicate), req.start, connectionComparator)), req.constraint);
+		const withOverlay = generateWithOverlay(startAt, pkConstraint ? once(rowsIterable) : rowsIterable, req.constraint, this.#overlay, conn.lastPushedEpoch, indexComparator, connectionComparator, mergedFilterPredicate);
+		const withConstraint = generateWithConstraint(skipYields(generateWithStart(withOverlay, req.start, connectionComparator)), req.constraint);
 		yield* mergedFilterPredicate ? generateWithFilter(withConstraint, mergedFilterPredicate) : withConstraint;
 	}
 	*#fetchMulti(req, conn) {
@@ -242,16 +243,22 @@ var MemorySource = class MemorySource {
 	}
 	#writeChange(change) {
 		for (const { data } of this.#indexes.values()) switch (change[0]) {
-			case 0:
-				assert(data.add(change[1]), "MemorySource: add must succeed since row existence was already checked");
+			case 0: {
+				const added = data.add(change[1]);
+				assert(added, "MemorySource: add must succeed since row existence was already checked");
 				break;
-			case 1:
-				assert(data.delete(change[1]), "MemorySource: remove must succeed since row existence was already checked");
+			}
+			case 1: {
+				const removed = data.delete(change[1]);
+				assert(removed, "MemorySource: remove must succeed since row existence was already checked");
 				break;
-			case 2:
-				assert(data.delete(change[2]), "MemorySource: edit remove must succeed since row existence was already checked");
+			}
+			case 2: {
+				const removed = data.delete(change[2]);
+				assert(removed, "MemorySource: edit remove must succeed since row existence was already checked");
 				data.add(change[1]);
 				break;
+			}
 			default: unreachable(change);
 		}
 	}
@@ -312,7 +319,7 @@ function* genPush(connections, change, exists, setOverlay, pushEpoch) {
 			const { output, filters, input } = conn;
 			if (output) {
 				conn.lastPushedEpoch = pushEpoch;
-				yield* filterPush(change[0] === 2 ? makeEditChange({
+				const outputChange = change[0] === 2 ? makeEditChange({
 					row: change[1],
 					relationships: {}
 				}, {
@@ -324,7 +331,8 @@ function* genPush(connections, change, exists, setOverlay, pushEpoch) {
 				}) : makeRemoveChange({
 					row: change[1],
 					relationships: {}
-				}), output, input, filters?.predicate);
+				});
+				yield* filterPush(outputChange, output, input, filters?.predicate);
 				yield void 0;
 			}
 		}
@@ -403,12 +411,10 @@ function computeOverlays(startAt, constraint, overlay, startAtCompare, filterPre
 				remove: overlay.change[1]
 			};
 			break;
-		case 2:
-			overlays = {
-				add: overlay.change[1],
-				remove: overlay.change[2]
-			};
-			break;
+		case 2: overlays = {
+			add: overlay.change[1],
+			remove: overlay.change[2]
+		};
 	}
 	if (startAt) overlays = overlaysForStartAt(overlays, startAt, startAtCompare);
 	if (constraint) overlays = overlaysForConstraint(overlays, constraint);
@@ -507,12 +513,10 @@ function generateWithOverlayUnordered(rows, constraint, overlay, lastPushedEpoch
 				remove: overlayToApply.change[1]
 			};
 			break;
-		case 2:
-			overlays = {
-				add: overlayToApply.change[1],
-				remove: overlayToApply.change[2]
-			};
-			break;
+		case 2: overlays = {
+			add: overlayToApply.change[1],
+			remove: overlayToApply.change[2]
+		};
 	}
 	if (constraint) overlays = overlaysForConstraint(overlays, constraint);
 	overlays = applyMultiConstraintsToOverlays(overlays, multiConstraints);
@@ -670,6 +674,6 @@ function* mergeSortedStreams(streams, compare) {
 	}
 }
 //#endregion
-export { MemorySource, genPushAndWriteWithSplitEdit, generateRows, generateWithOverlay, generateWithOverlayUnordered, generateWithStart, makeBoundComparator, maxValue, mergeSortedStreams, minValue };
+export { MemorySource, genPushAndWriteWithSplitEdit, generateRows, generateWithOverlay, generateWithOverlayInner, generateWithOverlayInnerUnordered, generateWithOverlayUnordered, generateWithStart, makeBoundComparator, maxValue, mergeSortedStreams, minValue, overlaysForConstraint as overlaysForConstraintForTest, overlaysForMultiConstraint as overlaysForMultiConstraintForTest, overlaysForStartAt as overlaysForStartAtForTest, stringify };
 
 //# sourceMappingURL=memory-source.js.map