@rocicorp/zero 1.12.0-canary.1 → 1.12.0-canary.11

package/out/zql/src/planner/planner-warnings.js.map

@@ -1 +1 @@
-{"version":3,"file":"planner-warnings.js","names":[],"sources":["../../../../../zql/src/planner/planner-warnings.ts"],"sourcesContent":["import type {Condition, Ordering} from '../../../zero-protocol/src/ast.ts';\nimport type {Plans} from './planner-builder.ts';\nimport type {\n  AccessPlan,\n  ConnectionAccess,\n  PlannerConnection,\n} from './planner-connection.ts';\n\n/**\n * When the planner reports a {@link PlanWarning}. Each threshold is compared\n * against the cost model's estimates, and 0 disables the warnings it gates.\n */\nexport type PlanWarningThresholds = {\n  /**\n   * The number of rows a single read of a table must scan (for a\n   * {@link MissingIndexWarning}) or sort (for a {@link FullSortWarning}).\n   */\n  readonly rows: number;\n\n  /**\n   * The number of rows the chosen plan must be estimated to process, for a\n   * {@link HighCostWarning}.\n   */\n  readonly cost: number;\n};\n\ntype TableRead = {\n  readonly table: string;\n\n  /**\n   * The aliases of the `related` subqueries leading to the read, starting\n   * from the root query. Empty for the root query and its EXISTS subqueries.\n   */\n  readonly path: readonly string[];\n\n  /**\n   * Whether the read runs once per row of another table, because a join\n   * binds some of its columns, rather than once per query.\n   */\n  readonly perRow: boolean;\n\n  /**\n   * An index that would let the source find the rows it reads and return\n   * them in order: the columns the rows are found by, then the ordering.\n   */\n  readonly suggestedIndex: readonly string[];\n};\n\n/**\n * The rows of a table are found by columns that no index covers, so every\n * read scans the whole table. This is typically a relationship whose foreign\n * key is not indexed.\n */\nexport type MissingIndexWarning = TableRead & {\n  readonly type: 'missing-index';\n  /**\n   * The columns the rows are found by: the columns a join binds and the\n   * columns filtered for equality.\n   */\n  readonly columns: readonly string[];\n  /** The rows each read scans. */\n  readonly rows: number;\n};\n\n/**\n * No index returns the rows of a table in the requested order, so every read\n * sorts all of the matching rows before returning the first one. A limit does\n * not reduce the rows read.\n */\nexport type FullSortWarning = TableRead & {\n  readonly type: 'full-sort';\n  readonly orderBy: Ordering;\n  /** The estimated number of rows each read sorts. */\n  readonly rows: number;\n};\n\n/**\n * The best plan the planner found is still estimated to process a lot of\n * rows. Only reported when every table the query reads has statistics, since\n * the estimates are guesses otherwise.\n */\nexport type HighCostWarning = {\n  readonly type: 'high-cost';\n  readonly table: string;\n  /** The estimated number of rows the plan processes. */\n  readonly cost: number;\n};\n\nexport type PlanWarning =\n  | MissingIndexWarning\n  | FullSortWarning\n  | HighCostWarning;\n\n/**\n * Warns about what the cost model reports the plans in `plans` will do\n * slowly. Call this after planning: it estimates each graph's current plan.\n *\n * @param table The table of the query that `plans` was built for.\n */\nexport function collectPlanWarnings(\n  table: string,\n  plans: Plans,\n  thresholds: PlanWarningThresholds,\n): PlanWarning[] {\n  const warnings = new Map<string, PlanWarning>();\n  const state = {warnings, estimated: true};\n  const cost = visit(plans, [], thresholds, state);\n  const result = [...warnings.values()];\n  if (state.estimated && thresholds.cost > 0 && cost >= thresholds.cost) {\n    result.push({type: 'high-cost', table, cost: Math.round(cost)});\n  }\n  return result;\n}\n\ntype VisitState = {\n  readonly warnings: Map<string, PlanWarning>;\n  /** Whether every access read a table with statistics. */\n  estimated: boolean;\n};\n\n/**\n * Collects the warnings for `plans` and its subplans, and returns the\n * estimated number of rows they process.\n */\nfunction visit(\n  plans: Plans,\n  path: readonly string[],\n  thresholds: PlanWarningThresholds,\n  state: VisitState,\n): number {\n  const estimate = plans.plan.estimateCurrentPlan();\n  for (const connection of plans.plan.connections) {\n    for (const access of connection.accesses()) {\n      if (access.plan?.tableRows === undefined) {\n        state.estimated = false;\n      } else if (thresholds.rows > 0) {\n        for (const warning of accessWarnings(\n          connection,\n          access,\n          access.plan,\n          access.plan.tableRows,\n          path,\n          thresholds.rows,\n        )) {\n          state.warnings.set(JSON.stringify(warning), warning);\n        }\n      }\n    }\n  }\n\n  // A `related` subquery runs once for each row of its parent.\n  let subCost = 0;\n  for (const [alias, subPlans] of Object.entries(plans.subPlans)) {\n    subCost += visit(subPlans, [...path, alias], thresholds, state);\n  }\n  const rowsOut =\n    estimate.limit === undefined\n      ? estimate.returnedRows\n      : Math.min(estimate.returnedRows, estimate.limit);\n  return (\n    estimate.startupCost + estimate.cost + estimate.scanEst + rowsOut * subCost\n  );\n}\n\nfunction* accessWarnings(\n  connection: PlannerConnection,\n  access: ConnectionAccess,\n  plan: AccessPlan,\n  tableRows: number,\n  path: readonly string[],\n  minRows: number,\n): Iterable<MissingIndexWarning | FullSortWarning> {\n  const constrained = Object.keys(access.constraint ?? {});\n  const columns = unique([...constrained, ...equalityColumns(access.filters)]);\n  const read: TableRead = {\n    table: connection.table,\n    path,\n    perRow: constrained.length > 0,\n    suggestedIndex: unique([\n      ...columns,\n      ...connection.sort.map(([column]) => column),\n    ]),\n  };\n\n  // A scan that stops at a limit reads an unknown share of the table, unless\n  // it runs per row: then even a limit of one (an EXISTS) scans the table\n  // for every row that has no match.\n  if (\n    plan.access === 'scan' &&\n    columns.length > 0 &&\n    (read.perRow || connection.limit === undefined) &&\n    tableRows >= minRows\n  ) {\n    yield {type: 'missing-index', ...read, columns, rows: tableRows};\n  }\n\n  if (plan.sort === 'full' && access.rows >= minRows) {\n    yield {\n      type: 'full-sort',\n      ...read,\n      orderBy: connection.sort,\n      rows: Math.round(access.rows),\n    };\n  }\n}\n\n/**\n * The columns that the top-level conjuncts of `condition` compare for\n * equality with a value, which an index lookup can use.\n */\nfunction equalityColumns(condition: Condition | undefined): string[] {\n  switch (condition?.type) {\n    case 'simple': {\n      const {left, op} = condition;\n      return (op === '=' || op === 'IS' || op === 'IN') &&\n        left.type === 'column'\n        ? [left.name]\n        : [];\n    }\n    case 'and':\n      return condition.conditions.flatMap(equalityColumns);\n    default:\n      return [];\n  }\n}\n\nfunction unique(values: string[]): string[] {\n  return [...new Set(values)];\n}\n"],"mappings":";;;;;;;AAmGA,SAAgB,oBACd,OACA,OACA,YACe;CACf,MAAM,2BAAW,IAAI,IAAyB;CAC9C,MAAM,QAAQ;EAAC;EAAU,WAAW;CAAI;CACxC,MAAM,OAAO,MAAM,OAAO,CAAC,GAAG,YAAY,KAAK;CAC/C,MAAM,SAAS,CAAC,GAAG,SAAS,OAAO,CAAC;CACpC,IAAI,MAAM,aAAa,WAAW,OAAO,KAAK,QAAQ,WAAW,MAC/D,OAAO,KAAK;EAAC,MAAM;EAAa;EAAO,MAAM,KAAK,MAAM,IAAI;CAAC,CAAC;CAEhE,OAAO;AACT;;;;;AAYA,SAAS,MACP,OACA,MACA,YACA,OACQ;CACR,MAAM,WAAW,MAAM,KAAK,oBAAoB;CAChD,KAAK,MAAM,cAAc,MAAM,KAAK,aAClC,KAAK,MAAM,UAAU,WAAW,SAAS,GACvC,IAAI,OAAO,MAAM,cAAc,KAAA,GAC7B,MAAM,YAAY;MACb,IAAI,WAAW,OAAO,GAC3B,KAAK,MAAM,WAAW,eACpB,YACA,QACA,OAAO,MACP,OAAO,KAAK,WACZ,MACA,WAAW,IACb,GACE,MAAM,SAAS,IAAI,KAAK,UAAU,OAAO,GAAG,OAAO;CAO3D,IAAI,UAAU;CACd,KAAK,MAAM,CAAC,OAAO,aAAa,OAAO,QAAQ,MAAM,QAAQ,GAC3D,WAAW,MAAM,UAAU,CAAC,GAAG,MAAM,KAAK,GAAG,YAAY,KAAK;CAEhE,MAAM,UACJ,SAAS,UAAU,KAAA,IACf,SAAS,eACT,KAAK,IAAI,SAAS,cAAc,SAAS,KAAK;CACpD,OACE,SAAS,cAAc,SAAS,OAAO,SAAS,UAAU,UAAU;AAExE;AAEA,UAAU,eACR,YACA,QACA,MACA,WACA,MACA,SACiD;CACjD,MAAM,cAAc,OAAO,KAAK,OAAO,cAAc,CAAC,CAAC;CACvD,MAAM,UAAU,OAAO,CAAC,GAAG,aAAa,GAAG,gBAAgB,OAAO,OAAO,CAAC,CAAC;CAC3E,MAAM,OAAkB;EACtB,OAAO,WAAW;EAClB;EACA,QAAQ,YAAY,SAAS;EAC7B,gBAAgB,OAAO,CACrB,GAAG,SACH,GAAG,WAAW,KAAK,KAAK,CAAC,YAAY,MAAM,CAC7C,CAAC;CACH;CAKA,IACE,KAAK,WAAW,UAChB,QAAQ,SAAS,MAChB,KAAK,UAAU,WAAW,UAAU,KAAA,MACrC,aAAa,SAEb,MAAM;EAAC,MAAM;EAAiB,GAAG;EAAM;EAAS,MAAM;CAAS;CAGjE,IAAI,KAAK,SAAS,UAAU,OAAO,QAAQ,SACzC,MAAM;EACJ,MAAM;EACN,GAAG;EACH,SAAS,WAAW;EACpB,MAAM,KAAK,MAAM,OAAO,IAAI;CAC9B;AAEJ;;;;;AAMA,SAAS,gBAAgB,WAA4C;CACnE,QAAQ,WAAW,MAAnB;EACE,KAAK,UAAU;GACb,MAAM,EAAC,MAAM,OAAM;GACnB,QAAQ,OAAO,OAAO,OAAO,QAAQ,OAAO,SAC1C,KAAK,SAAS,WACZ,CAAC,KAAK,IAAI,IACV,CAAC;EACP;EACA,KAAK,OACH,OAAO,UAAU,WAAW,QAAQ,eAAe;EACrD,SACE,OAAO,CAAC;CACZ;AACF;AAEA,SAAS,OAAO,QAA4B;CAC1C,OAAO,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC;AAC5B"}
+{"version":3,"file":"planner-warnings.js","names":[],"sources":["../../../../../zql/src/planner/planner-warnings.ts"],"sourcesContent":["import type {Condition, Ordering} from '../../../zero-protocol/src/ast.ts';\nimport type {Plans} from './planner-builder.ts';\nimport type {\n  AccessPlan,\n  ConnectionAccess,\n  PlannerConnection,\n} from './planner-connection.ts';\n\n/**\n * When the planner reports a {@link PlanWarning}. Each threshold is compared\n * against the cost model's estimates, and 0 disables the warnings it gates.\n */\nexport type PlanWarningThresholds = {\n  /**\n   * The number of rows a single read of a table must scan (for a\n   * {@link MissingIndexWarning}) or sort (for a {@link FullSortWarning}).\n   */\n  readonly rows: number;\n\n  /**\n   * The number of rows the chosen plan must be estimated to process, for a\n   * {@link HighCostWarning}.\n   */\n  readonly cost: number;\n};\n\ntype TableRead = {\n  readonly table: string;\n\n  /**\n   * The aliases of the `related` subqueries leading to the read, starting\n   * from the root query. Empty for the root query and its EXISTS subqueries.\n   */\n  readonly path: readonly string[];\n\n  /**\n   * Whether the read runs once per row of another table, because a join\n   * binds some of its columns, rather than once per query.\n   */\n  readonly perRow: boolean;\n\n  /**\n   * An index that would let the source find the rows it reads and return\n   * them in order: the columns the rows are found by, then the ordering.\n   */\n  readonly suggestedIndex: readonly string[];\n};\n\n/**\n * The rows of a table are found by columns that no index covers, so every\n * read scans the whole table. This is typically a relationship whose foreign\n * key is not indexed.\n */\ntype MissingIndexWarning = TableRead & {\n  readonly type: 'missing-index';\n  /**\n   * The columns the rows are found by: the columns a join binds and the\n   * columns filtered for equality.\n   */\n  readonly columns: readonly string[];\n  /** The rows each read scans. */\n  readonly rows: number;\n};\n\n/**\n * No index returns the rows of a table in the requested order, so every read\n * sorts all of the matching rows before returning the first one. A limit does\n * not reduce the rows read.\n */\ntype FullSortWarning = TableRead & {\n  readonly type: 'full-sort';\n  readonly orderBy: Ordering;\n  /** The estimated number of rows each read sorts. */\n  readonly rows: number;\n};\n\n/**\n * The best plan the planner found is still estimated to process a lot of\n * rows. Only reported when every table the query reads has statistics, since\n * the estimates are guesses otherwise.\n */\ntype HighCostWarning = {\n  readonly type: 'high-cost';\n  readonly table: string;\n  /** The estimated number of rows the plan processes. */\n  readonly cost: number;\n};\n\nexport type PlanWarning =\n  | MissingIndexWarning\n  | FullSortWarning\n  | HighCostWarning;\n\n/**\n * Warns about what the cost model reports the plans in `plans` will do\n * slowly. Call this after planning: it estimates each graph's current plan.\n *\n * @param table The table of the query that `plans` was built for.\n */\nexport function collectPlanWarnings(\n  table: string,\n  plans: Plans,\n  thresholds: PlanWarningThresholds,\n): PlanWarning[] {\n  const warnings = new Map<string, PlanWarning>();\n  const state = {warnings, estimated: true};\n  const cost = visit(plans, [], thresholds, state);\n  const result = [...warnings.values()];\n  if (state.estimated && thresholds.cost > 0 && cost >= thresholds.cost) {\n    result.push({type: 'high-cost', table, cost: Math.round(cost)});\n  }\n  return result;\n}\n\ntype VisitState = {\n  readonly warnings: Map<string, PlanWarning>;\n  /** Whether every access read a table with statistics. */\n  estimated: boolean;\n};\n\n/**\n * Collects the warnings for `plans` and its subplans, and returns the\n * estimated number of rows they process.\n */\nfunction visit(\n  plans: Plans,\n  path: readonly string[],\n  thresholds: PlanWarningThresholds,\n  state: VisitState,\n): number {\n  const estimate = plans.plan.estimateCurrentPlan();\n  for (const connection of plans.plan.connections) {\n    for (const access of connection.accesses()) {\n      if (access.plan?.tableRows === undefined) {\n        state.estimated = false;\n      } else if (thresholds.rows > 0) {\n        for (const warning of accessWarnings(\n          connection,\n          access,\n          access.plan,\n          access.plan.tableRows,\n          path,\n          thresholds.rows,\n        )) {\n          state.warnings.set(JSON.stringify(warning), warning);\n        }\n      }\n    }\n  }\n\n  // A `related` subquery runs once for each row of its parent.\n  let subCost = 0;\n  for (const [alias, subPlans] of Object.entries(plans.subPlans)) {\n    subCost += visit(subPlans, [...path, alias], thresholds, state);\n  }\n  const rowsOut =\n    estimate.limit === undefined\n      ? estimate.returnedRows\n      : Math.min(estimate.returnedRows, estimate.limit);\n  return (\n    estimate.startupCost + estimate.cost + estimate.scanEst + rowsOut * subCost\n  );\n}\n\nfunction* accessWarnings(\n  connection: PlannerConnection,\n  access: ConnectionAccess,\n  plan: AccessPlan,\n  tableRows: number,\n  path: readonly string[],\n  minRows: number,\n): Iterable<MissingIndexWarning | FullSortWarning> {\n  const constrained = Object.keys(access.constraint ?? {});\n  const columns = unique([...constrained, ...equalityColumns(access.filters)]);\n  const read: TableRead = {\n    table: connection.table,\n    path,\n    perRow: constrained.length > 0,\n    suggestedIndex: unique([\n      ...columns,\n      ...connection.sort.map(([column]) => column),\n    ]),\n  };\n\n  // A scan that stops at a limit reads an unknown share of the table, unless\n  // it runs per row: then even a limit of one (an EXISTS) scans the table\n  // for every row that has no match.\n  if (\n    plan.access === 'scan' &&\n    columns.length > 0 &&\n    (read.perRow || connection.limit === undefined) &&\n    tableRows >= minRows\n  ) {\n    yield {type: 'missing-index', ...read, columns, rows: tableRows};\n  }\n\n  if (plan.sort === 'full' && access.rows >= minRows) {\n    yield {\n      type: 'full-sort',\n      ...read,\n      orderBy: connection.sort,\n      rows: Math.round(access.rows),\n    };\n  }\n}\n\n/**\n * The columns that the top-level conjuncts of `condition` compare for\n * equality with a value, which an index lookup can use.\n */\nfunction equalityColumns(condition: Condition | undefined): string[] {\n  switch (condition?.type) {\n    case 'simple': {\n      const {left, op} = condition;\n      return (op === '=' || op === 'IS' || op === 'IN') &&\n        left.type === 'column'\n        ? [left.name]\n        : [];\n    }\n    case 'and':\n      return condition.conditions.flatMap(equalityColumns);\n    default:\n      return [];\n  }\n}\n\nfunction unique(values: string[]): string[] {\n  return [...new Set(values)];\n}\n"],"mappings":";;;;;;;AAmGA,SAAgB,oBACd,OACA,OACA,YACe;CACf,MAAM,2BAAW,IAAI,IAAyB;CAC9C,MAAM,QAAQ;EAAC;EAAU,WAAW;CAAI;CACxC,MAAM,OAAO,MAAM,OAAO,CAAC,GAAG,YAAY,KAAK;CAC/C,MAAM,SAAS,CAAC,GAAG,SAAS,OAAO,CAAC;CACpC,IAAI,MAAM,aAAa,WAAW,OAAO,KAAK,QAAQ,WAAW,MAC/D,OAAO,KAAK;EAAC,MAAM;EAAa;EAAO,MAAM,KAAK,MAAM,IAAI;CAAC,CAAC;CAEhE,OAAO;AACT;;;;;AAYA,SAAS,MACP,OACA,MACA,YACA,OACQ;CACR,MAAM,WAAW,MAAM,KAAK,oBAAoB;CAChD,KAAK,MAAM,cAAc,MAAM,KAAK,aAClC,KAAK,MAAM,UAAU,WAAW,SAAS,GACvC,IAAI,OAAO,MAAM,cAAc,KAAA,GAC7B,MAAM,YAAY;MACb,IAAI,WAAW,OAAO,GAC3B,KAAK,MAAM,WAAW,eACpB,YACA,QACA,OAAO,MACP,OAAO,KAAK,WACZ,MACA,WAAW,IACb,GACE,MAAM,SAAS,IAAI,KAAK,UAAU,OAAO,GAAG,OAAO;CAO3D,IAAI,UAAU;CACd,KAAK,MAAM,CAAC,OAAO,aAAa,OAAO,QAAQ,MAAM,QAAQ,GAC3D,WAAW,MAAM,UAAU,CAAC,GAAG,MAAM,KAAK,GAAG,YAAY,KAAK;CAEhE,MAAM,UACJ,SAAS,UAAU,KAAA,IACf,SAAS,eACT,KAAK,IAAI,SAAS,cAAc,SAAS,KAAK;CACpD,OACE,SAAS,cAAc,SAAS,OAAO,SAAS,UAAU,UAAU;AAExE;AAEA,UAAU,eACR,YACA,QACA,MACA,WACA,MACA,SACiD;CACjD,MAAM,cAAc,OAAO,KAAK,OAAO,cAAc,CAAC,CAAC;CACvD,MAAM,UAAU,OAAO,CAAC,GAAG,aAAa,GAAG,gBAAgB,OAAO,OAAO,CAAC,CAAC;CAC3E,MAAM,OAAkB;EACtB,OAAO,WAAW;EAClB;EACA,QAAQ,YAAY,SAAS;EAC7B,gBAAgB,OAAO,CACrB,GAAG,SACH,GAAG,WAAW,KAAK,KAAK,CAAC,YAAY,MAAM,CAC7C,CAAC;CACH;CAKA,IACE,KAAK,WAAW,UAChB,QAAQ,SAAS,MAChB,KAAK,UAAU,WAAW,UAAU,KAAA,MACrC,aAAa,SAEb,MAAM;EAAC,MAAM;EAAiB,GAAG;EAAM;EAAS,MAAM;CAAS;CAGjE,IAAI,KAAK,SAAS,UAAU,OAAO,QAAQ,SACzC,MAAM;EACJ,MAAM;EACN,GAAG;EACH,SAAS,WAAW;EACpB,MAAM,KAAK,MAAM,OAAO,IAAI;CAC9B;AAEJ;;;;;AAMA,SAAS,gBAAgB,WAA4C;CACnE,QAAQ,WAAW,MAAnB;EACE,KAAK,UAAU;GACb,MAAM,EAAC,MAAM,OAAM;GACnB,QAAQ,OAAO,OAAO,OAAO,QAAQ,OAAO,SAC1C,KAAK,SAAS,WACZ,CAAC,KAAK,IAAI,IACV,CAAC;EACP;EACA,KAAK,OACH,OAAO,UAAU,WAAW,QAAQ,eAAe;EACrD,SACE,OAAO,CAAC;CACZ;AACF;AAEA,SAAS,OAAO,QAA4B;CAC1C,OAAO,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC;AAC5B"}

