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

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

@@ -1,39 +1,47 @@
 import "../../shared/src/dotenv.js";
-import { consoleLogSink, LogContext } from '@rocicorp/logger';
+import { LogContext, consoleLogSink } from "@rocicorp/logger";
 import { astToZQL } from "../../ast-to-zql/src/ast-to-zql.js";
 import { formatOutput } from "../../ast-to-zql/src/format.js";
 import { must } from "../../shared/src/must.js";
 import { parseOptions } from "../../shared/src/options.js";
-import * as v from "../../shared/src/valita.js";
+import "../../shared/src/valita.js";
 import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer.js";
-import { appOptions, shardOptions, ZERO_ENV_VAR_PREFIX, } from "../../zero-cache/src/config/zero-config.js";
+import { ZERO_ENV_VAR_PREFIX, shardOptions, appOptions } from "../../zero-cache/src/config/zero-config.js";
 import { loadSchemaAndPermissions } from "../../zero-cache/src/scripts/permissions.js";
 import { pgClient } from "../../zero-cache/src/types/pg.js";
-import { getShardID, upstreamSchema } from "../../zero-cache/src/types/shards.js";
+import { upstreamSchema, getShardID } from "../../zero-cache/src/types/shards.js";
+import { string } from "@badrap/valita";
 const options = {
-    cvr: { db: v.string() },
-    schema: {
-        type: v.string().default('./schema.ts'),
-        desc: ['Path to the schema file.'],
-    },
-    app: appOptions,
-    shard: shardOptions,
-    hash: {
-        type: v.string().optional(),
-        desc: ['Hash of the query to fetch the AST for.'],
-    },
+  cvr: { db: string() },
+  schema: {
+    type: string().default("./schema.ts"),
+    desc: ["Path to the schema file."]
+  },
+  app: appOptions,
+  shard: shardOptions,
+  hash: {
+    type: string().optional(),
+    desc: ["Hash of the query to fetch the AST for."]
+  }
 };
 const config = parseOptions(options, { envNamePrefix: ZERO_ENV_VAR_PREFIX });
-const lc = new LogContext('debug', {}, consoleLogSink);
+const lc = new LogContext("debug", {}, consoleLogSink);
 const { permissions } = await loadSchemaAndPermissions(config.schema);
 const cvrDB = pgClient(lc, config.cvr.db);
-const rows = await cvrDB `select "clientAST", "internal" from ${cvrDB(upstreamSchema(getShardID(config)) + '/cvr')}."queries" where "queryHash" = ${must(config.hash)} limit 1;`;
-const queryAst = transformAndHashQuery(lc, '', rows[0].clientAST, permissions, {}, rows[0].internal).transformedAst;
-// oxlint-disable no-console
-console.log('\n=== AST ===\n');
+const rows = await cvrDB`select "clientAST", "internal" from ${cvrDB(upstreamSchema(getShardID(config)) + "/cvr")}."queries" where "queryHash" = ${must(
+  config.hash
+)} limit 1;`;
+const queryAst = transformAndHashQuery(
+  lc,
+  "",
+  rows[0].clientAST,
+  permissions,
+  {},
+  rows[0].internal
+).transformedAst;
+console.log("\n=== AST ===\n");
 console.log(JSON.stringify(queryAst, null, 2));
-console.log('\n=== ZQL ===\n');
+console.log("\n=== ZQL ===\n");
 console.log(await formatOutput(queryAst.table + astToZQL(queryAst)));
-// oxlint-enable no-console
 await cvrDB.end();
