@rocicorp/zero 0.25.0-canary.6 → 0.25.0-canary.8

package/out/zql/src/planner/planner-node.d.ts

@@ -1,4 +1,4 @@
-import type { PlannerConnection } from './planner-connection.ts';
+import type { FanoutCostModel, PlannerConnection } from './planner-connection.ts';
 import type { PlannerFanIn } from './planner-fan-in.ts';
 import type { PlannerFanOut } from './planner-fan-out.ts';
 import type { PlannerJoin } from './planner-join.ts';
@@ -41,6 +41,7 @@ export type CostEstimate = {
      */
     selectivity: number;
     limit: number | undefined;
+    fanout: FanoutCostModel;
 };
 export type NodeType = PlannerNode['kind'];
 export type JoinOrConnection = 'join' | 'connection';

package/out/zql/src/planner/planner-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planner-node.d.ts","sourceRoot":"","sources":["../../../../../zql/src/planner/planner-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAE3D;;;GAGG;AACH,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,iBAAiB,GACjB,aAAa,GACb,YAAY,GACZ,eAAe,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;OAUG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAE3C,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,YAAY,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"planner-node.d.ts","sourceRoot":"","sources":["../../../../../zql/src/planner/planner-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAE3D;;;GAGG;AACH,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,iBAAiB,GACjB,aAAa,GACb,YAAY,GACZ,eAAe,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;OAUG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAE3C,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,YAAY,CAAC;AAErD,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC"}

package/out/zql/src/planner/planner-source.js

