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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (218) hide show
  1. package/out/analyze-query/src/zql-chain.js +9 -1
  2. package/out/analyze-query/src/zql-chain.js.map +1 -1
  3. package/out/ast-to-zql/src/ast-to-zql.d.ts.map +1 -1
  4. package/out/ast-to-zql/src/ast-to-zql.js +61 -20
  5. package/out/ast-to-zql/src/ast-to-zql.js.map +1 -1
  6. package/out/z2s/src/compiler.d.ts +1 -1
  7. package/out/z2s/src/compiler.d.ts.map +1 -1
  8. package/out/z2s/src/compiler.js +339 -2
  9. package/out/z2s/src/compiler.js.map +1 -1
  10. package/out/z2s/src/sql.d.ts +8 -0
  11. package/out/z2s/src/sql.d.ts.map +1 -1
  12. package/out/z2s/src/sql.js +58 -11
  13. package/out/z2s/src/sql.js.map +1 -1
  14. package/out/zero/package.js +1 -1
  15. package/out/zero/package.js.map +1 -1
  16. package/out/zero/src/bindings.js +4 -4
  17. package/out/zero-cache/src/auth/write-authorizer.js +1 -1
  18. package/out/zero-cache/src/config/zero-config.d.ts +4 -0
  19. package/out/zero-cache/src/config/zero-config.d.ts.map +1 -1
  20. package/out/zero-cache/src/config/zero-config.js +13 -0
  21. package/out/zero-cache/src/config/zero-config.js.map +1 -1
  22. package/out/zero-cache/src/db/create.js +1 -1
  23. package/out/zero-cache/src/scripts/decommission.js +1 -1
  24. package/out/zero-cache/src/server/runner/run-worker.d.ts.map +1 -1
  25. package/out/zero-cache/src/server/runner/run-worker.js +8 -5
  26. package/out/zero-cache/src/server/runner/run-worker.js.map +1 -1
  27. package/out/zero-cache/src/services/change-source/pg/backfill-stream.js +1 -1
  28. package/out/zero-cache/src/services/change-source/pg/initial-sync.js +1 -1
  29. package/out/zero-cache/src/services/change-source/pg/logical-replication/stream.js +1 -1
  30. package/out/zero-cache/src/services/change-source/pg/schema/ddl.js +1 -1
  31. package/out/zero-cache/src/services/change-source/pg/schema/init.js +1 -1
  32. package/out/zero-cache/src/services/change-source/pg/schema/shard.js +1 -1
  33. package/out/zero-cache/src/services/http-service.d.ts +6 -0
  34. package/out/zero-cache/src/services/http-service.d.ts.map +1 -1
  35. package/out/zero-cache/src/services/http-service.js +13 -1
  36. package/out/zero-cache/src/services/http-service.js.map +1 -1
  37. package/out/zero-cache/src/services/life-cycle.d.ts +19 -0
  38. package/out/zero-cache/src/services/life-cycle.d.ts.map +1 -1
  39. package/out/zero-cache/src/services/life-cycle.js +53 -1
  40. package/out/zero-cache/src/services/life-cycle.js.map +1 -1
  41. package/out/zero-cache/src/services/replicator/change-processor.js +1 -1
  42. package/out/zero-cache/src/services/view-syncer/pipeline-driver.js +100 -12
  43. package/out/zero-cache/src/services/view-syncer/pipeline-driver.js.map +1 -1
  44. package/out/zero-cache/src/services/view-syncer/query-covering.js +2 -2
  45. package/out/zero-cache/src/services/view-syncer/query-covering.js.map +1 -1
  46. package/out/zero-cache/src/services/view-syncer/snapshotter.js +1 -1
  47. package/out/zero-cache/src/types/processes.js +4 -4
  48. package/out/zero-cache/src/types/processes.js.map +1 -1
  49. package/out/zero-cache/src/types/row-key.js +8 -1
  50. package/out/zero-cache/src/types/row-key.js.map +1 -1
  51. package/out/zero-cache/src/workers/connection.js +2 -2
  52. package/out/zero-client/src/client/bindings.d.ts +1 -1
  53. package/out/zero-client/src/client/bindings.d.ts.map +1 -1
  54. package/out/zero-client/src/client/bindings.js +4 -4
  55. package/out/zero-client/src/client/context.d.ts +7 -1
  56. package/out/zero-client/src/client/context.d.ts.map +1 -1
  57. package/out/zero-client/src/client/context.js +7 -0
  58. package/out/zero-client/src/client/context.js.map +1 -1
  59. package/out/zero-client/src/client/crud-impl.d.ts.map +1 -1
  60. package/out/zero-client/src/client/crud-impl.js +171 -2
  61. package/out/zero-client/src/client/crud-impl.js.map +1 -1
  62. package/out/zero-client/src/client/custom.d.ts.map +1 -1
  63. package/out/zero-client/src/client/custom.js +42 -3
  64. package/out/zero-client/src/client/custom.js.map +1 -1
  65. package/out/zero-client/src/client/ivm-branch.d.ts +62 -2
  66. package/out/zero-client/src/client/ivm-branch.d.ts.map +1 -1
  67. package/out/zero-client/src/client/ivm-branch.js +152 -31
  68. package/out/zero-client/src/client/ivm-branch.js.map +1 -1
  69. package/out/zero-client/src/client/keys.d.ts +33 -0
  70. package/out/zero-client/src/client/keys.d.ts.map +1 -1
  71. package/out/zero-client/src/client/keys.js +43 -4
  72. package/out/zero-client/src/client/keys.js.map +1 -1
  73. package/out/zero-client/src/client/version.js +1 -1
  74. package/out/zero-client/src/client/zero-poke-handler.d.ts.map +1 -1
  75. package/out/zero-client/src/client/zero-poke-handler.js +29 -1
  76. package/out/zero-client/src/client/zero-poke-handler.js.map +1 -1
  77. package/out/zero-client/src/client/zero-rep.d.ts +1 -1
  78. package/out/zero-client/src/client/zero-rep.d.ts.map +1 -1
  79. package/out/zero-client/src/client/zero-rep.js +2 -15
  80. package/out/zero-client/src/client/zero-rep.js.map +1 -1
  81. package/out/zero-client/src/client/zero.js +1 -1
  82. package/out/zero-client/src/mod.d.ts +3 -3
  83. package/out/zero-client/src/mod.d.ts.map +1 -1
  84. package/out/zero-protocol/src/aggregate-table.d.ts +15 -0
  85. package/out/zero-protocol/src/aggregate-table.d.ts.map +1 -0
  86. package/out/zero-protocol/src/aggregate-table.js +5 -0
  87. package/out/zero-protocol/src/aggregate-table.js.map +1 -0
  88. package/out/zero-protocol/src/ast.d.ts +141 -5
  89. package/out/zero-protocol/src/ast.d.ts.map +1 -1
  90. package/out/zero-protocol/src/ast.js +244 -18
  91. package/out/zero-protocol/src/ast.js.map +1 -1
  92. package/out/zero-protocol/src/down.d.ts +29 -29
  93. package/out/zero-protocol/src/inspect-down.d.ts +81 -81
  94. package/out/zero-protocol/src/protocol-version.d.ts +1 -1
  95. package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
  96. package/out/zero-protocol/src/protocol-version.js.map +1 -1
  97. package/out/zero-protocol/src/query-hash-visitor.d.ts.map +1 -1
  98. package/out/zero-protocol/src/query-hash-visitor.js +38 -0
  99. package/out/zero-protocol/src/query-hash-visitor.js.map +1 -1
  100. package/out/zero-react/src/bindings.js +4 -4
  101. package/out/zero-react/src/use-query.d.ts +3 -1
  102. package/out/zero-react/src/use-query.d.ts.map +1 -1
  103. package/out/zero-react/src/use-query.js +4 -2
  104. package/out/zero-react/src/use-query.js.map +1 -1
  105. package/out/zero-schema/src/builder/schema-builder.d.ts.map +1 -1
  106. package/out/zero-schema/src/builder/schema-builder.js +2 -0
  107. package/out/zero-schema/src/builder/schema-builder.js.map +1 -1
  108. package/out/zero-schema/src/name-mapper.d.ts.map +1 -1
  109. package/out/zero-schema/src/name-mapper.js +7 -4
  110. package/out/zero-schema/src/name-mapper.js.map +1 -1
  111. package/out/zero-server/src/custom.js +1 -1
  112. package/out/zero-server/src/schema.d.ts.map +1 -1
  113. package/out/zero-server/src/schema.js +13 -2
  114. package/out/zero-server/src/schema.js.map +1 -1
  115. package/out/zero-solid/src/bindings.js +4 -4
  116. package/out/zero-solid/src/solid-view.d.ts.map +1 -1
  117. package/out/zero-solid/src/solid-view.js +3 -3
  118. package/out/zero-solid/src/solid-view.js.map +1 -1
  119. package/out/zero-types/src/format.d.ts +13 -0
  120. package/out/zero-types/src/format.d.ts.map +1 -1
  121. package/out/zero-types/src/format.js.map +1 -1
  122. package/out/zero-types/src/name-mapper.d.ts +14 -0
  123. package/out/zero-types/src/name-mapper.d.ts.map +1 -1
  124. package/out/zero-types/src/name-mapper.js +12 -0
  125. package/out/zero-types/src/name-mapper.js.map +1 -1
  126. package/out/zero-types/src/schema-value.d.ts +2 -0
  127. package/out/zero-types/src/schema-value.d.ts.map +1 -1
  128. package/out/zero-types/src/schema-value.js +15 -0
  129. package/out/zero-types/src/schema-value.js.map +1 -0
  130. package/out/zero-types/src/server-schema.d.ts +18 -0
  131. package/out/zero-types/src/server-schema.d.ts.map +1 -1
  132. package/out/zql/src/builder/builder.d.ts +126 -1
  133. package/out/zql/src/builder/builder.d.ts.map +1 -1
  134. package/out/zql/src/builder/builder.js +281 -11
  135. package/out/zql/src/builder/builder.js.map +1 -1
  136. package/out/zql/src/builder/filter.d.ts +1 -1
  137. package/out/zql/src/builder/filter.d.ts.map +1 -1
  138. package/out/zql/src/builder/filter.js +41 -3
  139. package/out/zql/src/builder/filter.js.map +1 -1
  140. package/out/zql/src/ivm/aggregate.d.ts +188 -0
  141. package/out/zql/src/ivm/aggregate.d.ts.map +1 -0
  142. package/out/zql/src/ivm/aggregate.js +470 -0
  143. package/out/zql/src/ivm/aggregate.js.map +1 -0
  144. package/out/zql/src/ivm/array-view.d.ts +1 -1
  145. package/out/zql/src/ivm/array-view.d.ts.map +1 -1
  146. package/out/zql/src/ivm/array-view.js +3 -3
  147. package/out/zql/src/ivm/array-view.js.map +1 -1
  148. package/out/zql/src/ivm/cap.js +2 -2
  149. package/out/zql/src/ivm/constraint.d.ts.map +1 -1
  150. package/out/zql/src/ivm/constraint.js +2 -1
  151. package/out/zql/src/ivm/constraint.js.map +1 -1
  152. package/out/zql/src/ivm/deferred-input.js +1 -1
  153. package/out/zql/src/ivm/fan-in.js +1 -1
  154. package/out/zql/src/ivm/flipped-join.d.ts.map +1 -1
  155. package/out/zql/src/ivm/flipped-join.js +3 -2
  156. package/out/zql/src/ivm/flipped-join.js.map +1 -1
  157. package/out/zql/src/ivm/group-by.d.ts +98 -0
  158. package/out/zql/src/ivm/group-by.d.ts.map +1 -0
  159. package/out/zql/src/ivm/group-by.js +384 -0
  160. package/out/zql/src/ivm/group-by.js.map +1 -0
  161. package/out/zql/src/ivm/join-index.d.ts.map +1 -1
  162. package/out/zql/src/ivm/join-index.js +2 -1
  163. package/out/zql/src/ivm/join-index.js.map +1 -1
  164. package/out/zql/src/ivm/join-utils.d.ts.map +1 -1
  165. package/out/zql/src/ivm/join-utils.js +2 -1
  166. package/out/zql/src/ivm/join-utils.js.map +1 -1
  167. package/out/zql/src/ivm/join.js +1 -1
  168. package/out/zql/src/ivm/lift-field.d.ts +54 -0
  169. package/out/zql/src/ivm/lift-field.d.ts.map +1 -0
  170. package/out/zql/src/ivm/lift-field.js +168 -0
  171. package/out/zql/src/ivm/lift-field.js.map +1 -0
  172. package/out/zql/src/ivm/maybe-split-and-push-edit-change.js +1 -1
  173. package/out/zql/src/ivm/memory-source.d.ts +2 -0
  174. package/out/zql/src/ivm/memory-source.d.ts.map +1 -1
  175. package/out/zql/src/ivm/memory-source.js +9 -4
  176. package/out/zql/src/ivm/memory-source.js.map +1 -1
  177. package/out/zql/src/ivm/push-accumulated.js +1 -1
  178. package/out/zql/src/ivm/schema.d.ts +1 -0
  179. package/out/zql/src/ivm/schema.d.ts.map +1 -1
  180. package/out/zql/src/ivm/source.d.ts +21 -0
  181. package/out/zql/src/ivm/source.d.ts.map +1 -1
  182. package/out/zql/src/ivm/source.js.map +1 -1
  183. package/out/zql/src/ivm/take.js +1 -1
  184. package/out/zql/src/ivm/union-fan-in.js +1 -1
  185. package/out/zql/src/ivm/view-apply-change.d.ts +5 -0
  186. package/out/zql/src/ivm/view-apply-change.d.ts.map +1 -1
  187. package/out/zql/src/ivm/view-apply-change.js +23 -3
  188. package/out/zql/src/ivm/view-apply-change.js.map +1 -1
  189. package/out/zql/src/planner/planner-debug.d.ts +1 -1
  190. package/out/zql/src/planner/planner-debug.d.ts.map +1 -1
  191. package/out/zql/src/planner/planner-debug.js +4 -0
  192. package/out/zql/src/planner/planner-debug.js.map +1 -1
  193. package/out/zql/src/query/expression.d.ts +50 -3
  194. package/out/zql/src/query/expression.d.ts.map +1 -1
  195. package/out/zql/src/query/expression.js +62 -6
  196. package/out/zql/src/query/expression.js.map +1 -1
  197. package/out/zql/src/query/measure-push-operator.js +1 -1
  198. package/out/zql/src/query/query-delegate-base.d.ts +8 -0
  199. package/out/zql/src/query/query-delegate-base.d.ts.map +1 -1
  200. package/out/zql/src/query/query-delegate-base.js +13 -5
  201. package/out/zql/src/query/query-delegate-base.js.map +1 -1
  202. package/out/zql/src/query/query-impl.d.ts +17 -3
  203. package/out/zql/src/query/query-impl.d.ts.map +1 -1
  204. package/out/zql/src/query/query-impl.js +239 -7
  205. package/out/zql/src/query/query-impl.js.map +1 -1
  206. package/out/zql/src/query/query.d.ts +319 -7
  207. package/out/zql/src/query/query.d.ts.map +1 -1
  208. package/out/zqlite/src/pending-delta.d.ts.map +1 -1
  209. package/out/zqlite/src/pending-delta.js +4 -3
  210. package/out/zqlite/src/pending-delta.js.map +1 -1
  211. package/out/zqlite/src/query-builder.d.ts +12 -1
  212. package/out/zqlite/src/query-builder.d.ts.map +1 -1
  213. package/out/zqlite/src/query-builder.js +114 -13
  214. package/out/zqlite/src/query-builder.js.map +1 -1
  215. package/out/zqlite/src/table-source.d.ts.map +1 -1
  216. package/out/zqlite/src/table-source.js +37 -3
  217. package/out/zqlite/src/table-source.js.map +1 -1
  218. package/package.json +1 -1