package/out/zql/src/query/create-builder.js

@@ -14,7 +14,8 @@ function createRunnableBuilder(delegate, schema) {
 	return createBuilderWithQueryFactory(schema, (table) => newRunnableQuery(delegate, schema, table));
 }
 function createBuilderWithQueryFactory(schema, queryFactory) {
-	return recordProxy(Object.assign(Object.create(null), schema.tables), (_tableSchema, prop) => queryFactory(prop));
+	const target = Object.assign(Object.create(null), schema.tables);
+	return recordProxy(target, (_tableSchema, prop) => queryFactory(prop));
 }
 //#endregion
 export { createBuilder, createRunnableBuilder };

package/out/zql/src/query/create-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-builder.js","names":[],"sources":["../../../../../zql/src/query/create-builder.ts"],"sourcesContent":["import {recordProxy} from '../../../shared/src/record-proxy.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {QueryDelegate} from './query-delegate.ts';\nimport {newQuery} from './query-impl.ts';\nimport type {Query} from './query.ts';\nimport {newRunnableQuery} from './runnable-query-impl.ts';\nimport type {ConditionalSchemaQuery, SchemaQuery} from './schema-query.ts';\n\n/**\n * Returns a set of query builders for the given schema.\n */\nexport function createBuilder<S extends Schema>(schema: S): SchemaQuery<S> {\n  return createBuilderWithQueryFactory(schema, table =>\n    newQuery(schema, table),\n  );\n}\n\n/** @deprecated Use {@link createBuilder} with `tx.run(zql.table.where(...))` instead. */\nexport function createRunnableBuilder<S extends Schema>(\n  delegate: QueryDelegate,\n  schema: S,\n): ConditionalSchemaQuery<S> {\n  if (!schema.enableLegacyQueries) {\n    return undefined as ConditionalSchemaQuery<S>;\n  }\n\n  return createBuilderWithQueryFactory(schema, table =>\n    newRunnableQuery(delegate, schema, table),\n  ) as ConditionalSchemaQuery<S>;\n}\n\nfunction createBuilderWithQueryFactory<S extends Schema>(\n  schema: S,\n  queryFactory: (table: keyof S['tables'] & string) => Query<string, S>,\n): SchemaQuery<S> {\n  // Create a target with no prototype so accessing unknown properties returns\n  // undefined instead of inherited Object.prototype methods (e.g., toString).\n  // This fixes React 19 dev mode compatibility where accessing $$typeof should\n  // return undefined rather than throwing.\n  const target = Object.assign(Object.create(null), schema.tables) as Record<\n    string,\n    unknown\n  >;\n\n  // No onMissing handler needed - unknown properties return undefined due to\n  // null prototype, which is the desired behavior for normal JS object semantics.\n  return recordProxy(target, (_tableSchema, prop) =>\n    queryFactory(prop),\n  ) as SchemaQuery<S>;\n}\n"],"mappings":";;;;;;;AAWA,SAAgB,cAAgC,QAA2B;CACzE,OAAO,8BAA8B,SAAQ,UAC3C,SAAS,QAAQ,KAAK,CACxB;AACF;;AAGA,SAAgB,sBACd,UACA,QAC2B;CAC3B,IAAI,CAAC,OAAO,qBACV;CAGF,OAAO,8BAA8B,SAAQ,UAC3C,iBAAiB,UAAU,QAAQ,KAAK,CAC1C;AACF;AAEA,SAAS,8BACP,QACA,cACgB;CAYhB,OAAO,YAPQ,OAAO,OAAO,OAAO,OAAO,IAAI,GAAG,OAAO,MAOtC,IAAS,cAAc,SACxC,aAAa,IAAI,CACnB;AACF"}
+{"version":3,"file":"create-builder.js","names":[],"sources":["../../../../../zql/src/query/create-builder.ts"],"sourcesContent":["import {recordProxy} from '../../../shared/src/record-proxy.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {QueryDelegate} from './query-delegate.ts';\nimport {newQuery} from './query-impl.ts';\nimport type {Query} from './query.ts';\nimport {newRunnableQuery} from './runnable-query-impl.ts';\nimport type {ConditionalSchemaQuery, SchemaQuery} from './schema-query.ts';\n\n/**\n * Returns a set of query builders for the given schema.\n */\nexport function createBuilder<S extends Schema>(schema: S): SchemaQuery<S> {\n  return createBuilderWithQueryFactory(schema, table =>\n    newQuery(schema, table),\n  );\n}\n\n/** @deprecated Use {@link createBuilder} with `tx.run(zql.table.where(...))` instead. */\nexport function createRunnableBuilder<S extends Schema>(\n  delegate: QueryDelegate,\n  schema: S,\n): ConditionalSchemaQuery<S> {\n  if (!schema.enableLegacyQueries) {\n    return undefined as ConditionalSchemaQuery<S>;\n  }\n\n  return createBuilderWithQueryFactory(schema, table =>\n    newRunnableQuery(delegate, schema, table),\n  ) as ConditionalSchemaQuery<S>;\n}\n\nfunction createBuilderWithQueryFactory<S extends Schema>(\n  schema: S,\n  queryFactory: (table: keyof S['tables'] & string) => Query<string, S>,\n): SchemaQuery<S> {\n  // Create a target with no prototype so accessing unknown properties returns\n  // undefined instead of inherited Object.prototype methods (e.g., toString).\n  // This fixes React 19 dev mode compatibility where accessing $$typeof should\n  // return undefined rather than throwing.\n  const target = Object.assign(Object.create(null), schema.tables) as Record<\n    string,\n    unknown\n  >;\n\n  // No onMissing handler needed - unknown properties return undefined due to\n  // null prototype, which is the desired behavior for normal JS object semantics.\n  return recordProxy(target, (_tableSchema, prop) =>\n    queryFactory(prop),\n  ) as SchemaQuery<S>;\n}\n"],"mappings":";;;;;;;AAWA,SAAgB,cAAgC,QAA2B;CACzE,OAAO,8BAA8B,SAAQ,UAC3C,SAAS,QAAQ,KAAK,CACxB;AACF;;AAGA,SAAgB,sBACd,UACA,QAC2B;CAC3B,IAAI,CAAC,OAAO,qBACV;CAGF,OAAO,8BAA8B,SAAQ,UAC3C,iBAAiB,UAAU,QAAQ,KAAK,CAC1C;AACF;AAEA,SAAS,8BACP,QACA,cACgB;CAKhB,MAAM,SAAS,OAAO,OAAO,OAAO,OAAO,IAAI,GAAG,OAAO,MAAM;CAO/D,OAAO,YAAY,SAAS,cAAc,SACxC,aAAa,IAAI,CACnB;AACF"}

