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

package/out/_virtual/{_@oxc-project_runtime@0.130.0/helpers → _@oxc-project_runtime@0.154.0/helpers/esm}/usingCtx.js

@@ -1,4 +1,4 @@
-//#region \0@oxc-project+runtime@0.130.0/helpers/usingCtx.js
+//#region \0@oxc-project+runtime@0.154.0/helpers/esm/usingCtx.js
 function _usingCtx() {
 	var r = "function" == typeof SuppressedError ? SuppressedError : function(r, e) {
 		var n = Error();
@@ -54,4 +54,4 @@ function _usingCtx() {
 	};
 }
 //#endregion
-export { _usingCtx };
+export { _usingCtx as default };

package/out/analyze-query/src/analyze-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-cli.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/analyze-cli.ts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAM3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CACtC,CAAC;AAuHF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiG1E"}
+{"version":3,"file":"analyze-cli.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/analyze-cli.ts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAO3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CACtC,CAAC;AAuHF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiG1E"}

package/out/analyze-query/src/analyze-cli.js

@@ -7,9 +7,10 @@ import { logLevel, logOptions } from "../../otel/src/log-options.js";
 import { colorConsole } from "../../shared/src/logging.js";
 import { parseOptions } from "../../shared/src/options.js";
 import { ZERO_ENV_VAR_PREFIX } from "../../zero-cache/src/config/zero-config.js";
+import { evaluateZQLChain } from "./zql-chain.js";
 import { Console } from "node:console";
 import { styleText } from "node:util";
-import { WebSocket as WebSocket$1 } from "ws";
+import { WebSocket } from "ws";
 //#region ../analyze-query/src/analyze-cli.ts
 var options = {
 	zeroCacheURL: {
@@ -101,8 +102,9 @@ var stderrLogSink = { log(level, context, ...args) {
 * Exits the process with code 1 on error.
 */
 async function runAnalyzeCLI(opts) {
+	const argv = (opts.argv ?? process.argv.slice(2)).map((s) => s.replaceAll("\n", " "));
 	const config = parseOptions(options, {
-		argv: (opts.argv ?? process.argv.slice(2)).map((s) => s.replaceAll("\n", " ")),
+		argv,
 		envNamePrefix: ZERO_ENV_VAR_PREFIX,
 		description: [{
 			header: "analyze-query (remote)",
@@ -195,7 +197,7 @@ function buildQueryPlan(config) {
 	};
 }
 function buildZqlQuery(queryString, builder) {
-	return new Function("builder", `return builder.${queryString};`)(builder);
+	return evaluateZQLChain(queryString, builder);
 }
 function resolveHandshakeHeaders(config) {
 	const headers = {};
@@ -223,7 +225,7 @@ function resolveHandshakeHeaders(config) {
 	return headers;
 }
 function installWebSocketHeaderShim(headers) {
-	class HeaderInjectingWebSocket extends WebSocket$1 {
+	class HeaderInjectingWebSocket extends WebSocket {
 		constructor(url, protocols) {
 			super(url, protocols, { headers });
 		}

package/out/analyze-query/src/analyze-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-cli.js","names":[],"sources":["../../../../analyze-query/src/analyze-cli.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {Console} from 'node:console';\nimport {styleText} from 'node:util';\nimport type {LogSink} from '@rocicorp/logger';\nimport {WebSocket as NodeWebSocket} from 'ws';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {colorConsole} from '../../shared/src/logging.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../../zero-cache/src/config/zero-config.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {formatPlannerEvents} from '../../zql/src/planner/planner-debug.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {AnyQuery} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\n\nexport type AnalyzeCLIOptions = {\n  schema: Schema;\n  /** Defaults to `process.argv.slice(2)`. */\n  argv?: readonly string[] | undefined;\n};\n\nconst options = {\n  zeroCacheURL: {\n    type: v.string().optional(),\n    desc: [\n      'URL of the remote zero-cache to analyze against.',\n      'Accepts http(s):// or ws(s):// (ws(s) is the transport actually used).',\n    ],\n  },\n  adminPassword: {\n    type: v.string().optional(),\n    desc: [\n      'Admin password for zero-cache.',\n      'Required when the server is configured with one; ignored in dev mode.',\n    ],\n  },\n  authToken: {\n    type: v.string().optional(),\n    desc: [\n      'Raw JWT forwarded to zero-cache.',\n      'Used server-side to fill permission variables for the query.',\n    ],\n  },\n  cookie: {\n    type: v.string().optional(),\n    desc: [\n      'Cookie header value sent on the WebSocket upgrade request,',\n      'e.g. `session=abc; foo=bar`. Use this when zero-cache is behind',\n      'a proxy that resolves auth via cookies. Merged with --headers-json',\n      '(--cookie wins on conflict).',\n    ],\n  },\n  headersJson: {\n    type: v.string().optional(),\n    desc: [\n      'JSON object of arbitrary headers to send on the WebSocket upgrade',\n      'request, e.g. `{\"x-api-key\":\"...\"}`. Escape hatch for exotic auth',\n      'schemes; prefer --auth-token or --cookie when possible.',\n    ],\n  },\n  userId: {\n    type: v.string().optional(),\n    desc: [\n      'Optional userID to report to zero-cache.',\n      'Omit for anonymous analysis.',\n    ],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded AST. Exactly one of --ast / --query / --query-name is required.',\n      'The AST is sent to the server verbatim — provide it in server (post-mapping) form.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      'ZQL query in chain form, e.g. `issue.related(\"comments\").limit(10)`.',\n      'Evaluated against the schema you pass to runAnalyzeCLI.',\n    ],\n  },\n  queryName: {\n    type: v.string().optional(),\n    desc: [\n      'Name of a server-registered custom (named) query.',\n      'The server resolves the name + args via its registered query handler.',\n    ],\n  },\n  queryArgs: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded array of arguments for --query-name. Defaults to `[]`.',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().optional(() => false),\n    desc: [\n      'Include the rows read from the replica to execute the query.',\n      'Each row appears once per read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().optional(() => false),\n    desc: ['Include the rows that would be synced to the client.'],\n  },\n  joinPlans: {\n    type: v.boolean().optional(() => false),\n    desc: ['Include join planner diagnostics.'],\n  },\n  log: {\n    ...logOptions,\n    level: logLevel.optional(() => 'error'),\n  },\n};\n\ntype QueryPlan =\n  | {kind: 'ast'; ast: AST}\n  | {kind: 'zql'; text: string}\n  | {kind: 'named'; name: string; args: ReadonlyArray<unknown>};\n\n// Route all Zero client log output to stderr so stdout contains only the\n// analyze result. Shell redirection (`2>/dev/null`) can then cleanly silence\n// logs without affecting output.\nconst stderrConsole = new Console({\n  stdout: process.stderr,\n  stderr: process.stderr,\n});\nconst stderrLogSink: LogSink = {\n  log(level, context, ...args) {\n    const ctx = context\n      ? Object.entries(context).map(([k, v]) =>\n          v === undefined ? k : `${k}=${v}`,\n        )\n      : [];\n    stderrConsole[level](...ctx, ...args);\n  },\n};\n\n/**\n * Entry point for a user's `cli.ts`. Parses argv, connects to a remote\n * zero-cache by standing up an in-process Zero client (in-memory storage,\n * no subscriptions), calls the inspector's `analyze-query` RPC, and\n * renders the result. Intended to be called as:\n *\n * ```ts\n * import {schema} from './schema.ts';\n * import {runAnalyzeCLI} from '@rocicorp/zero/analyze';\n * await runAnalyzeCLI({schema});\n * ```\n *\n * Exits the process with code 1 on error.\n */\nexport async function runAnalyzeCLI(opts: AnalyzeCLIOptions): Promise<void> {\n  const argv = (opts.argv ?? process.argv.slice(2)).map(s =>\n    s.replaceAll('\\n', ' '),\n  );\n\n  const config = parseOptions(options, {\n    argv,\n    envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    description: [\n      {\n        header: 'analyze-query (remote)',\n        content: `Analyze a ZQL query against a remote zero-cache.\n\n  Connects to zero-cache's inspector protocol and reports the server-observed\n  row scans, SQLite query plans, and timings.`,\n      },\n      {\n        header: 'Examples',\n        content: `  node cli.ts --zero-cache-url=https://zero.example.com \\\\\n    --admin-password=\"$ZERO_ADMIN_PASSWORD\" \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --ast='\\\\{\"table\": \"issue\", \"limit\": 5\\\\}'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --query-name=issueList --query-args='[]'`,\n      },\n    ],\n  });\n\n  if (!config.zeroCacheURL) {\n    colorConsole.error('--zero-cache-url is required. See --help for usage.');\n    process.exit(1);\n  }\n\n  const plan = buildQueryPlan(config);\n\n  const handshakeHeaders = resolveHandshakeHeaders(config);\n  if (Object.keys(handshakeHeaders).length > 0) {\n    installWebSocketHeaderShim(handshakeHeaders);\n  }\n\n  // zero-client and replicache reference a build-time `TESTING` global that\n  // bundlers replace with a boolean literal; under node there's no replacement,\n  // so provide a runtime default.\n  (globalThis as {TESTING?: boolean}).TESTING ??= false;\n\n  const z = new Zero({\n    schema: opts.schema,\n    server: config.zeroCacheURL,\n    auth: config.authToken,\n    userID: config.userId,\n    kvStore: 'mem',\n    logLevel: config.log.level,\n    logSink: stderrLogSink,\n  });\n\n  let result: AnalyzeQueryResult;\n  try {\n    const authOk = await z.inspector.authenticate(config.adminPassword ?? '');\n    if (!authOk) {\n      throw new Error(\n        'admin password rejected (or --admin-password is required)',\n      );\n    }\n\n    const rpcOptions = {\n      vendedRows: config.outputVendedRows,\n      syncedRows: config.outputSyncedRows,\n      joinPlans: config.joinPlans,\n    };\n\n    if (plan.kind === 'ast') {\n      result = await z.inspector.analyzeServerAST(plan.ast, rpcOptions);\n    } else if (plan.kind === 'named') {\n      result = await z.inspector.analyzeNamedQuery(\n        plan.name,\n        plan.args as ReadonlyArray<never>,\n        rpcOptions,\n      );\n    } else {\n      const built = buildZqlQuery(plan.text, createBuilder(opts.schema));\n      result = await z.inspector.analyzeQuery(built, rpcOptions);\n    }\n  } catch (e) {\n    colorConsole.error(e instanceof Error ? e.message : String(e));\n    await z.close().catch(() => {});\n    process.exit(1);\n  }\n\n  renderResult(result, {\n    outputSyncedRows: config.outputSyncedRows,\n    outputVendedRows: config.outputVendedRows,\n  });\n\n  await z.close();\n}\n\nfunction buildQueryPlan(config: {\n  ast?: string | undefined;\n  query?: string | undefined;\n  queryName?: string | undefined;\n  queryArgs?: string | undefined;\n}): QueryPlan {\n  const selectors = [\n    config.ast !== undefined && 'ast',\n    config.query !== undefined && 'query',\n    config.queryName !== undefined && 'queryName',\n  ].filter(Boolean) as string[];\n\n  if (selectors.length === 0) {\n    colorConsole.error(\n      'Exactly one of --ast / --query / --query-name is required.',\n    );\n    process.exit(1);\n  }\n  if (selectors.length > 1) {\n    colorConsole.error(\n      `Only one of --ast / --query / --query-name may be provided; got: ${selectors.join(', ')}`,\n    );\n    process.exit(1);\n  }\n\n  if (config.ast !== undefined) {\n    return {kind: 'ast', ast: JSON.parse(config.ast) as AST};\n  }\n  if (config.query !== undefined) {\n    return {kind: 'zql', text: config.query};\n  }\n  const args = config.queryArgs\n    ? (JSON.parse(config.queryArgs) as ReadonlyArray<unknown>)\n    : [];\n  return {kind: 'named', name: config.queryName as string, args};\n}\n\nfunction buildZqlQuery(\n  queryString: string,\n  builder: SchemaQuery<Schema>,\n): AnyQuery {\n  const f = new Function('builder', `return builder.${queryString};`);\n  return f(builder) as AnyQuery;\n}\n\nfunction resolveHandshakeHeaders(config: {\n  cookie?: string | undefined;\n  headersJson?: string | undefined;\n}): Record<string, string> {\n  const headers: Record<string, string> = {};\n  if (config.headersJson !== undefined) {\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(config.headersJson);\n    } catch (e) {\n      colorConsole.error(\n        `--headers-json is not valid JSON: ${e instanceof Error ? e.message : String(e)}`,\n      );\n      process.exit(1);\n    }\n    if (\n      parsed === null ||\n      typeof parsed !== 'object' ||\n      Array.isArray(parsed)\n    ) {\n      colorConsole.error('--headers-json must be a JSON object.');\n      process.exit(1);\n    }\n    for (const [k, val] of Object.entries(parsed)) {\n      if (typeof val !== 'string') {\n        colorConsole.error(\n          `--headers-json values must be strings; got ${typeof val} for \"${k}\".`,\n        );\n        process.exit(1);\n      }\n      headers[k] = val;\n    }\n  }\n  if (config.cookie !== undefined) {\n    headers.cookie = config.cookie;\n  }\n  return headers;\n}\n\nfunction installWebSocketHeaderShim(headers: Record<string, string>): void {\n  class HeaderInjectingWebSocket extends NodeWebSocket {\n    constructor(url: string | URL, protocols?: string | string[]) {\n      super(url, protocols, {headers});\n    }\n  }\n  (globalThis as {WebSocket?: unknown}).WebSocket = HeaderInjectingWebSocket;\n}\n\nfunction renderResult(\n  result: AnalyzeQueryResult,\n  opts: {outputSyncedRows: boolean; outputVendedRows: boolean},\n) {\n  if (opts.outputSyncedRows) {\n    colorConsole.log(styleText(['blue', 'bold'], '=== Synced Rows: ===\\n'));\n    for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n      colorConsole.log(styleText('bold', table + ':'), rows);\n    }\n  }\n\n  colorConsole.log(styleText(['blue', 'bold'], '=== Query Stats: ===\\n'));\n  colorConsole.log(\n    styleText('bold', 'total synced rows:'),\n    result.syncedRowCount,\n  );\n\n  const readRowCountsByQuery = result.readRowCountsByQuery ?? {};\n  let totalRowsRead = 0;\n  for (const table of Object.keys(readRowCountsByQuery).sort()) {\n    const counts = readRowCountsByQuery[table];\n    for (const n of Object.values(counts)) {\n      totalRowsRead += n;\n    }\n    colorConsole.log(styleText('bold', `${table} vended:`), counts);\n  }\n  colorConsole.log(\n    styleText('bold', 'Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsRead),\n  );\n  const duration = result.elapsed ?? result.end - result.start;\n  colorConsole.log(styleText('bold', 'time:'), colorTime(duration), 'ms');\n\n  if (opts.outputVendedRows) {\n    colorConsole.log(\n      styleText(['blue', 'bold'], '=== JS Row Scan Values: ===\\n'),\n    );\n    for (const [table, rows] of Object.entries(result.readRows ?? {})) {\n      colorConsole.log(styleText('bold', `${table}:`), rows);\n    }\n  }\n\n  colorConsole.log(\n    styleText(['blue', 'bold'], '\\n=== Rows Scanned (by SQLite): ===\\n'),\n  );\n  const dbScansByQuery = result.dbScansByQuery ?? {};\n  let totalNVisit = 0;\n  for (const [table, queries] of Object.entries(dbScansByQuery)) {\n    colorConsole.log(styleText('bold', `${table}:`), queries);\n    for (const count of Object.values(queries)) {\n      totalNVisit += count;\n    }\n  }\n  colorConsole.log(\n    styleText('bold', 'total rows scanned:'),\n    colorRowsConsidered(totalNVisit),\n  );\n\n  colorConsole.log(styleText(['blue', 'bold'], '\\n\\n=== Query Plans: ===\\n'));\n  const plans = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(plans)) {\n    colorConsole.log(styleText('bold', 'query'), query);\n    colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n    colorConsole.log('\\n');\n  }\n\n  if (result.warnings.length > 0) {\n    colorConsole.log(styleText(['yellow', 'bold'], '=== Warnings: ===\\n'));\n    for (const w of result.warnings) {\n      colorConsole.log(styleText('yellow', w));\n    }\n  }\n\n  if (result.joinPlans && result.joinPlans.length > 0) {\n    colorConsole.log(styleText(['blue', 'bold'], '\\n=== Join Plans: ===\\n'));\n    colorConsole.log(formatPlannerEvents(result.joinPlans));\n  }\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return styleText('green', duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return styleText('yellow', duration.toFixed(2) + 'ms');\n  }\n  return styleText('red', duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return styleText('green', n.toString());\n  } else if (n < 10000) {\n    return styleText('yellow', n.toString());\n  }\n  return styleText('red', n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return styleText('yellow', row);\n    }\n    return styleText('red', row);\n  }\n  return styleText('green', row);\n}\n"],"mappings":"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"}
+{"version":3,"file":"analyze-cli.js","names":["v","NodeWebSocket"],"sources":["../../../../analyze-query/src/analyze-cli.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {Console} from 'node:console';\nimport {styleText} from 'node:util';\nimport type {LogSink} from '@rocicorp/logger';\nimport {WebSocket as NodeWebSocket} from 'ws';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {colorConsole} from '../../shared/src/logging.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../../zero-cache/src/config/zero-config.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {formatPlannerEvents} from '../../zql/src/planner/planner-debug.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {AnyQuery} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\nimport {evaluateZQLChain} from './zql-chain.ts';\n\nexport type AnalyzeCLIOptions = {\n  schema: Schema;\n  /** Defaults to `process.argv.slice(2)`. */\n  argv?: readonly string[] | undefined;\n};\n\nconst options = {\n  zeroCacheURL: {\n    type: v.string().optional(),\n    desc: [\n      'URL of the remote zero-cache to analyze against.',\n      'Accepts http(s):// or ws(s):// (ws(s) is the transport actually used).',\n    ],\n  },\n  adminPassword: {\n    type: v.string().optional(),\n    desc: [\n      'Admin password for zero-cache.',\n      'Required when the server is configured with one; ignored in dev mode.',\n    ],\n  },\n  authToken: {\n    type: v.string().optional(),\n    desc: [\n      'Raw JWT forwarded to zero-cache.',\n      'Used server-side to fill permission variables for the query.',\n    ],\n  },\n  cookie: {\n    type: v.string().optional(),\n    desc: [\n      'Cookie header value sent on the WebSocket upgrade request,',\n      'e.g. `session=abc; foo=bar`. Use this when zero-cache is behind',\n      'a proxy that resolves auth via cookies. Merged with --headers-json',\n      '(--cookie wins on conflict).',\n    ],\n  },\n  headersJson: {\n    type: v.string().optional(),\n    desc: [\n      'JSON object of arbitrary headers to send on the WebSocket upgrade',\n      'request, e.g. `{\"x-api-key\":\"...\"}`. Escape hatch for exotic auth',\n      'schemes; prefer --auth-token or --cookie when possible.',\n    ],\n  },\n  userId: {\n    type: v.string().optional(),\n    desc: [\n      'Optional userID to report to zero-cache.',\n      'Omit for anonymous analysis.',\n    ],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded AST. Exactly one of --ast / --query / --query-name is required.',\n      'The AST is sent to the server verbatim — provide it in server (post-mapping) form.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      'ZQL query in chain form, e.g. `issue.related(\"comments\").limit(10)`.',\n      'Evaluated against the schema you pass to runAnalyzeCLI.',\n    ],\n  },\n  queryName: {\n    type: v.string().optional(),\n    desc: [\n      'Name of a server-registered custom (named) query.',\n      'The server resolves the name + args via its registered query handler.',\n    ],\n  },\n  queryArgs: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded array of arguments for --query-name. Defaults to `[]`.',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().optional(() => false),\n    desc: [\n      'Include the rows read from the replica to execute the query.',\n      'Each row appears once per read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().optional(() => false),\n    desc: ['Include the rows that would be synced to the client.'],\n  },\n  joinPlans: {\n    type: v.boolean().optional(() => false),\n    desc: ['Include join planner diagnostics.'],\n  },\n  log: {\n    ...logOptions,\n    level: logLevel.optional(() => 'error'),\n  },\n};\n\ntype QueryPlan =\n  | {kind: 'ast'; ast: AST}\n  | {kind: 'zql'; text: string}\n  | {kind: 'named'; name: string; args: ReadonlyArray<unknown>};\n\n// Route all Zero client log output to stderr so stdout contains only the\n// analyze result. Shell redirection (`2>/dev/null`) can then cleanly silence\n// logs without affecting output.\nconst stderrConsole = new Console({\n  stdout: process.stderr,\n  stderr: process.stderr,\n});\nconst stderrLogSink: LogSink = {\n  log(level, context, ...args) {\n    const ctx = context\n      ? Object.entries(context).map(([k, v]) =>\n          v === undefined ? k : `${k}=${v}`,\n        )\n      : [];\n    stderrConsole[level](...ctx, ...args);\n  },\n};\n\n/**\n * Entry point for a user's `cli.ts`. Parses argv, connects to a remote\n * zero-cache by standing up an in-process Zero client (in-memory storage,\n * no subscriptions), calls the inspector's `analyze-query` RPC, and\n * renders the result. Intended to be called as:\n *\n * ```ts\n * import {schema} from './schema.ts';\n * import {runAnalyzeCLI} from '@rocicorp/zero/analyze';\n * await runAnalyzeCLI({schema});\n * ```\n *\n * Exits the process with code 1 on error.\n */\nexport async function runAnalyzeCLI(opts: AnalyzeCLIOptions): Promise<void> {\n  const argv = (opts.argv ?? process.argv.slice(2)).map(s =>\n    s.replaceAll('\\n', ' '),\n  );\n\n  const config = parseOptions(options, {\n    argv,\n    envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    description: [\n      {\n        header: 'analyze-query (remote)',\n        content: `Analyze a ZQL query against a remote zero-cache.\n\n  Connects to zero-cache's inspector protocol and reports the server-observed\n  row scans, SQLite query plans, and timings.`,\n      },\n      {\n        header: 'Examples',\n        content: `  node cli.ts --zero-cache-url=https://zero.example.com \\\\\n    --admin-password=\"$ZERO_ADMIN_PASSWORD\" \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --ast='\\\\{\"table\": \"issue\", \"limit\": 5\\\\}'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --query-name=issueList --query-args='[]'`,\n      },\n    ],\n  });\n\n  if (!config.zeroCacheURL) {\n    colorConsole.error('--zero-cache-url is required. See --help for usage.');\n    process.exit(1);\n  }\n\n  const plan = buildQueryPlan(config);\n\n  const handshakeHeaders = resolveHandshakeHeaders(config);\n  if (Object.keys(handshakeHeaders).length > 0) {\n    installWebSocketHeaderShim(handshakeHeaders);\n  }\n\n  // zero-client and replicache reference a build-time `TESTING` global that\n  // bundlers replace with a boolean literal; under node there's no replacement,\n  // so provide a runtime default.\n  (globalThis as {TESTING?: boolean}).TESTING ??= false;\n\n  const z = new Zero({\n    schema: opts.schema,\n    server: config.zeroCacheURL,\n    auth: config.authToken,\n    userID: config.userId,\n    kvStore: 'mem',\n    logLevel: config.log.level,\n    logSink: stderrLogSink,\n  });\n\n  let result: AnalyzeQueryResult;\n  try {\n    const authOk = await z.inspector.authenticate(config.adminPassword ?? '');\n    if (!authOk) {\n      throw new Error(\n        'admin password rejected (or --admin-password is required)',\n      );\n    }\n\n    const rpcOptions = {\n      vendedRows: config.outputVendedRows,\n      syncedRows: config.outputSyncedRows,\n      joinPlans: config.joinPlans,\n    };\n\n    if (plan.kind === 'ast') {\n      result = await z.inspector.analyzeServerAST(plan.ast, rpcOptions);\n    } else if (plan.kind === 'named') {\n      result = await z.inspector.analyzeNamedQuery(\n        plan.name,\n        plan.args as ReadonlyArray<never>,\n        rpcOptions,\n      );\n    } else {\n      const built = buildZqlQuery(plan.text, createBuilder(opts.schema));\n      result = await z.inspector.analyzeQuery(built, rpcOptions);\n    }\n  } catch (e) {\n    colorConsole.error(e instanceof Error ? e.message : String(e));\n    await z.close().catch(() => {});\n    process.exit(1);\n  }\n\n  renderResult(result, {\n    outputSyncedRows: config.outputSyncedRows,\n    outputVendedRows: config.outputVendedRows,\n  });\n\n  await z.close();\n}\n\nfunction buildQueryPlan(config: {\n  ast?: string | undefined;\n  query?: string | undefined;\n  queryName?: string | undefined;\n  queryArgs?: string | undefined;\n}): QueryPlan {\n  const selectors = [\n    config.ast !== undefined && 'ast',\n    config.query !== undefined && 'query',\n    config.queryName !== undefined && 'queryName',\n  ].filter(Boolean) as string[];\n\n  if (selectors.length === 0) {\n    colorConsole.error(\n      'Exactly one of --ast / --query / --query-name is required.',\n    );\n    process.exit(1);\n  }\n  if (selectors.length > 1) {\n    colorConsole.error(\n      `Only one of --ast / --query / --query-name may be provided; got: ${selectors.join(', ')}`,\n    );\n    process.exit(1);\n  }\n\n  if (config.ast !== undefined) {\n    return {kind: 'ast', ast: JSON.parse(config.ast) as AST};\n  }\n  if (config.query !== undefined) {\n    return {kind: 'zql', text: config.query};\n  }\n  const args = config.queryArgs\n    ? (JSON.parse(config.queryArgs) as ReadonlyArray<unknown>)\n    : [];\n  return {kind: 'named', name: config.queryName as string, args};\n}\n\nfunction buildZqlQuery(\n  queryString: string,\n  builder: SchemaQuery<Schema>,\n): AnyQuery {\n  return evaluateZQLChain(queryString, builder) as AnyQuery;\n}\n\nfunction resolveHandshakeHeaders(config: {\n  cookie?: string | undefined;\n  headersJson?: string | undefined;\n}): Record<string, string> {\n  const headers: Record<string, string> = {};\n  if (config.headersJson !== undefined) {\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(config.headersJson);\n    } catch (e) {\n      colorConsole.error(\n        `--headers-json is not valid JSON: ${e instanceof Error ? e.message : String(e)}`,\n      );\n      process.exit(1);\n    }\n    if (\n      parsed === null ||\n      typeof parsed !== 'object' ||\n      Array.isArray(parsed)\n    ) {\n      colorConsole.error('--headers-json must be a JSON object.');\n      process.exit(1);\n    }\n    for (const [k, val] of Object.entries(parsed)) {\n      if (typeof val !== 'string') {\n        colorConsole.error(\n          `--headers-json values must be strings; got ${typeof val} for \"${k}\".`,\n        );\n        process.exit(1);\n      }\n      headers[k] = val;\n    }\n  }\n  if (config.cookie !== undefined) {\n    headers.cookie = config.cookie;\n  }\n  return headers;\n}\n\nfunction installWebSocketHeaderShim(headers: Record<string, string>): void {\n  class HeaderInjectingWebSocket extends NodeWebSocket {\n    constructor(url: string | URL, protocols?: string | string[]) {\n      super(url, protocols, {headers});\n    }\n  }\n  (globalThis as {WebSocket?: unknown}).WebSocket = HeaderInjectingWebSocket;\n}\n\nfunction renderResult(\n  result: AnalyzeQueryResult,\n  opts: {outputSyncedRows: boolean; outputVendedRows: boolean},\n) {\n  if (opts.outputSyncedRows) {\n    colorConsole.log(styleText(['blue', 'bold'], '=== Synced Rows: ===\\n'));\n    for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n      colorConsole.log(styleText('bold', table + ':'), rows);\n    }\n  }\n\n  colorConsole.log(styleText(['blue', 'bold'], '=== Query Stats: ===\\n'));\n  colorConsole.log(\n    styleText('bold', 'total synced rows:'),\n    result.syncedRowCount,\n  );\n\n  const readRowCountsByQuery = result.readRowCountsByQuery ?? {};\n  let totalRowsRead = 0;\n  for (const table of Object.keys(readRowCountsByQuery).sort()) {\n    const counts = readRowCountsByQuery[table];\n    for (const n of Object.values(counts)) {\n      totalRowsRead += n;\n    }\n    colorConsole.log(styleText('bold', `${table} vended:`), counts);\n  }\n  colorConsole.log(\n    styleText('bold', 'Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsRead),\n  );\n  const duration = result.elapsed ?? result.end - result.start;\n  colorConsole.log(styleText('bold', 'time:'), colorTime(duration), 'ms');\n\n  if (opts.outputVendedRows) {\n    colorConsole.log(\n      styleText(['blue', 'bold'], '=== JS Row Scan Values: ===\\n'),\n    );\n    for (const [table, rows] of Object.entries(result.readRows ?? {})) {\n      colorConsole.log(styleText('bold', `${table}:`), rows);\n    }\n  }\n\n  colorConsole.log(\n    styleText(['blue', 'bold'], '\\n=== Rows Scanned (by SQLite): ===\\n'),\n  );\n  const dbScansByQuery = result.dbScansByQuery ?? {};\n  let totalNVisit = 0;\n  for (const [table, queries] of Object.entries(dbScansByQuery)) {\n    colorConsole.log(styleText('bold', `${table}:`), queries);\n    for (const count of Object.values(queries)) {\n      totalNVisit += count;\n    }\n  }\n  colorConsole.log(\n    styleText('bold', 'total rows scanned:'),\n    colorRowsConsidered(totalNVisit),\n  );\n\n  colorConsole.log(styleText(['blue', 'bold'], '\\n\\n=== Query Plans: ===\\n'));\n  const plans = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(plans)) {\n    colorConsole.log(styleText('bold', 'query'), query);\n    colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n    colorConsole.log('\\n');\n  }\n\n  if (result.warnings.length > 0) {\n    colorConsole.log(styleText(['yellow', 'bold'], '=== Warnings: ===\\n'));\n    for (const w of result.warnings) {\n      colorConsole.log(styleText('yellow', w));\n    }\n  }\n\n  if (result.joinPlans && result.joinPlans.length > 0) {\n    colorConsole.log(styleText(['blue', 'bold'], '\\n=== Join Plans: ===\\n'));\n    colorConsole.log(formatPlannerEvents(result.joinPlans));\n  }\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return styleText('green', duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return styleText('yellow', duration.toFixed(2) + 'ms');\n  }\n  return styleText('red', duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return styleText('green', n.toString());\n  } else if (n < 10000) {\n    return styleText('yellow', n.toString());\n  }\n  return styleText('red', n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return styleText('yellow', row);\n    }\n    return styleText('red', row);\n  }\n  return styleText('green', row);\n}\n"],"mappings":";;;;;;;;;;;;;;AA2BA,IAAM,UAAU;CACd,cAAc;EACZ,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,oDACA,wEACF;CACF;CACA,eAAe;EACb,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,kCACA,uEACF;CACF;CACA,WAAW;EACT,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,oCACA,8DACF;CACF;CACA,QAAQ;EACN,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM;GACJ;GACA;GACA;GACA;EACF;CACF;CACA,aAAa;EACX,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM;GACJ;GACA;GACA;EACF;CACF;CACA,QAAQ;EACN,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,4CACA,8BACF;CACF;CACA,KAAK;EACH,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,gFACA,oFACF;CACF;CACA,OAAO;EACL,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,0EACA,yDACF;CACF;CACA,WAAW;EACT,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,qDACA,uEACF;CACF;CACA,WAAW;EACT,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CACJ,qEACF;CACF;CACA,kBAAkB;EAChB,MAAMA,eAAE,QAAQ,CAAC,CAAC,eAAe,KAAK;EACtC,MAAM,CACJ,gEACA,iCACF;CACF;CACA,kBAAkB;EAChB,MAAMA,eAAE,QAAQ,CAAC,CAAC,eAAe,KAAK;EACtC,MAAM,CAAC,sDAAsD;CAC/D;CACA,WAAW;EACT,MAAMA,eAAE,QAAQ,CAAC,CAAC,eAAe,KAAK;EACtC,MAAM,CAAC,mCAAmC;CAC5C;CACA,KAAK;EACH,GAAG;EACH,OAAO,SAAS,eAAe,OAAO;CACxC;AACF;AAUA,IAAM,gBAAgB,IAAI,QAAQ;CAChC,QAAQ,QAAQ;CAChB,QAAQ,QAAQ;AAClB,CAAC;AACD,IAAM,gBAAyB,EAC7B,IAAI,OAAO,SAAS,GAAG,MAAM;CAC3B,MAAM,MAAM,UACR,OAAO,QAAQ,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,OAC/B,MAAM,KAAA,IAAY,IAAI,GAAG,EAAE,GAAG,GAChC,IACA,CAAC;CACL,cAAc,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI;AACtC,EACF;;;;;;;;;;;;;;;AAgBA,eAAsB,cAAc,MAAwC;CAC1E,MAAM,QAAQ,KAAK,QAAQ,QAAQ,KAAK,MAAM,CAAC,EAAA,CAAG,KAAI,MACpD,EAAE,WAAW,MAAM,GAAG,CACxB;CAEA,MAAM,SAAS,aAAa,SAAS;EACnC;EACA,eAAe;EACf,aAAa,CACX;GACE,QAAQ;GACR,SAAS;;;;EAIX,GACA;GACE,QAAQ;GACR,SAAS;;;;;;;;;EASX,CACF;CACF,CAAC;CAED,IAAI,CAAC,OAAO,cAAc;EACxB,aAAa,MAAM,qDAAqD;EACxE,QAAQ,KAAK,CAAC;CAChB;CAEA,MAAM,OAAO,eAAe,MAAM;CAElC,MAAM,mBAAmB,wBAAwB,MAAM;CACvD,IAAI,OAAO,KAAK,gBAAgB,CAAC,CAAC,SAAS,GACzC,2BAA2B,gBAAgB;CAM7C,WAAoC,YAAY;CAEhD,MAAM,IAAI,IAAI,KAAK;EACjB,QAAQ,KAAK;EACb,QAAQ,OAAO;EACf,MAAM,OAAO;EACb,QAAQ,OAAO;EACf,SAAS;EACT,UAAU,OAAO,IAAI;EACrB,SAAS;CACX,CAAC;CAED,IAAI;CACJ,IAAI;EAEF,IAAI,CAAC,MADgB,EAAE,UAAU,aAAa,OAAO,iBAAiB,EAAE,GAEtE,MAAM,IAAI,MACR,2DACF;EAGF,MAAM,aAAa;GACjB,YAAY,OAAO;GACnB,YAAY,OAAO;GACnB,WAAW,OAAO;EACpB;EAEA,IAAI,KAAK,SAAS,OAChB,SAAS,MAAM,EAAE,UAAU,iBAAiB,KAAK,KAAK,UAAU;OAC3D,IAAI,KAAK,SAAS,SACvB,SAAS,MAAM,EAAE,UAAU,kBACzB,KAAK,MACL,KAAK,MACL,UACF;OACK;GACL,MAAM,QAAQ,cAAc,KAAK,MAAM,cAAc,KAAK,MAAM,CAAC;GACjE,SAAS,MAAM,EAAE,UAAU,aAAa,OAAO,UAAU;EAC3D;CACF,SAAS,GAAG;EACV,aAAa,MAAM,aAAa,QAAQ,EAAE,UAAU,OAAO,CAAC,CAAC;EAC7D,MAAM,EAAE,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;EAC9B,QAAQ,KAAK,CAAC;CAChB;CAEA,aAAa,QAAQ;EACnB,kBAAkB,OAAO;EACzB,kBAAkB,OAAO;CAC3B,CAAC;CAED,MAAM,EAAE,MAAM;AAChB;AAEA,SAAS,eAAe,QAKV;CACZ,MAAM,YAAY;EAChB,OAAO,QAAQ,KAAA,KAAa;EAC5B,OAAO,UAAU,KAAA,KAAa;EAC9B,OAAO,cAAc,KAAA,KAAa;CACpC,CAAC,CAAC,OAAO,OAAO;CAEhB,IAAI,UAAU,WAAW,GAAG;EAC1B,aAAa,MACX,4DACF;EACA,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,UAAU,SAAS,GAAG;EACxB,aAAa,MACX,oEAAoE,UAAU,KAAK,IAAI,GACzF;EACA,QAAQ,KAAK,CAAC;CAChB;CAEA,IAAI,OAAO,QAAQ,KAAA,GACjB,OAAO;EAAC,MAAM;EAAO,KAAK,KAAK,MAAM,OAAO,GAAG;CAAQ;CAEzD,IAAI,OAAO,UAAU,KAAA,GACnB,OAAO;EAAC,MAAM;EAAO,MAAM,OAAO;CAAK;CAEzC,MAAM,OAAO,OAAO,YACf,KAAK,MAAM,OAAO,SAAS,IAC5B,CAAC;CACL,OAAO;EAAC,MAAM;EAAS,MAAM,OAAO;EAAqB;CAAI;AAC/D;AAEA,SAAS,cACP,aACA,SACU;CACV,OAAO,iBAAiB,aAAa,OAAO;AAC9C;AAEA,SAAS,wBAAwB,QAGN;CACzB,MAAM,UAAkC,CAAC;CACzC,IAAI,OAAO,gBAAgB,KAAA,GAAW;EACpC,IAAI;EACJ,IAAI;GACF,SAAS,KAAK,MAAM,OAAO,WAAW;EACxC,SAAS,GAAG;GACV,aAAa,MACX,qCAAqC,aAAa,QAAQ,EAAE,UAAU,OAAO,CAAC,GAChF;GACA,QAAQ,KAAK,CAAC;EAChB;EACA,IACE,WAAW,QACX,OAAO,WAAW,YAClB,MAAM,QAAQ,MAAM,GACpB;GACA,aAAa,MAAM,uCAAuC;GAC1D,QAAQ,KAAK,CAAC;EAChB;EACA,KAAK,MAAM,CAAC,GAAG,QAAQ,OAAO,QAAQ,MAAM,GAAG;GAC7C,IAAI,OAAO,QAAQ,UAAU;IAC3B,aAAa,MACX,8CAA8C,OAAO,IAAI,QAAQ,EAAE,GACrE;IACA,QAAQ,KAAK,CAAC;GAChB;GACA,QAAQ,KAAK;EACf;CACF;CACA,IAAI,OAAO,WAAW,KAAA,GACpB,QAAQ,SAAS,OAAO;CAE1B,OAAO;AACT;AAEA,SAAS,2BAA2B,SAAuC;CACzE,MAAM,iCAAiCC,UAAc;EACnD,YAAY,KAAmB,WAA+B;GAC5D,MAAM,KAAK,WAAW,EAAC,QAAO,CAAC;EACjC;CACF;CACA,WAAsC,YAAY;AACpD;AAEA,SAAS,aACP,QACA,MACA;CACA,IAAI,KAAK,kBAAkB;EACzB,aAAa,IAAI,UAAU,CAAC,QAAQ,MAAM,GAAG,wBAAwB,CAAC;EACtE,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,OAAO,cAAc,CAAC,CAAC,GAChE,aAAa,IAAI,UAAU,QAAQ,QAAQ,GAAG,GAAG,IAAI;CAEzD;CAEA,aAAa,IAAI,UAAU,CAAC,QAAQ,MAAM,GAAG,wBAAwB,CAAC;CACtE,aAAa,IACX,UAAU,QAAQ,oBAAoB,GACtC,OAAO,cACT;CAEA,MAAM,uBAAuB,OAAO,wBAAwB,CAAC;CAC7D,IAAI,gBAAgB;CACpB,KAAK,MAAM,SAAS,OAAO,KAAK,oBAAoB,CAAC,CAAC,KAAK,GAAG;EAC5D,MAAM,SAAS,qBAAqB;EACpC,KAAK,MAAM,KAAK,OAAO,OAAO,MAAM,GAClC,iBAAiB;EAEnB,aAAa,IAAI,UAAU,QAAQ,GAAG,MAAM,SAAS,GAAG,MAAM;CAChE;CACA,aAAa,IACX,UAAU,QAAQ,sBAAsB,GACxC,oBAAoB,aAAa,CACnC;CACA,MAAM,WAAW,OAAO,WAAW,OAAO,MAAM,OAAO;CACvD,aAAa,IAAI,UAAU,QAAQ,OAAO,GAAG,UAAU,QAAQ,GAAG,IAAI;CAEtE,IAAI,KAAK,kBAAkB;EACzB,aAAa,IACX,UAAU,CAAC,QAAQ,MAAM,GAAG,+BAA+B,CAC7D;EACA,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,OAAO,YAAY,CAAC,CAAC,GAC9D,aAAa,IAAI,UAAU,QAAQ,GAAG,MAAM,EAAE,GAAG,IAAI;CAEzD;CAEA,aAAa,IACX,UAAU,CAAC,QAAQ,MAAM,GAAG,uCAAuC,CACrE;CACA,MAAM,iBAAiB,OAAO,kBAAkB,CAAC;CACjD,IAAI,cAAc;CAClB,KAAK,MAAM,CAAC,OAAO,YAAY,OAAO,QAAQ,cAAc,GAAG;EAC7D,aAAa,IAAI,UAAU,QAAQ,GAAG,MAAM,EAAE,GAAG,OAAO;EACxD,KAAK,MAAM,SAAS,OAAO,OAAO,OAAO,GACvC,eAAe;CAEnB;CACA,aAAa,IACX,UAAU,QAAQ,qBAAqB,GACvC,oBAAoB,WAAW,CACjC;CAEA,aAAa,IAAI,UAAU,CAAC,QAAQ,MAAM,GAAG,4BAA4B,CAAC;CAC1E,MAAM,QAAQ,OAAO,eAAe,CAAC;CACrC,KAAK,MAAM,CAAC,OAAO,SAAS,OAAO,QAAQ,KAAK,GAAG;EACjD,aAAa,IAAI,UAAU,QAAQ,OAAO,GAAG,KAAK;EAClD,aAAa,IAAI,KAAK,KAAK,KAAK,MAAM,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;EACtE,aAAa,IAAI,IAAI;CACvB;CAEA,IAAI,OAAO,SAAS,SAAS,GAAG;EAC9B,aAAa,IAAI,UAAU,CAAC,UAAU,MAAM,GAAG,qBAAqB,CAAC;EACrE,KAAK,MAAM,KAAK,OAAO,UACrB,aAAa,IAAI,UAAU,UAAU,CAAC,CAAC;CAE3C;CAEA,IAAI,OAAO,aAAa,OAAO,UAAU,SAAS,GAAG;EACnD,aAAa,IAAI,UAAU,CAAC,QAAQ,MAAM,GAAG,yBAAyB,CAAC;EACvE,aAAa,IAAI,oBAAoB,OAAO,SAAS,CAAC;CACxD;AACF;AAEA,SAAS,UAAU,UAAkB;CACnC,IAAI,WAAW,KACb,OAAO,UAAU,SAAS,SAAS,QAAQ,CAAC,IAAI,IAAI;MAC/C,IAAI,WAAW,KACpB,OAAO,UAAU,UAAU,SAAS,QAAQ,CAAC,IAAI,IAAI;CAEvD,OAAO,UAAU,OAAO,SAAS,QAAQ,CAAC,IAAI,IAAI;AACpD;AAEA,SAAS,oBAAoB,GAAW;CACtC,IAAI,IAAI,KACN,OAAO,UAAU,SAAS,EAAE,SAAS,CAAC;MACjC,IAAI,IAAI,KACb,OAAO,UAAU,UAAU,EAAE,SAAS,CAAC;CAEzC,OAAO,UAAU,OAAO,EAAE,SAAS,CAAC;AACtC;AAEA,SAAS,aAAa,KAAa,GAAW;CAC5C,IAAI,IAAI,SAAS,MAAM,GAAG;EACxB,IAAI,MAAM,GACR,OAAO,UAAU,UAAU,GAAG;EAEhC,OAAO,UAAU,OAAO,GAAG;CAC7B;CACA,OAAO,UAAU,SAAS,GAAG;AAC/B"}

package/out/analyze-query/src/bin-transform.js

@@ -4,14 +4,14 @@ import "../../shared/src/dotenv.js";
 import { parseOptions } from "../../shared/src/options.js";
 import { getShardID, upstreamSchema } from "../../zero-cache/src/types/shards.js";
 import { ZERO_ENV_VAR_PREFIX, appOptions, shardOptions } from "../../zero-cache/src/config/zero-config.js";
+import { loadSchemaAndPermissions } from "../../zero-cache/src/scripts/permissions.js";
 import { astToZQL } from "../../ast-to-zql/src/ast-to-zql.js";
 import { formatOutput } from "../../ast-to-zql/src/format.js";
-import { loadSchemaAndPermissions } from "../../zero-cache/src/scripts/permissions.js";
 import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer.js";
 import { pgClient } from "../../zero-cache/src/types/pg.js";
 import { LogContext, consoleLogSink } from "@rocicorp/logger";
 //#region ../analyze-query/src/bin-transform.ts
-var config = parseOptions({
+var options = {
 	cvr: { db: valita_exports.string() },
 	schema: {
 		type: valita_exports.string().optional(() => "./schema.ts"),
@@ -23,7 +23,8 @@ var config = parseOptions({
 		type: valita_exports.string().optional(),
 		desc: ["Hash of the query to fetch the AST for."]
 	}
-}, { envNamePrefix: ZERO_ENV_VAR_PREFIX });
+};
+var config = parseOptions(options, { envNamePrefix: ZERO_ENV_VAR_PREFIX });
 var lc = new LogContext("debug", {}, consoleLogSink);
 var { permissions } = await loadSchemaAndPermissions(config.schema);
 var cvrDB = pgClient(lc, config.cvr.db, "analyze-query-transform-cvr");

package/out/analyze-query/src/bin-transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin-transform.js","names":[],"sources":["../../../../analyze-query/src/bin-transform.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {consoleLogSink, LogContext} from '@rocicorp/logger';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {transformAndHashQuery} from '../../zero-cache/src/auth/read-authorizer.ts';\nimport {\n  appOptions,\n  shardOptions,\n  ZERO_ENV_VAR_PREFIX,\n} from '../../zero-cache/src/config/zero-config.ts';\nimport {loadSchemaAndPermissions} from '../../zero-cache/src/scripts/permissions.ts';\nimport {pgClient} from '../../zero-cache/src/types/pg.ts';\nimport {getShardID, upstreamSchema} from '../../zero-cache/src/types/shards.ts';\n\nconst options = {\n  cvr: {db: v.string()},\n  schema: {\n    type: v.string().optional(() => './schema.ts'),\n    desc: ['Path to the schema file.'],\n  },\n  app: appOptions,\n  shard: shardOptions,\n  hash: {\n    type: v.string().optional(),\n    desc: ['Hash of the query to fetch the AST for.'],\n  },\n};\n\nconst config = parseOptions(options, {envNamePrefix: ZERO_ENV_VAR_PREFIX});\n\nconst lc = new LogContext('debug', {}, consoleLogSink);\nconst {permissions} = await loadSchemaAndPermissions(config.schema);\n\nconst cvrDB = pgClient(lc, config.cvr.db, 'analyze-query-transform-cvr');\n\nconst rows =\n  await cvrDB`select \"clientAST\", \"internal\" from ${cvrDB(upstreamSchema(getShardID(config)) + '/cvr')}.\"queries\" where \"queryHash\" = ${must(\n    config.hash,\n  )} limit 1;`;\n\nconst queryAst = transformAndHashQuery(\n  lc,\n  '',\n  rows[0].clientAST,\n  permissions,\n  {\n    type: 'jwt',\n    raw: '',\n    decoded: {},\n  },\n  rows[0].internal,\n).transformedAst;\n\n// oxlint-disable no-console\nconsole.log('\\n=== AST ===\\n');\nconsole.log(JSON.stringify(queryAst, null, 2));\nconsole.log('\\n=== ZQL ===\\n');\nconsole.log(await formatOutput(queryAst.table + astToZQL(queryAst)));\n// oxlint-enable no-console\n\nawait cvrDB.end();\n"],"mappings":";;;;;;;;;;;;;AAgCA,IAAM,SAAS,aAAa;CAb1B,KAAK,EAAC,IAAI,eAAE,OAAO,EAAC;CACpB,QAAQ;EACN,MAAM,eAAE,OAAO,EAAE,eAAe,aAAa;EAC7C,MAAM,CAAC,0BAA0B;CACnC;CACA,KAAK;CACL,OAAO;CACP,MAAM;EACJ,MAAM,eAAE,OAAO,EAAE,SAAS;EAC1B,MAAM,CAAC,yCAAyC;CAClD;AAG0B,GAAS,EAAC,eAAe,oBAAmB,CAAC;AAEzE,IAAM,KAAK,IAAI,WAAW,SAAS,CAAC,GAAG,cAAc;AACrD,IAAM,EAAC,gBAAe,MAAM,yBAAyB,OAAO,MAAM;AAElE,IAAM,QAAQ,SAAS,IAAI,OAAO,IAAI,IAAI,6BAA6B;AAEvE,IAAM,OACJ,MAAM,KAAK,uCAAuC,MAAM,eAAe,WAAW,MAAM,CAAC,IAAI,MAAM,EAAE,iCAAiC,KACpI,OAAO,IACT,EAAE;AAEJ,IAAM,WAAW,sBACf,IACA,IACA,KAAK,GAAG,WACR,aACA;CACE,MAAM;CACN,KAAK;CACL,SAAS,CAAC;AACZ,GACA,KAAK,GAAG,QACV,EAAE;AAGF,QAAQ,IAAI,iBAAiB;AAC7B,QAAQ,IAAI,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAC7C,QAAQ,IAAI,iBAAiB;AAC7B,QAAQ,IAAI,MAAM,aAAa,SAAS,QAAQ,SAAS,QAAQ,CAAC,CAAC;AAGnE,MAAM,MAAM,IAAI"}
+{"version":3,"file":"bin-transform.js","names":["v"],"sources":["../../../../analyze-query/src/bin-transform.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {consoleLogSink, LogContext} from '@rocicorp/logger';\nimport {astToZQL} from '../../ast-to-zql/src/ast-to-zql.ts';\nimport {formatOutput} from '../../ast-to-zql/src/format.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {transformAndHashQuery} from '../../zero-cache/src/auth/read-authorizer.ts';\nimport {\n  appOptions,\n  shardOptions,\n  ZERO_ENV_VAR_PREFIX,\n} from '../../zero-cache/src/config/zero-config.ts';\nimport {loadSchemaAndPermissions} from '../../zero-cache/src/scripts/permissions.ts';\nimport {pgClient} from '../../zero-cache/src/types/pg.ts';\nimport {getShardID, upstreamSchema} from '../../zero-cache/src/types/shards.ts';\n\nconst options = {\n  cvr: {db: v.string()},\n  schema: {\n    type: v.string().optional(() => './schema.ts'),\n    desc: ['Path to the schema file.'],\n  },\n  app: appOptions,\n  shard: shardOptions,\n  hash: {\n    type: v.string().optional(),\n    desc: ['Hash of the query to fetch the AST for.'],\n  },\n};\n\nconst config = parseOptions(options, {envNamePrefix: ZERO_ENV_VAR_PREFIX});\n\nconst lc = new LogContext('debug', {}, consoleLogSink);\nconst {permissions} = await loadSchemaAndPermissions(config.schema);\n\nconst cvrDB = pgClient(lc, config.cvr.db, 'analyze-query-transform-cvr');\n\nconst rows =\n  await cvrDB`select \"clientAST\", \"internal\" from ${cvrDB(upstreamSchema(getShardID(config)) + '/cvr')}.\"queries\" where \"queryHash\" = ${must(\n    config.hash,\n  )} limit 1;`;\n\nconst queryAst = transformAndHashQuery(\n  lc,\n  '',\n  rows[0].clientAST,\n  permissions,\n  {\n    type: 'jwt',\n    raw: '',\n    decoded: {},\n  },\n  rows[0].internal,\n).transformedAst;\n\n// oxlint-disable no-console\nconsole.log('\\n=== AST ===\\n');\nconsole.log(JSON.stringify(queryAst, null, 2));\nconsole.log('\\n=== ZQL ===\\n');\nconsole.log(await formatOutput(queryAst.table + astToZQL(queryAst)));\n// oxlint-enable no-console\n\nawait cvrDB.end();\n"],"mappings":";;;;;;;;;;;;;AAkBA,IAAM,UAAU;CACd,KAAK,EAAC,IAAIA,eAAE,OAAO,EAAC;CACpB,QAAQ;EACN,MAAMA,eAAE,OAAO,CAAC,CAAC,eAAe,aAAa;EAC7C,MAAM,CAAC,0BAA0B;CACnC;CACA,KAAK;CACL,OAAO;CACP,MAAM;EACJ,MAAMA,eAAE,OAAO,CAAC,CAAC,SAAS;EAC1B,MAAM,CAAC,yCAAyC;CAClD;AACF;AAEA,IAAM,SAAS,aAAa,SAAS,EAAC,eAAe,oBAAmB,CAAC;AAEzE,IAAM,KAAK,IAAI,WAAW,SAAS,CAAC,GAAG,cAAc;AACrD,IAAM,EAAC,gBAAe,MAAM,yBAAyB,OAAO,MAAM;AAElE,IAAM,QAAQ,SAAS,IAAI,OAAO,IAAI,IAAI,6BAA6B;AAEvE,IAAM,OACJ,MAAM,KAAK,uCAAuC,MAAM,eAAe,WAAW,MAAM,CAAC,IAAI,MAAM,EAAE,iCAAiC,KACpI,OAAO,IACT,EAAE;AAEJ,IAAM,WAAW,sBACf,IACA,IACA,KAAK,EAAE,CAAC,WACR,aACA;CACE,MAAM;CACN,KAAK;CACL,SAAS,CAAC;AACZ,GACA,KAAK,EAAE,CAAC,QACV,CAAC,CAAC;AAGF,QAAQ,IAAI,iBAAiB;AAC7B,QAAQ,IAAI,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAC7C,QAAQ,IAAI,iBAAiB;AAC7B,QAAQ,IAAI,MAAM,aAAa,SAAS,QAAQ,SAAS,QAAQ,CAAC,CAAC;AAGnE,MAAM,MAAM,IAAI"}

package/out/analyze-query/src/zql-chain.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Evaluates a ZQL query written in chain form, e.g.
+ * `issue.where('open', true).related('comments', q => q.limit(10))`.
+ *
+ * The text is parsed with oxc and the resulting JavaScript AST is evaluated
+ * directly. It is never run as JavaScript. Only these constructs are
+ * accepted:
+ *
+ * - identifiers: table names (looked up on `root`), arrow function
+ *   parameters, and `undefined`
+ * - calls to the query and expression builder methods in
+ *   {@link ALLOWED_METHODS}, either as `x.method(...)` or through a
+ *   destructured parameter such as `({cmp, or}) => or(cmp(...))`
+ * - string, number, boolean and null literals, negative numbers, and
+ *   template literals without substitutions
+ * - array and object literals
+ * - arrow functions with an expression body whose parameters are
+ *   identifiers or `{a, b}` patterns of allowed method names
+ *
+ * Anything else, including access to any other property, is rejected.
+ */
+export declare function evaluateZQLChain(text: string, root: object): unknown;
+//# sourceMappingURL=zql-chain.d.ts.map

package/out/analyze-query/src/zql-chain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zql-chain.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/zql-chain.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAiBpE"}

package/out/analyze-query/src/zql-chain.js

@@ -0,0 +1,170 @@
+import { parseSync } from "oxc-parser";
+//#region ../analyze-query/src/zql-chain.ts
+/**
+* Evaluates a ZQL query written in chain form, e.g.
+* `issue.where('open', true).related('comments', q => q.limit(10))`.
+*
+* The text is parsed with oxc and the resulting JavaScript AST is evaluated
+* directly. It is never run as JavaScript. Only these constructs are
+* accepted:
+*
+* - identifiers: table names (looked up on `root`), arrow function
+*   parameters, and `undefined`
+* - calls to the query and expression builder methods in
+*   {@link ALLOWED_METHODS}, either as `x.method(...)` or through a
+*   destructured parameter such as `({cmp, or}) => or(cmp(...))`
+* - string, number, boolean and null literals, negative numbers, and
+*   template literals without substitutions
+* - array and object literals
+* - arrow functions with an expression body whose parameters are
+*   identifiers or `{a, b}` patterns of allowed method names
+*
+* Anything else, including access to any other property, is rejected.
+*/
+function evaluateZQLChain(text, root) {
+	const { program, errors } = parseSync("query.js", text, {
+		lang: "js",
+		sourceType: "script"
+	});
+	if (errors.length > 0) {
+		const [error] = errors;
+		const pos = error.labels[0]?.start;
+		throw new SyntaxError(pos === void 0 ? error.message : `${error.message} at position ${pos}`);
+	}
+	const [statement, ...rest] = program.body;
+	if (statement?.type !== "ExpressionStatement" || rest.length > 0) throw new SyntaxError("Expected a single query expression");
+	return new Evaluator(text, root).evaluate(statement.expression, /* @__PURE__ */ new Map());
+}
+var QUERY_METHODS = {
+	where: true,
+	whereExists: true,
+	related: true,
+	orderBy: true,
+	limit: true,
+	one: true,
+	start: true,
+	count: true,
+	sum: true,
+	avg: true,
+	min: true,
+	max: true,
+	distinct: true,
+	groupBy: true,
+	run: false,
+	preload: false,
+	materialize: false
+};
+var EXPRESSION_BUILDER_METHODS = {
+	cmp: true,
+	cmpLit: true,
+	and: true,
+	or: true,
+	not: true,
+	exists: true,
+	eb: true,
+	json: true
+};
+var ALLOWED_METHODS = new Set(Object.entries({
+	...QUERY_METHODS,
+	...EXPRESSION_BUILDER_METHODS
+}).filter(([, allowed]) => allowed).map(([name]) => name));
+var Evaluator = class {
+	#text;
+	#root;
+	constructor(text, root) {
+		this.#text = text;
+		this.#root = root;
+	}
+	#reject(node, what) {
+		const source = this.#text.slice(node.start, node.end);
+		throw new SyntaxError(`${what} is not allowed: \`${source}\` at position ${node.start}`);
+	}
+	evaluate(node, scope) {
+		switch (node.type) {
+			case "ParenthesizedExpression": return this.evaluate(node.expression, scope);
+			case "Literal":
+				if (node.regex || node.bigint) this.#reject(node, "Literal");
+				return node.value;
+			case "TemplateLiteral":
+				if (node.expressions.length > 0) this.#reject(node, "Template substitution");
+				return node.quasis[0].value.cooked;
+			case "UnaryExpression":
+				if (node.operator === "-" && node.argument.type === "Literal" && typeof node.argument.value === "number") return -node.argument.value;
+				return this.#reject(node, "Operator");
+			case "Identifier": return this.#lookup(node, node.name, scope);
+			case "ArrayExpression": return node.elements.map((e) => {
+				if (e === null || e.type === "SpreadElement") return this.#reject(node, "Array hole or spread");
+				return this.evaluate(e, scope);
+			});
+			case "ObjectExpression": return this.#evaluateObject(node, scope);
+			case "ArrowFunctionExpression": return this.#evaluateArrow(node, scope);
+			case "CallExpression": return this.#evaluateCall(node, scope);
+			default: return this.#reject(node, node.type);
+		}
+	}
+	#lookup(node, name, scope) {
+		if (scope.has(name)) return scope.get(name);
+		if (name === "undefined") return;
+		if (!Object.hasOwn(this.#root, name)) this.#reject(node, "Unknown identifier");
+		return this.#root[name];
+	}
+	#evaluateObject(node, scope) {
+		const obj = {};
+		for (const prop of node.properties) {
+			if (prop.type !== "Property" || prop.kind !== "init" || prop.method || prop.computed) return this.#reject(prop, "Object member");
+			let key;
+			if (prop.key.type === "Identifier") key = prop.key.name;
+			else if (prop.key.type === "Literal" && typeof prop.key.value === "string") key = prop.key.value;
+			else return this.#reject(prop.key, "Object key");
+			if (key === "__proto__") return this.#reject(prop.key, "Object key");
+			obj[key] = this.evaluate(prop.value, scope);
+		}
+		return obj;
+	}
+	#evaluateArrow(node, scope) {
+		if (!node.expression || node.async) return this.#reject(node, "Arrow function with a block body");
+		const body = node.body;
+		const params = node.params.map((param) => {
+			if (param.type === "Identifier") return { name: param.name };
+			if (param.type !== "ObjectPattern") return this.#reject(param, "Parameter");
+			return { names: param.properties.map((p) => {
+				if (p.type !== "Property" || p.computed || p.value.type !== "Identifier" || !p.shorthand || p.key.type !== "Identifier" || !ALLOWED_METHODS.has(p.key.name)) return this.#reject(p, "Destructured parameter");
+				return p.key.name;
+			}) };
+		});
+		return (...args) => {
+			const inner = new Map(scope);
+			params.forEach((param, i) => {
+				if ("name" in param) inner.set(param.name, args[i]);
+				else {
+					const arg = args[i];
+					for (const name of param.names) inner.set(name, arg[name]);
+				}
+			});
+			return this.evaluate(body, inner);
+		};
+	}
+	#evaluateCall(node, scope) {
+		if (node.optional) return this.#reject(node, "Optional call");
+		const args = node.arguments.map((a) => {
+			if (a.type === "SpreadElement") return this.#reject(a, "Spread");
+			return this.evaluate(a, scope);
+		});
+		const { callee } = node;
+		let thisValue;
+		let fn;
+		if (callee.type === "MemberExpression") {
+			if (callee.computed || callee.optional || callee.property.type !== "Identifier" || !ALLOWED_METHODS.has(callee.property.name)) return this.#reject(callee, "Method");
+			thisValue = this.evaluate(callee.object, scope);
+			if (thisValue === null || typeof thisValue !== "object") return this.#reject(callee.object, "Receiver");
+			fn = thisValue[callee.property.name];
+		} else if (callee.type === "Identifier" && scope.has(callee.name)) fn = scope.get(callee.name);
+		else return this.#reject(callee, "Callee");
+		if (typeof fn !== "function") return this.#reject(callee, "Non-function call");
+		return Reflect.apply(fn, thisValue, args);
+	}
+};
+//#endregion
+export { evaluateZQLChain };
+
+//# sourceMappingURL=zql-chain.js.map

package/out/analyze-query/src/zql-chain.js.map

@@ -0,0 +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":";;;;;;;;;;;;;;;;;;;;;;;AAgCA,SAAgB,iBAAiB,MAAc,MAAuB;CACpE,MAAM,EAAC,SAAS,WAAU,UAAU,YAAY,MAAM;EACpD,MAAM;EACN,YAAY;CACd,CAAC;CACD,IAAI,OAAO,SAAS,GAAG;EACrB,MAAM,CAAC,SAAS;EAChB,MAAM,MAAM,MAAM,OAAO,EAAE,EAAE;EAC7B,MAAM,IAAI,YACR,QAAQ,KAAA,IAAY,MAAM,UAAU,GAAG,MAAM,QAAQ,eAAe,KACtE;CACF;CACA,MAAM,CAAC,WAAW,GAAG,QAAQ,QAAQ;CACrC,IAAI,WAAW,SAAS,yBAAyB,KAAK,SAAS,GAC7D,MAAM,IAAI,YAAY,oCAAoC;CAE5D,OAAO,IAAI,UAAU,MAAM,IAAI,CAAC,CAAC,SAAS,UAAU,4BAAY,IAAI,IAAI,CAAC;AAC3E;AAOA,IAAM,gBAAgB;CACpB,OAAO;CACP,aAAa;CACb,SAAS;CACT,SAAS;CACT,OAAO;CACP,KAAK;CACL,OAAO;CACP,OAAO;CACP,KAAK;CACL,KAAK;CACL,KAAK;CACL,KAAK;CACL,UAAU;CACV,SAAS;CACT,KAAK;CACL,SAAS;CACT,aAAa;AACf;AAEA,IAAM,6BAA6B;CACjC,KAAK;CACL,QAAQ;CACR,KAAK;CACL,IAAI;CACJ,KAAK;CACL,QAAQ;CACR,IAAI;CACJ,MAAM;AACR;AAEA,IAAM,kBAAuC,IAAI,IAC/C,OAAO,QAAQ;CAAC,GAAG;CAAe,GAAG;AAA0B,CAAC,CAAC,CAC9D,QAAQ,GAAG,aAAa,OAAO,CAAC,CAChC,KAAK,CAAC,UAAU,IAAI,CACzB;AAIA,IAAM,YAAN,MAAgB;CACd;CACA;CAEA,YAAY,MAAc,MAAc;EACtC,KAAK,QAAQ;EACb,KAAK,QAAQ;CACf;CAEA,QAAQ,MAAY,MAAqB;EACvC,MAAM,SAAS,KAAK,MAAM,MAAM,KAAK,OAAO,KAAK,GAAG;EACpD,MAAM,IAAI,YACR,GAAG,KAAK,qBAAqB,OAAO,iBAAiB,KAAK,OAC5D;CACF;CAEA,SAAS,MAAkB,OAAuB;EAChD,QAAQ,KAAK,MAAb;GACE,KAAK,2BACH,OAAO,KAAK,SAAS,KAAK,YAAY,KAAK;GAC7C,KAAK;IACH,IACG,KAA2B,SAC3B,KAA4B,QAE7B,KAAK,QAAQ,MAAM,SAAS;IAE9B,OAAO,KAAK;GACd,KAAK;IACH,IAAI,KAAK,YAAY,SAAS,GAC5B,KAAK,QAAQ,MAAM,uBAAuB;IAE5C,OAAO,KAAK,OAAO,EAAE,CAAC,MAAM;GAC9B,KAAK;IACH,IACE,KAAK,aAAa,OAClB,KAAK,SAAS,SAAS,aACvB,OAAO,KAAK,SAAS,UAAU,UAE/B,OAAO,CAAC,KAAK,SAAS;IAExB,OAAO,KAAK,QAAQ,MAAM,UAAU;GACtC,KAAK,cACH,OAAO,KAAK,QAAQ,MAAM,KAAK,MAAM,KAAK;GAC5C,KAAK,mBACH,OAAO,KAAK,SAAS,KAAI,MAAK;IAC5B,IAAI,MAAM,QAAQ,EAAE,SAAS,iBAC3B,OAAO,KAAK,QAAQ,MAAM,sBAAsB;IAElD,OAAO,KAAK,SAAS,GAAG,KAAK;GAC/B,CAAC;GACH,KAAK,oBACH,OAAO,KAAK,gBAAgB,MAAM,KAAK;GACzC,KAAK,2BACH,OAAO,KAAK,eAAe,MAAM,KAAK;GACxC,KAAK,kBACH,OAAO,KAAK,cAAc,MAAM,KAAK;GACvC,SACE,OAAO,KAAK,QAAQ,MAAM,KAAK,IAAI;EACvC;CACF;CAEA,QAAQ,MAAY,MAAc,OAAuB;EACvD,IAAI,MAAM,IAAI,IAAI,GAChB,OAAO,MAAM,IAAI,IAAI;EAEvB,IAAI,SAAS,aACX;EAEF,IAAI,CAAC,OAAO,OAAO,KAAK,OAAO,IAAI,GACjC,KAAK,QAAQ,MAAM,oBAAoB;EAEzC,OAAQ,KAAK,MAAkC;CACjD;CAEA,gBAAgB,MAAwB,OAAuB;EAC7D,MAAM,MAA+B,CAAC;EACtC,KAAK,MAAM,QAAQ,KAAK,YAAY;GAClC,IACE,KAAK,SAAS,cACd,KAAK,SAAS,UACd,KAAK,UACL,KAAK,UAEL,OAAO,KAAK,QAAQ,MAAM,eAAe;GAE3C,IAAI;GACJ,IAAI,KAAK,IAAI,SAAS,cACpB,MAAM,KAAK,IAAI;QACV,IACL,KAAK,IAAI,SAAS,aAClB,OAAO,KAAK,IAAI,UAAU,UAE1B,MAAM,KAAK,IAAI;QAEf,OAAO,KAAK,QAAQ,KAAK,KAAK,YAAY;GAE5C,IAAI,QAAQ,aACV,OAAO,KAAK,QAAQ,KAAK,KAAK,YAAY;GAE5C,IAAI,OAAO,KAAK,SAAS,KAAK,OAAqB,KAAK;EAC1D;EACA,OAAO;CACT;CAEA,eAAe,MAA+B,OAAuB;EACnE,IAAI,CAAC,KAAK,cAAc,KAAK,OAC3B,OAAO,KAAK,QAAQ,MAAM,kCAAkC;EAE9D,MAAM,OAAO,KAAK;EAClB,MAAM,SAAS,KAAK,OAAO,KAAI,UAAS;GACtC,IAAI,MAAM,SAAS,cACjB,OAAO,EAAC,MAAM,MAAM,KAAI;GAE1B,IAAI,MAAM,SAAS,iBACjB,OAAO,KAAK,QAAQ,OAAO,WAAW;GAExC,OAAO,EACL,OAAO,MAAM,WAAW,KAAI,MAAK;IAC/B,IACE,EAAE,SAAS,cACX,EAAE,YACF,EAAE,MAAM,SAAS,gBACjB,CAAC,EAAE,aACH,EAAE,IAAI,SAAS,gBACf,CAAC,gBAAgB,IAAI,EAAE,IAAI,IAAI,GAE/B,OAAO,KAAK,QAAQ,GAAG,wBAAwB;IAEjD,OAAO,EAAE,IAAI;GACf,CAAC,EACH;EACF,CAAC;EACD,QAAQ,GAAG,SAAoB;GAC7B,MAAM,QAAQ,IAAI,IAAI,KAAK;GAC3B,OAAO,SAAS,OAAO,MAAM;IAC3B,IAAI,UAAU,OACZ,MAAM,IAAI,MAAM,MAAM,KAAK,EAAE;SACxB;KACL,MAAM,MAAM,KAAK;KACjB,KAAK,MAAM,QAAQ,MAAM,OACvB,MAAM,IAAI,MAAM,IAAI,KAAK;IAE7B;GACF,CAAC;GACD,OAAO,KAAK,SAAS,MAAM,KAAK;EAClC;CACF;CAEA,cACE,MACA,OACS;EACT,IAAI,KAAK,UACP,OAAO,KAAK,QAAQ,MAAM,eAAe;EAE3C,MAAM,OAAO,KAAK,UAAU,KAAI,MAAK;GACnC,IAAI,EAAE,SAAS,iBACb,OAAO,KAAK,QAAQ,GAAG,QAAQ;GAEjC,OAAO,KAAK,SAAS,GAAG,KAAK;EAC/B,CAAC;EACD,MAAM,EAAC,WAAU;EACjB,IAAI;EACJ,IAAI;EACJ,IAAI,OAAO,SAAS,oBAAoB;GACtC,IACE,OAAO,YACP,OAAO,YACP,OAAO,SAAS,SAAS,gBACzB,CAAC,gBAAgB,IAAI,OAAO,SAAS,IAAI,GAEzC,OAAO,KAAK,QAAQ,QAAQ,QAAQ;GAEtC,YAAY,KAAK,SAAS,OAAO,QAAQ,KAAK;GAC9C,IAAI,cAAc,QAAQ,OAAO,cAAc,UAC7C,OAAO,KAAK,QAAQ,OAAO,QAAQ,UAAU;GAE/C,KAAM,UAAsC,OAAO,SAAS;EAC9D,OAAO,IAAI,OAAO,SAAS,gBAAgB,MAAM,IAAI,OAAO,IAAI,GAC9D,KAAK,MAAM,IAAI,OAAO,IAAI;OAE1B,OAAO,KAAK,QAAQ,QAAQ,QAAQ;EAEtC,IAAI,OAAO,OAAO,YAChB,OAAO,KAAK,QAAQ,QAAQ,mBAAmB;EAEjD,OAAO,QAAQ,MAAM,IAAI,WAAW,IAAI;CAC1C;AACF"}

package/out/ast-to-zql/src/ast-to-zql.d.ts.map

@@ -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"}
+{"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"}

package/out/ast-to-zql/src/ast-to-zql.js

@@ -20,29 +20,48 @@ function astToZQL(ast, options = {}) {
 		const nestedRelated = related.subquery.related?.[0];
 		if (nestedRelated) code += transformRelated(nestedRelated, options);
 	} else code += transformRelated(related, options);
+	if (ast.groupBy) {
+		const cols = ast.groupBy.map(jsStringLiteral).join(", ");
+		const { aggregate } = ast;
+		code += aggregate ? `.groupBy(${cols}).${aggregate.fn}(${transformAggregateArg(aggregate)})` : `.distinct(${cols})`;
+	} else if (ast.aggregate?.distinct) code += `.distinct(${ast.aggregate.distinct.map(jsStringLiteral).join(", ")})`;
 	if (ast.orderBy && ast.orderBy.length > 0) code += transformOrder(ast.orderBy);
 	if (ast.limit !== void 0) code += `.limit(${ast.limit})`;
 	if (ast.start) {
 		const { row, exclusive } = ast.start;
 		code += `.start(${options.redactLiterals ? "?" : JSON.stringify(row)}${exclusive ? "" : ", { inclusive: true }"})`;
 	}
+	if (ast.aggregate?.distinct) code += ".count()";
+	return code;
+}
+/**
+* Renders `code`, a builder-callback expression such as `cmp(...)` or
+* `not(exists(...))`, at `prefix`. At the top level `.where(field, ...)` has
+* no form for it, so it becomes `.where(({...needed}) => code)`; inside a
+* callback, the names it needs are added to the enclosing callback's
+* destructured args and `code` is returned as is.
+*/
+function wrap(prefix, args, needed, code) {
+	if (prefix === ".where") return `.where(({${toSorted(needed).join(", ")}}) => ${code})`;
+	for (const name of needed) args.add(name);
 	return code;
 }
 function transformCondition(condition, prefix, args, options) {
 	switch (condition.type) {
-		case "simple": return transformSimpleCondition(condition, prefix, options);
+		case "simple": return transformSimpleCondition(condition, prefix, args, options);
 		case "and":
 		case "or": return transformLogicalCondition(condition, prefix, args, options);
 		case "correlatedSubquery": return transformExistsCondition(condition, prefix, args, options);
 		default: unreachable(condition);
 	}
 }
-function transformSimpleCondition(condition, prefix, options) {
+function transformSimpleCondition(condition, prefix, args, options) {
 	const { left, op, right } = condition;
 	const leftCode = transformValuePosition(left, options);
 	const rightCode = transformValuePosition(right, options);
-	if (op === "=") return `${prefix}(${leftCode}, ${rightCode})`;
-	return `${prefix}(${leftCode}, '${op}', ${rightCode})`;
+	const argsCode = op === "=" ? `${leftCode}, ${rightCode}` : `${leftCode}, '${op}', ${rightCode}`;
+	if (left.type === "json") return wrap(prefix, args, ["cmp", "json"], `cmp(${argsCode})`);
+	return `${prefix}(${argsCode})`;
 }
 function transformLogicalCondition(condition, prefix, args, options) {
 	const { type, conditions } = condition;
@@ -53,11 +72,13 @@ function transformLogicalCondition(condition, prefix, args, options) {
 		args.add("and");
 		return "and(" + parts.join(", ") + ")";
 	}
-	args = /* @__PURE__ */ new Set();
-	const conditionsCode = conditions.map((c) => transformCondition(c, "cmp", args, options)).join(", ");
-	args.add("cmp");
-	args.add(type);
-	return `.where(({${toSorted(args).join(", ")}}) => ${type}(${conditionsCode}))`;
+	const innerArgs = prefix === ".where" ? /* @__PURE__ */ new Set() : args;
+	const conditionsCode = conditions.map((c) => transformCondition(c, "cmp", innerArgs, options)).join(", ");
+	return wrap(prefix, args, [.../* @__PURE__ */ new Set([
+		...innerArgs,
+		"cmp",
+		type
+	])], `${type}(${conditionsCode})`);
 }
 function transformExistsCondition(condition, prefix, args, options) {
 	const { related, op } = condition;
@@ -78,16 +99,7 @@ function transformExistsCondition(condition, prefix, args, options) {
 		args.add("exists");
 		return `exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})`;
 	}
-	if (hasSubQueryProps) {
-		if (prefix === ".where") return `.where(({exists, not}) => not(exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr})))`;
-		args.add("not");
-		args.add("exists");
-		return `not(exists('${relationship}', q => q${astToZQL(nextSubquery, options)}${optionsStr}))`;
-	}
-	if (prefix === ".where") return `.where(({exists, not}) => not(exists('${relationship}'${optionsStr})))`;
-	args.add("not");
-	args.add("exists");
-	return `not(exists('${relationship}'${optionsStr})))`;
+	return wrap(prefix, args, ["exists", "not"], `not(exists('${relationship}'${hasSubQueryProps ? `, q => q${astToZQL(nextSubquery, options)}` : ""}${optionsStr}))`);
 }
 function getNextExistsSubquery(related) {
 	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) {
 	switch (value.type) {
 		case "literal": return options.redactLiterals ? "?" : transformLiteral(value);
 		case "column": return `'${value.name}'`;
+		case "json": {
+			const segs = value.path.map((s) => transformLiteral({
+				type: "literal",
+				value: s
+			})).join(", ");
+			return `json('${value.value.name}', ${segs})`;
+		}
 		case "static": return transformParameter(value);
 		default: unreachable(value);
 	}
@@ -121,9 +140,31 @@ function transformValuePosition(value, options) {
 function transformLiteral(literal) {
 	if (literal.value === null) return "null";
 	if (Array.isArray(literal.value)) return JSON.stringify(literal.value);
-	if (typeof literal.value === "string") return `'${literal.value.replace(/'/g, "\\'")}'`;
+	if (typeof literal.value === "string") return jsStringLiteral(literal.value);
 	return String(literal.value);
 }
+/**
+* A single-quoted JavaScript string literal for `s`. `JSON.stringify` does the
+* escaping (backslashes, control characters, quotes), so the rendered code
+* parses back to exactly `s`: escaping only `'` would drop the backslash from
+* a JSON path key like `c\d` and name a different path than the engines read.
+*/
+function jsStringLiteral(s) {
+	return `'${JSON.stringify(s).slice(1, -1).replace(/\\"/g, "\"").replace(/'/g, "\\'")}'`;
+}
+/**
+* The argument of an aggregate method: nothing for a count, a column name, or
+* a callback picking a leaf inside a `json()` column.
+*/
+function transformAggregateArg({ field, path }) {
+	if (field === void 0) return "";
+	const name = jsStringLiteral(field);
+	if (path === void 0) return name;
+	return `({json}) => json(${name}, ${path.map((s) => transformLiteral({
+		type: "literal",
+		value: s
+	})).join(", ")})`;
+}
 function transformParameter(param) {
 	return `authParam(${Array.isArray(param.field) ? `[${param.field.map((f) => `'${f}'`).join(", ")}]` : `'${param.field}'`})`;
 }