@@ -43,6 +43,13 @@ var QUERY_METHODS = {
43
43
  limit: true,
44
44
  one: true,
45
45
  start: true,
46
+ count: true,
47
+ sum: true,
48
+ avg: true,
49
+ min: true,
50
+ max: true,
51
+ distinct: true,
52
+ groupBy: true,
46
53
  run: false,
47
54
  preload: false,
48
55
  materialize: false
@@ -54,7 +61,8 @@ var EXPRESSION_BUILDER_METHODS = {
54
61
  or: true,
55
62
  not: true,
56
63
  exists: true,
57
- eb: true
64
+ eb: true,
65
+ json: true
58
66
  };
59
67
  var ALLOWED_METHODS = new Set(Object.entries({
60
68
  ...QUERY_METHODS,
@@ -1 +1 @@
1
- {"version":3,"file":"zql-chain.js","names":[],"sources":["../../../../analyze-query/src/zql-chain.ts"],"sourcesContent":["import {\n parseSync,\n type ArrowFunctionExpression,\n type Expression,\n type Node,\n type ObjectExpression,\n} from 'oxc-parser';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ExpressionBuilder} from '../../zql/src/query/expression.ts';\nimport type {Query} from '../../zql/src/query/query.ts';\n\n/**\n * Evaluates a ZQL query written in chain form, e.g.\n * `issue.where('open', true).related('comments', q => q.limit(10))`.\n *\n * The text is parsed with oxc and the resulting JavaScript AST is evaluated\n * directly. It is never run as JavaScript. Only these constructs are\n * accepted:\n *\n * - identifiers: table names (looked up on `root`), arrow function\n * parameters, and `undefined`\n * - calls to the query and expression builder methods in\n * {@link ALLOWED_METHODS}, either as `x.method(...)` or through a\n * destructured parameter such as `({cmp, or}) => or(cmp(...))`\n * - string, number, boolean and null literals, negative numbers, and\n * template literals without substitutions\n * - array and object literals\n * - arrow functions with an expression body whose parameters are\n * identifiers or `{a, b}` patterns of allowed method names\n *\n * Anything else, including access to any other property, is rejected.\n */\nexport function evaluateZQLChain(text: string, root: object): unknown {\n const {program, errors} = parseSync('query.js', text, {\n lang: 'js',\n sourceType: 'script',\n });\n if (errors.length > 0) {\n const [error] = errors;\n const pos = error.labels[0]?.start;\n throw new SyntaxError(\n pos === undefined ? error.message : `${error.message} at position ${pos}`,\n );\n }\n const [statement, ...rest] = program.body;\n if (statement?.type !== 'ExpressionStatement' || rest.length > 0) {\n throw new SyntaxError('Expected a single query expression');\n }\n return new Evaluator(text, root).evaluate(statement.expression, new Map());\n}\n\n// Every string-keyed member of Query and ExpressionBuilder is listed here, so\n// adding or removing one fails type checking until it is classified as\n// allowed or not. Symbol keys can't be written in the query text.\ntype MethodName<T> = Extract<keyof T, string>;\n\nconst QUERY_METHODS = {\n where: true,\n whereExists: true,\n related: true,\n orderBy: true,\n limit: true,\n one: true,\n start: true,\n run: false,\n preload: false,\n materialize: false,\n} satisfies Record<MethodName<Query<string, Schema>>, boolean>;\n\nconst EXPRESSION_BUILDER_METHODS = {\n cmp: true,\n cmpLit: true,\n and: true,\n or: true,\n not: true,\n exists: true,\n eb: true,\n} satisfies Record<MethodName<ExpressionBuilder<string, Schema>>, boolean>;\n\nconst ALLOWED_METHODS: ReadonlySet<string> = new Set(\n Object.entries({...QUERY_METHODS, ...EXPRESSION_BUILDER_METHODS})\n .filter(([, allowed]) => allowed)\n .map(([name]) => name),\n);\n\ntype Scope = ReadonlyMap<string, unknown>;\n\nclass Evaluator {\n readonly #text: string;\n readonly #root: object;\n\n constructor(text: string, root: object) {\n this.#text = text;\n this.#root = root;\n }\n\n #reject(node: Node, what: string): never {\n const source = this.#text.slice(node.start, node.end);\n throw new SyntaxError(\n `${what} is not allowed: \\`${source}\\` at position ${node.start}`,\n );\n }\n\n evaluate(node: Expression, scope: Scope): unknown {\n switch (node.type) {\n case 'ParenthesizedExpression':\n return this.evaluate(node.expression, scope);\n case 'Literal':\n if (\n (node as {regex?: unknown}).regex ||\n (node as {bigint?: unknown}).bigint\n ) {\n this.#reject(node, 'Literal');\n }\n return node.value;\n case 'TemplateLiteral':\n if (node.expressions.length > 0) {\n this.#reject(node, 'Template substitution');\n }\n return node.quasis[0].value.cooked;\n case 'UnaryExpression':\n if (\n node.operator === '-' &&\n node.argument.type === 'Literal' &&\n typeof node.argument.value === 'number'\n ) {\n return -node.argument.value;\n }\n return this.#reject(node, 'Operator');\n case 'Identifier':\n return this.#lookup(node, node.name, scope);\n case 'ArrayExpression':\n return node.elements.map(e => {\n if (e === null || e.type === 'SpreadElement') {\n return this.#reject(node, 'Array hole or spread');\n }\n return this.evaluate(e, scope);\n });\n case 'ObjectExpression':\n return this.#evaluateObject(node, scope);\n case 'ArrowFunctionExpression':\n return this.#evaluateArrow(node, scope);\n case 'CallExpression':\n return this.#evaluateCall(node, scope);\n default:\n return this.#reject(node, node.type);\n }\n }\n\n #lookup(node: Node, name: string, scope: Scope): unknown {\n if (scope.has(name)) {\n return scope.get(name);\n }\n if (name === 'undefined') {\n return undefined;\n }\n if (!Object.hasOwn(this.#root, name)) {\n this.#reject(node, 'Unknown identifier');\n }\n return (this.#root as Record<string, unknown>)[name];\n }\n\n #evaluateObject(node: ObjectExpression, scope: Scope): unknown {\n const obj: Record<string, unknown> = {};\n for (const prop of node.properties) {\n if (\n prop.type !== 'Property' ||\n prop.kind !== 'init' ||\n prop.method ||\n prop.computed\n ) {\n return this.#reject(prop, 'Object member');\n }\n let key: string;\n if (prop.key.type === 'Identifier') {\n key = prop.key.name;\n } else if (\n prop.key.type === 'Literal' &&\n typeof prop.key.value === 'string'\n ) {\n key = prop.key.value;\n } else {\n return this.#reject(prop.key, 'Object key');\n }\n if (key === '__proto__') {\n return this.#reject(prop.key, 'Object key');\n }\n obj[key] = this.evaluate(prop.value as Expression, scope);\n }\n return obj;\n }\n\n #evaluateArrow(node: ArrowFunctionExpression, scope: Scope): unknown {\n if (!node.expression || node.async) {\n return this.#reject(node, 'Arrow function with a block body');\n }\n const body = node.body as Expression;\n const params = node.params.map(param => {\n if (param.type === 'Identifier') {\n return {name: param.name};\n }\n if (param.type !== 'ObjectPattern') {\n return this.#reject(param, 'Parameter');\n }\n return {\n names: param.properties.map(p => {\n if (\n p.type !== 'Property' ||\n p.computed ||\n p.value.type !== 'Identifier' ||\n !p.shorthand ||\n p.key.type !== 'Identifier' ||\n !ALLOWED_METHODS.has(p.key.name)\n ) {\n return this.#reject(p, 'Destructured parameter');\n }\n return p.key.name;\n }),\n };\n });\n return (...args: unknown[]) => {\n const inner = new Map(scope);\n params.forEach((param, i) => {\n if ('name' in param) {\n inner.set(param.name, args[i]);\n } else {\n const arg = args[i] as Record<string, unknown>;\n for (const name of param.names) {\n inner.set(name, arg[name]);\n }\n }\n });\n return this.evaluate(body, inner);\n };\n }\n\n #evaluateCall(\n node: Extract<Expression, {type: 'CallExpression'}>,\n scope: Scope,\n ): unknown {\n if (node.optional) {\n return this.#reject(node, 'Optional call');\n }\n const args = node.arguments.map(a => {\n if (a.type === 'SpreadElement') {\n return this.#reject(a, 'Spread');\n }\n return this.evaluate(a, scope);\n });\n const {callee} = node;\n let thisValue: unknown;\n let fn: unknown;\n if (callee.type === 'MemberExpression') {\n if (\n callee.computed ||\n callee.optional ||\n callee.property.type !== 'Identifier' ||\n !ALLOWED_METHODS.has(callee.property.name)\n ) {\n return this.#reject(callee, 'Method');\n }\n thisValue = this.evaluate(callee.object, scope);\n if (thisValue === null || typeof thisValue !== 'object') {\n return this.#reject(callee.object, 'Receiver');\n }\n fn = (thisValue as Record<string, unknown>)[callee.property.name];\n } else if (callee.type === 'Identifier' && scope.has(callee.name)) {\n fn = scope.get(callee.name);\n } else {\n return this.#reject(callee, 'Callee');\n }\n if (typeof fn !== 'function') {\n return this.#reject(callee, 'Non-function call');\n }\n return Reflect.apply(fn, thisValue, args);\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"zql-chain.js","names":[],"sources":["../../../../analyze-query/src/zql-chain.ts"],"sourcesContent":["import {\n parseSync,\n type ArrowFunctionExpression,\n type Expression,\n type Node,\n type ObjectExpression,\n} from 'oxc-parser';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport type {ExpressionBuilder} from '../../zql/src/query/expression.ts';\nimport type {Query} from '../../zql/src/query/query.ts';\n\n/**\n * Evaluates a ZQL query written in chain form, e.g.\n * `issue.where('open', true).related('comments', q => q.limit(10))`.\n *\n * The text is parsed with oxc and the resulting JavaScript AST is evaluated\n * directly. It is never run as JavaScript. Only these constructs are\n * accepted:\n *\n * - identifiers: table names (looked up on `root`), arrow function\n * parameters, and `undefined`\n * - calls to the query and expression builder methods in\n * {@link ALLOWED_METHODS}, either as `x.method(...)` or through a\n * destructured parameter such as `({cmp, or}) => or(cmp(...))`\n * - string, number, boolean and null literals, negative numbers, and\n * template literals without substitutions\n * - array and object literals\n * - arrow functions with an expression body whose parameters are\n * identifiers or `{a, b}` patterns of allowed method names\n *\n * Anything else, including access to any other property, is rejected.\n */\nexport function evaluateZQLChain(text: string, root: object): unknown {\n const {program, errors} = parseSync('query.js', text, {\n lang: 'js',\n sourceType: 'script',\n });\n if (errors.length > 0) {\n const [error] = errors;\n const pos = error.labels[0]?.start;\n throw new SyntaxError(\n pos === undefined ? error.message : `${error.message} at position ${pos}`,\n );\n }\n const [statement, ...rest] = program.body;\n if (statement?.type !== 'ExpressionStatement' || rest.length > 0) {\n throw new SyntaxError('Expected a single query expression');\n }\n return new Evaluator(text, root).evaluate(statement.expression, new Map());\n}\n\n// Every string-keyed member of Query and ExpressionBuilder is listed here, so\n// adding or removing one fails type checking until it is classified as\n// allowed or not. Symbol keys can't be written in the query text.\ntype MethodName<T> = Extract<keyof T, string>;\n\nconst QUERY_METHODS = {\n where: true,\n whereExists: true,\n related: true,\n orderBy: true,\n limit: true,\n one: true,\n start: true,\n count: true,\n sum: true,\n avg: true,\n min: true,\n max: true,\n distinct: true,\n groupBy: true,\n run: false,\n preload: false,\n materialize: false,\n} satisfies Record<MethodName<Query<string, Schema>>, boolean>;\n\nconst EXPRESSION_BUILDER_METHODS = {\n cmp: true,\n cmpLit: true,\n and: true,\n or: true,\n not: true,\n exists: true,\n eb: true,\n json: true,\n} satisfies Record<MethodName<ExpressionBuilder<string, Schema>>, boolean>;\n\nconst ALLOWED_METHODS: ReadonlySet<string> = new Set(\n Object.entries({...QUERY_METHODS, ...EXPRESSION_BUILDER_METHODS})\n .filter(([, allowed]) => allowed)\n .map(([name]) => name),\n);\n\ntype Scope = ReadonlyMap<string, unknown>;\n\nclass Evaluator {\n readonly #text: string;\n readonly #root: object;\n\n constructor(text: string, root: object) {\n this.#text = text;\n this.#root = root;\n }\n\n #reject(node: Node, what: string): never {\n const source = this.#text.slice(node.start, node.end);\n throw new SyntaxError(\n `${what} is not allowed: \\`${source}\\` at position ${node.start}`,\n );\n }\n\n evaluate(node: Expression, scope: Scope): unknown {\n switch (node.type) {\n case 'ParenthesizedExpression':\n return this.evaluate(node.expression, scope);\n case 'Literal':\n if (\n (node as {regex?: unknown}).regex ||\n (node as {bigint?: unknown}).bigint\n ) {\n this.#reject(node, 'Literal');\n }\n return node.value;\n case 'TemplateLiteral':\n if (node.expressions.length > 0) {\n this.#reject(node, 'Template substitution');\n }\n return node.quasis[0].value.cooked;\n case 'UnaryExpression':\n if (\n node.operator === '-' &&\n node.argument.type === 'Literal' &&\n typeof node.argument.value === 'number'\n ) {\n return -node.argument.value;\n }\n return this.#reject(node, 'Operator');\n case 'Identifier':\n return this.#lookup(node, node.name, scope);\n case 'ArrayExpression':\n return node.elements.map(e => {\n if (e === null || e.type === 'SpreadElement') {\n return this.#reject(node, 'Array hole or spread');\n }\n return this.evaluate(e, scope);\n });\n case 'ObjectExpression':\n return this.#evaluateObject(node, scope);\n case 'ArrowFunctionExpression':\n return this.#evaluateArrow(node, scope);\n case 'CallExpression':\n return this.#evaluateCall(node, scope);\n default:\n return this.#reject(node, node.type);\n }\n }\n\n #lookup(node: Node, name: string, scope: Scope): unknown {\n if (scope.has(name)) {\n return scope.get(name);\n }\n if (name === 'undefined') {\n return undefined;\n }\n if (!Object.hasOwn(this.#root, name)) {\n this.#reject(node, 'Unknown identifier');\n }\n return (this.#root as Record<string, unknown>)[name];\n }\n\n #evaluateObject(node: ObjectExpression, scope: Scope): unknown {\n const obj: Record<string, unknown> = {};\n for (const prop of node.properties) {\n if (\n prop.type !== 'Property' ||\n prop.kind !== 'init' ||\n prop.method ||\n prop.computed\n ) {\n return this.#reject(prop, 'Object member');\n }\n let key: string;\n if (prop.key.type === 'Identifier') {\n key = prop.key.name;\n } else if (\n prop.key.type === 'Literal' &&\n typeof prop.key.value === 'string'\n ) {\n key = prop.key.value;\n } else {\n return this.#reject(prop.key, 'Object key');\n }\n if (key === '__proto__') {\n return this.#reject(prop.key, 'Object key');\n }\n obj[key] = this.evaluate(prop.value as Expression, scope);\n }\n return obj;\n }\n\n #evaluateArrow(node: ArrowFunctionExpression, scope: Scope): unknown {\n if (!node.expression || node.async) {\n return this.#reject(node, 'Arrow function with a block body');\n }\n const body = node.body as Expression;\n const params = node.params.map(param => {\n if (param.type === 'Identifier') {\n return {name: param.name};\n }\n if (param.type !== 'ObjectPattern') {\n return this.#reject(param, 'Parameter');\n }\n return {\n names: param.properties.map(p => {\n if (\n p.type !== 'Property' ||\n p.computed ||\n p.value.type !== 'Identifier' ||\n !p.shorthand ||\n p.key.type !== 'Identifier' ||\n !ALLOWED_METHODS.has(p.key.name)\n ) {\n return this.#reject(p, 'Destructured parameter');\n }\n return p.key.name;\n }),\n };\n });\n return (...args: unknown[]) => {\n const inner = new Map(scope);\n params.forEach((param, i) => {\n if ('name' in param) {\n inner.set(param.name, args[i]);\n } else {\n const arg = args[i] as Record<string, unknown>;\n for (const name of param.names) {\n inner.set(name, arg[name]);\n }\n }\n });\n return this.evaluate(body, inner);\n };\n }\n\n #evaluateCall(\n node: Extract<Expression, {type: 'CallExpression'}>,\n scope: Scope,\n ): unknown {\n if (node.optional) {\n return this.#reject(node, 'Optional call');\n }\n const args = node.arguments.map(a => {\n if (a.type === 'SpreadElement') {\n return this.#reject(a, 'Spread');\n }\n return this.evaluate(a, scope);\n });\n const {callee} = node;\n let thisValue: unknown;\n let fn: unknown;\n if (callee.type === 'MemberExpression') {\n if (\n callee.computed ||\n callee.optional ||\n callee.property.type !== 'Identifier' ||\n !ALLOWED_METHODS.has(callee.property.name)\n ) {\n return this.#reject(callee, 'Method');\n }\n thisValue = this.evaluate(callee.object, scope);\n if (thisValue === null || typeof thisValue !== 'object') {\n return this.#reject(callee.object, 'Receiver');\n }\n fn = (thisValue as Record<string, unknown>)[callee.property.name];\n } else if (callee.type === 'Identifier' && scope.has(callee.name)) {\n fn = scope.get(callee.name);\n } else {\n return this.#reject(callee, 'Callee');\n }\n if (typeof fn !== 'function') {\n return this.#reject(callee, 'Non-function call');\n }\n return Reflect.apply(fn, thisValue, args);\n }\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"ast-to-zql.d.ts","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,GAAG,EAWJ,MAAM,gCAAgC,CAAC;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,eAAoB,GAAG,MAAM,CAyCxE;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/C,CAAC"}
1
+ {"version":3,"file":"ast-to-zql.d.ts","sourceRoot":"","sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,GAAG,EAWJ,MAAM,gCAAgC,CAAC;AAGxC;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,eAAoB,GAAG,MAAM,CA0DxE;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/C,CAAC"}
@@ -20,29 +20,48 @@ function astToZQL(ast, options = {}) {
20
20
  const nestedRelated = related.subquery.related?.[0];
21
21
  if (nestedRelated) code += transformRelated(nestedRelated, options);
22
22
  } else code += transformRelated(related, options);
23
+ if (ast.groupBy) {
24
+ const cols = ast.groupBy.map(jsStringLiteral).join(", ");
25
+ const { aggregate } = ast;
26
+ code += aggregate ? `.groupBy(${cols}).${aggregate.fn}(${transformAggregateArg(aggregate)})` : `.distinct(${cols})`;
27
+ } else if (ast.aggregate?.distinct) code += `.distinct(${ast.aggregate.distinct.map(jsStringLiteral).join(", ")})`;
23
28
  if (ast.orderBy && ast.orderBy.length > 0) code += transformOrder(ast.orderBy);
24
29
  if (ast.limit !== void 0) code += `.limit(${ast.limit})`;
25
30
  if (ast.start) {
26
31
  const { row, exclusive } = ast.start;
27
32
  code += `.start(${options.redactLiterals ? "?" : JSON.stringify(row)}${exclusive ? "" : ", { inclusive: true }"})`;
28
33
  }
34
+ if (ast.aggregate?.distinct) code += ".count()";
35
+ return code;
36
+ }
37
+ /**
38
+ * Renders `code`, a builder-callback expression such as `cmp(...)` or
39
+ * `not(exists(...))`, at `prefix`. At the top level `.where(field, ...)` has
40
+ * no form for it, so it becomes `.where(({...needed}) => code)`; inside a
41
+ * callback, the names it needs are added to the enclosing callback's
42
+ * destructured args and `code` is returned as is.
43
+ */
44
+ function wrap(prefix, args, needed, code) {
45
+ if (prefix === ".where") return `.where(({${toSorted(needed).join(", ")}}) => ${code})`;
46
+ for (const name of needed) args.add(name);
29
47
  return code;
30
48
  }
31
49
  function transformCondition(condition, prefix, args, options) {
32
50
  switch (condition.type) {
33
- case "simple": return transformSimpleCondition(condition, prefix, options);
51
+ case "simple": return transformSimpleCondition(condition, prefix, args, options);
34
52
  case "and":
35
53
  case "or": return transformLogicalCondition(condition, prefix, args, options);
36
54
  case "correlatedSubquery": return transformExistsCondition(condition, prefix, args, options);
37
55
  default: unreachable(condition);
38
56
  }
39
57
  }
40
- function transformSimpleCondition(condition, prefix, options) {
58
+ function transformSimpleCondition(condition, prefix, args, options) {
41
59
  const { left, op, right } = condition;
42
60
  const leftCode = transformValuePosition(left, options);
43
61
  const rightCode = transformValuePosition(right, options);
44
- if (op === "=") return `${prefix}(${leftCode}, ${rightCode})`;
45
- return `${prefix}(${leftCode}, '${op}', ${rightCode})`;
62
+ const argsCode = op === "=" ? `${leftCode}, ${rightCode}` : `${leftCode}, '${op}', ${rightCode}`;
63
+ if (left.type === "json") return wrap(prefix, args, ["cmp", "json"], `cmp(${argsCode})`);
64
+ return `${prefix}(${argsCode})`;
46
65
  }
47
66
  function transformLogicalCondition(condition, prefix, args, options) {
48
67
  const { type, conditions } = condition;
@@ -53,11 +72,13 @@ function transformLogicalCondition(condition, prefix, args, options) {
53
72
  args.add("and");
54
73
  return "and(" + parts.join(", ") + ")";
55
74
  }
56
- args = /* @__PURE__ */ new Set();
57
- const conditionsCode = conditions.map((c) => transformCondition(c, "cmp", args, options)).join(", ");
58
- args.add("cmp");
59
- args.add(type);
60
- return `.where(({${toSorted(args).join(", ")}}) => ${type}(${conditionsCode}))`;
75
+ const innerArgs = prefix === ".where" ? /* @__PURE__ */ new Set() : args;
76
+ const conditionsCode = conditions.map((c) => transformCondition(c, "cmp", innerArgs, options)).join(", ");
77
+ return wrap(prefix, args, [.../* @__PURE__ */ new Set([
78
+ ...innerArgs,
79
+ "cmp",
80
+ type
81
+ ])], `${type}(${conditionsCode})`);
61
82
  }
62
83
  function transformExistsCondition(condition, prefix, args, options) {
63
84
  const { related, op } = condition;
@@ -78,16 +99,7 @@ function transformExistsCondition(condition, prefix, args, options) {
78
99
  args.add("exists");
79
100
  return `exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;
80
101
  }
81
- if (hasSubQueryProps) {
82
- if (prefix === ".where") return `.where(({exists, not}) => not(exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})))`;
83
- args.add("not");
84
- args.add("exists");
85
- return `not(exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr}))`;
86
- }
87
- if (prefix === ".where") return `.where(({exists, not}) => not(exists('${relationship}'${optionsStr})))`;
88
- args.add("not");
89
- args.add("exists");
90
- return `not(exists('${relationship}'${optionsStr})))`;
102
+ return wrap(prefix, args, ["exists", "not"], `not(exists('${relationship}'${hasSubQueryProps ? `, q => q${astToZQL(nextSubquery, options)}` : ""}${optionsStr}))`);
91
103
  }
92
104
  function getNextExistsSubquery(related) {
93
105
  if (related.subquery.where?.type === "correlatedSubquery" && related.subquery.where.related.subquery.alias?.includes("zsubq_zhidden_")) return getNextExistsSubquery(related.subquery.where.related);
@@ -114,6 +126,13 @@ function transformValuePosition(value, options) {
114
126
  switch (value.type) {
115
127
  case "literal": return options.redactLiterals ? "?" : transformLiteral(value);
116
128
  case "column": return `'${value.name}'`;
129
+ case "json": {
130
+ const segs = value.path.map((s) => transformLiteral({
131
+ type: "literal",
132
+ value: s
133
+ })).join(", ");
134
+ return `json('${value.value.name}', ${segs})`;
135
+ }
117
136
  case "static": return transformParameter(value);
118
137
  default: unreachable(value);
119
138
  }
@@ -121,9 +140,31 @@ function transformValuePosition(value, options) {
121
140
  function transformLiteral(literal) {
122
141
  if (literal.value === null) return "null";
123
142
  if (Array.isArray(literal.value)) return JSON.stringify(literal.value);
124
- if (typeof literal.value === "string") return `'${literal.value.replace(/'/g, "\\'")}'`;
143
+ if (typeof literal.value === "string") return jsStringLiteral(literal.value);
125
144
  return String(literal.value);
126
145
  }