-//# sourceMappingURL=bin-transform.js.map
+//# sourceMappingURL=bin-transform.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bin-transform.js","sourceRoot":"","sources":["../../../../analyze-query/src/bin-transform.ts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAEpC,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAC,QAAQ,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8CAA8C,CAAC;AACnF,OAAO,EACL,UAAU,EACV,YAAY,EACZ,mBAAmB,GACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,sCAAsC,CAAC;AAEhF,MAAM,OAAO,GAAG;IACd,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAC;IACrB,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,CAAC,0BAA0B,CAAC;KACnC;IACD,GAAG,EAAE,UAAU;IACf,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE,CAAC,yCAAyC,CAAC;KAClD;CACF,CAAC;AAEF,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,EAAE,EAAC,aAAa,EAAE,mBAAmB,EAAC,CAAC,CAAC;AAE3E,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;AACvD,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAEpE,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAE1C,MAAM,IAAI,GACR,MAAM,KAAK,CAAA,uCAAuC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,kCAAkC,IAAI,CACxI,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC;AAEf,MAAM,QAAQ,GAAG,qBAAqB,CACpC,EAAE,EACF,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EACjB,WAAW,EACX,EAAE,EACF,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CACjB,CAAC,cAAc,CAAC;AAEjB,4BAA4B;AAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/C,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AACrE,2BAA2B;AAE3B,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"bin-transform.js","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().default('./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);\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  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"],"names":["v.string"],"mappings":";;;;;;;;;;;;;AAkBA,MAAM,UAAU;AAAA,EACd,KAAK,EAAC,IAAIA,SAAS;AAAA,EACnB,QAAQ;AAAA,IACN,MAAMA,OAAE,EAAS,QAAQ,aAAa;AAAA,IACtC,MAAM,CAAC,0BAA0B;AAAA,EAAA;AAAA,EAEnC,KAAK;AAAA,EACL,OAAO;AAAA,EACP,MAAM;AAAA,IACJ,MAAMA,OAAE,EAAS,SAAA;AAAA,IACjB,MAAM,CAAC,yCAAyC;AAAA,EAAA;AAEpD;AAEA,MAAM,SAAS,aAAa,SAAS,EAAC,eAAe,qBAAoB;AAEzE,MAAM,KAAK,IAAI,WAAW,SAAS,CAAA,GAAI,cAAc;AACrD,MAAM,EAAC,YAAA,IAAe,MAAM,yBAAyB,OAAO,MAAM;AAElE,MAAM,QAAQ,SAAS,IAAI,OAAO,IAAI,EAAE;AAExC,MAAM,OACJ,MAAM,4CAA4C,MAAM,eAAe,WAAW,MAAM,CAAC,IAAI,MAAM,CAAC,kCAAkC;AAAA,EACpI,OAAO;AACT,CAAC;AAEH,MAAM,WAAW;AAAA,EACf;AAAA,EACA;AAAA,EACA,KAAK,CAAC,EAAE;AAAA,EACR;AAAA,EACA,CAAA;AAAA,EACA,KAAK,CAAC,EAAE;AACV,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,IAAA;"}

package/out/analyze-query/src/explain-queries.js