package/out/zql/src/query/expression.d.ts

@@ -1,9 +1,40 @@
-import { toStaticParam, type Condition, type LiteralValue, type Parameter, type SimpleOperator } from '../../../zero-protocol/src/ast.ts';
+import { type Aggregate, type AggregateFunction, toStaticParam, type Condition, type JsonPathReference, type LiteralValue, type Parameter, type SimpleOperator } from '../../../zero-protocol/src/ast.ts';
+import type { SchemaValueToTSType } from '../../../zero-types/src/schema-value.ts';
 import type { Schema as ZeroSchema } from '../../../zero-types/src/schema.ts';
-import type { DestTableName, ExistsOptions, GetFilterType, NoCompoundTypeSelector, PullTableSchema, Query } from './query.ts';
+import type { DestTableName, ExistsOptions, GetFilterType, GetJsonLeafFilterType, JsonSelectors, NoCompoundTypeSelector, PullTableSchema, Query, ValidJsonPath, ValueAtPath } from './query.ts';
 export type ParameterReference = {
     [toStaticParam](): Parameter;
 };
+declare const toColumnRef: unique symbol;
+declare const columnRefBrand: unique symbol;
+/**
+ * A reference to a value *inside* a `json()` column, produced by
+ * {@link ExpressionBuilder.json} and accepted by `cmp` in the left position.
+ *
+ * It carries, as phantom type parameters (never present at runtime), the json
+ * column's resolved TypeScript type (`TColumnType`), the path (`P`) and the
+ * table it was built for (`TTable`, so a reference built by one table's
+ * builder is rejected by another table's `cmp`). `json` resolves `TColumnType`
+ * from the schema at the (concrete) call site, so `cmp` walks the path over a
+ * *concrete* type rather than a deferred schema lookup. A deferred path-walk
+ * in `cmp`'s signature is too complex for TypeScript's structural comparison
+ * of `ExpressionBuilder` and breaks it wholesale.
+ */
+export type ColumnRef<TColumnType = unknown, P extends readonly (string | number)[] = readonly (string | number)[], TTable extends string = string> = {
+    [toColumnRef](): JsonPathReference;
+    [columnRefBrand]?(brand: [TColumnType, P, TTable]): void;
+};
+/**
+ * The callback form of an aggregate's argument: picks a scalar leaf inside a
+ * `json()` column, e.g. `c.sum(({json}) => json('metadata', 'points'))`.
+ */
+export type JsonAggregateSelector = (builder: any) => unknown;
+/**
+ * Builds the AST aggregate for `fn` over `selector`: nothing for `count`, a
+ * column name, or a {@link JsonAggregateSelector} picking a leaf inside a
+ * `json()` column.
+ */
+export declare function aggregateFromSelector(fn: AggregateFunction, selector: string | JsonAggregateSelector | undefined): Aggregate;
 /**
  * A factory function that creates a condition. This is used to create
  * complex conditions that can be passed to the `where` method of a query.
@@ -29,6 +60,21 @@ export declare class ExpressionBuilder<TTable extends keyof TSchema['tables'] &
     get eb(): this;
     cmp<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>, TOperator extends SimpleOperator>(field: TSelector, op: TOperator, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator> | ParameterReference | undefined): Condition;
     cmp<TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>>(field: TSelector, value: GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='> | ParameterReference | undefined): Condition;
+    cmp<TColumnType, const P extends readonly (string | number)[], TOperator extends SimpleOperator>(ref: ColumnRef<TColumnType, P, TTable>, op: TOperator, value: GetJsonLeafFilterType<ValueAtPath<TColumnType, P>, TOperator> | ParameterReference | undefined): Condition;
+    cmp<TColumnType, const P extends readonly (string | number)[]>(ref: ColumnRef<TColumnType, P, TTable>, value: GetJsonLeafFilterType<ValueAtPath<TColumnType, P>, '='> | ParameterReference | undefined): Condition;
+    /**
+     * References a value inside a `json()` column for use in `cmp`. Path
+     * segments are object keys or array indices, applied left-to-right; at least
+     * one segment is required, since a whole JSON column is never a comparison
+     * operand (only scalar leaves can be compared).
+     *
+     * @example
+     * ```ts
+     * z.query.issue.where(({cmp, json}) =>
+     *   cmp(json('metadata', 'priority'), '=', 'high'));
+     * ```
+     */
+    json<TColumn extends JsonSelectors<PullTableSchema<TTable, TSchema>> & string, const P extends readonly [string | number, ...(string | number)[]]>(column: TColumn, ...path: P & ValidJsonPath<SchemaValueToTSType<PullTableSchema<TTable, TSchema>['columns'][TColumn]>, P>): ColumnRef<SchemaValueToTSType<PullTableSchema<TTable, TSchema>['columns'][TColumn]>, P, TTable>;
     cmpLit(left: ParameterReference | LiteralValue | undefined, op: SimpleOperator, right: ParameterReference | LiteralValue | undefined): Condition;
     and: typeof and;
     or: typeof or;
@@ -38,28 +84,7 @@ export declare class ExpressionBuilder<TTable extends keyof TSchema['tables'] &
 export declare function and(...conditions: (Condition | undefined)[]): Condition;
 export declare function or(...conditions: (Condition | undefined)[]): Condition;
 export declare function not(expression: Condition): Condition;
-export declare function cmp(field: string, opOrValue: SimpleOperator | ParameterReference | LiteralValue | undefined, value?: ParameterReference | LiteralValue): Condition;
-export declare const TRUE: Condition;
+export declare function cmp(field: string | ColumnRef, opOrValue: SimpleOperator | ParameterReference | LiteralValue | undefined, value?: ParameterReference | LiteralValue): Condition;
 export declare function simplifyCondition(c: Condition): Condition;
-export declare function flatten(type: 'and' | 'or', conditions: readonly Condition[]): Condition[];
-declare const negateOperatorMap: {
-    readonly "=": '!=';
-    readonly "!=": '=';
-    readonly "<": '>=';
-    readonly ">": '<=';
-    readonly ">=": '<';
-    readonly "<=": '>';
-    readonly IN: 'NOT IN';
-    readonly "NOT IN": 'IN';
-    readonly LIKE: 'NOT LIKE';
-    readonly "NOT LIKE": 'LIKE';
-    readonly ILIKE: 'NOT ILIKE';
-    readonly "NOT ILIKE": 'ILIKE';
-    readonly IS: 'IS NOT';
-    readonly "IS NOT": 'IS';
-    readonly EXISTS: 'NOT EXISTS';
-    readonly "NOT EXISTS": 'EXISTS';
-};
-export declare function negateOperator<OP extends keyof typeof negateOperatorMap>(op: OP): (typeof negateOperatorMap)[OP];
 export {};
 //# sourceMappingURL=expression.d.ts.map

package/out/zql/src/query/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/expression.ts"],"names":[],"mappings":"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"}

package/out/zql/src/query/expression.js

@@ -1,6 +1,43 @@
 import { must } from "../../../shared/src/must.js";
-import { toStaticParam } from "../../../zero-protocol/src/ast.js";
+import { MAX_JSON_PATH_INDEX, isHomogeneousList, isValidJsonPathIndex, toStaticParam } from "../../../zero-protocol/src/ast.js";
 //#region ../zql/src/query/expression.ts