146
+ /**
147
+ * A single-quoted JavaScript string literal for `s`. `JSON.stringify` does the
148
+ * escaping (backslashes, control characters, quotes), so the rendered code
149
+ * parses back to exactly `s`: escaping only `'` would drop the backslash from
150
+ * a JSON path key like `c\d` and name a different path than the engines read.
151
+ */
152
+ function jsStringLiteral(s) {
153
+ return `'${JSON.stringify(s).slice(1, -1).replace(/\\"/g, "\"").replace(/'/g, "\\'")}'`;
154
+ }
155
+ /**
156
+ * The argument of an aggregate method: nothing for a count, a column name, or
157
+ * a callback picking a leaf inside a `json()` column.
158
+ */
159
+ function transformAggregateArg({ field, path }) {
160
+ if (field === void 0) return "";
161
+ const name = jsStringLiteral(field);
162
+ if (path === void 0) return name;
163
+ return `({json}) => json(${name}, ${path.map((s) => transformLiteral({
164
+ type: "literal",
165
+ value: s
166
+ })).join(", ")})`;
167
+ }
127
168
  function transformParameter(param) {
128
169
  return `authParam(${Array.isArray(param.field) ? `[${param.field.map((f) => `'${f}'`).join(", ")}]` : `'${param.field}'`})`;
129
170
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ast-to-zql.js","names":["relationship"],"sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"sourcesContent":["import {unreachable} from '../../shared/src/asserts.ts';\nimport {toSorted} from '../../shared/src/iterables.ts';\nimport {must} from '../../shared/src/must.ts';\nimport type {\n AST,\n Condition,\n Conjunction,\n CorrelatedSubquery,\n CorrelatedSubqueryCondition,\n Disjunction,\n LiteralReference,\n Ordering,\n Parameter,\n SimpleCondition,\n ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport {SUBQ_PREFIX} from '../../zero-protocol/src/ast.ts';\n\n/**\n * Converts an AST to the equivalent query builder code.\n * This is useful for debugging and understanding queries.\n *\n * @example\n * ```\n * const ast = query.issue.where('id', '=', 123)[astSymbol];\n * console.log(astToZQL(ast)); // outputs: .where('id', '=', 123)\n * ```\n */\nexport function astToZQL(ast: AST, options: AstToZQLOptions = {}): string {\n let code = '';\n\n // Handle where conditions\n if (ast.where) {\n code += transformCondition(ast.where, '.where', new Set(), options);\n }\n\n // Handle related subqueries\n if (ast.related && ast.related.length > 0) {\n for (const related of ast.related) {\n if (related.hidden) {\n const nestedRelated = related.subquery.related?.[0];\n if (nestedRelated) {\n code += transformRelated(nestedRelated, options);\n }\n } else {\n code += transformRelated(related, options);\n }\n }\n }\n\n // Handle orderBy\n if (ast.orderBy && ast.orderBy.length > 0) {\n code += transformOrder(ast.orderBy);\n }\n\n // Handle limit\n if (ast.limit !== undefined) {\n code += `.limit(${ast.limit})`;\n }\n\n // Handle start\n if (ast.start) {\n const {row, exclusive} = ast.start;\n code += `.start(${options.redactLiterals ? '?' : JSON.stringify(row)}${\n exclusive ? '' : ', { inclusive: true }'\n })`;\n }\n\n return code;\n}\n\nexport type AstToZQLOptions = {\n /**\n * Renders every literal value, and the `start` row, as `?` so that the\n * output can be logged without leaking row data or query arguments.\n */\n readonly redactLiterals?: boolean | undefined;\n};\n\ntype Args = Set<string>;\n\ntype Prefix = '.where' | 'cmp';\n\nfunction transformCondition(\n condition: Condition,\n prefix: Prefix,\n args: Args,\n options: AstToZQLOptions,\n): string {\n switch (condition.type) {\n case 'simple':\n return transformSimpleCondition(condition, prefix, options);\n case 'and':\n case 'or':\n return transformLogicalCondition(condition, prefix, args, options);\n case 'correlatedSubquery':\n return transformExistsCondition(condition, prefix, args, options);\n default:\n unreachable(condition);\n }\n}\n\nfunction transformSimpleCondition(\n condition: SimpleCondition,\n prefix: Prefix,\n options: AstToZQLOptions,\n): string {\n const {left, op, right} = condition;\n\n const leftCode = transformValuePosition(left, options);\n const rightCode = transformValuePosition(right, options);\n\n // Handle the shorthand form for equals\n if (op === '=') {\n return `${prefix}(${leftCode}, ${rightCode})`;\n }\n\n return `${prefix}(${leftCode}, '${op}', ${rightCode})`;\n}\n\nfunction transformLogicalCondition(\n condition: Conjunction | Disjunction,\n prefix: Prefix,\n args: Args,\n options: AstToZQLOptions,\n): string {\n const {type, conditions} = condition;\n\n // For single condition, no need for logical operator\n if (conditions.length === 1) {\n return transformCondition(conditions[0], prefix, args, options);\n }\n\n // Generate multiple where calls for top-level AND conditions\n if (type === 'and') {\n const parts = conditions.map(c =>\n transformCondition(c, prefix, args, options),\n );\n // Simply concatenate the where conditions\n if (prefix === '.where') {\n return parts.join('');\n }\n args.add('and');\n return 'and(' + parts.join(', ') + ')';\n }\n\n args = new Set<string>();\n\n // Handle nested conditions with a callback for OR conditions and nested ANDs/ORs\n const conditionsCode = conditions\n .map(c => transformCondition(c, 'cmp', args, options))\n .join(', ');\n\n args.add('cmp');\n args.add(type);\n const argsCode = toSorted(args).join(', ');\n\n return `.where(({${argsCode}}) => ${type}(${conditionsCode}))`;\n}\n\nfunction transformExistsCondition(\n condition: CorrelatedSubqueryCondition,\n prefix: '.where' | 'cmp',\n args: Set<string>,\n options: AstToZQLOptions,\n): string {\n const {related, op} = condition;\n const relationship = extractRelationshipName(related);\n\n const nextSubquery = getNextExistsSubquery(related);\n\n // Check if subquery has additional properties\n const hasSubQueryProps =\n nextSubquery.where ||\n (nextSubquery.related && nextSubquery.related.length > 0) ||\n nextSubquery.orderBy ||\n nextSubquery.limit;\n\n // Build options string for flip and scalar\n const optionParts: string[] = [];\n if (condition.flip !== undefined) {\n optionParts.push(`flip: ${condition.flip}`);\n }\n if (condition.scalar !== undefined) {\n optionParts.push(`scalar: ${condition.scalar}`);\n }\n const optionsStr =\n optionParts.length > 0 ? `, {${optionParts.join(', ')}}` : '';\n\n if (op === 'EXISTS') {\n if (!hasSubQueryProps) {\n if (prefix === '.where') {\n return `.whereExists('${relationship}'${optionsStr})`;\n }\n args.add('exists');\n return `exists('${relationship}'${optionsStr})`;\n }\n\n if (prefix === '.where') {\n return `.whereExists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;\n }\n prefix satisfies 'cmp';\n args.add('exists');\n return `exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;\n }\n\n op satisfies 'NOT EXISTS';\n\n if (hasSubQueryProps) {\n if (prefix === '.where') {\n return `.where(({exists, not}) => not(exists('${relationship}', q => q${astToZQL(\n nextSubquery,\n options,\n )}${optionsStr})))`;\n }\n prefix satisfies 'cmp';\n args.add('not');\n args.add('exists');\n return `not(exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr}))`;\n }\n\n if (prefix === '.where') {\n return `.where(({exists, not}) => not(exists('${relationship}'${optionsStr})))`;\n }\n args.add('not');\n args.add('exists');\n\n return `not(exists('${relationship}'${optionsStr})))`;\n}\n\n// If the `exists` is applied against a junction edge, both hops will have the same alias and both hops will be exists conditions.\nfunction getNextExistsSubquery(related: CorrelatedSubquery): AST {\n if (\n related.subquery.where?.type === 'correlatedSubquery' &&\n related.subquery.where.related.subquery.alias?.includes(\n SUBQ_PREFIX + 'zhidden_',\n )\n ) {\n return getNextExistsSubquery(related.subquery.where.related);\n }\n\n return related.subquery;\n}\n\nfunction extractRelationshipName(related: CorrelatedSubquery): string {\n const alias = must(related.subquery.alias);\n return alias.startsWith(SUBQ_PREFIX)\n ? alias.substring(SUBQ_PREFIX.length)\n : alias;\n}\n\nfunction transformRelated(\n related: CorrelatedSubquery,\n options: AstToZQLOptions,\n): string {\n const {alias} = related.subquery;\n if (!alias) return '';\n\n const relationship = alias;\n let code = `.related('${relationship}'`;\n\n // If the subquery has additional filters or configurations\n if (\n related.subquery.where ||\n (related.subquery.related && related.subquery.related.length > 0) ||\n related.subquery.orderBy ||\n related.subquery.limit\n ) {\n code += ', q => q' + astToZQL(related.subquery, options);\n }\n\n code += ')';\n return code;\n}\n\nfunction transformOrder(orderBy: Ordering): string {\n let code = '';\n for (const [field, direction] of orderBy) {\n code += `.orderBy('${field}', '${direction}')`;\n }\n return code;\n}\n\nfunction transformValuePosition(\n value: ValuePosition,\n options: AstToZQLOptions,\n): string {\n switch (value.type) {\n case 'literal':\n return options.redactLiterals ? '?' : transformLiteral(value);\n case 'column':\n return `'${value.name}'`;\n case 'static':\n return transformParameter(value);\n default:\n unreachable(value);\n }\n}\n\nfunction transformLiteral(literal: LiteralReference): string {\n if (literal.value === null) {\n return 'null';\n }\n if (Array.isArray(literal.value)) {\n return JSON.stringify(literal.value);\n }\n if (typeof literal.value === 'string') {\n return `'${literal.value.replace(/'/g, \"\\\\'\")}'`;\n }\n return String(literal.value);\n}\n\nfunction transformParameter(param: Parameter): string {\n const fieldStr = Array.isArray(param.field)\n ? `[${param.field.map(f => `'${f}'`).join(', ')}]`\n : `'${param.field}'`;\n\n return `authParam(${fieldStr})`;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"ast-to-zql.js","names":["relationship"],"sources":["../../../../ast-to-zql/src/ast-to-zql.ts"],"sourcesContent":["import {unreachable} from '../../shared/src/asserts.ts';\nimport {toSorted} from '../../shared/src/iterables.ts';\nimport {must} from '../../shared/src/must.ts';\nimport type {\n Aggregate,\n AST,\n Condition,\n Conjunction,\n CorrelatedSubquery,\n CorrelatedSubqueryCondition,\n Disjunction,\n LiteralReference,\n Ordering,\n Parameter,\n SimpleCondition,\n ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport {SUBQ_PREFIX} from '../../zero-protocol/src/ast.ts';\n\n/**\n * Converts an AST to the equivalent query builder code.\n * This is useful for debugging and understanding queries.\n *\n * @example\n * ```\n * const ast = query.issue.where('id', '=', 123)[astSymbol];\n * console.log(astToZQL(ast)); // outputs: .where('id', '=', 123)\n * ```\n */\nexport function astToZQL(ast: AST, options: AstToZQLOptions = {}): string {\n let code = '';\n\n // Handle where conditions\n if (ast.where) {\n code += transformCondition(ast.where, '.where', new Set(), options);\n }\n\n // Handle related subqueries\n if (ast.related && ast.related.length > 0) {\n for (const related of ast.related) {\n if (related.hidden) {\n const nestedRelated = related.subquery.related?.[0];\n if (nestedRelated) {\n code += transformRelated(nestedRelated, options);\n }\n } else {\n code += transformRelated(related, options);\n }\n }\n }\n\n // Handle distinct and groupBy, before orderBy, which then orders their rows.\n // A count of the distinct values carries the columns on its aggregate.\n if (ast.groupBy) {\n const cols = ast.groupBy.map(jsStringLiteral).join(', ');\n const {aggregate} = ast;\n code += aggregate\n ? `.groupBy(${cols}).${aggregate.fn}(${transformAggregateArg(aggregate)})`\n : `.distinct(${cols})`;\n } else if (ast.aggregate?.distinct) {\n code += `.distinct(${ast.aggregate.distinct.map(jsStringLiteral).join(', ')})`;\n }\n\n // Handle orderBy\n if (ast.orderBy && ast.orderBy.length > 0) {\n code += transformOrder(ast.orderBy);\n }\n\n // Handle limit\n if (ast.limit !== undefined) {\n code += `.limit(${ast.limit})`;\n }\n\n // Handle start\n if (ast.start) {\n const {row, exclusive} = ast.start;\n code += `.start(${options.redactLiterals ? '?' : JSON.stringify(row)}${\n exclusive ? '' : ', { inclusive: true }'\n })`;\n }\n\n // A count of the distinct values ends the chain.\n if (ast.aggregate?.distinct) {\n code += '.count()';\n }\n\n return code;\n}\n\nexport type AstToZQLOptions = {\n /**\n * Renders every literal value, and the `start` row, as `?` so that the\n * output can be logged without leaking row data or query arguments.\n */\n readonly redactLiterals?: boolean | undefined;\n};\n\ntype Args = Set<string>;\n\ntype Prefix = '.where' | 'cmp';\n\n/**\n * Renders `code`, a builder-callback expression such as `cmp(...)` or\n * `not(exists(...))`, at `prefix`. At the top level `.where(field, ...)` has\n * no form for it, so it becomes `.where(({...needed}) => code)`; inside a\n * callback, the names it needs are added to the enclosing callback's\n * destructured args and `code` is returned as is.\n */\nfunction wrap(\n prefix: Prefix,\n args: Args,\n needed: readonly string[],\n code: string,\n): string {\n if (prefix === '.where') {\n return `.where(({${toSorted(needed).join(', ')}}) => ${code})`;\n }\n for (const name of needed) {\n args.add(name);\n }\n return code;\n}\n\nfunction transformCondition(\n condition: Condition,\n prefix: Prefix,\n args: Args,\n options: AstToZQLOptions,\n): string {\n switch (condition.type) {\n case 'simple':\n return transformSimpleCondition(condition, prefix, args, options);\n case 'and':\n case 'or':\n return transformLogicalCondition(condition, prefix, args, options);\n case 'correlatedSubquery':\n return transformExistsCondition(condition, prefix, args, options);\n default:\n unreachable(condition);\n }\n}\n\nfunction transformSimpleCondition(\n condition: SimpleCondition,\n prefix: Prefix,\n args: Args,\n options: AstToZQLOptions,\n): string {\n const {left, op, right} = condition;\n\n const leftCode = transformValuePosition(left, options);\n const rightCode = transformValuePosition(right, options);\n\n // Handle the shorthand form for equals\n const argsCode =\n op === '='\n ? `${leftCode}, ${rightCode}`\n : `${leftCode}, '${op}', ${rightCode}`;\n\n if (left.type === 'json') {\n // A JSON path operand only exists through the expression builder's\n // `json()`, so the condition must be rendered as a callback.\n return wrap(prefix, args, ['cmp', 'json'], `cmp(${argsCode})`);\n }\n return `${prefix}(${argsCode})`;\n}\n\nfunction transformLogicalCondition(\n condition: Conjunction | Disjunction,\n prefix: Prefix,\n args: Args,\n options: AstToZQLOptions,\n): string {\n const {type, conditions} = condition;\n\n // For single condition, no need for logical operator\n if (conditions.length === 1) {\n return transformCondition(conditions[0], prefix, args, options);\n }\n\n // Generate multiple where calls for top-level AND conditions\n if (type === 'and') {\n const parts = conditions.map(c =>\n transformCondition(c, prefix, args, options),\n );\n // Simply concatenate the where conditions\n if (prefix === '.where') {\n return parts.join('');\n }\n args.add('and');\n return 'and(' + parts.join(', ') + ')';\n }\n\n // Handle nested conditions with a callback for OR conditions and nested\n // ANDs/ORs. Inside a callback (`cmp` prefix) the names are added to the\n // enclosing callback's args; at the top level they get a callback of their\n // own.\n const innerArgs = prefix === '.where' ? new Set<string>() : args;\n const conditionsCode = conditions\n .map(c => transformCondition(c, 'cmp', innerArgs, options))\n .join(', ');\n\n return wrap(\n prefix,\n args,\n [...new Set([...innerArgs, 'cmp', type])],\n `${type}(${conditionsCode})`,\n );\n}\n\nfunction transformExistsCondition(\n condition: CorrelatedSubqueryCondition,\n prefix: '.where' | 'cmp',\n args: Set<string>,\n options: AstToZQLOptions,\n): string {\n const {related, op} = condition;\n const relationship = extractRelationshipName(related);\n\n const nextSubquery = getNextExistsSubquery(related);\n\n // Check if subquery has additional properties\n const hasSubQueryProps =\n nextSubquery.where ||\n (nextSubquery.related && nextSubquery.related.length > 0) ||\n nextSubquery.orderBy ||\n nextSubquery.limit;\n\n // Build options string for flip and scalar\n const optionParts: string[] = [];\n if (condition.flip !== undefined) {\n optionParts.push(`flip: ${condition.flip}`);\n }\n if (condition.scalar !== undefined) {\n optionParts.push(`scalar: ${condition.scalar}`);\n }\n const optionsStr =\n optionParts.length > 0 ? `, {${optionParts.join(', ')}}` : '';\n\n if (op === 'EXISTS') {\n if (!hasSubQueryProps) {\n if (prefix === '.where') {\n return `.whereExists('${relationship}'${optionsStr})`;\n }\n args.add('exists');\n return `exists('${relationship}'${optionsStr})`;\n }\n\n if (prefix === '.where') {\n return `.whereExists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;\n }\n prefix satisfies 'cmp';\n args.add('exists');\n return `exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;\n }\n\n op satisfies 'NOT EXISTS';\n\n const subquery = hasSubQueryProps\n ? `, q => q${astToZQL(nextSubquery, options)}`\n : '';\n return wrap(\n prefix,\n args,\n ['exists', 'not'],\n `not(exists('${relationship}'${subquery}${optionsStr}))`,\n );\n}\n\n// If the `exists` is applied against a junction edge, both hops will have the same alias and both hops will be exists conditions.\nfunction getNextExistsSubquery(related: CorrelatedSubquery): AST {\n if (\n related.subquery.where?.type === 'correlatedSubquery' &&\n related.subquery.where.related.subquery.alias?.includes(\n SUBQ_PREFIX + 'zhidden_',\n )\n ) {\n return getNextExistsSubquery(related.subquery.where.related);\n }\n\n return related.subquery;\n}\n\nfunction extractRelationshipName(related: CorrelatedSubquery): string {\n const alias = must(related.subquery.alias);\n return alias.startsWith(SUBQ_PREFIX)\n ? alias.substring(SUBQ_PREFIX.length)\n : alias;\n}\n\nfunction transformRelated(\n related: CorrelatedSubquery,\n options: AstToZQLOptions,\n): string {\n const {alias} = related.subquery;\n if (!alias) return '';\n\n const relationship = alias;\n let code = `.related('${relationship}'`;\n\n // If the subquery has additional filters or configurations\n if (\n related.subquery.where ||\n (related.subquery.related && related.subquery.related.length > 0) ||\n related.subquery.orderBy ||\n related.subquery.limit\n ) {\n code += ', q => q' + astToZQL(related.subquery, options);\n }\n\n code += ')';\n return code;\n}\n\nfunction transformOrder(orderBy: Ordering): string {\n let code = '';\n for (const [field, direction] of orderBy) {\n code += `.orderBy('${field}', '${direction}')`;\n }\n return code;\n}\n\nfunction transformValuePosition(\n value: ValuePosition,\n options: AstToZQLOptions,\n): string {\n switch (value.type) {\n case 'literal':\n return options.redactLiterals ? '?' : transformLiteral(value);\n case 'column':\n return `'${value.name}'`;\n case 'json': {\n // Segments render exactly like literals so escaping lives in one place.\n const segs = value.path\n .map(s => transformLiteral({type: 'literal', value: s}))\n .join(', ');\n return `json('${value.value.name}', ${segs})`;\n }\n case 'static':\n return transformParameter(value);\n default:\n unreachable(value);\n }\n}\n\nfunction transformLiteral(literal: LiteralReference): string {\n if (literal.value === null) {\n return 'null';\n }\n if (Array.isArray(literal.value)) {\n return JSON.stringify(literal.value);\n }\n if (typeof literal.value === 'string') {\n return jsStringLiteral(literal.value);\n }\n return String(literal.value);\n}\n\n/**\n * A single-quoted JavaScript string literal for `s`. `JSON.stringify` does the\n * escaping (backslashes, control characters, quotes), so the rendered code\n * parses back to exactly `s`: escaping only `'` would drop the backslash from\n * a JSON path key like `c\\d` and name a different path than the engines read.\n */\nfunction jsStringLiteral(s: string): string {\n const inner = JSON.stringify(s).slice(1, -1);\n return `'${inner.replace(/\\\\\"/g, '\"').replace(/'/g, \"\\\\'\")}'`;\n}\n\n/**\n * The argument of an aggregate method: nothing for a count, a column name, or\n * a callback picking a leaf inside a `json()` column.\n */\nfunction transformAggregateArg({field, path}: Aggregate): string {\n if (field === undefined) {\n return '';\n }\n const name = jsStringLiteral(field);\n if (path === undefined) {\n return name;\n }\n const segs = path\n .map(s => transformLiteral({type: 'literal', value: s}))\n .join(', ');\n return `({json}) => json(${name}, ${segs})`;\n}\n\nfunction transformParameter(param: Parameter): string {\n const fieldStr = Array.isArray(param.field)\n ? `[${param.field.map(f => `'${f}'`).join(', ')}]`\n : `'${param.field}'`;\n\n return `authParam(${fieldStr})`;\n}\n"],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import type { SQLQuery } from '@databases/sql';
2
2
  import { type JSONValue } from '../../shared/src/json.ts';
3
- import type { AST, Bound, CorrelatedSubquery, Correlation, Ordering, SimpleCondition } from '../../zero-protocol/src/ast.ts';
3
+ import { type AST, type Bound, type CorrelatedSubquery, type Correlation, type Ordering, type SimpleCondition } from '../../zero-protocol/src/ast.ts';
4
4
  import { type NameMapper } from '../../zero-schema/src/name-mapper.ts';
5
5
  import type { Schema } from '../../zero-types/src/schema.ts';
6
6
  import type { ServerSchema } from '../../zero-types/src/server-schema.ts';
@@ -1 +1 @@
1
- {"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}