@rocicorp/zero 1.10.0-canary.24 → 1.10.0-canary.26

package/out/zero-client/src/types/query-result.d.ts

@@ -3,8 +3,6 @@ export type QueryResultDetails = {
     readonly type: 'complete';
 } | {
     readonly type: 'unknown';
-} | {
-    readonly type: 'cached';
 } | {
     readonly type: 'error';
     readonly retry: () => void;

package/out/zero-client/src/types/query-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-result.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/types/query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAC1B;IACE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CACzB,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,sCAAsC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,KAAK,EACV;QACE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;QACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;KACtC,GACD;QACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;QACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;KACtC,CAAC;CACP,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE;IAAC,IAAI,EAAE,OAAO,CAAA;CAAC,CAAC,CAAC"}
+{"version":3,"file":"query-result.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/types/query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAC1B;IACE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,sCAAsC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,KAAK,EACV;QACE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;QACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;KACtC,GACD;QACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;QACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;KACtC,CAAC;CACP,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE;IAAC,IAAI,EAAE,OAAO,CAAA;CAAC,CAAC,CAAC"}

package/out/zero-protocol/src/analyze-query-result.d.ts

@@ -37,7 +37,7 @@ declare const bestPlanSelectedEventJSONSchema: v.ObjectType<{
 declare const nodeConstraintEventJSONSchema: v.ObjectType<{
     type: v.Type<"node-constraint">;
     attemptNumber: v.Optional<number>;
-    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"filter">, v.Type<"terminus">]>;
+    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"terminus">]>;
     node: v.Type<string>;
     branchPattern: v.ArrayType<v.Type<number>>;
     constraint: v.Optional<Record<string, unknown> | null>;
@@ -118,7 +118,7 @@ declare const planDebugEventJSONSchema: v.UnionType<[v.ObjectType<{
 }, undefined>, v.ObjectType<{
     type: v.Type<"node-cost">;
     attemptNumber: v.Optional<number>;
-    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"filter">, v.Type<"terminus">]>;
+    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"terminus">]>;
     node: v.Type<string>;
     branchPattern: v.ArrayType<v.Type<number>>;
     downstreamChildSelectivity: v.Type<number>;
@@ -136,7 +136,7 @@ declare const planDebugEventJSONSchema: v.UnionType<[v.ObjectType<{
 }, undefined>, v.ObjectType<{
     type: v.Type<"node-constraint">;
     attemptNumber: v.Optional<number>;
-    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"filter">, v.Type<"terminus">]>;
+    nodeType: v.UnionType<[v.Type<"connection">, v.Type<"join">, v.Type<"fan-out">, v.Type<"fan-in">, v.Type<"terminus">]>;
     node: v.Type<string>;
     branchPattern: v.ArrayType<v.Type<number>>;
     constraint: v.Optional<Record<string, unknown> | null>;
@@ -240,7 +240,7 @@ export declare const analyzeQueryResultSchema: v.ObjectType<{
         ordering?: readonly (readonly [string, "desc" | "asc"])[] | undefined;
         joinType?: "semi" | "flipped" | "unflippable" | undefined;
         type: "node-cost";
-        nodeType: "join" | "filter" | "connection" | "fan-out" | "fan-in" | "terminus";
+        nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
         node: string;
         branchPattern: number[];
         downstreamChildSelectivity: number;
@@ -256,7 +256,7 @@ export declare const analyzeQueryResultSchema: v.ObjectType<{
         attemptNumber?: number | undefined;
         constraint?: Record<string, unknown> | null | undefined;
         type: "node-constraint";
-        nodeType: "join" | "filter" | "connection" | "fan-out" | "fan-in" | "terminus";
+        nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
         node: string;
         branchPattern: number[];
         from: string;

package/out/zero-protocol/src/analyze-query-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-query-result.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/analyze-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAKhD,eAAO,MAAM,sBAAsB,gCAAuB,CAAC;AAC3D,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,uBAAuB,gDAAmC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,eAAO,MAAM,iBAAiB,sHAA+B,CAAC;AAC9D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB,sIAA8B,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAe9D,QAAA,MAAM,2BAA2B;;;;aAI/B,CAAC;AAiBH,QAAA,MAAM,iCAAiC;;;;;;aAMrC,CAAC;AAiCH,QAAA,MAAM,yBAAyB;;;;aAI7B,CAAC;AAEH,QAAA,MAAM,+BAA+B;;;;;;;;;aAWnC,CAAC;AAwBH,QAAA,MAAM,6BAA6B;;;;;;;;aAQjC,CAAC;AAEH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAU7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,yBAAyB,EACzB,+BAA+B,EAC/B,6BAA6B,GAC9B,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;IAKnC,8CAA8C;;;;IAI9C,2CAA2C;;IAE3C,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAQ/B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"analyze-query-result.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/analyze-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAKhD,eAAO,MAAM,sBAAsB,gCAAuB,CAAC;AAC3D,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,uBAAuB,gDAAmC,CAAC;AACxE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,eAAO,MAAM,iBAAiB,sHAA+B,CAAC;AAC9D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB,sIAA8B,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAe9D,QAAA,MAAM,2BAA2B;;;;aAI/B,CAAC;AAiBH,QAAA,MAAM,iCAAiC;;;;;;aAMrC,CAAC;AAiCH,QAAA,MAAM,yBAAyB;;;;aAI7B,CAAC;AAEH,QAAA,MAAM,+BAA+B;;;;;;;;;aAWnC,CAAC;AAuBH,QAAA,MAAM,6BAA6B;;;;;;;;aAQjC,CAAC;AAEH,QAAA,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAU7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EACjC,yBAAyB,EACzB,+BAA+B,EAC/B,6BAA6B,GAC9B,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;IAKnC,8CAA8C;;;;IAI9C,2CAA2C;;IAE3C,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAQ/B,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}

package/out/zero-protocol/src/analyze-query-result.js

@@ -74,7 +74,7 @@ var bestPlanSelectedEventJSONSchema = valita_exports.object({
 		type: joinTypeSchema
 	}))
 });
-var nodeTypeSchema = valita_exports.union(valita_exports.literal("connection"), valita_exports.literal("join"), valita_exports.literal("fan-out"), valita_exports.literal("fan-in"), valita_exports.literal("filter"), valita_exports.literal("terminus"));
+var nodeTypeSchema = valita_exports.union(valita_exports.literal("connection"), valita_exports.literal("join"), valita_exports.literal("fan-out"), valita_exports.literal("fan-in"), valita_exports.literal("terminus"));
 var nodeCostEventJSONSchema = valita_exports.object({
 	type: valita_exports.literal("node-cost"),
 	attemptNumber: valita_exports.number().optional(),

package/out/zero-protocol/src/analyze-query-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-query-result.js","names":[],"sources":["../../../../zero-protocol/src/analyze-query-result.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\n\nimport {conditionSchema, orderingSchema} from './ast.ts';\nimport {rowSchema} from './data.ts';\n\nexport const rowCountsByQuerySchema = v.record(v.number());\nexport type RowCountsByQuery = v.Infer<typeof rowCountsByQuerySchema>;\n\nexport const rowCountsBySourceSchema = v.record(rowCountsByQuerySchema);\nexport type RowCountsBySource = v.Infer<typeof rowCountsBySourceSchema>;\n\nexport const rowsByQuerySchema = v.record(v.array(rowSchema));\nexport type RowsByQuery = v.Infer<typeof rowsByQuerySchema>;\n\nexport const rowsBySourceSchema = v.record(rowsByQuerySchema);\nexport type RowsBySource = v.Infer<typeof rowsBySourceSchema>;\n\n// Planner debug event schemas\n\nconst costEstimateJSONSchema = v.object({\n  startupCost: v.number(),\n  scanEst: v.number(),\n  cost: v.number(),\n  returnedRows: v.number(),\n  selectivity: v.number(),\n  limit: v.number().optional(),\n});\n\nconst plannerConstraintSchema = v.record(v.union(v.unknown(), v.null()));\n\nconst attemptStartEventJSONSchema = v.object({\n  type: v.literal('attempt-start'),\n  attemptNumber: v.number(),\n  totalAttempts: v.number(),\n});\n\nconst connectionCostsEventJSONSchema = v.object({\n  type: v.literal('connection-costs'),\n  attemptNumber: v.number(),\n  costs: v.array(\n    v.object({\n      connection: v.string(),\n      cost: v.number(),\n      costEstimate: costEstimateJSONSchema,\n      pinned: v.boolean(),\n      constraints: v.record(v.union(plannerConstraintSchema, v.null())),\n      constraintCosts: v.record(costEstimateJSONSchema),\n    }),\n  ),\n});\n\nconst connectionSelectedEventJSONSchema = v.object({\n  type: v.literal('connection-selected'),\n  attemptNumber: v.number(),\n  connection: v.string(),\n  cost: v.number(),\n  isRoot: v.boolean(),\n});\n\nconst constraintsPropagatedEventJSONSchema = v.object({\n  type: v.literal('constraints-propagated'),\n  attemptNumber: v.number(),\n  connectionConstraints: v.array(\n    v.object({\n      connection: v.string(),\n      constraints: v.record(v.union(plannerConstraintSchema, v.null())),\n      constraintCosts: v.record(costEstimateJSONSchema),\n    }),\n  ),\n});\n\nconst joinTypeSchema = v.union(\n  v.literal('semi'),\n  v.literal('flipped'),\n  v.literal('unflippable'),\n);\n\nconst planCompleteEventJSONSchema = v.object({\n  type: v.literal('plan-complete'),\n  attemptNumber: v.number(),\n  totalCost: v.number(),\n  flipPattern: v.number(),\n  joinStates: v.array(\n    v.object({\n      join: v.string(),\n      type: joinTypeSchema,\n    }),\n  ),\n});\n\nconst planFailedEventJSONSchema = v.object({\n  type: v.literal('plan-failed'),\n  attemptNumber: v.number(),\n  reason: v.string(),\n});\n\nconst bestPlanSelectedEventJSONSchema = v.object({\n  type: v.literal('best-plan-selected'),\n  bestAttemptNumber: v.number(),\n  totalCost: v.number(),\n  flipPattern: v.number(),\n  joinStates: v.array(\n    v.object({\n      join: v.string(),\n      type: joinTypeSchema,\n    }),\n  ),\n});\n\nconst nodeTypeSchema = v.union(\n  v.literal('connection'),\n  v.literal('join'),\n  v.literal('fan-out'),\n  v.literal('fan-in'),\n  v.literal('filter'),\n  v.literal('terminus'),\n);\n\nconst nodeCostEventJSONSchema = v.object({\n  type: v.literal('node-cost'),\n  attemptNumber: v.number().optional(),\n  nodeType: nodeTypeSchema,\n  node: v.string(),\n  branchPattern: v.array(v.number()),\n  downstreamChildSelectivity: v.number(),\n  costEstimate: costEstimateJSONSchema,\n  filters: conditionSchema.optional(),\n  ordering: orderingSchema.optional(),\n  joinType: joinTypeSchema.optional(),\n});\n\nconst nodeConstraintEventJSONSchema = v.object({\n  type: v.literal('node-constraint'),\n  attemptNumber: v.number().optional(),\n  nodeType: nodeTypeSchema,\n  node: v.string(),\n  branchPattern: v.array(v.number()),\n  constraint: v.union(plannerConstraintSchema, v.null()).optional(),\n  from: v.string(),\n});\n\nconst planDebugEventJSONSchema = v.union(\n  attemptStartEventJSONSchema,\n  connectionCostsEventJSONSchema,\n  connectionSelectedEventJSONSchema,\n  constraintsPropagatedEventJSONSchema,\n  planCompleteEventJSONSchema,\n  planFailedEventJSONSchema,\n  bestPlanSelectedEventJSONSchema,\n  nodeCostEventJSONSchema,\n  nodeConstraintEventJSONSchema,\n);\n\nexport type PlanDebugEventJSON = v.Infer<typeof planDebugEventJSONSchema>;\n\nexport {\n  attemptStartEventJSONSchema,\n  connectionSelectedEventJSONSchema,\n  planFailedEventJSONSchema,\n  bestPlanSelectedEventJSONSchema,\n  nodeConstraintEventJSONSchema,\n};\n\nexport const analyzeQueryResultSchema = v.object({\n  warnings: v.array(v.string()),\n  syncedRows: v.record(v.array(rowSchema)).optional(),\n  syncedRowCount: v.number(),\n  start: v.number(),\n  /** @deprecated Use start + elapsed instead */\n  end: v.number(),\n  elapsed: v.number().optional(),\n  afterPermissions: v.string().optional(),\n  /** @deprecated Use readRowCountsByQuery */\n  vendedRowCounts: rowCountsBySourceSchema.optional(),\n  /** @deprecated Use readRows */\n  vendedRows: rowsBySourceSchema.optional(),\n  sqlitePlans: v.record(v.array(v.string())).optional(),\n  readRows: rowsBySourceSchema.optional(),\n  readRowCountsByQuery: rowCountsBySourceSchema.optional(),\n  readRowCount: v.number().optional(),\n  dbScansByQuery: rowCountsBySourceSchema.optional(),\n  joinPlans: v.array(planDebugEventJSONSchema).optional(),\n});\n\nexport type AnalyzeQueryResult = v.Infer<typeof analyzeQueryResultSchema>;\n"],"mappings":"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"}
+{"version":3,"file":"analyze-query-result.js","names":[],"sources":["../../../../zero-protocol/src/analyze-query-result.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\n\nimport {conditionSchema, orderingSchema} from './ast.ts';\nimport {rowSchema} from './data.ts';\n\nexport const rowCountsByQuerySchema = v.record(v.number());\nexport type RowCountsByQuery = v.Infer<typeof rowCountsByQuerySchema>;\n\nexport const rowCountsBySourceSchema = v.record(rowCountsByQuerySchema);\nexport type RowCountsBySource = v.Infer<typeof rowCountsBySourceSchema>;\n\nexport const rowsByQuerySchema = v.record(v.array(rowSchema));\nexport type RowsByQuery = v.Infer<typeof rowsByQuerySchema>;\n\nexport const rowsBySourceSchema = v.record(rowsByQuerySchema);\nexport type RowsBySource = v.Infer<typeof rowsBySourceSchema>;\n\n// Planner debug event schemas\n\nconst costEstimateJSONSchema = v.object({\n  startupCost: v.number(),\n  scanEst: v.number(),\n  cost: v.number(),\n  returnedRows: v.number(),\n  selectivity: v.number(),\n  limit: v.number().optional(),\n});\n\nconst plannerConstraintSchema = v.record(v.union(v.unknown(), v.null()));\n\nconst attemptStartEventJSONSchema = v.object({\n  type: v.literal('attempt-start'),\n  attemptNumber: v.number(),\n  totalAttempts: v.number(),\n});\n\nconst connectionCostsEventJSONSchema = v.object({\n  type: v.literal('connection-costs'),\n  attemptNumber: v.number(),\n  costs: v.array(\n    v.object({\n      connection: v.string(),\n      cost: v.number(),\n      costEstimate: costEstimateJSONSchema,\n      pinned: v.boolean(),\n      constraints: v.record(v.union(plannerConstraintSchema, v.null())),\n      constraintCosts: v.record(costEstimateJSONSchema),\n    }),\n  ),\n});\n\nconst connectionSelectedEventJSONSchema = v.object({\n  type: v.literal('connection-selected'),\n  attemptNumber: v.number(),\n  connection: v.string(),\n  cost: v.number(),\n  isRoot: v.boolean(),\n});\n\nconst constraintsPropagatedEventJSONSchema = v.object({\n  type: v.literal('constraints-propagated'),\n  attemptNumber: v.number(),\n  connectionConstraints: v.array(\n    v.object({\n      connection: v.string(),\n      constraints: v.record(v.union(plannerConstraintSchema, v.null())),\n      constraintCosts: v.record(costEstimateJSONSchema),\n    }),\n  ),\n});\n\nconst joinTypeSchema = v.union(\n  v.literal('semi'),\n  v.literal('flipped'),\n  v.literal('unflippable'),\n);\n\nconst planCompleteEventJSONSchema = v.object({\n  type: v.literal('plan-complete'),\n  attemptNumber: v.number(),\n  totalCost: v.number(),\n  flipPattern: v.number(),\n  joinStates: v.array(\n    v.object({\n      join: v.string(),\n      type: joinTypeSchema,\n    }),\n  ),\n});\n\nconst planFailedEventJSONSchema = v.object({\n  type: v.literal('plan-failed'),\n  attemptNumber: v.number(),\n  reason: v.string(),\n});\n\nconst bestPlanSelectedEventJSONSchema = v.object({\n  type: v.literal('best-plan-selected'),\n  bestAttemptNumber: v.number(),\n  totalCost: v.number(),\n  flipPattern: v.number(),\n  joinStates: v.array(\n    v.object({\n      join: v.string(),\n      type: joinTypeSchema,\n    }),\n  ),\n});\n\nconst nodeTypeSchema = v.union(\n  v.literal('connection'),\n  v.literal('join'),\n  v.literal('fan-out'),\n  v.literal('fan-in'),\n  v.literal('terminus'),\n);\n\nconst nodeCostEventJSONSchema = v.object({\n  type: v.literal('node-cost'),\n  attemptNumber: v.number().optional(),\n  nodeType: nodeTypeSchema,\n  node: v.string(),\n  branchPattern: v.array(v.number()),\n  downstreamChildSelectivity: v.number(),\n  costEstimate: costEstimateJSONSchema,\n  filters: conditionSchema.optional(),\n  ordering: orderingSchema.optional(),\n  joinType: joinTypeSchema.optional(),\n});\n\nconst nodeConstraintEventJSONSchema = v.object({\n  type: v.literal('node-constraint'),\n  attemptNumber: v.number().optional(),\n  nodeType: nodeTypeSchema,\n  node: v.string(),\n  branchPattern: v.array(v.number()),\n  constraint: v.union(plannerConstraintSchema, v.null()).optional(),\n  from: v.string(),\n});\n\nconst planDebugEventJSONSchema = v.union(\n  attemptStartEventJSONSchema,\n  connectionCostsEventJSONSchema,\n  connectionSelectedEventJSONSchema,\n  constraintsPropagatedEventJSONSchema,\n  planCompleteEventJSONSchema,\n  planFailedEventJSONSchema,\n  bestPlanSelectedEventJSONSchema,\n  nodeCostEventJSONSchema,\n  nodeConstraintEventJSONSchema,\n);\n\nexport type PlanDebugEventJSON = v.Infer<typeof planDebugEventJSONSchema>;\n\nexport {\n  attemptStartEventJSONSchema,\n  connectionSelectedEventJSONSchema,\n  planFailedEventJSONSchema,\n  bestPlanSelectedEventJSONSchema,\n  nodeConstraintEventJSONSchema,\n};\n\nexport const analyzeQueryResultSchema = v.object({\n  warnings: v.array(v.string()),\n  syncedRows: v.record(v.array(rowSchema)).optional(),\n  syncedRowCount: v.number(),\n  start: v.number(),\n  /** @deprecated Use start + elapsed instead */\n  end: v.number(),\n  elapsed: v.number().optional(),\n  afterPermissions: v.string().optional(),\n  /** @deprecated Use readRowCountsByQuery */\n  vendedRowCounts: rowCountsBySourceSchema.optional(),\n  /** @deprecated Use readRows */\n  vendedRows: rowsBySourceSchema.optional(),\n  sqlitePlans: v.record(v.array(v.string())).optional(),\n  readRows: rowsBySourceSchema.optional(),\n  readRowCountsByQuery: rowCountsBySourceSchema.optional(),\n  readRowCount: v.number().optional(),\n  dbScansByQuery: rowCountsBySourceSchema.optional(),\n  joinPlans: v.array(planDebugEventJSONSchema).optional(),\n});\n\nexport type AnalyzeQueryResult = v.Infer<typeof analyzeQueryResultSchema>;\n"],"mappings":"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"}

package/out/zero-protocol/src/ast.d.ts

@@ -146,70 +146,7 @@ export type CorrelatedSubqueryCondition = {
     [planIdSymbol]?: number | undefined;
 };
 export type CorrelatedSubqueryConditionOperator = 'EXISTS' | 'NOT EXISTS';
-declare const normalizedTag: unique symbol;
-/**
- * An {@link AST} in its normalized form: `related` is sorted, `where` is
- * flattened and sorted, and every field is present, in a fixed order. Two ASTs
- * that describe the same query have the same JSON encoding, and thus the same
- * hash, once normalized.
- *
- * The tag only exists in the type, so the only way to get one is from
- * {@link normalizeAST}, {@link normalizedAST} or {@link tableAST}. Spreading
- * one keeps the tag, which is what lets a query builder derive a normalized
- * AST from another one by replacing a field it knows to be safe.
- */
-export type NormalizedAST = Required<AST> & {
-    readonly [normalizedTag]: true;
-};
-export declare function normalizeAST(ast: AST): NormalizedAST;
-/**
- * Normalizes a single level of an AST, assuming that the ASTs of its
- * subqueries (i.e. those in `related` and in correlated subquery conditions)
- * are already normalized and that the `related` entries have the shape that
- * {@link normalizedRelated} gives them.
- *
- * This lets a query builder keep its AST normalized as it builds it up
- * instead of normalizing the whole tree afterwards. A builder that knows
- * which of the rules a step can break at all is better off applying just
- * those (see {@link tableAST}, {@link insertRelated} and
- * {@link normalizeCondition}).
- */
-export declare function normalizedAST(ast: AST): NormalizedAST;
-/**
- * The normalized AST that selects a whole table. Spreading it (or any other
- * normalized AST) and replacing a field keeps the field order, since a
- * normalized AST has every field.
- */
-export declare function tableAST(table: string, alias?: string | undefined): NormalizedAST;
-/**
- * Adds `subquery` to the `related` of a normalized AST, at the position that
- * keeps it sorted.
- */
-export declare function insertRelated(related: readonly CorrelatedSubquery[] | undefined, subquery: CorrelatedSubquery): readonly CorrelatedSubquery[];
-/**
- * Gives a correlated subquery the shape that a normalized AST has: every
- * field, in a fixed order (see {@link normalizedAST}). Its `subquery` must
- * already be normalized.
- */
-export declare function normalizedRelated(related: CorrelatedSubquery): Required<CorrelatedSubquery>;
-/**
- * Normalizes a condition, assuming that the ASTs of any correlated subqueries
- * it contains are already normalized.
- *
- * Like {@link normalizedAST}, this rebuilds every node with its fields in a
- * fixed order, so that structurally equal conditions have the same JSON
- * encoding (and thus the same hash) no matter how they were put together.
- * That includes a round trip through Postgres, whose jsonb type reorders
- * object keys: without the rebuild, every query record reloaded from the CVR
- * re-hashed to a different transformationHash than was stored, making it look
- * changed and re-execute on every view-syncer restart.
- */
-export declare function normalizeCondition(cond: Condition): Condition;
-/**
- * Maps the table and column names of `ast`. The result is not a
- * {@link NormalizedAST} even if `ast` was normalized: the names it sorts by
- * are the ones that changed.
- */
+export declare function normalizeAST(ast: AST): Required<AST>;
 export declare function mapAST(ast: AST, mapper: NameMapper): Required<AST>;
 export declare function mapCondition(cond: Condition, table: string, mapper: NameMapper): Condition;
 export {};

package/out/zero-protocol/src/ast.d.ts.map

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

package/out/zero-protocol/src/ast.js

@@ -1,6 +1,6 @@
 import { assert } from "../../shared/src/asserts.js";
 import { literalUnion, readonly, readonlyArray, readonlyObject, valita_exports } from "../../shared/src/valita.js";
-import { getOrInsertComputed } from "../../shared/src/map.js";
+import { defined } from "../../shared/src/arrays.js";
 import { must } from "../../shared/src/must.js";
 import { rowSchema } from "./data.js";
 import { compareUTF8 } from "compare-utf8";
@@ -109,12 +109,13 @@ function transformAST(ast, transform) {
 	const key = (table, k) => {
 		return mustCompoundKey(k.map((col) => columnName(table, col)));
 	};
+	const where = ast.where ? transform.where(ast.where) : void 0;
 	return {
 		schema: ast.schema,
 		table: tableName(ast.table),
 		alias: ast.alias,
-		where: ast.where ? transformWhere(ast.where, ast.table, transform) : void 0,
-		related: ast.related?.map((r) => ({
+		where: where ? transformWhere(where, ast.table, transform) : void 0,
+		related: ast.related ? transform.related(ast.related.map((r) => ({
 			correlation: {
 				parentField: key(ast.table, r.correlation.parentField),
 				childField: key(r.subquery.table, r.correlation.childField)
@@ -122,7 +123,7 @@ function transformAST(ast, transform) {
 			hidden: r.hidden,
 			subquery: transformAST(r.subquery, transform),
 			system: r.system
-		})),
+		}))) : void 0,
 		start: ast.start ? {
 			...ast.start,
 			row: Object.fromEntries(Object.entries(ast.start.row).map(([col, val]) => [colName(col), val]))
@@ -160,206 +161,46 @@ function transformWhere(where, table, transform) {
 	}
 	return {
 		type: where.type,
-		conditions: where.conditions.map((c) => transformWhere(c, table, transform))
+		conditions: transform.conditions(where.conditions.map((c) => transformWhere(c, table, transform)))
 	};
 }
-function asNormalized(ast) {
-	return ast;
-}
 var normalizeCache = /* @__PURE__ */ new WeakMap();
+var NORMALIZE_TRANSFORM = {
+	tableName: (t) => t,
+	columnName: (_, c) => c,
+	related: sortedRelated,
+	where: flattened,
+	conditions: (c) => c.sort(cmpCondition)
+};
 function normalizeAST(ast) {
-	return getOrInsertComputed(normalizeCache, ast, normalizeASTUncached);
-}
-function normalizeASTUncached(ast) {
-	const { where, related } = ast;
-	return normalizedAST({
-		...ast,
-		where: where && normalizeSubqueries(where),
-		related: related?.map((r) => normalizedRelated({
-			...r,
-			subquery: normalizeAST(r.subquery)
-		}))
-	});
-}
-/**
-* Normalizes the ASTs of the correlated subqueries of `cond`. The condition
-* itself is normalized by {@link normalizeCondition}.
-*/
-function normalizeSubqueries(cond) {
-	switch (cond.type) {
-		case "simple": return cond;
-		case "correlatedSubquery": return {
-			...cond,
-			related: {
-				...cond.related,
-				subquery: normalizeAST(cond.related.subquery)
-			}
-		};
-		default: return {
-			type: cond.type,
-			conditions: cond.conditions.map(normalizeSubqueries)
-		};
-	}
-}
-/**
-* Normalizes a single level of an AST, assuming that the ASTs of its
-* subqueries (i.e. those in `related` and in correlated subquery conditions)
-* are already normalized and that the `related` entries have the shape that
-* {@link normalizedRelated} gives them.
-*
-* This lets a query builder keep its AST normalized as it builds it up
-* instead of normalizing the whole tree afterwards. A builder that knows
-* which of the rules a step can break at all is better off applying just
-* those (see {@link tableAST}, {@link insertRelated} and
-* {@link normalizeCondition}).
-*/
-function normalizedAST(ast) {
-	const { schema, table, alias, where, related, start, limit, orderBy } = ast;
-	return asNormalized({
-		schema,
-		table,
-		alias,
-		where: where === void 0 ? void 0 : normalizeCondition(where),
-		related: related === void 0 ? void 0 : normalizeRelated(related),
-		start,
-		limit,
-		orderBy
-	});
-}
-/**
-* The normalized AST that selects a whole table. Spreading it (or any other
-* normalized AST) and replacing a field keeps the field order, since a
-* normalized AST has every field.
-*/
-function tableAST(table, alias) {
-	return asNormalized({
-		schema: void 0,
-		table,
-		alias,
-		where: void 0,
-		related: void 0,
-		start: void 0,
-		limit: void 0,
-		orderBy: void 0
-	});
-}
-/**
-* Adds `subquery` to the `related` of a normalized AST, at the position that
-* keeps it sorted.
-*/
-function insertRelated(related, subquery) {
-	const normalized = normalizedRelated(subquery);
-	if (related === void 0) return [normalized];
-	let i = related.length;
-	while (i > 0 && cmpRelated(related[i - 1], normalized) > 0) i--;
-	return related.toSpliced(i, 0, normalized);
-}
-var normalizedConditions = /* @__PURE__ */ new WeakSet();
-function normalizeRelated(related) {
-	for (let i = 1; i < related.length; i++) if (cmpRelated(related[i - 1], related[i]) > 0) return related.toSorted(cmpRelated);
-	return related;
-}
-/**
-* Gives a correlated subquery the shape that a normalized AST has: every
-* field, in a fixed order (see {@link normalizedAST}). Its `subquery` must
-* already be normalized.
-*/
-function normalizedRelated(related) {
-	const { correlation, hidden, subquery, system } = related;
-	return {
-		correlation: {
-			parentField: correlation.parentField,
-			childField: correlation.childField
-		},
-		hidden,
-		subquery,
-		system
-	};
-}
-function normalizeValuePosition(v) {
-	switch (v.type) {
-		case "literal": return {
-			type: "literal",
-			value: v.value
-		};
-		case "column": return {
-			type: "column",
-			name: v.name
-		};
-		default: return {
-			type: "static",
-			anchor: v.anchor,
-			field: v.field
-		};
-	}
-}
-/**
-* Normalizes a condition, assuming that the ASTs of any correlated subqueries
-* it contains are already normalized.
-*
-* Like {@link normalizedAST}, this rebuilds every node with its fields in a
-* fixed order, so that structurally equal conditions have the same JSON
-* encoding (and thus the same hash) no matter how they were put together.
-* That includes a round trip through Postgres, whose jsonb type reorders
-* object keys: without the rebuild, every query record reloaded from the CVR
-* re-hashed to a different transformationHash than was stored, making it look
-* changed and re-execute on every view-syncer restart.
-*/
-function normalizeCondition(cond) {
-	if (normalizedConditions.has(cond)) return cond;
-	if (cond.type === "simple") {
-		const normalized = {
-			type: "simple",
-			op: cond.op,
-			left: normalizeValuePosition(cond.left),
-			right: normalizeValuePosition(cond.right)
-		};
-		normalizedConditions.add(normalized);
-		return normalized;
-	}
-	if (cond.type === "correlatedSubquery") {
-		const normalized = {
-			type: "correlatedSubquery",
-			related: normalizedRelated(cond.related),
-			op: cond.op,
-			flip: cond.flip,
-			scalar: cond.scalar
-		};
-		normalizedConditions.add(normalized);
-		return normalized;
-	}
-	const conditions = [];
-	for (const c of cond.conditions) {
-		const n = normalizeCondition(c);
-		if (n.type === cond.type) conditions.push(...n.conditions);
-		else conditions.push(n);
+	let normalized = normalizeCache.get(ast);
+	if (!normalized) {
+		normalized = transformAST(ast, NORMALIZE_TRANSFORM);
+		normalizeCache.set(ast, normalized);
 	}
-	if (conditions.length === 1) return conditions[0];
-	conditions.sort(cmpCondition);
-	const normalized = {
-		type: cond.type,
-		conditions
-	};
-	normalizedConditions.add(normalized);
 	return normalized;
 }
-/**
-* Maps the table and column names of `ast`. The result is not a
-* {@link NormalizedAST} even if `ast` was normalized: the names it sorts by
-* are the ones that changed.
-*/
 function mapAST(ast, mapper) {
 	return transformAST(ast, {
 		tableName: (table) => mapper.tableName(table),
-		columnName: (table, col) => mapper.columnName(table, col)
+		columnName: (table, col) => mapper.columnName(table, col),
+		related: (r) => r,
+		where: (w) => w,
+		conditions: (c) => c
 	});
 }
 function mapCondition(cond, table, mapper) {
 	return transformWhere(cond, table, {
 		tableName: (table) => mapper.tableName(table),
-		columnName: (table, col) => mapper.columnName(table, col)
+		columnName: (table, col) => mapper.columnName(table, col),
+		related: (r) => r,
+		where: (w) => w,
+		conditions: (c) => c
 	});
 }
+function sortedRelated(related) {
+	return related.sort(cmpRelated);
+}
 function cmpCondition(a, b) {
 	if (a.type === "simple") {
 		if (b.type !== "simple") return -1;
@@ -384,51 +225,39 @@ function compareValuePosition(a, b) {
 	switch (a.type) {
 		case "literal":
 			assert(b.type === "literal", "Expected literal type for comparison");
-			return cmpLiteralValue(a.value, b.value);
+			return compareUTF8(String(a.value), String(b.value));
 		case "column":
 			assert(b.type === "column", "Expected column type for comparison");
 			return compareUTF8(a.name, b.name);
-		case "static":
-			assert(b.type === "static", "Expected static type for comparison");
-			return compareUTF8(a.anchor, b.anchor) || cmpLiteralValue(a.field, b.field);
-	}
-}
-var LITERAL_VALUE_TYPES = [
-	"object",
-	"boolean",
-	"number",
-	"string"
-];
-function literalValueType(value) {
-	return Array.isArray(value) ? LITERAL_VALUE_TYPES.length : LITERAL_VALUE_TYPES.indexOf(typeof value);
-}
-function cmpLiteralValue(a, b) {
-	const type = literalValueType(a) - literalValueType(b);
-	if (type !== 0) return type;
-	if (Array.isArray(a)) {
-		assert(Array.isArray(b), "Expected array for comparison");
-		for (let i = 0; i < a.length && i < b.length; i++) {
-			const val = cmpLiteralValue(a[i], b[i]);
-			if (val !== 0) return val;
-		}
-		return a.length - b.length;
-	}
-	switch (typeof a) {
-		case "string":
-			assert(typeof b === "string", "Expected string for comparison");
-			return compareUTF8(a, b);
-		case "number":
-			assert(typeof b === "number", "Expected number for comparison");
-			return a < b ? -1 : a > b ? 1 : 0;
-		case "boolean":
-			assert(typeof b === "boolean", "Expected boolean for comparison");
-			return Number(a) - Number(b);
-		default: return 0;
+		case "static": throw new Error("Static parameters should be resolved before normalization");
 	}
 }
 function cmpRelated(a, b) {
 	return compareUTF8(must(a.subquery.alias), must(b.subquery.alias));
 }
+/**
+* Returns a flattened version of the Conditions in which nested Conjunctions with
+* the same operation ('AND' or 'OR') are flattened to the same level. e.g.
+*
+* ```
+* ((a AND b) AND (c AND (d OR (e OR f)))) -> (a AND b AND c AND (d OR e OR f))
+* ```
+*
+* Also flattens singleton Conjunctions regardless of operator, and removes
+* empty Conjunctions.
+*/
+function flattened(cond) {
+	if (cond.type === "simple" || cond.type === "correlatedSubquery") return cond;
+	const conditions = defined(cond.conditions.flatMap((c) => c.type === cond.type ? c.conditions.map((c) => flattened(c)) : flattened(c)));
+	switch (conditions.length) {
+		case 0: return;
+		case 1: return conditions[0];
+		default: return {
+			type: cond.type,
+			conditions
+		};
+	}
+}
 function compareUTF8MaybeNull(a, b) {
 	if (a !== null && b !== null) return compareUTF8(a, b);
 	if (b !== null) return -1;
@@ -440,6 +269,6 @@ function cmpOptionalBool(a, b) {
 	return toNum(a) - toNum(b);
 }
 //#endregion
-export { SUBQ_PREFIX, astSchema, compoundKeySchema, conditionSchema, insertRelated, mapAST, mapCondition, normalizeAST, normalizeCondition, normalizedRelated, orderingSchema, planIdSymbol, tableAST, toStaticParam };
+export { SUBQ_PREFIX, astSchema, compoundKeySchema, conditionSchema, mapAST, mapCondition, normalizeAST, orderingSchema, planIdSymbol, toStaticParam };
 
 //# sourceMappingURL=ast.js.map