+var toColumnRef = Symbol();
+function isColumnRef(v) {
+	return typeof v === "object" && v !== null && toColumnRef in v;
+}
+function makeColumnRef(name, path) {
+	if (path.length === 0) throw new Error(`json('${name}') requires at least one path segment`);
+	for (const seg of path) if (typeof seg === "number" && !isValidJsonPathIndex(seg)) throw new Error(`Invalid JSON path segment ${seg} in json('${name}', ...): a numeric segment is an array index and must be a non-negative integer no larger than ${MAX_JSON_PATH_INDEX}`);
+	const ref = {
+		type: "json",
+		value: {
+			type: "column",
+			name
+		},
+		path
+	};
+	return { [toColumnRef]: () => ref };
+}
+var jsonAggregateBuilder = { json: (column, ...path) => makeColumnRef(column, path) };
+/**
+* Builds the AST aggregate for `fn` over `selector`: nothing for `count`, a
+* column name, or a {@link JsonAggregateSelector} picking a leaf inside a
+* `json()` column.
+*/
+function aggregateFromSelector(fn, selector) {
+	if (typeof selector !== "function") return {
+		fn,
+		field: selector
+	};
+	const ref = selector(jsonAggregateBuilder);
+	if (!isColumnRef(ref)) throw new Error(`${fn}() expects the callback to return json(...)`);
+	const { value, path } = ref[toColumnRef]();
+	return {
+		fn,
+		field: value.name,
+		path
+	};
+}
 var ExpressionBuilder = class {
 	#exists;
 	constructor(exists) {
@@ -10,9 +47,24 @@ var ExpressionBuilder = class {
 	get eb() {
 		return this;
 	}
-	cmp(field, opOrValue, value) {
-		if (arguments.length === 2) return cmp(field, opOrValue);
-		return cmp(field, opOrValue, value);
+	cmp(field, ...args) {
+		if (args.length === 1) return cmp(field, args[0]);
+		return cmp(field, args[0], args[1]);
+	}
+	/**
+	* References a value inside a `json()` column for use in `cmp`. Path
+	* segments are object keys or array indices, applied left-to-right; at least
+	* one segment is required, since a whole JSON column is never a comparison
+	* operand (only scalar leaves can be compared).
+	*
+	* @example
+	* ```ts
+	* z.query.issue.where(({cmp, json}) =>
+	*   cmp(json('metadata', 'priority'), '=', 'high'));
+	* ```
+	*/
+	json(column, ...path) {
+		return makeColumnRef(column, path);
 	}
 	cmpLit(left, op, right) {
 		return {
@@ -86,9 +138,13 @@ function cmp(field, opOrValue, value) {
 		op = opOrValue;
 		actualValue = value;
 	}
+	if (isColumnRef(actualValue)) throw new Error("A json() reference is only valid as the left operand of cmp()");
+	if (isColumnRef(field) && (op === "IN" || op === "NOT IN") && Array.isArray(actualValue)) {
+		if (!isHomogeneousList(actualValue)) throw new Error(`${op} against a JSON path requires a list of values of one type`);
+	}
 	return {
 		type: "simple",
-		left: {
+		left: isColumnRef(field) ? field[toColumnRef]() : {
 			type: "column",
 			name: field
 		},
@@ -164,6 +220,6 @@ function filterFalse(conditions) {
 	return conditions.filter((c) => !isAlwaysFalse(c));
 }
 //#endregion
-export { ExpressionBuilder, and, cmp, simplifyCondition };
+export { ExpressionBuilder, aggregateFromSelector, and, cmp, not, or, simplifyCondition };
 
 //# sourceMappingURL=expression.js.map

package/out/zql/src/query/expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"expression.js","names":["#exists"],"sources":["../../../../../zql/src/query/expression.ts"],"sourcesContent":["/* oxlint-disable @typescript-eslint/no-explicit-any */\nimport {must} from '../../../shared/src/must.ts';\nimport {\n  toStaticParam,\n  type Condition,\n  type LiteralValue,\n  type Parameter,\n  type SimpleOperator,\n} from '../../../zero-protocol/src/ast.ts';\nimport type {Schema as ZeroSchema} from '../../../zero-types/src/schema.ts';\nimport type {\n  DestTableName,\n  ExistsOptions,\n  GetFilterType,\n  NoCompoundTypeSelector,\n  PullTableSchema,\n  Query,\n} from './query.ts';\n\nexport type ParameterReference = {\n  [toStaticParam](): Parameter;\n};\n\n/**\n * A factory function that creates a condition. This is used to create\n * complex conditions that can be passed to the `where` method of a query.\n *\n * @example\n *\n * ```ts\n * const condition: ExpressionFactory<User> = ({and, cmp, or}) =>\n *   and(\n *     cmp('name', '=', 'Alice'),\n *     or(cmp('age', '>', 18), cmp('isStudent', '=', true)),\n *   );\n *\n * const query = z.query.user.where(condition);\n * ```\n */\nexport interface ExpressionFactory<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends ZeroSchema,\n> {\n  (eb: ExpressionBuilder<TTable, TSchema>): Condition;\n}\n\nexport class ExpressionBuilder<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends ZeroSchema,\n> {\n  readonly #exists: (\n    relationship: string,\n    cb?: (query: Query<TTable, TSchema>) => Query<TTable, TSchema, any>,\n    options?: ExistsOptions,\n  ) => Condition;\n\n  constructor(\n    exists: (\n      relationship: string,\n      cb?: (query: Query<TTable, TSchema>) => Query<TTable, TSchema, any>,\n      options?: ExistsOptions,\n    ) => Condition,\n  ) {\n    this.#exists = exists;\n    this.exists = this.exists.bind(this);\n  }\n\n  get eb() {\n    return this;\n  }\n\n  cmp<\n    TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>,\n    TOperator extends SimpleOperator,\n  >(\n    field: TSelector,\n    op: TOperator,\n    value:\n      | GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  cmp<\n    TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>,\n  >(\n    field: TSelector,\n    value:\n      | GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  cmp(\n    field: string,\n    opOrValue: SimpleOperator | ParameterReference | LiteralValue | undefined,\n    value?: ParameterReference | LiteralValue,\n  ): Condition {\n    if (arguments.length === 2) {\n      return cmp(field, opOrValue);\n    }\n    return cmp(field, opOrValue, value);\n  }\n\n  cmpLit(\n    left: ParameterReference | LiteralValue | undefined,\n    op: SimpleOperator,\n    right: ParameterReference | LiteralValue | undefined,\n  ): Condition {\n    return {\n      type: 'simple',\n      left: isParameterReference(left)\n        ? left[toStaticParam]()\n        : {type: 'literal', value: left ?? null},\n      right: isParameterReference(right)\n        ? right[toStaticParam]()\n        : {type: 'literal', value: right ?? null},\n      op,\n    };\n  }\n\n  and = and;\n  or = or;\n  not = not;\n\n  // The relationship names are inline for the reason given on `Query.related`.\n  exists = <\n    TRelationship extends keyof TSchema['relationships'][TTable] & string,\n  >(\n    relationship: TRelationship,\n    cb?: (\n      query: Query<DestTableName<TTable, TSchema, TRelationship>, TSchema>,\n    ) => Query<any, TSchema>,\n    options?: ExistsOptions,\n  ): Condition => this.#exists(relationship, cb, options);\n}\n\nexport function and(...conditions: (Condition | undefined)[]): Condition {\n  const expressions = filterTrue(filterUndefined(conditions));\n\n  if (expressions.length === 1) {\n    return expressions[0];\n  }\n\n  if (expressions.some(isAlwaysFalse)) {\n    return FALSE;\n  }\n\n  return {type: 'and', conditions: expressions};\n}\n\nexport function or(...conditions: (Condition | undefined)[]): Condition {\n  const expressions = filterFalse(filterUndefined(conditions));\n\n  if (expressions.length === 1) {\n    return expressions[0];\n  }\n\n  if (expressions.some(isAlwaysTrue)) {\n    return TRUE;\n  }\n\n  return {type: 'or', conditions: expressions};\n}\n\nexport function not(expression: Condition): Condition {\n  switch (expression.type) {\n    case 'and':\n      return {\n        type: 'or',\n        conditions: expression.conditions.map(not),\n      };\n    case 'or':\n      return {\n        type: 'and',\n        conditions: expression.conditions.map(not),\n      };\n    case 'correlatedSubquery':\n      return {\n        type: 'correlatedSubquery',\n        related: expression.related,\n        op: negateOperator(expression.op),\n        ...(expression.flip !== undefined ? {flip: expression.flip} : {}),\n        ...(expression.scalar !== undefined ? {scalar: expression.scalar} : {}),\n      };\n    case 'simple':\n      return {\n        type: 'simple',\n        op: negateOperator(expression.op),\n        left: expression.left,\n        right: expression.right,\n      };\n  }\n}\n\nexport function cmp(\n  field: string,\n  opOrValue: SimpleOperator | ParameterReference | LiteralValue | undefined,\n  value?: ParameterReference | LiteralValue,\n): Condition {\n  let op: SimpleOperator;\n  let actualValue: ParameterReference | LiteralValue | undefined;\n\n  if (arguments.length === 2) {\n    // 2-arg form: cmp(field, value) - defaults to '=' operator\n    actualValue = opOrValue as ParameterReference | LiteralValue | undefined;\n    op = '=';\n  } else {\n    // 3-arg form: cmp(field, op, value)\n    op = opOrValue as SimpleOperator;\n    actualValue = value;\n  }\n\n  return {\n    type: 'simple',\n    left: {type: 'column', name: field},\n    right: isParameterReference(actualValue)\n      ? actualValue[toStaticParam]()\n      : {type: 'literal', value: actualValue ?? null},\n    op,\n  };\n}\n\nfunction isParameterReference(\n  value: ParameterReference | LiteralValue | null | undefined,\n): value is ParameterReference {\n  return (\n    value !== null &&\n    value !== undefined &&\n    typeof value === 'object' &&\n    (value as any)[toStaticParam]\n  );\n}\n\nexport const TRUE: Condition = {\n  type: 'and',\n  conditions: [],\n};\n\nconst FALSE: Condition = {\n  type: 'or',\n  conditions: [],\n};\n\nfunction isAlwaysTrue(condition: Condition): boolean {\n  return condition.type === 'and' && condition.conditions.length === 0;\n}\n\nfunction isAlwaysFalse(condition: Condition): boolean {\n  return condition.type === 'or' && condition.conditions.length === 0;\n}\n\nexport function simplifyCondition(c: Condition): Condition {\n  if (c.type === 'simple' || c.type === 'correlatedSubquery') {\n    return c;\n  }\n  if (c.conditions.length === 1) {\n    return simplifyCondition(c.conditions[0]);\n  }\n  const conditions = flatten(c.type, c.conditions.map(simplifyCondition));\n  if (c.type === 'and' && conditions.some(isAlwaysFalse)) {\n    return FALSE;\n  }\n  if (c.type === 'or' && conditions.some(isAlwaysTrue)) {\n    return TRUE;\n  }\n  return {\n    type: c.type,\n    conditions,\n  };\n}\n\nexport function flatten(\n  type: 'and' | 'or',\n  conditions: readonly Condition[],\n): Condition[] {\n  const flattened: Condition[] = [];\n  for (const c of conditions) {\n    if (c.type === type) {\n      flattened.push(...c.conditions);\n    } else {\n      flattened.push(c);\n    }\n  }\n\n  return flattened;\n}\n\nconst negateSimpleOperatorMap = {\n  ['=']: '!=',\n  ['!=']: '=',\n  ['<']: '>=',\n  ['>']: '<=',\n  ['>=']: '<',\n  ['<=']: '>',\n  ['IN']: 'NOT IN',\n  ['NOT IN']: 'IN',\n  ['LIKE']: 'NOT LIKE',\n  ['NOT LIKE']: 'LIKE',\n  ['ILIKE']: 'NOT ILIKE',\n  ['NOT ILIKE']: 'ILIKE',\n  ['IS']: 'IS NOT',\n  ['IS NOT']: 'IS',\n} as const;\n\nconst negateOperatorMap = {\n  ...negateSimpleOperatorMap,\n  ['EXISTS']: 'NOT EXISTS',\n  ['NOT EXISTS']: 'EXISTS',\n} as const;\n\nexport function negateOperator<OP extends keyof typeof negateOperatorMap>(\n  op: OP,\n): (typeof negateOperatorMap)[OP] {\n  return must(negateOperatorMap[op]);\n}\n\nfunction filterUndefined<T>(array: (T | undefined)[]): T[] {\n  return array.filter(e => e !== undefined);\n}\n\nfunction filterTrue(conditions: Condition[]): Condition[] {\n  return conditions.filter(c => !isAlwaysTrue(c));\n}\n\nfunction filterFalse(conditions: Condition[]): Condition[] {\n  return conditions.filter(c => !isAlwaysFalse(c));\n}\n"],"mappings":"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"}
+{"version":3,"file":"expression.js","names":[],"sources":["../../../../../zql/src/query/expression.ts"],"sourcesContent":["/* oxlint-disable @typescript-eslint/no-explicit-any */\nimport {must} from '../../../shared/src/must.ts';\nimport {\n  type Aggregate,\n  type AggregateFunction,\n  isHomogeneousList,\n  isValidJsonPathIndex,\n  MAX_JSON_PATH_INDEX,\n  toStaticParam,\n  type ColumnReference,\n  type Condition,\n  type JsonPathReference,\n  type LiteralValue,\n  type Parameter,\n  type SimpleOperator,\n} from '../../../zero-protocol/src/ast.ts';\nimport type {SchemaValueToTSType} from '../../../zero-types/src/schema-value.ts';\nimport type {Schema as ZeroSchema} from '../../../zero-types/src/schema.ts';\nimport type {\n  DestTableName,\n  ExistsOptions,\n  GetFilterType,\n  GetJsonLeafFilterType,\n  JsonSelectors,\n  NoCompoundTypeSelector,\n  PullTableSchema,\n  Query,\n  ValidJsonPath,\n  ValueAtPath,\n} from './query.ts';\n\nexport type ParameterReference = {\n  [toStaticParam](): Parameter;\n};\n\nconst toColumnRef = Symbol();\ndeclare const columnRefBrand: unique symbol;\n\n/**\n * A reference to a value *inside* a `json()` column, produced by\n * {@link ExpressionBuilder.json} and accepted by `cmp` in the left position.\n *\n * It carries, as phantom type parameters (never present at runtime), the json\n * column's resolved TypeScript type (`TColumnType`), the path (`P`) and the\n * table it was built for (`TTable`, so a reference built by one table's\n * builder is rejected by another table's `cmp`). `json` resolves `TColumnType`\n * from the schema at the (concrete) call site, so `cmp` walks the path over a\n * *concrete* type rather than a deferred schema lookup. A deferred path-walk\n * in `cmp`'s signature is too complex for TypeScript's structural comparison\n * of `ExpressionBuilder` and breaks it wholesale.\n */\nexport type ColumnRef<\n  TColumnType = unknown,\n  P extends readonly (string | number)[] = readonly (string | number)[],\n  TTable extends string = string,\n> = {\n  [toColumnRef](): JsonPathReference;\n  // Phantom brand. Declared as a *method* (not a property) so the type\n  // parameters are bivariant: `json`'s return type embeds a schema-derived\n  // `TColumnType`, and a covariant brand would make a concrete-schema\n  // `ColumnRef` unassignable to a generic-schema one, breaking\n  // `ExpressionBuilder` assignability across the query builder. `cmp` still\n  // infers `TColumnType`/`P`/`TTable` from this position.\n  [columnRefBrand]?(brand: [TColumnType, P, TTable]): void;\n};\n\nfunction isColumnRef(v: unknown): v is ColumnRef {\n  return typeof v === 'object' && v !== null && toColumnRef in v;\n}\n\nfunction makeColumnRef(\n  name: string,\n  path: readonly (string | number)[],\n): ColumnRef {\n  // `json()` requires at least one segment (enforced by its type): a whole JSON\n  // column is never a comparison operand.\n  if (path.length === 0) {\n    throw new Error(`json('${name}') requires at least one path segment`);\n  }\n  for (const seg of path) {\n    if (typeof seg === 'number' && !isValidJsonPathIndex(seg)) {\n      throw new Error(\n        `Invalid JSON path segment ${seg} in json('${name}', ...): a numeric ` +\n          'segment is an array index and must be a non-negative integer ' +\n          `no larger than ${MAX_JSON_PATH_INDEX}`,\n      );\n    }\n  }\n  const column: ColumnReference = {type: 'column', name};\n  const ref: JsonPathReference = {type: 'json', value: column, path};\n  return {[toColumnRef]: () => ref};\n}\n\n/**\n * The callback form of an aggregate's argument: picks a scalar leaf inside a\n * `json()` column, e.g. `c.sum(({json}) => json('metadata', 'points'))`.\n */\n// Loosely typed: the public signatures (see `Query.sum`) type the builder and\n// the leaf; this is what the implementation accepts, checked at runtime.\nexport type JsonAggregateSelector = (builder: any) => unknown;\n\nconst jsonAggregateBuilder = {\n  json: (column: string, ...path: (string | number)[]) =>\n    makeColumnRef(column, path),\n};\n\n/**\n * Builds the AST aggregate for `fn` over `selector`: nothing for `count`, a\n * column name, or a {@link JsonAggregateSelector} picking a leaf inside a\n * `json()` column.\n */\nexport function aggregateFromSelector(\n  fn: AggregateFunction,\n  selector: string | JsonAggregateSelector | undefined,\n): Aggregate {\n  if (typeof selector !== 'function') {\n    return {fn, field: selector};\n  }\n  const ref = selector(jsonAggregateBuilder);\n  if (!isColumnRef(ref)) {\n    throw new Error(`${fn}() expects the callback to return json(...)`);\n  }\n  const {value, path} = ref[toColumnRef]();\n  return {fn, field: value.name, path};\n}\n\n/**\n * A factory function that creates a condition. This is used to create\n * complex conditions that can be passed to the `where` method of a query.\n *\n * @example\n *\n * ```ts\n * const condition: ExpressionFactory<User> = ({and, cmp, or}) =>\n *   and(\n *     cmp('name', '=', 'Alice'),\n *     or(cmp('age', '>', 18), cmp('isStudent', '=', true)),\n *   );\n *\n * const query = z.query.user.where(condition);\n * ```\n */\nexport interface ExpressionFactory<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends ZeroSchema,\n> {\n  (eb: ExpressionBuilder<TTable, TSchema>): Condition;\n}\n\nexport class ExpressionBuilder<\n  TTable extends keyof TSchema['tables'] & string,\n  TSchema extends ZeroSchema,\n> {\n  readonly #exists: (\n    relationship: string,\n    cb?: (query: Query<TTable, TSchema>) => Query<TTable, TSchema, any>,\n    options?: ExistsOptions,\n  ) => Condition;\n\n  constructor(\n    exists: (\n      relationship: string,\n      cb?: (query: Query<TTable, TSchema>) => Query<TTable, TSchema, any>,\n      options?: ExistsOptions,\n    ) => Condition,\n  ) {\n    this.#exists = exists;\n    this.exists = this.exists.bind(this);\n  }\n\n  get eb() {\n    return this;\n  }\n\n  cmp<\n    TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>,\n    TOperator extends SimpleOperator,\n  >(\n    field: TSelector,\n    op: TOperator,\n    value:\n      | GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, TOperator>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  cmp<\n    TSelector extends NoCompoundTypeSelector<PullTableSchema<TTable, TSchema>>,\n  >(\n    field: TSelector,\n    value:\n      | GetFilterType<PullTableSchema<TTable, TSchema>, TSelector, '='>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  cmp<\n    TColumnType,\n    const P extends readonly (string | number)[],\n    TOperator extends SimpleOperator,\n  >(\n    ref: ColumnRef<TColumnType, P, TTable>,\n    op: TOperator,\n    value:\n      | GetJsonLeafFilterType<ValueAtPath<TColumnType, P>, TOperator>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  cmp<TColumnType, const P extends readonly (string | number)[]>(\n    ref: ColumnRef<TColumnType, P, TTable>,\n    value:\n      | GetJsonLeafFilterType<ValueAtPath<TColumnType, P>, '='>\n      | ParameterReference\n      | undefined,\n  ): Condition;\n  // Implementation signature, intentionally loose. The typed contract is\n  // defined by the overloads above; this only needs to subsume them.\n  cmp(field: string | ColumnRef, ...args: any[]): Condition {\n    if (args.length === 1) {\n      return cmp(field, args[0]);\n    }\n    return cmp(field, args[0], args[1]);\n  }\n\n  /**\n   * References a value inside a `json()` column for use in `cmp`. Path\n   * segments are object keys or array indices, applied left-to-right; at least\n   * one segment is required, since a whole JSON column is never a comparison\n   * operand (only scalar leaves can be compared).\n   *\n   * @example\n   * ```ts\n   * z.query.issue.where(({cmp, json}) =>\n   *   cmp(json('metadata', 'priority'), '=', 'high'));\n   * ```\n   */\n  json<\n    TColumn extends JsonSelectors<PullTableSchema<TTable, TSchema>> & string,\n    const P extends readonly [string | number, ...(string | number)[]],\n  >(\n    column: TColumn,\n    // `P` is inferred from the args; intersecting with `ValidJsonPath` rejects\n    // an out-of-shape segment at its position (and drives autocomplete).\n    ...path: P &\n      ValidJsonPath<\n        SchemaValueToTSType<\n          PullTableSchema<TTable, TSchema>['columns'][TColumn]\n        >,\n        P\n      >\n  ): ColumnRef<\n    SchemaValueToTSType<PullTableSchema<TTable, TSchema>['columns'][TColumn]>,\n    P,\n    TTable\n  > {\n    return makeColumnRef(column, path) as ColumnRef<\n      SchemaValueToTSType<PullTableSchema<TTable, TSchema>['columns'][TColumn]>,\n      P,\n      TTable\n    >;\n  }\n\n  cmpLit(\n    left: ParameterReference | LiteralValue | undefined,\n    op: SimpleOperator,\n    right: ParameterReference | LiteralValue | undefined,\n  ): Condition {\n    return {\n      type: 'simple',\n      left: isParameterReference(left)\n        ? left[toStaticParam]()\n        : {type: 'literal', value: left ?? null},\n      right: isParameterReference(right)\n        ? right[toStaticParam]()\n        : {type: 'literal', value: right ?? null},\n      op,\n    };\n  }\n\n  and = and;\n  or = or;\n  not = not;\n\n  // The relationship names are inline for the reason given on `Query.related`.\n  exists = <\n    TRelationship extends keyof TSchema['relationships'][TTable] & string,\n  >(\n    relationship: TRelationship,\n    cb?: (\n      query: Query<DestTableName<TTable, TSchema, TRelationship>, TSchema>,\n    ) => Query<any, TSchema>,\n    options?: ExistsOptions,\n  ): Condition => this.#exists(relationship, cb, options);\n}\n\nexport function and(...conditions: (Condition | undefined)[]): Condition {\n  const expressions = filterTrue(filterUndefined(conditions));\n\n  if (expressions.length === 1) {\n    return expressions[0];\n  }\n\n  if (expressions.some(isAlwaysFalse)) {\n    return FALSE;\n  }\n\n  return {type: 'and', conditions: expressions};\n}\n\nexport function or(...conditions: (Condition | undefined)[]): Condition {\n  const expressions = filterFalse(filterUndefined(conditions));\n\n  if (expressions.length === 1) {\n    return expressions[0];\n  }\n\n  if (expressions.some(isAlwaysTrue)) {\n    return TRUE;\n  }\n\n  return {type: 'or', conditions: expressions};\n}\n\nexport function not(expression: Condition): Condition {\n  switch (expression.type) {\n    case 'and':\n      return {\n        type: 'or',\n        conditions: expression.conditions.map(not),\n      };\n    case 'or':\n      return {\n        type: 'and',\n        conditions: expression.conditions.map(not),\n      };\n    case 'correlatedSubquery':\n      return {\n        type: 'correlatedSubquery',\n        related: expression.related,\n        op: negateOperator(expression.op),\n        ...(expression.flip !== undefined ? {flip: expression.flip} : {}),\n        ...(expression.scalar !== undefined ? {scalar: expression.scalar} : {}),\n      };\n    case 'simple':\n      return {\n        type: 'simple',\n        op: negateOperator(expression.op),\n        left: expression.left,\n        right: expression.right,\n      };\n  }\n}\n\nexport function cmp(\n  field: string | ColumnRef,\n  opOrValue: SimpleOperator | ParameterReference | LiteralValue | undefined,\n  value?: ParameterReference | LiteralValue,\n): Condition {\n  let op: SimpleOperator;\n  let actualValue: ParameterReference | LiteralValue | undefined;\n\n  if (arguments.length === 2) {\n    // 2-arg form: cmp(field, value) - defaults to '=' operator\n    actualValue = opOrValue as ParameterReference | LiteralValue | undefined;\n    op = '=';\n  } else {\n    // 3-arg form: cmp(field, op, value)\n    op = opOrValue as SimpleOperator;\n    actualValue = value;\n  }\n\n  if (isColumnRef(actualValue)) {\n    // Without this the reference would be wrapped as a literal `{}`: an\n    // always-false predicate on the client and a wire rejection on the server.\n    throw new Error(\n      'A json() reference is only valid as the left operand of cmp()',\n    );\n  }\n  if (\n    isColumnRef(field) &&\n    (op === 'IN' || op === 'NOT IN') &&\n    Array.isArray(actualValue)\n  ) {\n    // The engines compare a JSON leaf against the type of the list's first\n    // element (see jsonLiteralType); a mixed list has no consistent meaning.\n    if (!isHomogeneousList(actualValue)) {\n      throw new Error(\n        `${op} against a JSON path requires a list of values of one type`,\n      );\n    }\n  }\n\n  return {\n    type: 'simple',\n    left: isColumnRef(field)\n      ? field[toColumnRef]()\n      : {type: 'column', name: field},\n    right: isParameterReference(actualValue)\n      ? actualValue[toStaticParam]()\n      : {type: 'literal', value: actualValue ?? null},\n    op,\n  };\n}\n\nfunction isParameterReference(\n  value: ParameterReference | LiteralValue | null | undefined,\n): value is ParameterReference {\n  return (\n    value !== null &&\n    value !== undefined &&\n    typeof value === 'object' &&\n    (value as any)[toStaticParam]\n  );\n}\n\nconst TRUE: Condition = {\n  type: 'and',\n  conditions: [],\n};\n\nconst FALSE: Condition = {\n  type: 'or',\n  conditions: [],\n};\n\nfunction isAlwaysTrue(condition: Condition): boolean {\n  return condition.type === 'and' && condition.conditions.length === 0;\n}\n\nfunction isAlwaysFalse(condition: Condition): boolean {\n  return condition.type === 'or' && condition.conditions.length === 0;\n}\n\nexport function simplifyCondition(c: Condition): Condition {\n  if (c.type === 'simple' || c.type === 'correlatedSubquery') {\n    return c;\n  }\n  if (c.conditions.length === 1) {\n    return simplifyCondition(c.conditions[0]);\n  }\n  const conditions = flatten(c.type, c.conditions.map(simplifyCondition));\n  if (c.type === 'and' && conditions.some(isAlwaysFalse)) {\n    return FALSE;\n  }\n  if (c.type === 'or' && conditions.some(isAlwaysTrue)) {\n    return TRUE;\n  }\n  return {\n    type: c.type,\n    conditions,\n  };\n}\n\nfunction flatten(\n  type: 'and' | 'or',\n  conditions: readonly Condition[],\n): Condition[] {\n  const flattened: Condition[] = [];\n  for (const c of conditions) {\n    if (c.type === type) {\n      flattened.push(...c.conditions);\n    } else {\n      flattened.push(c);\n    }\n  }\n\n  return flattened;\n}\n\nconst negateSimpleOperatorMap = {\n  ['=']: '!=',\n  ['!=']: '=',\n  ['<']: '>=',\n  ['>']: '<=',\n  ['>=']: '<',\n  ['<=']: '>',\n  ['IN']: 'NOT IN',\n  ['NOT IN']: 'IN',\n  ['LIKE']: 'NOT LIKE',\n  ['NOT LIKE']: 'LIKE',\n  ['ILIKE']: 'NOT ILIKE',\n  ['NOT ILIKE']: 'ILIKE',\n  ['IS']: 'IS NOT',\n  ['IS NOT']: 'IS',\n} as const;\n\nconst negateOperatorMap = {\n  ...negateSimpleOperatorMap,\n  ['EXISTS']: 'NOT EXISTS',\n  ['NOT EXISTS']: 'EXISTS',\n} as const;\n\nfunction negateOperator<OP extends keyof typeof negateOperatorMap>(\n  op: OP,\n): (typeof negateOperatorMap)[OP] {\n  return must(negateOperatorMap[op]);\n}\n\nfunction filterUndefined<T>(array: (T | undefined)[]): T[] {\n  return array.filter(e => e !== undefined);\n}\n\nfunction filterTrue(conditions: Condition[]): Condition[] {\n  return conditions.filter(c => !isAlwaysTrue(c));\n}\n\nfunction filterFalse(conditions: Condition[]): Condition[] {\n  return conditions.filter(c => !isAlwaysFalse(c));\n}\n"],"mappings":"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"}

package/out/zql/src/query/measure-push-operator.js

@@ -1,5 +1,5 @@
-import { emptyArray } from "../../../shared/src/sentinels.js";
 import { throwOutput } from "../ivm/operator.js";
+import { emptyArray } from "../../../shared/src/sentinels.js";
 //#region ../zql/src/query/measure-push-operator.ts
 var MeasurePushOperator = class {
 	#input;

package/out/zql/src/query/measure-push-operator.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-push-operator.js","names":["#input","#queryID","#metricsDelegate","#sampleRate","#metricName","#output","#sample","#measure","#count"],"sources":["../../../../../zql/src/query/measure-push-operator.ts"],"sourcesContent":["import {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Change} from '../ivm/change.ts';\nimport type {Node} from '../ivm/data.ts';\nimport {\n  throwOutput,\n  type FetchRequest,\n  type Input,\n  type InputBase,\n  type Operator,\n  type Output,\n} from '../ivm/operator.ts';\nimport type {SourceSchema} from '../ivm/schema.ts';\nimport type {Stream} from '../ivm/stream.ts';\nimport type {MetricsDelegate} from './metrics-delegate.ts';\n\ntype MetricName = 'query-update-client' | 'query-update-server';\n\nexport class MeasurePushOperator implements Operator {\n  readonly #input: Input;\n  readonly #queryID: string;\n  readonly #metricsDelegate: MetricsDelegate;\n  readonly #sampleRate: number;\n  /** Pushes and reconciles so far, sampled or not. */\n  #count = 0;\n\n  #output: Output = throwOutput;\n  readonly #metricName: MetricName;\n\n  /**\n   * With a `sampleRate` of n, only the first of every n pushes (and\n   * reconciles) is timed and reported. The others go straight to the output,\n   * without a timer or the generator that measuring needs. The metrics\n   * delegate should weight each reported time by n.\n   */\n  constructor(\n    input: Input,\n    queryID: string,\n    metricsDelegate: MetricsDelegate,\n    metricName: MetricName,\n    sampleRate = 1,\n  ) {\n    this.#input = input;\n    this.#queryID = queryID;\n    this.#metricsDelegate = metricsDelegate;\n    this.#metricName = metricName;\n    this.#sampleRate = sampleRate;\n    input.setOutput(this);\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    return this.#input.fetch(req);\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  push(change: Change): Stream<'yield'> {\n    if (!this.#sample()) {\n      return this.#output.push(change, this);\n    }\n    return this.#measure(() => this.#output.push(change, this));\n  }\n\n  reconcile(_pusher: InputBase): Stream<'yield'> {\n    const output = this.#output;\n    if (output.reconcile === undefined) {\n      return emptyArray;\n    }\n    if (!this.#sample()) {\n      return output.reconcile(this);\n    }\n    const reconcile = output.reconcile.bind(output);\n    return this.#measure(() => reconcile(this));\n  }\n\n  #sample(): boolean {\n    return this.#count++ % this.#sampleRate === 0;\n  }\n\n  /**\n   * Runs the stream returned by `run` and records the time spent running it.\n   *\n   * The time the stream spends suspended at a `yield` is not counted: the\n   * caller yields the thread there, and whatever else runs in the meantime\n   * is not this query's work.\n   *\n   * The time is recorded even if the stream throws or is abandoned, so that\n   * a push aborted for taking too long is accounted to its query.\n   */\n  *#measure(run: () => Stream<'yield'>): Stream<'yield'> {\n    let elapsed = 0;\n    let start = performance.now();\n    let running = true;\n    try {\n      for (const result of run()) {\n        elapsed += performance.now() - start;\n        running = false;\n        yield result;\n        running = true;\n        start = performance.now();\n      }\n    } finally {\n      if (running) {\n        elapsed += performance.now() - start;\n      }\n      this.#metricsDelegate.addMetric(this.#metricName, elapsed, this.#queryID);\n    }\n  }\n}\n"],"mappings":";;;AAiBA,IAAa,sBAAb,MAAqD;CACnD;CACA;CACA;CACA;;CAEA,SAAS;CAET,UAAkB;CAClB;;;;;;;CAQA,YACE,OACA,SACA,iBACA,YACA,aAAa,GACb;EACA,KAAKA,SAAS;EACd,KAAKC,WAAW;EAChB,KAAKC,mBAAmB;EACxB,KAAKE,cAAc;EACnB,KAAKD,cAAc;EACnB,MAAM,UAAU,IAAI;CACtB;CAEA,UAAU,QAAsB;EAC9B,KAAKE,UAAU;CACjB;CAEA,MAAM,KAA2C;EAC/C,OAAO,KAAKL,OAAO,MAAM,GAAG;CAC9B;CAEA,YAA0B;EACxB,OAAO,KAAKA,OAAO,UAAU;CAC/B;CAEA,UAAgB;EACd,KAAKA,OAAO,QAAQ;CACtB;CAEA,KAAK,QAAiC;EACpC,IAAI,CAAC,KAAKM,QAAQ,GAChB,OAAO,KAAKD,QAAQ,KAAK,QAAQ,IAAI;EAEvC,OAAO,KAAKE,eAAe,KAAKF,QAAQ,KAAK,QAAQ,IAAI,CAAC;CAC5D;CAEA,UAAU,SAAqC;EAC7C,MAAM,SAAS,KAAKA;EACpB,IAAI,OAAO,cAAc,KAAA,GACvB,OAAO;EAET,IAAI,CAAC,KAAKC,QAAQ,GAChB,OAAO,OAAO,UAAU,IAAI;EAE9B,MAAM,YAAY,OAAO,UAAU,KAAK,MAAM;EAC9C,OAAO,KAAKC,eAAe,UAAU,IAAI,CAAC;CAC5C;CAEA,UAAmB;EACjB,OAAO,KAAKC,WAAW,KAAKL,gBAAgB;CAC9C;;;;;;;;;;;CAYA,CAACI,SAAS,KAA6C;EACrD,IAAI,UAAU;EACd,IAAI,QAAQ,YAAY,IAAI;EAC5B,IAAI,UAAU;EACd,IAAI;GACF,KAAK,MAAM,UAAU,IAAI,GAAG;IAC1B,WAAW,YAAY,IAAI,IAAI;IAC/B,UAAU;IACV,MAAM;IACN,UAAU;IACV,QAAQ,YAAY,IAAI;GAC1B;EACF,UAAU;GACR,IAAI,SACF,WAAW,YAAY,IAAI,IAAI;GAEjC,KAAKL,iBAAiB,UAAU,KAAKE,aAAa,SAAS,KAAKH,QAAQ;EAC1E;CACF;AACF"}
+{"version":3,"file":"measure-push-operator.js","names":[],"sources":["../../../../../zql/src/query/measure-push-operator.ts"],"sourcesContent":["import {emptyArray} from '../../../shared/src/sentinels.ts';\nimport type {Change} from '../ivm/change.ts';\nimport type {Node} from '../ivm/data.ts';\nimport {\n  throwOutput,\n  type FetchRequest,\n  type Input,\n  type InputBase,\n  type Operator,\n  type Output,\n} from '../ivm/operator.ts';\nimport type {SourceSchema} from '../ivm/schema.ts';\nimport type {Stream} from '../ivm/stream.ts';\nimport type {MetricsDelegate} from './metrics-delegate.ts';\n\ntype MetricName = 'query-update-client' | 'query-update-server';\n\nexport class MeasurePushOperator implements Operator {\n  readonly #input: Input;\n  readonly #queryID: string;\n  readonly #metricsDelegate: MetricsDelegate;\n  readonly #sampleRate: number;\n  /** Pushes and reconciles so far, sampled or not. */\n  #count = 0;\n\n  #output: Output = throwOutput;\n  readonly #metricName: MetricName;\n\n  /**\n   * With a `sampleRate` of n, only the first of every n pushes (and\n   * reconciles) is timed and reported. The others go straight to the output,\n   * without a timer or the generator that measuring needs. The metrics\n   * delegate should weight each reported time by n.\n   */\n  constructor(\n    input: Input,\n    queryID: string,\n    metricsDelegate: MetricsDelegate,\n    metricName: MetricName,\n    sampleRate = 1,\n  ) {\n    this.#input = input;\n    this.#queryID = queryID;\n    this.#metricsDelegate = metricsDelegate;\n    this.#metricName = metricName;\n    this.#sampleRate = sampleRate;\n    input.setOutput(this);\n  }\n\n  setOutput(output: Output): void {\n    this.#output = output;\n  }\n\n  fetch(req: FetchRequest): Stream<Node | 'yield'> {\n    return this.#input.fetch(req);\n  }\n\n  getSchema(): SourceSchema {\n    return this.#input.getSchema();\n  }\n\n  destroy(): void {\n    this.#input.destroy();\n  }\n\n  push(change: Change): Stream<'yield'> {\n    if (!this.#sample()) {\n      return this.#output.push(change, this);\n    }\n    return this.#measure(() => this.#output.push(change, this));\n  }\n\n  reconcile(_pusher: InputBase): Stream<'yield'> {\n    const output = this.#output;\n    if (output.reconcile === undefined) {\n      return emptyArray;\n    }\n    if (!this.#sample()) {\n      return output.reconcile(this);\n    }\n    const reconcile = output.reconcile.bind(output);\n    return this.#measure(() => reconcile(this));\n  }\n\n  #sample(): boolean {\n    return this.#count++ % this.#sampleRate === 0;\n  }\n\n  /**\n   * Runs the stream returned by `run` and records the time spent running it.\n   *\n   * The time the stream spends suspended at a `yield` is not counted: the\n   * caller yields the thread there, and whatever else runs in the meantime\n   * is not this query's work.\n   *\n   * The time is recorded even if the stream throws or is abandoned, so that\n   * a push aborted for taking too long is accounted to its query.\n   */\n  *#measure(run: () => Stream<'yield'>): Stream<'yield'> {\n    let elapsed = 0;\n    let start = performance.now();\n    let running = true;\n    try {\n      for (const result of run()) {\n        elapsed += performance.now() - start;\n        running = false;\n        yield result;\n        running = true;\n        start = performance.now();\n      }\n    } finally {\n      if (running) {\n        elapsed += performance.now() - start;\n      }\n      this.#metricsDelegate.addMetric(this.#metricName, elapsed, this.#queryID);\n    }\n  }\n}\n"],"mappings":";;;AAiBA,IAAa,sBAAb,MAAqD;CACnD;CACA;CACA;CACA;;CAEA,SAAS;CAET,UAAkB;CAClB;;;;;;;CAQA,YACE,OACA,SACA,iBACA,YACA,aAAa,GACb;EACA,KAAK,SAAS;EACd,KAAK,WAAW;EAChB,KAAK,mBAAmB;EACxB,KAAK,cAAc;EACnB,KAAK,cAAc;EACnB,MAAM,UAAU,IAAI;CACtB;CAEA,UAAU,QAAsB;EAC9B,KAAK,UAAU;CACjB;CAEA,MAAM,KAA2C;EAC/C,OAAO,KAAK,OAAO,MAAM,GAAG;CAC9B;CAEA,YAA0B;EACxB,OAAO,KAAK,OAAO,UAAU;CAC/B;CAEA,UAAgB;EACd,KAAK,OAAO,QAAQ;CACtB;CAEA,KAAK,QAAiC;EACpC,IAAI,CAAC,KAAK,QAAQ,GAChB,OAAO,KAAK,QAAQ,KAAK,QAAQ,IAAI;EAEvC,OAAO,KAAK,eAAe,KAAK,QAAQ,KAAK,QAAQ,IAAI,CAAC;CAC5D;CAEA,UAAU,SAAqC;EAC7C,MAAM,SAAS,KAAK;EACpB,IAAI,OAAO,cAAc,KAAA,GACvB,OAAO;EAET,IAAI,CAAC,KAAK,QAAQ,GAChB,OAAO,OAAO,UAAU,IAAI;EAE9B,MAAM,YAAY,OAAO,UAAU,KAAK,MAAM;EAC9C,OAAO,KAAK,eAAe,UAAU,IAAI,CAAC;CAC5C;CAEA,UAAmB;EACjB,OAAO,KAAK,WAAW,KAAK,gBAAgB;CAC9C;;;;;;;;;;;CAYA,CAAC,SAAS,KAA6C;EACrD,IAAI,UAAU;EACd,IAAI,QAAQ,YAAY,IAAI;EAC5B,IAAI,UAAU;EACd,IAAI;GACF,KAAK,MAAM,UAAU,IAAI,GAAG;IAC1B,WAAW,YAAY,IAAI,IAAI;IAC/B,UAAU;IACV,MAAM;IACN,UAAU;IACV,QAAQ,YAAY,IAAI;GAC1B;EACF,UAAU;GACR,IAAI,SACF,WAAW,YAAY,IAAI,IAAI;GAEjC,KAAK,iBAAiB,UAAU,KAAK,aAAa,SAAS,KAAK,QAAQ;EAC1E;CACF;AACF"}

package/out/zql/src/query/named.js

@@ -33,7 +33,8 @@ function syncedQueryWithContext(name, parser, fn) {
 /** @deprecated */
 function syncedQueryImpl(name, fn, takesContext) {
 	return (context, args) => {
-		return asQueryInternals(takesContext ? fn(context, ...args) : fn(...args)).nameAndArgs(name, args);
+		const q = takesContext ? fn(context, ...args) : fn(...args);
+		return asQueryInternals(q).nameAndArgs(name, args);
 	};
 }
 /** @deprecated */

package/out/zql/src/query/named.js.map

@@ -1 +1 @@
-{"version":3,"file":"named.js","names":[],"sources":["../../../../../zql/src/query/named.ts"],"sourcesContent":["import type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {QueryParseError} from './error.ts';\nimport {asQueryInternals} from './query-internals.ts';\nimport {type AnyQuery} from './query.ts';\n\n/** @deprecated */\nexport type QueryFn<\n  TContext,\n  TTakesContext extends boolean,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n> = TTakesContext extends false\n  ? {(...args: TArg): TReturnQuery}\n  : {(context: TContext, ...args: TArg): TReturnQuery};\n\n/** @deprecated */\nexport type SyncedQuery<\n  TName extends string,\n  TContext,\n  TTakesContext extends boolean,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n> = QueryFn<TContext, TTakesContext, TArg, TReturnQuery> & {\n  queryName: TName;\n  parse: ParseFn<TArg> | undefined;\n  takesContext: TTakesContext;\n};\n\nfunction normalizeParser<T extends ReadonlyJSONValue[]>(\n  parser: ParseFn<T> | HasParseFn<T> | undefined,\n): ParseFn<T> | undefined {\n  if (parser) {\n    if ('parse' in parser) {\n      return parser.parse.bind(parser);\n    }\n    return parser;\n  }\n  return undefined;\n}\n\n/**\n * @deprecated Use {@link defineQuery} instead.\n */\nexport function syncedQuery<\n  TName extends string,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n>(\n  name: TName,\n  parser: ParseFn<TArg> | HasParseFn<TArg> | undefined,\n  fn: QueryFn<unknown, false, TArg, TReturnQuery>,\n): SyncedQuery<TName, unknown, false, TArg, TReturnQuery> {\n  const impl = syncedQueryImpl(name, fn, false);\n  // oxlint-disable-next-line no-explicit-any\n  const ret: any = (...args: TArg) => impl(undefined, args);\n  ret.queryName = name;\n  ret.parse = normalizeParser(parser);\n  ret.takesContext = false;\n  return ret;\n}\n\n/**\n * @deprecated Use {@link defineQuery} instead.\n */\nexport function syncedQueryWithContext<\n  TName extends string,\n  TContext,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n>(\n  name: TName,\n  parser: ParseFn<TArg> | HasParseFn<TArg> | undefined,\n  fn: QueryFn<TContext, true, TArg, TReturnQuery>,\n): SyncedQuery<TName, TContext, true, TArg, TReturnQuery> {\n  const impl = syncedQueryImpl(name, fn, true);\n  // oxlint-disable-next-line no-explicit-any\n  const ret: any = (context: TContext, ...args: TArg) => impl(context, args);\n  ret.queryName = name;\n  ret.parse = normalizeParser(parser);\n  ret.takesContext = true;\n  return ret;\n}\n\n/** @deprecated */\nfunction syncedQueryImpl<\n  TName extends string,\n  TContext,\n  TArg extends ReadonlyJSONValue[],\n  // oxlint-disable-next-line no-explicit-any\n>(name: TName, fn: any, takesContext: boolean) {\n  return (context: TContext, args: TArg) => {\n    const q = takesContext ? fn(context, ...args) : fn(...args);\n    return asQueryInternals(q).nameAndArgs(name, args);\n  };\n}\n\n/** @deprecated */\n\n// oxlint-disable-next-line no-explicit-any\ntype AnySyncedQuery = SyncedQuery<any, any, any, any, any>;\n\n/** @deprecated */\nexport function withValidation<F extends AnySyncedQuery>(\n  fn: F,\n  // oxlint-disable-next-line no-explicit-any\n): F extends SyncedQuery<infer N, infer C, any, any, infer R>\n  ? SyncedQuery<N, C, true, ReadonlyJSONValue[], R>\n  : F {\n  // If we have a parse function this is a SyncedQuery\n  if ('parse' in fn) {\n    const {parse} = fn;\n    if (!parse) {\n      throw new Error('ret does not have a parse function defined');\n    }\n    // oxlint-disable-next-line no-explicit-any\n    const ret: any = (context: unknown, ...args: unknown[]) => {\n      let parsed;\n      try {\n        parsed = parse(args);\n      } catch (error) {\n        throw new QueryParseError({cause: error});\n      }\n      // oxlint-disable-next-line no-explicit-any\n      return fn.takesContext ? fn(context, ...parsed) : (fn as any)(...parsed);\n    };\n    ret.queryName = fn.queryName;\n    ret.parse = fn.parse;\n    ret.takesContext = true;\n\n    return ret;\n  }\n\n  // If we don't have a parse function, return the function as-is\n  // (this shouldn't happen in practice)\n  // oxlint-disable-next-line no-explicit-any\n  return fn as any;\n}\n\n/** @deprecated */\nexport type ParseFn<T extends ReadonlyJSONValue[]> = (args: unknown[]) => T;\n\n/** @deprecated */\nexport type HasParseFn<T extends ReadonlyJSONValue[]> = {\n  parse: ParseFn<T>;\n};\n\n/** @deprecated */\nexport type Parser<T extends ReadonlyJSONValue[]> = ParseFn<T> | HasParseFn<T>;\n\nexport type CustomQueryID = {\n  name: string;\n  args: ReadonlyArray<ReadonlyJSONValue>;\n};\n"],"mappings":";;;;AA4BA,SAAS,gBACP,QACwB;CACxB,IAAI,QAAQ;EACV,IAAI,WAAW,QACb,OAAO,OAAO,MAAM,KAAK,MAAM;EAEjC,OAAO;CACT;AAEF;;;;AAKA,SAAgB,YAKd,MACA,QACA,IACwD;CACxD,MAAM,OAAO,gBAAgB,MAAM,IAAI,KAAK;CAE5C,MAAM,OAAY,GAAG,SAAe,KAAK,KAAA,GAAW,IAAI;CACxD,IAAI,YAAY;CAChB,IAAI,QAAQ,gBAAgB,MAAM;CAClC,IAAI,eAAe;CACnB,OAAO;AACT;;;;AAKA,SAAgB,uBAMd,MACA,QACA,IACwD;CACxD,MAAM,OAAO,gBAAgB,MAAM,IAAI,IAAI;CAE3C,MAAM,OAAY,SAAmB,GAAG,SAAe,KAAK,SAAS,IAAI;CACzE,IAAI,YAAY;CAChB,IAAI,QAAQ,gBAAgB,MAAM;CAClC,IAAI,eAAe;CACnB,OAAO;AACT;;AAGA,SAAS,gBAKP,MAAa,IAAS,cAAuB;CAC7C,QAAQ,SAAmB,SAAe;EAExC,OAAO,iBADG,eAAe,GAAG,SAAS,GAAG,IAAI,IAAI,GAAG,GAAG,IAAI,CACjC,EAAE,YAAY,MAAM,IAAI;CACnD;AACF;;AAQA,SAAgB,eACd,IAII;CAEJ,IAAI,WAAW,IAAI;EACjB,MAAM,EAAC,UAAS;EAChB,IAAI,CAAC,OACH,MAAM,IAAI,MAAM,4CAA4C;EAG9D,MAAM,OAAY,SAAkB,GAAG,SAAoB;GACzD,IAAI;GACJ,IAAI;IACF,SAAS,MAAM,IAAI;GACrB,SAAS,OAAO;IACd,MAAM,IAAI,gBAAgB,EAAC,OAAO,MAAK,CAAC;GAC1C;GAEA,OAAO,GAAG,eAAe,GAAG,SAAS,GAAG,MAAM,IAAK,GAAW,GAAG,MAAM;EACzE;EACA,IAAI,YAAY,GAAG;EACnB,IAAI,QAAQ,GAAG;EACf,IAAI,eAAe;EAEnB,OAAO;CACT;CAKA,OAAO;AACT"}
+{"version":3,"file":"named.js","names":[],"sources":["../../../../../zql/src/query/named.ts"],"sourcesContent":["import type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {QueryParseError} from './error.ts';\nimport {asQueryInternals} from './query-internals.ts';\nimport {type AnyQuery} from './query.ts';\n\n/** @deprecated */\nexport type QueryFn<\n  TContext,\n  TTakesContext extends boolean,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n> = TTakesContext extends false\n  ? {(...args: TArg): TReturnQuery}\n  : {(context: TContext, ...args: TArg): TReturnQuery};\n\n/** @deprecated */\nexport type SyncedQuery<\n  TName extends string,\n  TContext,\n  TTakesContext extends boolean,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n> = QueryFn<TContext, TTakesContext, TArg, TReturnQuery> & {\n  queryName: TName;\n  parse: ParseFn<TArg> | undefined;\n  takesContext: TTakesContext;\n};\n\nfunction normalizeParser<T extends ReadonlyJSONValue[]>(\n  parser: ParseFn<T> | HasParseFn<T> | undefined,\n): ParseFn<T> | undefined {\n  if (parser) {\n    if ('parse' in parser) {\n      return parser.parse.bind(parser);\n    }\n    return parser;\n  }\n  return undefined;\n}\n\n/**\n * @deprecated Use {@link defineQuery} instead.\n */\nexport function syncedQuery<\n  TName extends string,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n>(\n  name: TName,\n  parser: ParseFn<TArg> | HasParseFn<TArg> | undefined,\n  fn: QueryFn<unknown, false, TArg, TReturnQuery>,\n): SyncedQuery<TName, unknown, false, TArg, TReturnQuery> {\n  const impl = syncedQueryImpl(name, fn, false);\n  // oxlint-disable-next-line no-explicit-any\n  const ret: any = (...args: TArg) => impl(undefined, args);\n  ret.queryName = name;\n  ret.parse = normalizeParser(parser);\n  ret.takesContext = false;\n  return ret;\n}\n\n/**\n * @deprecated Use {@link defineQuery} instead.\n */\nexport function syncedQueryWithContext<\n  TName extends string,\n  TContext,\n  TArg extends ReadonlyJSONValue[],\n  TReturnQuery extends AnyQuery,\n>(\n  name: TName,\n  parser: ParseFn<TArg> | HasParseFn<TArg> | undefined,\n  fn: QueryFn<TContext, true, TArg, TReturnQuery>,\n): SyncedQuery<TName, TContext, true, TArg, TReturnQuery> {\n  const impl = syncedQueryImpl(name, fn, true);\n  // oxlint-disable-next-line no-explicit-any\n  const ret: any = (context: TContext, ...args: TArg) => impl(context, args);\n  ret.queryName = name;\n  ret.parse = normalizeParser(parser);\n  ret.takesContext = true;\n  return ret;\n}\n\n/** @deprecated */\nfunction syncedQueryImpl<\n  TName extends string,\n  TContext,\n  TArg extends ReadonlyJSONValue[],\n  // oxlint-disable-next-line no-explicit-any\n>(name: TName, fn: any, takesContext: boolean) {\n  return (context: TContext, args: TArg) => {\n    const q = takesContext ? fn(context, ...args) : fn(...args);\n    return asQueryInternals(q).nameAndArgs(name, args);\n  };\n}\n\n/** @deprecated */\n\n// oxlint-disable-next-line no-explicit-any\ntype AnySyncedQuery = SyncedQuery<any, any, any, any, any>;\n\n/** @deprecated */\nexport function withValidation<F extends AnySyncedQuery>(\n  fn: F,\n  // oxlint-disable-next-line no-explicit-any\n): F extends SyncedQuery<infer N, infer C, any, any, infer R>\n  ? SyncedQuery<N, C, true, ReadonlyJSONValue[], R>\n  : F {\n  // If we have a parse function this is a SyncedQuery\n  if ('parse' in fn) {\n    const {parse} = fn;\n    if (!parse) {\n      throw new Error('ret does not have a parse function defined');\n    }\n    // oxlint-disable-next-line no-explicit-any\n    const ret: any = (context: unknown, ...args: unknown[]) => {\n      let parsed;\n      try {\n        parsed = parse(args);\n      } catch (error) {\n        throw new QueryParseError({cause: error});\n      }\n      // oxlint-disable-next-line no-explicit-any\n      return fn.takesContext ? fn(context, ...parsed) : (fn as any)(...parsed);\n    };\n    ret.queryName = fn.queryName;\n    ret.parse = fn.parse;\n    ret.takesContext = true;\n\n    return ret;\n  }\n\n  // If we don't have a parse function, return the function as-is\n  // (this shouldn't happen in practice)\n  // oxlint-disable-next-line no-explicit-any\n  return fn as any;\n}\n\n/** @deprecated */\nexport type ParseFn<T extends ReadonlyJSONValue[]> = (args: unknown[]) => T;\n\n/** @deprecated */\nexport type HasParseFn<T extends ReadonlyJSONValue[]> = {\n  parse: ParseFn<T>;\n};\n\n/** @deprecated */\nexport type Parser<T extends ReadonlyJSONValue[]> = ParseFn<T> | HasParseFn<T>;\n\nexport type CustomQueryID = {\n  name: string;\n  args: ReadonlyArray<ReadonlyJSONValue>;\n};\n"],"mappings":";;;;AA4BA,SAAS,gBACP,QACwB;CACxB,IAAI,QAAQ;EACV,IAAI,WAAW,QACb,OAAO,OAAO,MAAM,KAAK,MAAM;EAEjC,OAAO;CACT;AAEF;;;;AAKA,SAAgB,YAKd,MACA,QACA,IACwD;CACxD,MAAM,OAAO,gBAAgB,MAAM,IAAI,KAAK;CAE5C,MAAM,OAAY,GAAG,SAAe,KAAK,KAAA,GAAW,IAAI;CACxD,IAAI,YAAY;CAChB,IAAI,QAAQ,gBAAgB,MAAM;CAClC,IAAI,eAAe;CACnB,OAAO;AACT;;;;AAKA,SAAgB,uBAMd,MACA,QACA,IACwD;CACxD,MAAM,OAAO,gBAAgB,MAAM,IAAI,IAAI;CAE3C,MAAM,OAAY,SAAmB,GAAG,SAAe,KAAK,SAAS,IAAI;CACzE,IAAI,YAAY;CAChB,IAAI,QAAQ,gBAAgB,MAAM;CAClC,IAAI,eAAe;CACnB,OAAO;AACT;;AAGA,SAAS,gBAKP,MAAa,IAAS,cAAuB;CAC7C,QAAQ,SAAmB,SAAe;EACxC,MAAM,IAAI,eAAe,GAAG,SAAS,GAAG,IAAI,IAAI,GAAG,GAAG,IAAI;EAC1D,OAAO,iBAAiB,CAAC,CAAC,CAAC,YAAY,MAAM,IAAI;CACnD;AACF;;AAQA,SAAgB,eACd,IAII;CAEJ,IAAI,WAAW,IAAI;EACjB,MAAM,EAAC,UAAS;EAChB,IAAI,CAAC,OACH,MAAM,IAAI,MAAM,4CAA4C;EAG9D,MAAM,OAAY,SAAkB,GAAG,SAAoB;GACzD,IAAI;GACJ,IAAI;IACF,SAAS,MAAM,IAAI;GACrB,SAAS,OAAO;IACd,MAAM,IAAI,gBAAgB,EAAC,OAAO,MAAK,CAAC;GAC1C;GAEA,OAAO,GAAG,eAAe,GAAG,SAAS,GAAG,MAAM,IAAK,GAAW,GAAG,MAAM;EACzE;EACA,IAAI,YAAY,GAAG;EACnB,IAAI,QAAQ,GAAG;EACf,IAAI,eAAe;EAEnB,OAAO;CACT;CAKA,OAAO;AACT"}

package/out/zql/src/query/query-delegate-base.d.ts

@@ -118,11 +118,12 @@ export declare abstract class QueryDelegateBase implements QueryDelegate {
     onPipelinesReady(_attach: AttachPipeline): () => void;
     abstract getSource(name: string): Source | undefined;
 }
-export declare function runImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(query: Query<TTable, TSchema, TReturn>, delegate: QueryDelegate, options?: RunOptions): Promise<HumanReadable<TReturn>>;
-export declare function preloadImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn>(query: Query<TTable, TSchema, TReturn>, delegate: QueryDelegate, options?: PreloadOptions): {
-    cleanup: () => void;
-    complete: Promise<void>;
-    cached: Promise<void>;
-};
-export declare function materializeImpl<TTable extends keyof TSchema['tables'] & string, TSchema extends Schema, TReturn, T>(query: Query<TTable, TSchema, TReturn>, delegate: QueryDelegate, factory?: ViewFactory<TTable, TSchema, TReturn, T>, options?: MaterializeOptions): T;
+/**
+ * The ID a materialized query is registered with the server under: the hash of
+ * its name and args for a named query, of its AST otherwise.
+ */
+export declare function queryIDOf({ ast, customQueryID, }: {
+    readonly ast: AST;
+    readonly customQueryID: CustomQueryID | undefined;
+}): string;
 //# sourceMappingURL=query-delegate-base.d.ts.map

package/out/zql/src/query/query-delegate-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-delegate-base.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-delegate-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-delegate-base.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/query-delegate-base.ts"],"names":[],"mappings":"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"}

package/out/zql/src/query/query-delegate-base.js

@@ -1,12 +1,12 @@
+import { resolver } from "../../../shared/src/resolver.js";
 import { hashNameAndArgs } from "../../../zero-protocol/src/query-hash-visitor.js";
 import { asQueryInternals } from "./query-internals.js";
 import { hashOfAST } from "../../../zero-protocol/src/query-hash.js";
-import { buildPipeline } from "../builder/builder.js";
+import { buildPipeline, groupViewInput } from "../builder/builder.js";
 import { ArrayView } from "../ivm/array-view.js";
 import { DeferredInput } from "../ivm/deferred-input.js";
 import { MemoryStorage } from "../ivm/memory-storage.js";
 import "./ttl.js";
-import { resolver } from "@rocicorp/resolver";
 //#region ../zql/src/query/query-delegate-base.ts
 /**
 * Base class that provides default implementations for common QueryDelegate methods.
@@ -181,11 +181,18 @@ function preloadImpl(query, delegate, options) {
 		cached
 	};
 }
+/**
+* The ID a materialized query is registered with the server under: the hash of
+* its name and args for a named query, of its AST otherwise.
+*/
+function queryIDOf({ ast, customQueryID }) {
+	return customQueryID ? hashNameAndArgs(customQueryID.name, customQueryID.args) : hashOfAST(ast);
+}
 function materializeImpl(query, delegate, factory = arrayViewFactory, options) {
 	let ttl = options?.ttl ?? 3e5;
 	const qi = asQueryInternals(query);
 	const { ast, format, customQueryID } = qi;
-	const queryID = customQueryID ? hashNameAndArgs(customQueryID.name, customQueryID.args) : hashOfAST(qi.ast);
+	const queryID = queryIDOf(qi);
 	const queryCompleteResolver = resolver();
 	const deferPipeline = !delegate.pipelinesReady;
 	let attached = !deferPipeline;
@@ -222,7 +229,7 @@ function materializeImpl(query, delegate, factory = arrayViewFactory, options) {
 		destroyed = true;
 		removePendingAttach?.();
 		removePendingAttach = void 0;
-		input.destroy();
+		viewInput.destroy();
 		removeCommitObserver?.();
 		removeAddedQuery();
 	};
@@ -230,7 +237,8 @@ function materializeImpl(query, delegate, factory = arrayViewFactory, options) {
 	const removeAddedQuery = customQueryID ? delegate.addCustomQuery(ast, customQueryID, ttl, gotCallback) : delegate.addServerQuery(ast, ttl, gotCallback);
 	const deferred = deferPipeline ? newDeferredInput(ast, delegate, queryID) : void 0;
 	const input = deferred ?? buildPipeline(ast, delegate, queryID);
-	const view = delegate.batchViewUpdates(() => (factory ?? arrayViewFactory)(query, input, format, onDestroy, (cb) => {
+	const viewInput = ast.groupBy ? groupViewInput(input, ast, delegate) : input;
+	const view = delegate.batchViewUpdates(() => (factory ?? arrayViewFactory)(query, viewInput, format, onDestroy, (cb) => {
 		removeCommitObserver = delegate.onTransactionCommit(cb);
 	}, queryComplete || queryCompleteResolver.promise, updateTTL));
 	if (!deferred) delegate.addMetric("query-materialization-client", performance.now() - t0, queryID);
@@ -295,6 +303,6 @@ function arrayViewFactory(_query, input, format, onDestroy, onTransactionCommit,
 	return v;
 }
 //#endregion
-export { QueryDelegateBase };
+export { QueryDelegateBase, queryIDOf };
 
 //# sourceMappingURL=query-delegate-base.js.map