@@ -1,13 +1,24 @@
-import { PlannerConnection, } from "./planner-connection.js";
-export class PlannerSource {
-    name;
-    #model;
-    constructor(name, model) {
-        this.name = name;
-        this.#model = model;
-    }
-    connect(sort, filters, isRoot, baseConstraints, limit) {
-        return new PlannerConnection(this.name, this.#model, sort, filters, isRoot, baseConstraints, limit);
-    }
+import { PlannerConnection } from "./planner-connection.js";
+class PlannerSource {
+  name;
+  #model;
+  constructor(name, model) {
+    this.name = name;
+    this.#model = model;
+  }
+  connect(sort, filters, isRoot, baseConstraints, limit) {
+    return new PlannerConnection(
+      this.name,
+      this.#model,
+      sort,
+      filters,
+      isRoot,
+      baseConstraints,
+      limit
+    );
+  }
 }
-//# sourceMappingURL=planner-source.js.map
+export {
+  PlannerSource
+};
+//# sourceMappingURL=planner-source.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"planner-source.js","sourceRoot":"","sources":["../../../../../zql/src/planner/planner-source.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,GAElB,MAAM,yBAAyB,CAAC;AAKjC,MAAM,OAAO,aAAa;IACf,IAAI,CAAS;IACb,MAAM,CAAsB;IAErC,YAAY,IAAY,EAAE,KAA0B;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,CACL,IAAc,EACd,OAA8B,EAC9B,MAAe,EACf,eAAmC,EACnC,KAAc;QAEd,OAAO,IAAI,iBAAiB,CAC1B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,MAAM,EACX,IAAI,EACJ,OAAO,EACP,MAAM,EACN,eAAe,EACf,KAAK,CACN,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"planner-source.js","sources":["../../../../../zql/src/planner/planner-source.ts"],"sourcesContent":["import type {Condition, Ordering} from '../../../zero-protocol/src/ast.ts';\nimport {\n  PlannerConnection,\n  type ConnectionCostModel,\n} from './planner-connection.ts';\nimport type {PlannerConstraint} from './planner-constraint.ts';\n\nexport type {ConnectionCostModel};\n\nexport class PlannerSource {\n  readonly name: string;\n  readonly #model: ConnectionCostModel;\n\n  constructor(name: string, model: ConnectionCostModel) {\n    this.name = name;\n    this.#model = model;\n  }\n\n  connect(\n    sort: Ordering,\n    filters: Condition | undefined,\n    isRoot: boolean,\n    baseConstraints?: PlannerConstraint,\n    limit?: number,\n  ): PlannerConnection {\n    return new PlannerConnection(\n      this.name,\n      this.#model,\n      sort,\n      filters,\n      isRoot,\n      baseConstraints,\n      limit,\n    );\n  }\n}\n"],"names":[],"mappings":";AASO,MAAM,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,EAET,YAAY,MAAc,OAA4B;AACpD,SAAK,OAAO;AACZ,SAAK,SAAS;AAAA,EAChB;AAAA,EAEA,QACE,MACA,SACA,QACA,iBACA,OACmB;AACnB,WAAO,IAAI;AAAA,MACT,KAAK;AAAA,MACL,KAAK;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AACF;"}

package/out/zql/src/planner/planner-terminus.js

@@ -1,28 +1,29 @@
-export class PlannerTerminus {
-    kind = 'terminus';
-    #input;
-    constructor(input) {
-        this.#input = input;
-    }
-    get pinned() {
-        return true;
-    }
-    closestJoinOrSource() {
-        return this.#input.closestJoinOrSource();
-    }
-    propagateConstraints(planDebugger) {
-        this.#input.propagateConstraints([], undefined, this, planDebugger);
-    }
-    estimateCost(planDebugger) {
-        // Terminus starts the cost estimation flow with empty branch pattern
-        return this.#input.estimateCost(1, [], planDebugger);
-    }
-    /**
-     * Propagate unlimiting when a parent join is flipped.
-     * Terminus doesn't participate in unlimiting.
-     */
-    propagateUnlimitFromFlippedJoin() {
-        // No-op: terminus doesn't need to unlimit anything
-    }
+class PlannerTerminus {
+  kind = "terminus";
+  #input;
+  constructor(input) {
+    this.#input = input;
+  }
+  get pinned() {
+    return true;
+  }
+  closestJoinOrSource() {
+    return this.#input.closestJoinOrSource();
+  }
+  propagateConstraints(planDebugger) {
+    this.#input.propagateConstraints([], void 0, this, planDebugger);
+  }
+  estimateCost(planDebugger) {
+    return this.#input.estimateCost(1, [], planDebugger);
+  }
+  /**
+   * Propagate unlimiting when a parent join is flipped.
+   * Terminus doesn't participate in unlimiting.
+   */
+  propagateUnlimitFromFlippedJoin() {
+  }
 }
-//# sourceMappingURL=planner-terminus.js.map
+export {
+  PlannerTerminus
+};
+//# sourceMappingURL=planner-terminus.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"planner-terminus.js","sourceRoot":"","sources":["../../../../../zql/src/planner/planner-terminus.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,eAAe;IACjB,IAAI,GAAG,UAAmB,CAAC;IAC3B,MAAM,CAAwC;IAEvD,YAAY,KAA4C;QACtD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC;IACd,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IAED,oBAAoB,CAAC,YAA2B;QAC9C,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC;IAED,YAAY,CAAC,YAA2B;QACtC,qEAAqE;QACrE,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;IACvD,CAAC;IAED;;;OAGG;IACH,+BAA+B;QAC7B,mDAAmD;IACrD,CAAC;CACF"}
+{"version":3,"file":"planner-terminus.js","sources":["../../../../../zql/src/planner/planner-terminus.ts"],"sourcesContent":["import type {PlanDebugger} from './planner-debug.ts';\nimport type {\n  CostEstimate,\n  JoinOrConnection,\n  PlannerNode,\n} from './planner-node.ts';\n\nexport class PlannerTerminus {\n  readonly kind = 'terminus' as const;\n  readonly #input: Exclude<PlannerNode, PlannerTerminus>;\n\n  constructor(input: Exclude<PlannerNode, PlannerTerminus>) {\n    this.#input = input;\n  }\n\n  get pinned(): boolean {\n    return true;\n  }\n\n  closestJoinOrSource(): JoinOrConnection {\n    return this.#input.closestJoinOrSource();\n  }\n\n  propagateConstraints(planDebugger?: PlanDebugger): void {\n    this.#input.propagateConstraints([], undefined, this, planDebugger);\n  }\n\n  estimateCost(planDebugger?: PlanDebugger): CostEstimate {\n    // Terminus starts the cost estimation flow with empty branch pattern\n    return this.#input.estimateCost(1, [], planDebugger);\n  }\n\n  /**\n   * Propagate unlimiting when a parent join is flipped.\n   * Terminus doesn't participate in unlimiting.\n   */\n  propagateUnlimitFromFlippedJoin(): void {\n    // No-op: terminus doesn't need to unlimit anything\n  }\n}\n"],"names":[],"mappings":"AAOO,MAAM,gBAAgB;AAAA,EAClB,OAAO;AAAA,EACP;AAAA,EAET,YAAY,OAA8C;AACxD,SAAK,SAAS;AAAA,EAChB;AAAA,EAEA,IAAI,SAAkB;AACpB,WAAO;AAAA,EACT;AAAA,EAEA,sBAAwC;AACtC,WAAO,KAAK,OAAO,oBAAA;AAAA,EACrB;AAAA,EAEA,qBAAqB,cAAmC;AACtD,SAAK,OAAO,qBAAqB,CAAA,GAAI,QAAW,MAAM,YAAY;AAAA,EACpE;AAAA,EAEA,aAAa,cAA2C;AAEtD,WAAO,KAAK,OAAO,aAAa,GAAG,CAAA,GAAI,YAAY;AAAA,EACrD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,kCAAwC;AAAA,EAExC;AACF;"}

package/out/zql/src/query/complete-ordering.d.ts

@@ -0,0 +1,5 @@
+import type { AST, Ordering } from '../../../zero-protocol/src/ast.ts';
+import type { PrimaryKey } from '../../../zero-protocol/src/primary-key.ts';
+export declare function completeOrdering(ast: AST, getPrimaryKey: (tableName: string) => PrimaryKey): AST;
+export declare function assertOrderingIncludesPK(ordering: Ordering, pk: PrimaryKey): void;
+//# sourceMappingURL=complete-ordering.d.ts.map

package/out/zql/src/query/complete-ordering.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"complete-ordering.d.ts","sourceRoot":"","sources":["../../../../../zql/src/query/complete-ordering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAa,QAAQ,EAAC,MAAM,mCAAmC,CAAC;AAChF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAE1E,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,UAAU,GAC/C,GAAG,CAmBL;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,UAAU,GACb,IAAI,CAWN"}

package/out/zql/src/query/complete-ordering.js

@@ -0,0 +1,71 @@
+import { assert } from "../../../shared/src/asserts.js";
+import { must } from "../../../shared/src/must.js";
+function completeOrdering(ast, getPrimaryKey) {
+  const primaryKey = must(getPrimaryKey(ast.table));
+  return {
+    ...ast,
+    ...ast.related ? {
+      related: ast.related?.map((r) => ({
+        ...r,
+        subquery: completeOrdering(r.subquery, getPrimaryKey)
+      }))
+    } : void 0,
+    ...ast.where ? {
+      where: completeOrderingInCondition(ast.where, getPrimaryKey)
+    } : void 0,
+    orderBy: addPrimaryKeys(primaryKey, ast.orderBy)
+  };
+}
+function assertOrderingIncludesPK(ordering, pk) {
+  const orderingFields = ordering.map(([field]) => field);
+  const missingFields = pk.filter((pkField) => !orderingFields.includes(pkField));
+  assert(
+    missingFields.length === 0,
+    `Ordering must include all primary key fields. Missing: ${missingFields.join(
+      ", "
+    )}.`
+  );
+}
+function completeOrderingInCondition(condition, getPrimaryKey) {
+  if (!condition) {
+    return condition;
+  }
+  if (condition.type === "simple") {
+    return condition;
+  }
+  if (condition.type === "correlatedSubquery") {
+    return {
+      ...condition,
+      related: {
+        ...condition.related,
+        subquery: completeOrdering(condition.related.subquery, getPrimaryKey)
+      }
+    };
+  }
+  condition.type;
+  return {
+    ...condition,
+    conditions: condition.conditions.map(
+      (c) => completeOrderingInCondition(c, getPrimaryKey)
+    )
+  };
+}
+function addPrimaryKeys(primaryKey, orderBy) {
+  orderBy = orderBy ?? [];
+  const primaryKeysToAdd = new Set(primaryKey);
+  for (const [field] of orderBy) {
+    primaryKeysToAdd.delete(field);
+  }
+  if (primaryKeysToAdd.size === 0) {
+    return orderBy;
+  }
+  return [
+    ...orderBy,
+    ...[...primaryKeysToAdd].map((key) => [key, "asc"])
+  ];
+}
+export {
+  assertOrderingIncludesPK,
+  completeOrdering
+};
+//# sourceMappingURL=complete-ordering.js.map

package/out/zql/src/query/complete-ordering.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"complete-ordering.js","sources":["../../../../../zql/src/query/complete-ordering.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {AST, Condition, Ordering} from '../../../zero-protocol/src/ast.ts';\nimport type {PrimaryKey} from '../../../zero-protocol/src/primary-key.ts';\n\nexport function completeOrdering(\n  ast: AST,\n  getPrimaryKey: (tableName: string) => PrimaryKey,\n): AST {\n  const primaryKey = must(getPrimaryKey(ast.table));\n  return {\n    ...ast,\n    ...(ast.related\n      ? {\n          related: ast.related?.map(r => ({\n            ...r,\n            subquery: completeOrdering(r.subquery, getPrimaryKey),\n          })),\n        }\n      : undefined),\n    ...(ast.where\n      ? {\n          where: completeOrderingInCondition(ast.where, getPrimaryKey),\n        }\n      : undefined),\n    orderBy: addPrimaryKeys(primaryKey, ast.orderBy),\n  };\n}\n\nexport function assertOrderingIncludesPK(\n  ordering: Ordering,\n  pk: PrimaryKey,\n): void {\n  // oxlint-disable-next-line unicorn/prefer-set-has -- Array is more appropriate here for small collections\n  const orderingFields = ordering.map(([field]) => field);\n  const missingFields = pk.filter(pkField => !orderingFields.includes(pkField));\n\n  assert(\n    missingFields.length === 0,\n    `Ordering must include all primary key fields. Missing: ${missingFields.join(\n      ', ',\n    )}.`,\n  );\n}\n\nfunction completeOrderingInCondition<C extends Condition | undefined>(\n  condition: C,\n  getPrimaryKey: (tableName: string) => PrimaryKey,\n): C {\n  if (!condition) {\n    return condition;\n  }\n  if (condition.type === 'simple') {\n    return condition;\n  }\n  if (condition.type === 'correlatedSubquery') {\n    return {\n      ...condition,\n      related: {\n        ...condition.related,\n        subquery: completeOrdering(condition.related.subquery, getPrimaryKey),\n      },\n    };\n  }\n  condition.type satisfies 'and' | 'or';\n  return {\n    ...condition,\n    conditions: condition.conditions.map(c =>\n      completeOrderingInCondition(c, getPrimaryKey),\n    ),\n  };\n}\n\nfunction addPrimaryKeys(\n  primaryKey: PrimaryKey,\n  orderBy: Ordering | undefined,\n): Ordering {\n  orderBy = orderBy ?? [];\n  const primaryKeysToAdd = new Set(primaryKey);\n\n  for (const [field] of orderBy) {\n    primaryKeysToAdd.delete(field);\n  }\n\n  if (primaryKeysToAdd.size === 0) {\n    return orderBy;\n  }\n\n  return [\n    ...orderBy,\n    ...[...primaryKeysToAdd].map(key => [key, 'asc'] as [string, 'asc']),\n  ];\n}\n"],"names":[],"mappings":";;AAKO,SAAS,iBACd,KACA,eACK;AACL,QAAM,aAAa,KAAK,cAAc,IAAI,KAAK,CAAC;AAChD,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAI,IAAI,UACJ;AAAA,MACE,SAAS,IAAI,SAAS,IAAI,CAAA,OAAM;AAAA,QAC9B,GAAG;AAAA,QACH,UAAU,iBAAiB,EAAE,UAAU,aAAa;AAAA,MAAA,EACpD;AAAA,IAAA,IAEJ;AAAA,IACJ,GAAI,IAAI,QACJ;AAAA,MACE,OAAO,4BAA4B,IAAI,OAAO,aAAa;AAAA,IAAA,IAE7D;AAAA,IACJ,SAAS,eAAe,YAAY,IAAI,OAAO;AAAA,EAAA;AAEnD;AAEO,SAAS,yBACd,UACA,IACM;AAEN,QAAM,iBAAiB,SAAS,IAAI,CAAC,CAAC,KAAK,MAAM,KAAK;AACtD,QAAM,gBAAgB,GAAG,OAAO,CAAA,YAAW,CAAC,eAAe,SAAS,OAAO,CAAC;AAE5E;AAAA,IACE,cAAc,WAAW;AAAA,IACzB,0DAA0D,cAAc;AAAA,MACtE;AAAA,IAAA,CACD;AAAA,EAAA;AAEL;AAEA,SAAS,4BACP,WACA,eACG;AACH,MAAI,CAAC,WAAW;AACd,WAAO;AAAA,EACT;AACA,MAAI,UAAU,SAAS,UAAU;AAC/B,WAAO;AAAA,EACT;AACA,MAAI,UAAU,SAAS,sBAAsB;AAC3C,WAAO;AAAA,MACL,GAAG;AAAA,MACH,SAAS;AAAA,QACP,GAAG,UAAU;AAAA,QACb,UAAU,iBAAiB,UAAU,QAAQ,UAAU,aAAa;AAAA,MAAA;AAAA,IACtE;AAAA,EAEJ;AACA,YAAU;AACV,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,UAAU,WAAW;AAAA,MAAI,CAAA,MACnC,4BAA4B,GAAG,aAAa;AAAA,IAAA;AAAA,EAC9C;AAEJ;AAEA,SAAS,eACP,YACA,SACU;AACV,YAAU,WAAW,CAAA;AACrB,QAAM,mBAAmB,IAAI,IAAI,UAAU;AAE3C,aAAW,CAAC,KAAK,KAAK,SAAS;AAC7B,qBAAiB,OAAO,KAAK;AAAA,EAC/B;AAEA,MAAI,iBAAiB,SAAS,GAAG;AAC/B,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG,CAAC,GAAG,gBAAgB,EAAE,IAAI,CAAA,QAAO,CAAC,KAAK,KAAK,CAAoB;AAAA,EAAA;AAEvE;"}

package/out/zql/src/query/define-query.d.ts

@@ -1,45 +1,59 @@
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { Query } from './query.ts';
-export type DefineQueryOptions<Input, Output> = {
-    validator?: StandardSchemaV1<Input, Output> | undefined;
-};
+import type { AnyQuery, Query } from './query.ts';
+declare const defineQueryTag: unique symbol;
 /**
- * Function type for root query functions that take context and args.
+ * A query definition function that has been wrapped by `defineQuery`.
+ * Contains the original function plus metadata (validator and tag).
  */
-export type DefineQueryFunc<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs> = (options: {
+export type QueryDefinition<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined> = ((options: {
+    args: TOutput;
     ctx: TContext;
-    args: TArgs;
-}) => Query<TSchema, TTable, TReturn, TContext>;
-export type NamedQueryFunction<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined> = ([TOutput] extends [undefined] ? (() => Query<TSchema, TTable, TReturn, TContext>) & ((args: undefined) => Query<TSchema, TTable, TReturn, TContext>) : undefined extends TOutput ? (args?: TInput) => Query<TSchema, TTable, TReturn, TContext> : (args: TInput) => Query<TSchema, TTable, TReturn, TContext>) & {
-    queryName: TName;
+}) => Query<TSchema, TTable, TReturn>) & {
+    [defineQueryTag]: true;
+    validator: StandardSchemaV1<TInput, TOutput> | undefined;
 };
-export type AnyNamedQueryFunction = NamedQueryFunction<string, Schema, string, any, any, ReadonlyJSONValue | undefined, ReadonlyJSONValue | undefined>;
-export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs extends ReadonlyJSONValue | undefined>(name: TName, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TArgs>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
-export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined = TOutput>(name: TName, options: DefineQueryOptions<TInput, TOutput>, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TOutput, TInput>;
-export declare function defineQuery<TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs extends ReadonlyJSONValue | undefined>(name: TName, options: {}, queryFn: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TArgs>): NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
+export declare function isQueryDefinition<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined>(f: unknown): f is QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;
+export declare function defineQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TArgs extends ReadonlyJSONValue | undefined>(queryFn: (options: {
+    args: TArgs;
+    ctx: TContext;
+}) => Query<TSchema, TTable, TReturn>): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
+export declare function defineQuery<TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TContext, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined>(validator: StandardSchemaV1<TInput, TOutput>, queryFn: (options: {
+    args: TOutput;
+    ctx: TContext;
+}) => Query<TSchema, TTable, TReturn>): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;
+/**
+ * Wraps a query definition with a query name and context, creating a function that
+ * returns a Query with the name and args bound to the instance.
+ *
+ * @param queryName - The name to assign to the query
+ * @param f - The query definition to wrap
+ * @param contextHolder - An object containing the context to pass to the query
+ * @returns A function that takes args and returns a Query
+ */
+export declare function wrapCustomQuery<TArgs, Context>(queryName: string, f: QueryDefinition<any, any, any, any, any, any>, contextHolder: {
+    context: Context;
+}): (args: TArgs) => AnyQuery;
 /**
  * Creates a type-safe query definition function that is parameterized by a
- * custom context type.
+ * custom context type, without requiring a query name.
  *
  * This utility allows you to define queries with explicit context typing,
  * ensuring that the query function receives the correct context type. It
- * returns a function that can be used to define named queries with schema,
+ * returns a function that can be used to define queries with schema,
  * table, input, and output types.
  *
  * @typeParam TContext - The type of the context object that will be passed to
  * the query function.
  *
- * @returns A function for defining named queries with the specified context
- * type.
+ * @returns A function for defining queries with the specified context type.
  *
  * @example
  * ```ts
- * const defineQuery = defineQueryWithContextType<MyContext>();
- * const myQuery = defineQuery(
- *   "getUser",
- *   {validator: z.string()},
+ * const defineQuery2 = defineQuery2WithContextType<MyContext>();
+ * const myQuery = defineQuery2(
+ *   z.string(),
  *   ({ctx, args}) => {
  *     ctx satisfies MyContext;
  *     ...
@@ -47,5 +61,15 @@ export declare function defineQuery<TName extends string, TSchema extends Schema
  * );
  * ```
  */
-export declare function defineQueryWithContextType<TContext>(): <TName extends string, TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TOutput extends ReadonlyJSONValue | undefined, TInput extends ReadonlyJSONValue | undefined = TOutput>(name: TName, optionsOrQueryFn: DefineQueryOptions<TInput, TOutput> | DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>, queryFn?: DefineQueryFunc<TSchema, TTable, TReturn, TContext, TOutput>) => NamedQueryFunction<TName, TSchema, TTable, TReturn, TContext, TOutput, TInput>;
+export declare function defineQueryWithContextType<TContext>(): {
+    <TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TArgs extends ReadonlyJSONValue | undefined>(queryFn: (options: {
+        args: TArgs;
+        ctx: TContext;
+    }) => Query<TSchema, TTable, TReturn>): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;
+    <TSchema extends Schema, TTable extends keyof TSchema['tables'] & string, TReturn, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined>(validator: StandardSchemaV1<TInput, TOutput>, queryFn: (options: {
+        args: TOutput;
+        ctx: TContext;
+    }) => Query<TSchema, TTable, TReturn>): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;
+};
+export {};
 //# sourceMappingURL=define-query.d.ts.map

package/out/zql/src/query/define-query.d.ts.map

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

package/out/zql/src/query/define-query.js

@@ -1,53 +1,47 @@
-import { RootNamedQuery } from "./root-named-query.js";
-// Implementation
-export function defineQuery(name, optionsOrQueryFn, queryFn) {
-    // Handle different parameter patterns
-    let defineOptions;
-    let actualQueryFn;
-    if (typeof optionsOrQueryFn === 'function') {
-        // defineQuery(name, queryFn) - no options
-        defineOptions = undefined;
-        actualQueryFn = optionsOrQueryFn;
-    }
-    else {
-        // defineQuery(name, options, queryFn) - with options
-        defineOptions = optionsOrQueryFn;
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        actualQueryFn = queryFn;
-    }
-    const f = ((args) => new RootNamedQuery(name, actualQueryFn, args, defineOptions?.validator));
-    f.queryName = name;
-    return f;
+import { must } from "../../../shared/src/must.js";
+import { asQueryInternals } from "./query-internals.js";
+import { validateInput } from "./validate-input.js";
+const defineQueryTag = Symbol();
+function isQueryDefinition(f) {
+  return typeof f === "function" && f[defineQueryTag];
 }
-/**
- * Creates a type-safe query definition function that is parameterized by a
- * custom context type.
- *
- * This utility allows you to define queries with explicit context typing,
- * ensuring that the query function receives the correct context type. It
- * returns a function that can be used to define named queries with schema,
- * table, input, and output types.
- *
- * @typeParam TContext - The type of the context object that will be passed to
- * the query function.
- *
- * @returns A function for defining named queries with the specified context
- * type.
- *
- * @example
- * ```ts
- * const defineQuery = defineQueryWithContextType<MyContext>();
- * const myQuery = defineQuery(
- *   "getUser",
- *   {validator: z.string()},
- *   ({ctx, args}) => {
- *     ctx satisfies MyContext;
- *     ...
- *   },
- * );
- * ```
- */
-export function defineQueryWithContextType() {
-    return defineQuery;
+function defineQuery(validatorOrQueryFn, queryFn) {
+  let validator;
+  let actualQueryFn;
+  if (typeof validatorOrQueryFn === "function") {
+    validator = void 0;
+    actualQueryFn = validatorOrQueryFn;
+  } else {
+    validator = validatorOrQueryFn;
+    actualQueryFn = must(queryFn);
+  }
+  const f = actualQueryFn;
+  f[defineQueryTag] = true;
+  f.validator = validator;
+  return f;
 }
-//# sourceMappingURL=define-query.js.map
+function wrapCustomQuery(queryName, f, contextHolder) {
+  const { validator } = f;
+  const validate = validator ? (args) => validateInput(queryName, args, validator, "query") : (args) => args;
+  return (args) => {
+    const q = f({
+      args: validate(args),
+      ctx: contextHolder.context
+    });
+    return asQueryInternals(q).nameAndArgs(
+      queryName,
+      // TODO(arv): Get rid of the array?
+      args === void 0 ? [] : [args]
+    );
+  };
+}
+function defineQueryWithContextType() {
+  return defineQuery;
+}
+export {
+  defineQuery,
+  defineQueryWithContextType,
+  isQueryDefinition,
+  wrapCustomQuery
+};
+//# sourceMappingURL=define-query.js.map

package/out/zql/src/query/define-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"define-query.js","sourceRoot":"","sources":["../../../../../zql/src/query/define-query.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAmGrD,iBAAiB;AACjB,MAAM,UAAU,WAAW,CASzB,IAAW,EACX,gBAEgE,EAChE,OAAsE;IAUtE,sCAAsC;IACtC,IAAI,aAA8D,CAAC;IACnE,IAAI,aAMH,CAAC;IAEF,IAAI,OAAO,gBAAgB,KAAK,UAAU,EAAE,CAAC;QAC3C,0CAA0C;QAC1C,aAAa,GAAG,SAAS,CAAC;QAC1B,aAAa,GAAG,gBAAgB,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,qDAAqD;QACrD,aAAa,GAAG,gBAAgB,CAAC;QACjC,oEAAoE;QACpE,aAAa,GAAG,OAAQ,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,CAAC,IAAa,EAAE,EAAE,CAC3B,IAAI,cAAc,CAChB,IAAI,EACJ,aAAa,EACb,IAAI,EACJ,aAAa,EAAE,SAAS,CACzB,CAQF,CAAC;IACF,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,0BAA0B;IAsBxC,OAAO,WAqBN,CAAC;AACJ,CAAC"}
+{"version":3,"file":"define-query.js","sources":["../../../../../zql/src/query/define-query.ts"],"sourcesContent":["import type {StandardSchemaV1} from '@standard-schema/spec';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {asQueryInternals} from './query-internals.ts';\nimport type {AnyQuery, Query} from './query.ts';\nimport {validateInput} from './validate-input.ts';\n\nconst defineQueryTag = Symbol();\n\n/**\n * A query definition function that has been wrapped by `defineQuery`.\n * Contains the original function plus metadata (validator and tag).\n */\nexport type QueryDefinition<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n> = ((options: {\n  args: TOutput;\n  ctx: TContext;\n}) => Query<TSchema, TTable, TReturn>) & {\n  [defineQueryTag]: true;\n  validator: StandardSchemaV1<TInput, TOutput> | undefined;\n};\n\nexport function isQueryDefinition<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  f: unknown,\n): f is QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput> {\n  // oxlint-disable-next-line no-explicit-any\n  return typeof f === 'function' && (f as any)[defineQueryTag];\n}\n\n// Overload for no validator parameter with default inference for untyped functions\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TArgs extends ReadonlyJSONValue | undefined,\n>(\n  queryFn: (options: {\n    args: TArgs;\n    ctx: TContext;\n  }) => Query<TSchema, TTable, TReturn>,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;\n\n// Overload for validator parameter - Input and Output can be different\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  validator: StandardSchemaV1<TInput, TOutput>,\n  queryFn: (options: {\n    args: TOutput;\n    ctx: TContext;\n  }) => Query<TSchema, TTable, TReturn>,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;\n\n// Implementation\nexport function defineQuery<\n  TSchema extends Schema,\n  TTable extends keyof TSchema['tables'] & string,\n  TReturn,\n  TContext,\n  TInput extends ReadonlyJSONValue | undefined,\n  TOutput extends ReadonlyJSONValue | undefined,\n>(\n  validatorOrQueryFn:\n    | StandardSchemaV1<TInput, TOutput>\n    | ((options: {\n        args: TOutput;\n        ctx: TContext;\n      }) => Query<TSchema, TTable, TReturn>),\n  queryFn?: (options: {\n    args: TOutput;\n    ctx: TContext;\n  }) => Query<TSchema, TTable, TReturn>,\n): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput> {\n  // Handle different parameter patterns\n  let validator: StandardSchemaV1<TInput, TOutput> | undefined;\n  let actualQueryFn: (options: {\n    args: TOutput;\n    ctx: TContext;\n  }) => Query<TSchema, TTable, TReturn>;\n\n  if (typeof validatorOrQueryFn === 'function') {\n    // defineQuery(queryFn) - no validator\n    validator = undefined;\n    actualQueryFn = validatorOrQueryFn;\n  } else {\n    // defineQuery(validator, queryFn) - with validator\n    validator = validatorOrQueryFn;\n    actualQueryFn = must(queryFn);\n  }\n\n  // Pass through the function as-is, only adding tag and validator\n  const f = actualQueryFn as QueryDefinition<\n    TSchema,\n    TTable,\n    TReturn,\n    TContext,\n    TInput,\n    TOutput\n  >;\n\n  f[defineQueryTag] = true;\n  f.validator = validator;\n  return f;\n}\n\n/**\n * Wraps a query definition with a query name and context, creating a function that\n * returns a Query with the name and args bound to the instance.\n *\n * @param queryName - The name to assign to the query\n * @param f - The query definition to wrap\n * @param contextHolder - An object containing the context to pass to the query\n * @returns A function that takes args and returns a Query\n */\nexport function wrapCustomQuery<TArgs, Context>(\n  queryName: string,\n  // oxlint-disable-next-line no-explicit-any\n  f: QueryDefinition<any, any, any, any, any, any>,\n  contextHolder: {context: Context},\n): (args: TArgs) => AnyQuery {\n  const {validator} = f;\n  const validate = validator\n    ? (args: TArgs) =>\n        validateInput<TArgs, TArgs>(queryName, args, validator, 'query')\n    : (args: TArgs) => args;\n\n  return (args?: TArgs) => {\n    // The args that we send to the server is the args that the user passed in.\n    // This is what gets fed into the validator.\n    const q = f({\n      args: validate(args as TArgs),\n      ctx: contextHolder.context,\n    });\n    return asQueryInternals(q).nameAndArgs(\n      queryName,\n      // TODO(arv): Get rid of the array?\n      args === undefined ? [] : [args as unknown as ReadonlyJSONValue],\n    );\n  };\n}\n\n/**\n * Creates a type-safe query definition function that is parameterized by a\n * custom context type, without requiring a query name.\n *\n * This utility allows you to define queries with explicit context typing,\n * ensuring that the query function receives the correct context type. It\n * returns a function that can be used to define queries with schema,\n * table, input, and output types.\n *\n * @typeParam TContext - The type of the context object that will be passed to\n * the query function.\n *\n * @returns A function for defining queries with the specified context type.\n *\n * @example\n * ```ts\n * const defineQuery2 = defineQuery2WithContextType<MyContext>();\n * const myQuery = defineQuery2(\n *   z.string(),\n *   ({ctx, args}) => {\n *     ctx satisfies MyContext;\n *     ...\n *   },\n * );\n * ```\n */\nexport function defineQueryWithContextType<TContext>(): {\n  <\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    TArgs extends ReadonlyJSONValue | undefined,\n  >(\n    queryFn: (options: {\n      args: TArgs;\n      ctx: TContext;\n    }) => Query<TSchema, TTable, TReturn>,\n  ): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;\n\n  <\n    TSchema extends Schema,\n    TTable extends keyof TSchema['tables'] & string,\n    TReturn,\n    TInput extends ReadonlyJSONValue | undefined,\n    TOutput extends ReadonlyJSONValue | undefined,\n  >(\n    validator: StandardSchemaV1<TInput, TOutput>,\n    queryFn: (options: {\n      args: TOutput;\n      ctx: TContext;\n    }) => Query<TSchema, TTable, TReturn>,\n  ): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;\n} {\n  return defineQuery as {\n    <\n      TSchema extends Schema,\n      TTable extends keyof TSchema['tables'] & string,\n      TReturn,\n      TArgs extends ReadonlyJSONValue | undefined,\n    >(\n      queryFn: (options: {\n        args: TArgs;\n        ctx: TContext;\n      }) => Query<TSchema, TTable, TReturn>,\n    ): QueryDefinition<TSchema, TTable, TReturn, TContext, TArgs, TArgs>;\n\n    <\n      TSchema extends Schema,\n      TTable extends keyof TSchema['tables'] & string,\n      TReturn,\n      TInput extends ReadonlyJSONValue | undefined,\n      TOutput extends ReadonlyJSONValue | undefined,\n    >(\n      validator: StandardSchemaV1<TInput, TOutput>,\n      queryFn: (options: {\n        args: TOutput;\n        ctx: TContext;\n      }) => Query<TSchema, TTable, TReturn>,\n    ): QueryDefinition<TSchema, TTable, TReturn, TContext, TInput, TOutput>;\n  };\n}\n"],"names":[],"mappings":";;;AAQA,MAAM,iBAAiB,OAAA;AAqBhB,SAAS,kBAQd,GAC2E;AAE3E,SAAO,OAAO,MAAM,cAAe,EAAU,cAAc;AAC7D;AAiCO,SAAS,YAQd,oBAMA,SAIsE;AAEtE,MAAI;AACJ,MAAI;AAKJ,MAAI,OAAO,uBAAuB,YAAY;AAE5C,gBAAY;AACZ,oBAAgB;AAAA,EAClB,OAAO;AAEL,gBAAY;AACZ,oBAAgB,KAAK,OAAO;AAAA,EAC9B;AAGA,QAAM,IAAI;AASV,IAAE,cAAc,IAAI;AACpB,IAAE,YAAY;AACd,SAAO;AACT;AAWO,SAAS,gBACd,WAEA,GACA,eAC2B;AAC3B,QAAM,EAAC,cAAa;AACpB,QAAM,WAAW,YACb,CAAC,SACC,cAA4B,WAAW,MAAM,WAAW,OAAO,IACjE,CAAC,SAAgB;AAErB,SAAO,CAAC,SAAiB;AAGvB,UAAM,IAAI,EAAE;AAAA,MACV,MAAM,SAAS,IAAa;AAAA,MAC5B,KAAK,cAAc;AAAA,IAAA,CACpB;AACD,WAAO,iBAAiB,CAAC,EAAE;AAAA,MACzB;AAAA;AAAA,MAEA,SAAS,SAAY,CAAA,IAAK,CAAC,IAAoC;AAAA,IAAA;AAAA,EAEnE;AACF;AA4BO,SAAS,6BA0Bd;AACA,SAAO;AA2BT;"}

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

@@ -1,9 +1,13 @@
-export class QueryParseError extends Error {
-    constructor(opts) {
-        super(opts?.cause instanceof Error
-            ? `Failed to parse arguments for query: ${opts.cause.message}`
-            : `Failed to parse arguments for query`, opts);
-        this.name = 'QueryParseError';
-    }
+class QueryParseError extends Error {
+  constructor(opts) {
+    super(
+      opts?.cause instanceof Error ? `Failed to parse arguments for query: ${opts.cause.message}` : `Failed to parse arguments for query`,
+      opts
+    );
+    this.name = "QueryParseError";
+  }
 }
-//# sourceMappingURL=error.js.map
+export {
+  QueryParseError
+};
+//# sourceMappingURL=error.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../../zql/src/query/error.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,YAAY,IAAkB;QAC5B,KAAK,CACH,IAAI,EAAE,KAAK,YAAY,KAAK;YAC1B,CAAC,CAAC,wCAAwC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAC9D,CAAC,CAAC,qCAAqC,EACzC,IAAI,CACL,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF"}
+{"version":3,"file":"error.js","sources":["../../../../../zql/src/query/error.ts"],"sourcesContent":["export class QueryParseError extends Error {\n  constructor(opts: ErrorOptions) {\n    super(\n      opts?.cause instanceof Error\n        ? `Failed to parse arguments for query: ${opts.cause.message}`\n        : `Failed to parse arguments for query`,\n      opts,\n    );\n    this.name = 'QueryParseError';\n  }\n}\n"],"names":[],"mappings":"AAAO,MAAM,wBAAwB,MAAM;AAAA,EACzC,YAAY,MAAoB;AAC9B;AAAA,MACE,MAAM,iBAAiB,QACnB,wCAAwC,KAAK,MAAM,OAAO,KAC1D;AAAA,MACJ;AAAA,IAAA;AAEF,SAAK,OAAO;AAAA,EACd;AACF;"}

package/out/zql/src/query/escape-like.js

@@ -0,0 +1,7 @@
+function escapeLike(val) {
+  return val.replace(/[%_]/g, "\\$&");
+}
+export {
+  escapeLike
+};
+//# sourceMappingURL=escape-like.js.map

package/out/zql/src/query/escape-like.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"escape-like.js","sources":["../../../../../zql/src/query/escape-like.ts"],"sourcesContent":["export function escapeLike(val: string) {\n  return val.replace(/[%_]/g, '\\\\$&');\n}\n"],"names":[],"mappings":"AAAO,SAAS,WAAW,KAAa;AACtC,SAAO,IAAI,QAAQ,SAAS,MAAM;AACpC;"}