@@ -1,18 +1,15 @@
-export function explainQueries(counts, db) {
-    const plans = {};
-    for (const querySet of Object.values(counts)) {
-        const queries = Object.keys(querySet);
-        for (const query of queries) {
-            const plan = db
-                // we should be more intelligent about value replacement.
-                // Different values result in different plans. E.g., picking a value at the start
-                // of an index will result in `scan` vs `search`. The scan is fine in that case.
-                .prepare(`EXPLAIN QUERY PLAN ${query.replaceAll('?', "'sdfse'")}`)
-                .all()
-                .map(r => r.detail);
-            plans[query] = plan;
-        }
+function explainQueries(counts, db) {
+  const plans = {};
+  for (const querySet of Object.values(counts)) {
+    const queries = Object.keys(querySet);
+    for (const query of queries) {
+      const plan = db.prepare(`EXPLAIN QUERY PLAN ${query.replaceAll("?", "'sdfse'")}`).all().map((r) => r.detail);
+      plans[query] = plan;
     }
-    return plans;
+  }
+  return plans;
 }
-//# sourceMappingURL=explain-queries.js.map
+export {
+  explainQueries
+};
+//# sourceMappingURL=explain-queries.js.map

package/out/analyze-query/src/explain-queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"explain-queries.js","sourceRoot":"","sources":["../../../../analyze-query/src/explain-queries.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,cAAc,CAAC,MAAyB,EAAE,EAAY;IACpE,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,EAAE;gBACb,yDAAyD;gBACzD,iFAAiF;gBACjF,gFAAgF;iBAC/E,OAAO,CAAC,sBAAsB,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;iBACjE,GAAG,EAAoB;iBACvB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACtB,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"explain-queries.js","sources":["../../../../analyze-query/src/explain-queries.ts"],"sourcesContent":["import type {RowCountsBySource} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {Database} from '../../zqlite/src/db.ts';\n\nexport function explainQueries(counts: RowCountsBySource, db: Database) {\n  const plans: Record<string, string[]> = {};\n  for (const querySet of Object.values(counts)) {\n    const queries = Object.keys(querySet);\n    for (const query of queries) {\n      const plan = db\n        // we should be more intelligent about value replacement.\n        // Different values result in different plans. E.g., picking a value at the start\n        // of an index will result in `scan` vs `search`. The scan is fine in that case.\n        .prepare(`EXPLAIN QUERY PLAN ${query.replaceAll('?', \"'sdfse'\")}`)\n        .all<{detail: string}>()\n        .map(r => r.detail);\n      plans[query] = plan;\n    }\n  }\n\n  return plans;\n}\n"],"names":[],"mappings":"AAGO,SAAS,eAAe,QAA2B,IAAc;AACtE,QAAM,QAAkC,CAAA;AACxC,aAAW,YAAY,OAAO,OAAO,MAAM,GAAG;AAC5C,UAAM,UAAU,OAAO,KAAK,QAAQ;AACpC,eAAW,SAAS,SAAS;AAC3B,YAAM,OAAO,GAIV,QAAQ,sBAAsB,MAAM,WAAW,KAAK,SAAS,CAAC,EAAE,EAChE,IAAA,EACA,IAAI,CAAA,MAAK,EAAE,MAAM;AACpB,YAAM,KAAK,IAAI;AAAA,IACjB;AAAA,EACF;AAEA,SAAO;AACT;"}

package/out/analyze-query/src/run-ast.d.ts

@@ -1,4 +1,4 @@
-import { LogContext } from '@rocicorp/logger';
+import type { LogContext } from '@rocicorp/logger';
 import type { LiteAndZqlSpec } from '../../zero-cache/src/db/specs.ts';
 import type { AnalyzeQueryResult } from '../../zero-protocol/src/analyze-query-result.ts';
 import type { AST } from '../../zero-protocol/src/ast.ts';
@@ -6,6 +6,7 @@ import type { PermissionsConfig } from '../../zero-schema/src/compiled-permissio
 import type { NameMapper } from '../../zero-schema/src/name-mapper.ts';
 import { type BuilderDelegate } from '../../zql/src/builder/builder.ts';
 import type { Database } from '../../zqlite/src/db.ts';
+import type { ClientSchema } from '../../zero-protocol/src/client-schema.ts';
 export type RunAstOptions = {
     applyPermissions?: boolean | undefined;
     authData?: string | undefined;
@@ -17,5 +18,5 @@ export type RunAstOptions = {
     tableSpecs: Map<string, LiteAndZqlSpec>;
     vendedRows?: boolean | undefined;
 };
-export declare function runAst(lc: LogContext, ast: AST, isTransformed: boolean, options: RunAstOptions): Promise<AnalyzeQueryResult>;
+export declare function runAst(lc: LogContext, clientSchema: ClientSchema, ast: AST, isTransformed: boolean, options: RunAstOptions): Promise<AnalyzeQueryResult>;
 //# sourceMappingURL=run-ast.d.ts.map

package/out/analyze-query/src/run-ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAQ5C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iDAAiD,CAAC;AACxF,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AAIxD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAErD,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,kBAAkB,CAAC,CA6F7B"}
+{"version":3,"file":"run-ast.d.ts","sourceRoot":"","sources":["../../../../analyze-query/src/run-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,iDAAiD,CAAC;AACxF,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAC;AAIxD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AACrF,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC9C,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,WAAW,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC5C,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,wBAAsB,MAAM,CAC1B,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,kBAAkB,CAAC,CA2F7B"}

package/out/analyze-query/src/run-ast.js

@@ -1,89 +1,95 @@
-import { LogContext } from '@rocicorp/logger';
 import { astToZQL } from "../../ast-to-zql/src/ast-to-zql.js";
 import { formatOutput } from "../../ast-to-zql/src/format.js";
 import { assert } from "../../shared/src/asserts.js";
 import { must } from "../../shared/src/must.js";
 import { sleep } from "../../shared/src/sleep.js";
 import { transformAndHashQuery } from "../../zero-cache/src/auth/read-authorizer.js";
-import { computeZqlSpecs } from "../../zero-cache/src/db/lite-tables.js";
 import { hydrate } from "../../zero-cache/src/services/view-syncer/pipeline-driver.js";
 import { mapAST } from "../../zero-protocol/src/ast.js";
 import { hashOfAST } from "../../zero-protocol/src/query-hash.js";
-import { buildPipeline, } from "../../zql/src/builder/builder.js";
-export async function runAst(lc, ast, isTransformed, options) {
-    const { clientToServerMapper, permissions, host, db } = options;
-    const result = {
-        warnings: [],
-        syncedRows: undefined,
-        syncedRowCount: 0,
-        start: 0,
-        end: 0,
-        afterPermissions: undefined,
-        readRows: undefined,
-        readRowCountsByQuery: {},
-        readRowCount: undefined,
-    };
-    if (!isTransformed) {
-        // map the AST to server names if not already transformed
-        ast = mapAST(ast, must(clientToServerMapper));
+import { buildPipeline } from "../../zql/src/builder/builder.js";
+async function runAst(lc, clientSchema, ast, isTransformed, options) {
+  const { clientToServerMapper, permissions, host } = options;
+  const result = {
+    warnings: [],
+    syncedRows: void 0,
+    syncedRowCount: 0,
+    start: 0,
+    end: 0,
+    afterPermissions: void 0,
+    readRows: void 0,
+    readRowCountsByQuery: {},
+    readRowCount: void 0
+  };
+  if (!isTransformed) {
+    ast = mapAST(ast, must(clientToServerMapper));
+  }
+  if (options.applyPermissions) {
+    const authData = options.authData ? JSON.parse(options.authData) : {};
+    if (!options.authData) {
+      result.warnings.push(
+        "No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced."
+      );
     }
-    if (options.applyPermissions) {
-        const authData = options.authData ? JSON.parse(options.authData) : {};
-        if (!options.authData) {
-            result.warnings.push('No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.');
-        }
-        ast = transformAndHashQuery(lc, 'clientGroupIDForAnalyze', ast, must(permissions), authData, false).transformedAst;
-        result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));
+    ast = transformAndHashQuery(
+      lc,
+      "clientGroupIDForAnalyze",
+      ast,
+      must(permissions),
+      authData,
+      false
+    ).transformedAst;
+    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));
+  }
+  const pipeline = buildPipeline(ast, host, "query-id");
+  const start = performance.now();
+  let syncedRowCount = 0;
+  const rowsByTable = {};
+  const seenByTable = /* @__PURE__ */ new Set();
+  for (const rowChange of hydrate(pipeline, hashOfAST(ast), clientSchema)) {
+    assert(rowChange.type === "add");
+    if (syncedRowCount % 10 === 0) {
+      await Promise.resolve();
     }
-    const tableSpecs = computeZqlSpecs(lc, db);
-    const pipeline = buildPipeline(ast, host, 'query-id');
-    const start = performance.now();
-    let syncedRowCount = 0;
-    const rowsByTable = {};
-    const seenByTable = new Set();
-    for (const rowChange of hydrate(pipeline, hashOfAST(ast), tableSpecs)) {
-        assert(rowChange.type === 'add');
-        // yield to other tasks to avoid blocking for too long
-        if (syncedRowCount % 10 === 0) {
-            await Promise.resolve();
-        }
-        if (syncedRowCount % 100 === 0) {
-            await sleep(1);
-        }
-        let rows = rowsByTable[rowChange.table];
-        const s = rowChange.table + '.' + JSON.stringify(rowChange.row);
-        if (seenByTable.has(s)) {
-            continue; // skip duplicates
-        }
-        syncedRowCount++;
-        seenByTable.add(s);
-        if (options.syncedRows) {
-            if (!rows) {
-                rows = [];
-                rowsByTable[rowChange.table] = rows;
-            }
-            rows.push(rowChange.row);
-        }
+    if (syncedRowCount % 100 === 0) {
+      await sleep(1);
     }
-    const end = performance.now();
-    if (options.syncedRows) {
-        result.syncedRows = rowsByTable;
+    let rows = rowsByTable[rowChange.table];
+    const s = rowChange.table + "." + JSON.stringify(rowChange.row);
+    if (seenByTable.has(s)) {
+      continue;
     }
-    result.start = start;
-    result.end = end;
-    // Always include the count of synced and vended rows.
-    result.syncedRowCount = syncedRowCount;
-    result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};
-    let readRowCount = 0;
-    for (const c of Object.values(result.readRowCountsByQuery)) {
-        for (const v of Object.values(c)) {
-            readRowCount += v;
-        }
+    syncedRowCount++;
+    seenByTable.add(s);
+    if (options.syncedRows) {
+      if (!rows) {
+        rows = [];
+        rowsByTable[rowChange.table] = rows;
+      }
+      rows.push(rowChange.row);
     }
-    result.readRowCount = readRowCount;
-    if (options.vendedRows) {
-        result.readRows = host.debug?.getVendedRows();
+  }
+  const end = performance.now();
+  if (options.syncedRows) {
+    result.syncedRows = rowsByTable;
+  }
+  result.start = start;
+  result.end = end;
+  result.syncedRowCount = syncedRowCount;
+  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};
+  let readRowCount = 0;
+  for (const c of Object.values(result.readRowCountsByQuery)) {
+    for (const v of Object.values(c)) {
+      readRowCount += v;
     }
-    return result;
+  }
+  result.readRowCount = readRowCount;
+  if (options.vendedRows) {
+    result.readRows = host.debug?.getVendedRows();
+  }
+  return result;
 }
-//# sourceMappingURL=run-ast.js.map
+export {
+  runAst
+};
+//# sourceMappingURL=run-ast.js.map

package/out/analyze-query/src/run-ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-ast.js","sourceRoot":"","sources":["../../../../analyze-query/src/run-ast.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-ast.js","sources":["../../../../analyze-query/src/run-ast.ts"],"sourcesContent":["import type {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 {assert} from '../../shared/src/asserts.ts';\nimport {must} from '../../shared/src/must.ts';\nimport {sleep} from '../../shared/src/sleep.ts';\nimport {transformAndHashQuery} from '../../zero-cache/src/auth/read-authorizer.ts';\nimport type {LiteAndZqlSpec} from '../../zero-cache/src/db/specs.ts';\nimport {hydrate} from '../../zero-cache/src/services/view-syncer/pipeline-driver.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport {mapAST} from '../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../zero-protocol/src/data.ts';\nimport {hashOfAST} from '../../zero-protocol/src/query-hash.ts';\nimport type {PermissionsConfig} from '../../zero-schema/src/compiled-permissions.ts';\nimport type {NameMapper} from '../../zero-schema/src/name-mapper.ts';\nimport {\n  buildPipeline,\n  type BuilderDelegate,\n} from '../../zql/src/builder/builder.ts';\nimport type {Database} from '../../zqlite/src/db.ts';\nimport type {ClientSchema} from '../../zero-protocol/src/client-schema.ts';\n\nexport type RunAstOptions = {\n  applyPermissions?: boolean | undefined;\n  authData?: string | undefined;\n  clientToServerMapper?: NameMapper | undefined;\n  db: Database;\n  host: BuilderDelegate;\n  permissions?: PermissionsConfig | undefined;\n  syncedRows?: boolean | undefined;\n  tableSpecs: Map<string, LiteAndZqlSpec>;\n  vendedRows?: boolean | undefined;\n};\n\nexport async function runAst(\n  lc: LogContext,\n  clientSchema: ClientSchema,\n  ast: AST,\n  isTransformed: boolean,\n  options: RunAstOptions,\n): Promise<AnalyzeQueryResult> {\n  const {clientToServerMapper, permissions, host} = options;\n  const result: AnalyzeQueryResult = {\n    warnings: [],\n    syncedRows: undefined,\n    syncedRowCount: 0,\n    start: 0,\n    end: 0,\n    afterPermissions: undefined,\n    readRows: undefined,\n    readRowCountsByQuery: {},\n    readRowCount: undefined,\n  };\n\n  if (!isTransformed) {\n    // map the AST to server names if not already transformed\n    ast = mapAST(ast, must(clientToServerMapper));\n  }\n  if (options.applyPermissions) {\n    const authData = options.authData ? JSON.parse(options.authData) : {};\n    if (!options.authData) {\n      result.warnings.push(\n        'No auth data provided. Permission rules will compare to `NULL` wherever an auth data field is referenced.',\n      );\n    }\n    ast = transformAndHashQuery(\n      lc,\n      'clientGroupIDForAnalyze',\n      ast,\n      must(permissions),\n      authData,\n      false,\n    ).transformedAst;\n    result.afterPermissions = await formatOutput(ast.table + astToZQL(ast));\n  }\n  const pipeline = buildPipeline(ast, host, 'query-id');\n\n  const start = performance.now();\n\n  let syncedRowCount = 0;\n  const rowsByTable: Record<string, Row[]> = {};\n  const seenByTable: Set<string> = new Set();\n  for (const rowChange of hydrate(pipeline, hashOfAST(ast), clientSchema)) {\n    assert(rowChange.type === 'add');\n\n    // yield to other tasks to avoid blocking for too long\n    if (syncedRowCount % 10 === 0) {\n      await Promise.resolve();\n    }\n    if (syncedRowCount % 100 === 0) {\n      await sleep(1);\n    }\n\n    let rows: Row[] = rowsByTable[rowChange.table];\n    const s = rowChange.table + '.' + JSON.stringify(rowChange.row);\n    if (seenByTable.has(s)) {\n      continue; // skip duplicates\n    }\n    syncedRowCount++;\n    seenByTable.add(s);\n    if (options.syncedRows) {\n      if (!rows) {\n        rows = [];\n        rowsByTable[rowChange.table] = rows;\n      }\n      rows.push(rowChange.row);\n    }\n  }\n\n  const end = performance.now();\n  if (options.syncedRows) {\n    result.syncedRows = rowsByTable;\n  }\n  result.start = start;\n  result.end = end;\n\n  // Always include the count of synced and vended rows.\n  result.syncedRowCount = syncedRowCount;\n  result.readRowCountsByQuery = host.debug?.getVendedRowCounts() ?? {};\n  let readRowCount = 0;\n  for (const c of Object.values(result.readRowCountsByQuery)) {\n    for (const v of Object.values(c)) {\n      readRowCount += v;\n    }\n  }\n  result.readRowCount = readRowCount;\n\n  if (options.vendedRows) {\n    result.readRows = host.debug?.getVendedRows();\n  }\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;AAmCA,eAAsB,OACpB,IACA,cACA,KACA,eACA,SAC6B;AAC7B,QAAM,EAAC,sBAAsB,aAAa,KAAA,IAAQ;AAClD,QAAM,SAA6B;AAAA,IACjC,UAAU,CAAA;AAAA,IACV,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,OAAO;AAAA,IACP,KAAK;AAAA,IACL,kBAAkB;AAAA,IAClB,UAAU;AAAA,IACV,sBAAsB,CAAA;AAAA,IACtB,cAAc;AAAA,EAAA;AAGhB,MAAI,CAAC,eAAe;AAElB,UAAM,OAAO,KAAK,KAAK,oBAAoB,CAAC;AAAA,EAC9C;AACA,MAAI,QAAQ,kBAAkB;AAC5B,UAAM,WAAW,QAAQ,WAAW,KAAK,MAAM,QAAQ,QAAQ,IAAI,CAAA;AACnE,QAAI,CAAC,QAAQ,UAAU;AACrB,aAAO,SAAS;AAAA,QACd;AAAA,MAAA;AAAA,IAEJ;AACA,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,KAAK,WAAW;AAAA,MAChB;AAAA,MACA;AAAA,IAAA,EACA;AACF,WAAO,mBAAmB,MAAM,aAAa,IAAI,QAAQ,SAAS,GAAG,CAAC;AAAA,EACxE;AACA,QAAM,WAAW,cAAc,KAAK,MAAM,UAAU;AAEpD,QAAM,QAAQ,YAAY,IAAA;AAE1B,MAAI,iBAAiB;AACrB,QAAM,cAAqC,CAAA;AAC3C,QAAM,kCAA+B,IAAA;AACrC,aAAW,aAAa,QAAQ,UAAU,UAAU,GAAG,GAAG,YAAY,GAAG;AACvE,WAAO,UAAU,SAAS,KAAK;AAG/B,QAAI,iBAAiB,OAAO,GAAG;AAC7B,YAAM,QAAQ,QAAA;AAAA,IAChB;AACA,QAAI,iBAAiB,QAAQ,GAAG;AAC9B,YAAM,MAAM,CAAC;AAAA,IACf;AAEA,QAAI,OAAc,YAAY,UAAU,KAAK;AAC7C,UAAM,IAAI,UAAU,QAAQ,MAAM,KAAK,UAAU,UAAU,GAAG;AAC9D,QAAI,YAAY,IAAI,CAAC,GAAG;AACtB;AAAA,IACF;AACA;AACA,gBAAY,IAAI,CAAC;AACjB,QAAI,QAAQ,YAAY;AACtB,UAAI,CAAC,MAAM;AACT,eAAO,CAAA;AACP,oBAAY,UAAU,KAAK,IAAI;AAAA,MACjC;AACA,WAAK,KAAK,UAAU,GAAG;AAAA,IACzB;AAAA,EACF;AAEA,QAAM,MAAM,YAAY,IAAA;AACxB,MAAI,QAAQ,YAAY;AACtB,WAAO,aAAa;AAAA,EACtB;AACA,SAAO,QAAQ;AACf,SAAO,MAAM;AAGb,SAAO,iBAAiB;AACxB,SAAO,uBAAuB,KAAK,OAAO,mBAAA,KAAwB,CAAA;AAClE,MAAI,eAAe;AACnB,aAAW,KAAK,OAAO,OAAO,OAAO,oBAAoB,GAAG;AAC1D,eAAW,KAAK,OAAO,OAAO,CAAC,GAAG;AAChC,sBAAgB;AAAA,IAClB;AAAA,EACF;AACA,SAAO,eAAe;AAEtB,MAAI,QAAQ,YAAY;AACtB,WAAO,WAAW,KAAK,OAAO,cAAA;AAAA,EAChC;AACA,SAAO;AACT;"}