@rocicorp/zero 1.11.0-canary.4 → 1.11.0-canary.40

package/out/zero-protocol/src/inspect-up.d.ts

@@ -113,75 +113,172 @@ export declare const inspectUpMessageSchema: v.TupleType<[v.Type<"inspect">, v.U
     name: v.Optional<string>;
     args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;
 }, undefined>]>]>;
-declare const unparsedInspectUpBodySchema: v.UnionType<[v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "clientID" | "op"> & {
-    op: v.Type<"queries">;
-    clientID: v.Optional<string>;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op"> & {
-    op: v.Type<"metrics">;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op"> & {
-    op: v.Type<"version">;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op" | "value"> & {
-    op: v.Type<"authenticate">;
-    value: v.Type<string>;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "args" | "ast" | "name" | "op" | "options" | "value"> & {
-    op: v.Type<"analyze-query">;
-    /** @deprecated Use {@linkcode ast} instead */
-    value: v.Optional<unknown>;
-    options: v.Optional<{
+export declare const unparsedInspectUpBodySchema: v.Type<{
+    id: string;
+    op: "queries";
+    clientID?: string | undefined;
+} | {
+    id: string;
+    op: "metrics";
+} | {
+    id: string;
+    op: "version";
+} | {
+    id: string;
+    op: "authenticate";
+    value: string;
+} | {
+    id: string;
+    op: "analyze-query";
+    value?: unknown;
+    options?: {
         vendedRows?: boolean | undefined;
         syncedRows?: boolean | undefined;
         joinPlans?: boolean | undefined;
-    }>;
-    ast: v.Optional<unknown>;
-    name: v.Optional<string>;
-    args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;
-}, undefined>]>;
-export declare const unparsedInspectUpMessageSchema: v.TupleType<[v.Type<"inspect">, v.UnionType<[v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "clientID" | "op"> & {
-    op: v.Type<"queries">;
-    clientID: v.Optional<string>;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op"> & {
-    op: v.Type<"metrics">;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op"> & {
-    op: v.Type<"version">;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "op" | "value"> & {
-    op: v.Type<"authenticate">;
-    value: v.Type<string>;
-}, undefined>, v.ObjectType<Omit<{
-    id: v.Type<string>;
-}, "args" | "ast" | "name" | "op" | "options" | "value"> & {
-    op: v.Type<"analyze-query">;
-    /** @deprecated Use {@linkcode ast} instead */
-    value: v.Optional<unknown>;
-    options: v.Optional<{
+    } | undefined;
+    ast?: unknown;
+    name?: string | undefined;
+    args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+} | v.UnrecognizedObject<"op">> & {
+    isKnown(value: {
+        id: string;
+        op: "queries";
+        clientID?: string | undefined;
+    } | {
+        id: string;
+        op: "metrics";
+    } | {
+        id: string;
+        op: "version";
+    } | {
+        id: string;
+        op: "authenticate";
+        value: string;
+    } | {
+        id: string;
+        op: "analyze-query";
+        value?: unknown;
+        options?: {
+            vendedRows?: boolean | undefined;
+            syncedRows?: boolean | undefined;
+            joinPlans?: boolean | undefined;
+        } | undefined;
+        ast?: unknown;
+        name?: string | undefined;
+        args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+    } | v.UnrecognizedObject<"op">): value is {
+        id: string;
+        op: "queries";
+        clientID?: string | undefined;
+    } | {
+        id: string;
+        op: "metrics";
+    } | {
+        id: string;
+        op: "version";
+    } | {
+        id: string;
+        op: "authenticate";
+        value: string;
+    } | {
+        id: string;
+        op: "analyze-query";
+        value?: unknown;
+        options?: {
+            vendedRows?: boolean | undefined;
+            syncedRows?: boolean | undefined;
+            joinPlans?: boolean | undefined;
+        } | undefined;
+        ast?: unknown;
+        name?: string | undefined;
+        args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+    };
+};
+export declare const unparsedInspectUpMessageSchema: v.TupleType<[v.Type<"inspect">, v.Type<{
+    id: string;
+    op: "queries";
+    clientID?: string | undefined;
+} | {
+    id: string;
+    op: "metrics";
+} | {
+    id: string;
+    op: "version";
+} | {
+    id: string;
+    op: "authenticate";
+    value: string;
+} | {
+    id: string;
+    op: "analyze-query";
+    value?: unknown;
+    options?: {
         vendedRows?: boolean | undefined;
         syncedRows?: boolean | undefined;
         joinPlans?: boolean | undefined;
-    }>;
-    ast: v.Optional<unknown>;
-    name: v.Optional<string>;
-    args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;
-}, undefined>]>]>;
+    } | undefined;
+    ast?: unknown;
+    name?: string | undefined;
+    args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+} | v.UnrecognizedObject<"op">> & {
+    isKnown(value: {
+        id: string;
+        op: "queries";
+        clientID?: string | undefined;
+    } | {
+        id: string;
+        op: "metrics";
+    } | {
+        id: string;
+        op: "version";
+    } | {
+        id: string;
+        op: "authenticate";
+        value: string;
+    } | {
+        id: string;
+        op: "analyze-query";
+        value?: unknown;
+        options?: {
+            vendedRows?: boolean | undefined;
+            syncedRows?: boolean | undefined;
+            joinPlans?: boolean | undefined;
+        } | undefined;
+        ast?: unknown;
+        name?: string | undefined;
+        args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+    } | v.UnrecognizedObject<"op">): value is {
+        id: string;
+        op: "queries";
+        clientID?: string | undefined;
+    } | {
+        id: string;
+        op: "metrics";
+    } | {
+        id: string;
+        op: "version";
+    } | {
+        id: string;
+        op: "authenticate";
+        value: string;
+    } | {
+        id: string;
+        op: "analyze-query";
+        value?: unknown;
+        options?: {
+            vendedRows?: boolean | undefined;
+            syncedRows?: boolean | undefined;
+            joinPlans?: boolean | undefined;
+        } | undefined;
+        ast?: unknown;
+        name?: string | undefined;
+        args?: readonly import("../../shared/src/json.ts").ReadonlyJSONValue[] | undefined;
+    };
+}]>;
 export type InspectUpMessage = v.Infer<typeof inspectUpMessageSchema>;
 export type InspectUpBody = v.Infer<typeof inspectUpBodySchema>;
 export type UnparsedInspectUpMessage = v.Infer<typeof unparsedInspectUpMessageSchema>;
-export type UnparsedInspectUpBody = v.Infer<typeof unparsedInspectUpBodySchema>;
+/** An inspect request with an op this build knows. */
+export type UnparsedInspectUpBody = Exclude<v.Infer<typeof unparsedInspectUpBodySchema>, v.UnrecognizedObject<'op'>>;
 export {};
 //# sourceMappingURL=inspect-up.d.ts.map

package/out/zero-protocol/src/inspect-up.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect-up.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-up.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAOhD,QAAA,MAAM,0BAA0B;;;;;aAG9B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,QAAA,MAAM,sBAAsB;;;;aAE1B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E,QAAA,MAAM,sBAAsB;;;;aAE1B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E,eAAO,MAAM,2BAA2B;;;;;aAGtC,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,2BAA2B,CACnC,CAAC;AAEF,QAAA,MAAM,yBAAyB;;;;aAI7B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E,eAAO,MAAM,2BAA2B;;;;IAEtC,8CAA8C;;;;;;;;;;aAM9C,CAAC;AAYH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,2BAA2B,CACnC,CAAC;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;IAtBvB,8CAA8C;;;;;;;;;;eA4B/C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IA9BjC,8CAA8C;;;;;;;;;;iBAiC9C,CAAC;AAEH,QAAA,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;IAzB/B,8CAA8C;;;;;;;;;;eA+B/C,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;IAjCzC,8CAA8C;;;;;;;;;;iBAoC9C,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC"}
+{"version":3,"file":"inspect-up.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-up.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAOhD,QAAA,MAAM,0BAA0B;;;;;aAG9B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,QAAA,MAAM,sBAAsB;;;;aAE1B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E,QAAA,MAAM,sBAAsB;;;;aAE1B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE1E,eAAO,MAAM,2BAA2B;;;;;aAGtC,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,2BAA2B,CACnC,CAAC;AAEF,QAAA,MAAM,yBAAyB;;;;aAI7B,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E,eAAO,MAAM,2BAA2B;;;;IAEtC,8CAA8C;;;;;;;;;;aAM9C,CAAC;AAYH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,2BAA2B,CACnC,CAAC;AAEF,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;IAtBvB,8CAA8C;;;;;;;;;;eA4B/C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;IA9BjC,8CAA8C;;;;;;;;;;iBAiC9C,CAAC;AAIH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAUvC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAGzC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,sDAAsD;AACtD,MAAM,MAAM,qBAAqB,GAAG,OAAO,CACzC,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,EAC3C,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAC3B,CAAC"}

package/out/zero-protocol/src/inspect-up.js

@@ -1,6 +1,6 @@
-import { readonlyArray, valita_exports } from "../../shared/src/valita.js";
+import { readonlyArray, taggedObjectUnion, valita_exports } from "../../shared/src/valita.js";
 import { jsonSchema } from "../../shared/src/json-schema.js";
-import { astSchema } from "./ast.js";
+import { strictASTSchema } from "./ast.js";
 //#region ../zero-protocol/src/inspect-up.ts
 var inspectUpBase = valita_exports.object({ id: valita_exports.string() });
 var inspectQueriesUpBodySchema = inspectUpBase.extend({
@@ -21,9 +21,9 @@ var analyzeQueryOptionsSchema = valita_exports.object({
 var inspectAnalyzeQueryUpSchema = inspectUpBase.extend({
 	op: valita_exports.literal("analyze-query"),
 	/** @deprecated Use {@linkcode ast} instead */
-	value: astSchema.optional(),
+	value: strictASTSchema.optional(),
 	options: analyzeQueryOptionsSchema.optional(),
-	ast: astSchema.optional(),
+	ast: strictASTSchema.optional(),
 	name: valita_exports.string().optional(),
 	args: readonlyArray(jsonSchema).optional()
 });
@@ -38,9 +38,15 @@ var unparsedInspectAnalyzeQueryUpSchema = inspectUpBase.extend({
 });
 var inspectUpBodySchema = valita_exports.union(inspectQueriesUpBodySchema, inspectMetricsUpSchema, inspectVersionUpSchema, inspectAuthenticateUpSchema, inspectAnalyzeQueryUpSchema);
 var inspectUpMessageSchema = valita_exports.tuple([valita_exports.literal("inspect"), inspectUpBodySchema]);
-var unparsedInspectUpBodySchema = valita_exports.union(inspectQueriesUpBodySchema, inspectMetricsUpSchema, inspectVersionUpSchema, inspectAuthenticateUpSchema, unparsedInspectAnalyzeQueryUpSchema);
+var unparsedInspectUpBodySchema = taggedObjectUnion("op", [
+	inspectQueriesUpBodySchema,
+	inspectMetricsUpSchema,
+	inspectVersionUpSchema,
+	inspectAuthenticateUpSchema,
+	unparsedInspectAnalyzeQueryUpSchema
+], { open: true });
 var unparsedInspectUpMessageSchema = valita_exports.tuple([valita_exports.literal("inspect"), unparsedInspectUpBodySchema]);
 //#endregion
-export { inspectAnalyzeQueryUpSchema, inspectUpMessageSchema, unparsedInspectUpMessageSchema };
+export { inspectAnalyzeQueryUpSchema, inspectUpMessageSchema, unparsedInspectUpBodySchema, unparsedInspectUpMessageSchema };
 
 //# sourceMappingURL=inspect-up.js.map

package/out/zero-protocol/src/inspect-up.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspect-up.js","names":[],"sources":["../../../../zero-protocol/src/inspect-up.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {astSchema} from './ast.ts';\n\nconst inspectUpBase = v.object({\n  id: v.string(),\n});\n\nconst inspectQueriesUpBodySchema = inspectUpBase.extend({\n  op: v.literal('queries'),\n  clientID: v.string().optional(),\n});\n\nexport type InspectQueriesUpBody = v.Infer<typeof inspectQueriesUpBodySchema>;\n\nconst inspectMetricsUpSchema = inspectUpBase.extend({\n  op: v.literal('metrics'),\n});\n\nexport type InspectMetricsUpBody = v.Infer<typeof inspectMetricsUpSchema>;\n\nconst inspectVersionUpSchema = inspectUpBase.extend({\n  op: v.literal('version'),\n});\n\nexport type InspectVersionUpBody = v.Infer<typeof inspectVersionUpSchema>;\n\nexport const inspectAuthenticateUpSchema = inspectUpBase.extend({\n  op: v.literal('authenticate'),\n  value: v.string(),\n});\n\nexport type InspectAuthenticateUpBody = v.Infer<\n  typeof inspectAuthenticateUpSchema\n>;\n\nconst analyzeQueryOptionsSchema = v.object({\n  vendedRows: v.boolean().optional(),\n  syncedRows: v.boolean().optional(),\n  joinPlans: v.boolean().optional(),\n});\n\nexport type AnalyzeQueryOptions = v.Infer<typeof analyzeQueryOptionsSchema>;\n\nexport const inspectAnalyzeQueryUpSchema = inspectUpBase.extend({\n  op: v.literal('analyze-query'),\n  /** @deprecated Use {@linkcode ast} instead */\n  value: astSchema.optional(),\n  options: analyzeQueryOptionsSchema.optional(),\n  ast: astSchema.optional(),\n  name: v.string().optional(),\n  args: v.readonlyArray(jsonSchema).optional(),\n});\n\nconst unparsedInspectAnalyzeQueryUpSchema = inspectUpBase.extend({\n  op: v.literal('analyze-query'),\n  /** @deprecated Use {@linkcode ast} instead */\n  value: v.unknown().optional(),\n  options: analyzeQueryOptionsSchema.optional(),\n  ast: v.unknown().optional(),\n  name: v.string().optional(),\n  args: v.readonlyArray(jsonSchema).optional(),\n});\n\nexport type InspectAnalyzeQueryUpBody = v.Infer<\n  typeof inspectAnalyzeQueryUpSchema\n>;\n\nconst inspectUpBodySchema = v.union(\n  inspectQueriesUpBodySchema,\n  inspectMetricsUpSchema,\n  inspectVersionUpSchema,\n  inspectAuthenticateUpSchema,\n  inspectAnalyzeQueryUpSchema,\n);\n\nexport const inspectUpMessageSchema = v.tuple([\n  v.literal('inspect'),\n  inspectUpBodySchema,\n]);\n\nconst unparsedInspectUpBodySchema = v.union(\n  inspectQueriesUpBodySchema,\n  inspectMetricsUpSchema,\n  inspectVersionUpSchema,\n  inspectAuthenticateUpSchema,\n  unparsedInspectAnalyzeQueryUpSchema,\n);\n\nexport const unparsedInspectUpMessageSchema = v.tuple([\n  v.literal('inspect'),\n  unparsedInspectUpBodySchema,\n]);\n\nexport type InspectUpMessage = v.Infer<typeof inspectUpMessageSchema>;\n\nexport type InspectUpBody = v.Infer<typeof inspectUpBodySchema>;\n\nexport type UnparsedInspectUpMessage = v.Infer<\n  typeof unparsedInspectUpMessageSchema\n>;\n\nexport type UnparsedInspectUpBody = v.Infer<typeof unparsedInspectUpBodySchema>;\n"],"mappings":";;;;AAIA,IAAM,gBAAgB,eAAE,OAAO,EAC7B,IAAI,eAAE,OAAO,EACf,CAAC;AAED,IAAM,6BAA6B,cAAc,OAAO;CACtD,IAAI,eAAE,QAAQ,SAAS;CACvB,UAAU,eAAE,OAAO,EAAE,SAAS;AAChC,CAAC;AAID,IAAM,yBAAyB,cAAc,OAAO,EAClD,IAAI,eAAE,QAAQ,SAAS,EACzB,CAAC;AAID,IAAM,yBAAyB,cAAc,OAAO,EAClD,IAAI,eAAE,QAAQ,SAAS,EACzB,CAAC;AAID,IAAa,8BAA8B,cAAc,OAAO;CAC9D,IAAI,eAAE,QAAQ,cAAc;CAC5B,OAAO,eAAE,OAAO;AAClB,CAAC;AAMD,IAAM,4BAA4B,eAAE,OAAO;CACzC,YAAY,eAAE,QAAQ,EAAE,SAAS;CACjC,YAAY,eAAE,QAAQ,EAAE,SAAS;CACjC,WAAW,eAAE,QAAQ,EAAE,SAAS;AAClC,CAAC;AAID,IAAa,8BAA8B,cAAc,OAAO;CAC9D,IAAI,eAAE,QAAQ,eAAe;;CAE7B,OAAO,UAAU,SAAS;CAC1B,SAAS,0BAA0B,SAAS;CAC5C,KAAK,UAAU,SAAS;CACxB,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,cAAgB,UAAU,EAAE,SAAS;AAC7C,CAAC;AAED,IAAM,sCAAsC,cAAc,OAAO;CAC/D,IAAI,eAAE,QAAQ,eAAe;;CAE7B,OAAO,eAAE,QAAQ,EAAE,SAAS;CAC5B,SAAS,0BAA0B,SAAS;CAC5C,KAAK,eAAE,QAAQ,EAAE,SAAS;CAC1B,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,cAAgB,UAAU,EAAE,SAAS;AAC7C,CAAC;AAMD,IAAM,sBAAsB,eAAE,MAC5B,4BACA,wBACA,wBACA,6BACA,2BACF;AAEA,IAAa,yBAAyB,eAAE,MAAM,CAC5C,eAAE,QAAQ,SAAS,GACnB,mBACF,CAAC;AAED,IAAM,8BAA8B,eAAE,MACpC,4BACA,wBACA,wBACA,6BACA,mCACF;AAEA,IAAa,iCAAiC,eAAE,MAAM,CACpD,eAAE,QAAQ,SAAS,GACnB,2BACF,CAAC"}
+{"version":3,"file":"inspect-up.js","names":[],"sources":["../../../../zero-protocol/src/inspect-up.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {strictASTSchema} from './ast.ts';\n\nconst inspectUpBase = v.object({\n  id: v.string(),\n});\n\nconst inspectQueriesUpBodySchema = inspectUpBase.extend({\n  op: v.literal('queries'),\n  clientID: v.string().optional(),\n});\n\nexport type InspectQueriesUpBody = v.Infer<typeof inspectQueriesUpBodySchema>;\n\nconst inspectMetricsUpSchema = inspectUpBase.extend({\n  op: v.literal('metrics'),\n});\n\nexport type InspectMetricsUpBody = v.Infer<typeof inspectMetricsUpSchema>;\n\nconst inspectVersionUpSchema = inspectUpBase.extend({\n  op: v.literal('version'),\n});\n\nexport type InspectVersionUpBody = v.Infer<typeof inspectVersionUpSchema>;\n\nexport const inspectAuthenticateUpSchema = inspectUpBase.extend({\n  op: v.literal('authenticate'),\n  value: v.string(),\n});\n\nexport type InspectAuthenticateUpBody = v.Infer<\n  typeof inspectAuthenticateUpSchema\n>;\n\nconst analyzeQueryOptionsSchema = v.object({\n  vendedRows: v.boolean().optional(),\n  syncedRows: v.boolean().optional(),\n  joinPlans: v.boolean().optional(),\n});\n\nexport type AnalyzeQueryOptions = v.Infer<typeof analyzeQueryOptionsSchema>;\n\nexport const inspectAnalyzeQueryUpSchema = inspectUpBase.extend({\n  op: v.literal('analyze-query'),\n  /** @deprecated Use {@linkcode ast} instead */\n  value: strictASTSchema.optional(),\n  options: analyzeQueryOptionsSchema.optional(),\n  ast: strictASTSchema.optional(),\n  name: v.string().optional(),\n  args: v.readonlyArray(jsonSchema).optional(),\n});\n\nconst unparsedInspectAnalyzeQueryUpSchema = inspectUpBase.extend({\n  op: v.literal('analyze-query'),\n  /** @deprecated Use {@linkcode ast} instead */\n  value: v.unknown().optional(),\n  options: analyzeQueryOptionsSchema.optional(),\n  ast: v.unknown().optional(),\n  name: v.string().optional(),\n  args: v.readonlyArray(jsonSchema).optional(),\n});\n\nexport type InspectAnalyzeQueryUpBody = v.Infer<\n  typeof inspectAnalyzeQueryUpSchema\n>;\n\nconst inspectUpBodySchema = v.union(\n  inspectQueriesUpBodySchema,\n  inspectMetricsUpSchema,\n  inspectVersionUpSchema,\n  inspectAuthenticateUpSchema,\n  inspectAnalyzeQueryUpSchema,\n);\n\nexport const inspectUpMessageSchema = v.tuple([\n  v.literal('inspect'),\n  inspectUpBodySchema,\n]);\n\n// zero-cache answers an op from a newer client with an error for that request\n// instead of closing the connection.\nexport const unparsedInspectUpBodySchema = v.taggedObjectUnion(\n  'op',\n  [\n    inspectQueriesUpBodySchema,\n    inspectMetricsUpSchema,\n    inspectVersionUpSchema,\n    inspectAuthenticateUpSchema,\n    unparsedInspectAnalyzeQueryUpSchema,\n  ],\n  {open: true},\n);\n\nexport const unparsedInspectUpMessageSchema = v.tuple([\n  v.literal('inspect'),\n  unparsedInspectUpBodySchema,\n]);\n\nexport type InspectUpMessage = v.Infer<typeof inspectUpMessageSchema>;\n\nexport type InspectUpBody = v.Infer<typeof inspectUpBodySchema>;\n\nexport type UnparsedInspectUpMessage = v.Infer<\n  typeof unparsedInspectUpMessageSchema\n>;\n\n/** An inspect request with an op this build knows. */\nexport type UnparsedInspectUpBody = Exclude<\n  v.Infer<typeof unparsedInspectUpBodySchema>,\n  v.UnrecognizedObject<'op'>\n>;\n"],"mappings":";;;;AAIA,IAAM,gBAAgB,eAAE,OAAO,EAC7B,IAAI,eAAE,OAAO,EACf,CAAC;AAED,IAAM,6BAA6B,cAAc,OAAO;CACtD,IAAI,eAAE,QAAQ,SAAS;CACvB,UAAU,eAAE,OAAO,EAAE,SAAS;AAChC,CAAC;AAID,IAAM,yBAAyB,cAAc,OAAO,EAClD,IAAI,eAAE,QAAQ,SAAS,EACzB,CAAC;AAID,IAAM,yBAAyB,cAAc,OAAO,EAClD,IAAI,eAAE,QAAQ,SAAS,EACzB,CAAC;AAID,IAAa,8BAA8B,cAAc,OAAO;CAC9D,IAAI,eAAE,QAAQ,cAAc;CAC5B,OAAO,eAAE,OAAO;AAClB,CAAC;AAMD,IAAM,4BAA4B,eAAE,OAAO;CACzC,YAAY,eAAE,QAAQ,EAAE,SAAS;CACjC,YAAY,eAAE,QAAQ,EAAE,SAAS;CACjC,WAAW,eAAE,QAAQ,EAAE,SAAS;AAClC,CAAC;AAID,IAAa,8BAA8B,cAAc,OAAO;CAC9D,IAAI,eAAE,QAAQ,eAAe;;CAE7B,OAAO,gBAAgB,SAAS;CAChC,SAAS,0BAA0B,SAAS;CAC5C,KAAK,gBAAgB,SAAS;CAC9B,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,cAAgB,UAAU,EAAE,SAAS;AAC7C,CAAC;AAED,IAAM,sCAAsC,cAAc,OAAO;CAC/D,IAAI,eAAE,QAAQ,eAAe;;CAE7B,OAAO,eAAE,QAAQ,EAAE,SAAS;CAC5B,SAAS,0BAA0B,SAAS;CAC5C,KAAK,eAAE,QAAQ,EAAE,SAAS;CAC1B,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,cAAgB,UAAU,EAAE,SAAS;AAC7C,CAAC;AAMD,IAAM,sBAAsB,eAAE,MAC5B,4BACA,wBACA,wBACA,6BACA,2BACF;AAEA,IAAa,yBAAyB,eAAE,MAAM,CAC5C,eAAE,QAAQ,SAAS,GACnB,mBACF,CAAC;AAID,IAAa,8BAA8B,kBACzC,MACA;CACE;CACA;CACA;CACA;CACA;AACF,GACA,EAAC,MAAM,KAAI,CACb;AAEA,IAAa,iCAAiC,eAAE,MAAM,CACpD,eAAE,QAAQ,SAAS,GACnB,2BACF,CAAC"}

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

@@ -3,7 +3,10 @@
  *
  * The `PROTOCOL_VERSION` encompasses both the wire-protocol of the `/sync/...`
  * connection between the browser and `zero-cache`, as well as the format of
- * the `AST` objects stored in both components (i.e. IDB and CVR).
+ * the `AST` objects stored in the CVR. The client's local database has its
+ * own version, `STORAGE_VERSION` in zero-client. A bump that changes what the
+ * client stores (as version 23 did by adding mutation results) must bump that
+ * too.
  *
  * A change in the `AST` schema (e.g. new functionality added) must be
  * accompanied by an increment of the `PROTOCOL_VERSION` and a new major

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

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAiDH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}
+{"version":3,"file":"protocol-version.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AAiDH,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC"}

package/out/zero-protocol/src/protocol-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.js","names":[],"sources":["../../../../zero-protocol/src/protocol-version.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\n\n/**\n * The current `PROTOCOL_VERSION` of the code.\n *\n * The `PROTOCOL_VERSION` encompasses both the wire-protocol of the `/sync/...`\n * connection between the browser and `zero-cache`, as well as the format of\n * the `AST` objects stored in both components (i.e. IDB and CVR).\n *\n * A change in the `AST` schema (e.g. new functionality added) must be\n * accompanied by an increment of the `PROTOCOL_VERSION` and a new major\n * release. The server (`zero-cache`) must be deployed before clients start\n * running the new code.\n */\n// History:\n// -- Version 5 adds support for `pokeEnd.cookie`. (0.14)\n// -- Version 6 makes `pokeStart.cookie` optional. (0.16)\n// -- Version 7 introduces the initConnection.clientSchema field. (0.17)\n// -- Version 8 drops support for Version 5 (0.18).\n// -- Version 11 adds inspect queries. (0.18)\n// -- Version 12 adds 'timestamp' and 'date' types to the ClientSchema ValueType. (not shipped, reversed by version 14)\n// -- Version 14 removes 'timestamp' and 'date' types from the ClientSchema ValueType. (0.18)\n// -- Version 15 adds a `userPushParams` field to `initConnection` (0.19)\n// -- Version 16 adds a new error type (alreadyProcessed) to mutation responses (0.19)\n// -- Version 17 deprecates `AST` in downstream query puts. It was never used anyway. (0.21)\n// -- Version 18 adds `name` and `args` to the `queries-patch` protocol (0.21)\n// -- Version 19 adds `activeClients` to the `initConnection` protocol (0.22)\n// -- Version 20 changes inspector down message (0.22)\n// -- Version 21 removes `AST` in downstream query puts which was deprecated in Version 17, removes support for versions < 18 (0.22)\n// -- Version 22 adds an optional 'userQueryParams' field to `initConnection` (0.22)\n// -- Version 23 add `mutationResults` to poke (0.22)\n// -- Version 24 adds `ackMutationResults` to upstream (0.22).\n// -- version 25 modifies `mutationsResults` to include `del` patches (0.22)\n// -- version 26 adds inspect/metrics and adds metrics to inspect/query (0.23)\n// -- version 27 adds inspect/version (0.23)\n// -- version 28 adds more inspect/metrics (0.23)\n// -- version 29 adds error responses for custom queries (0.23)\n// -- version 30 adds an optional primaryKey to the ClientSchema (0.24)\n// -- version 31 adds admin password authentication to inspector RPC calls (0.24)\n// -- version 32 adds analyze-query to the inspector RPC calls (0.24)\n// -- version 33 adds `flip` to CorrelatedSubquery (0.25)\n// -- version 34 moves `flip` from CorrelatedSubquery to CorrelatedSubqueryCondition (0.25)\n// -- version 35 adds `readRows`, `readRowCountsByQuery` and `readRowCount` to analyze-query result (0.25)\n// -- version 36 changes inspector analyze-query and adds error response to RPC (0.25)\n// -- version 37 adds `elapsed` to AnalyzeQueryResult (0.25)\n// -- version 38 adds structured push/transform error responses (0.25)\n// -- version 39 removes per-transform error types and adds `message` to app error (0.25)\n// -- version 40 adds `dbRowScansByQuery` to AnalyzeQueryResult (0.25)\n// -- version 41 makes ClientSchema.primaryKey required (0.25)\n// -- version 42 adds planner events to AnalyzeQueryResult (0.25)\n// -- version 43 renames `plans` to `sqlitePlans`, `plannerEvents` to `joinPlans`, and `plannerDebug` option to `joinPlans` (0.25)\n// -- version 44 adds profileID to connection URL (0.25)\n// -- version 45 adds userPushHeaders and userQueryHeaders to initConnection (0.25)\n// -- version 46 adds scalarSubquery condition type to AST\n// -- version 47 adds optional auth token to push body\n// -- version 48 adds updateAuth\n// -- version 49 adds `scalar` to CorrelatedSubqueryCondition, removes scalarSubquery\n// -- version 50 adds OTEL headers to push and query messages\n// -- version 51 changes inspector metrics fields\n// -- version 52 replaces JSON pokePart messages with binary poke chunks for\n//    clients using protocol version 52 or newer. Older clients retain pokePart.\n// -- version 53 adds 'filter' node type to AnalyzeQueryResult\nexport const PROTOCOL_VERSION = 53;\n\n/**\n * The minimum server-supported sync protocol version (i.e. the version\n * declared in the \"/sync/v{#}/connect\" URL).\n *\n * CloudZero can serve applications running old client releases indefinitely.\n * Consequently, this value must never be increased: `zero-cache` must continue\n * to support every sync protocol from this version through `PROTOCOL_VERSION`.\n * A wire change that an old client cannot ignore must branch on the client's\n * protocol version and retain the old behavior. Keep each compatibility fork\n * isolated at the boundary that owns the changed behavior and test both sides\n * of its version cutoff.\n *\n * Client connections from protocol versions before this historical floor are\n * closed with a `VersionNotSupported` error.\n */\nexport const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;\n\nassert(\n  MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION,\n  'MIN_SERVER_SUPPORTED_SYNC_PROTOCOL must be less than PROTOCOL_VERSION',\n);\n"],"mappings":";AAiFA,OAAA,MAEE,uEACF"}
+{"version":3,"file":"protocol-version.js","names":[],"sources":["../../../../zero-protocol/src/protocol-version.ts"],"sourcesContent":["import {assert} from '../../shared/src/asserts.ts';\n\n/**\n * The current `PROTOCOL_VERSION` of the code.\n *\n * The `PROTOCOL_VERSION` encompasses both the wire-protocol of the `/sync/...`\n * connection between the browser and `zero-cache`, as well as the format of\n * the `AST` objects stored in the CVR. The client's local database has its\n * own version, `STORAGE_VERSION` in zero-client. A bump that changes what the\n * client stores (as version 23 did by adding mutation results) must bump that\n * too.\n *\n * A change in the `AST` schema (e.g. new functionality added) must be\n * accompanied by an increment of the `PROTOCOL_VERSION` and a new major\n * release. The server (`zero-cache`) must be deployed before clients start\n * running the new code.\n */\n// History:\n// -- Version 5 adds support for `pokeEnd.cookie`. (0.14)\n// -- Version 6 makes `pokeStart.cookie` optional. (0.16)\n// -- Version 7 introduces the initConnection.clientSchema field. (0.17)\n// -- Version 8 drops support for Version 5 (0.18).\n// -- Version 11 adds inspect queries. (0.18)\n// -- Version 12 adds 'timestamp' and 'date' types to the ClientSchema ValueType. (not shipped, reversed by version 14)\n// -- Version 14 removes 'timestamp' and 'date' types from the ClientSchema ValueType. (0.18)\n// -- Version 15 adds a `userPushParams` field to `initConnection` (0.19)\n// -- Version 16 adds a new error type (alreadyProcessed) to mutation responses (0.19)\n// -- Version 17 deprecates `AST` in downstream query puts. It was never used anyway. (0.21)\n// -- Version 18 adds `name` and `args` to the `queries-patch` protocol (0.21)\n// -- Version 19 adds `activeClients` to the `initConnection` protocol (0.22)\n// -- Version 20 changes inspector down message (0.22)\n// -- Version 21 removes `AST` in downstream query puts which was deprecated in Version 17, removes support for versions < 18 (0.22)\n// -- Version 22 adds an optional 'userQueryParams' field to `initConnection` (0.22)\n// -- Version 23 add `mutationResults` to poke (0.22)\n// -- Version 24 adds `ackMutationResults` to upstream (0.22).\n// -- version 25 modifies `mutationsResults` to include `del` patches (0.22)\n// -- version 26 adds inspect/metrics and adds metrics to inspect/query (0.23)\n// -- version 27 adds inspect/version (0.23)\n// -- version 28 adds more inspect/metrics (0.23)\n// -- version 29 adds error responses for custom queries (0.23)\n// -- version 30 adds an optional primaryKey to the ClientSchema (0.24)\n// -- version 31 adds admin password authentication to inspector RPC calls (0.24)\n// -- version 32 adds analyze-query to the inspector RPC calls (0.24)\n// -- version 33 adds `flip` to CorrelatedSubquery (0.25)\n// -- version 34 moves `flip` from CorrelatedSubquery to CorrelatedSubqueryCondition (0.25)\n// -- version 35 adds `readRows`, `readRowCountsByQuery` and `readRowCount` to analyze-query result (0.25)\n// -- version 36 changes inspector analyze-query and adds error response to RPC (0.25)\n// -- version 37 adds `elapsed` to AnalyzeQueryResult (0.25)\n// -- version 38 adds structured push/transform error responses (0.25)\n// -- version 39 removes per-transform error types and adds `message` to app error (0.25)\n// -- version 40 adds `dbRowScansByQuery` to AnalyzeQueryResult (0.25)\n// -- version 41 makes ClientSchema.primaryKey required (0.25)\n// -- version 42 adds planner events to AnalyzeQueryResult (0.25)\n// -- version 43 renames `plans` to `sqlitePlans`, `plannerEvents` to `joinPlans`, and `plannerDebug` option to `joinPlans` (0.25)\n// -- version 44 adds profileID to connection URL (0.25)\n// -- version 45 adds userPushHeaders and userQueryHeaders to initConnection (0.25)\n// -- version 46 adds scalarSubquery condition type to AST\n// -- version 47 adds optional auth token to push body\n// -- version 48 adds updateAuth\n// -- version 49 adds `scalar` to CorrelatedSubqueryCondition, removes scalarSubquery\n// -- version 50 adds OTEL headers to push and query messages\n// -- version 51 changes inspector metrics fields\n// -- version 52 replaces JSON pokePart messages with binary poke chunks for\n//    clients using protocol version 52 or newer. Older clients retain pokePart.\n// -- version 53 adds 'filter' node type to AnalyzeQueryResult\nexport const PROTOCOL_VERSION = 53;\n\n/**\n * The minimum server-supported sync protocol version (i.e. the version\n * declared in the \"/sync/v{#}/connect\" URL).\n *\n * CloudZero can serve applications running old client releases indefinitely.\n * Consequently, this value must never be increased: `zero-cache` must continue\n * to support every sync protocol from this version through `PROTOCOL_VERSION`.\n * A wire change that an old client cannot ignore must branch on the client's\n * protocol version and retain the old behavior. Keep each compatibility fork\n * isolated at the boundary that owns the changed behavior and test both sides\n * of its version cutoff.\n *\n * Client connections from protocol versions before this historical floor are\n * closed with a `VersionNotSupported` error.\n */\nexport const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;\n\nassert(\n  MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION,\n  'MIN_SERVER_SUPPORTED_SYNC_PROTOCOL must be less than PROTOCOL_VERSION',\n);\n"],"mappings":";AAoFA,OAAA,MAEE,uEACF"}

package/out/zero-protocol/src/queries-patch.js

@@ -1,6 +1,6 @@
 import { readonly, valita_exports } from "../../shared/src/valita.js";
 import { jsonSchema } from "../../shared/src/json-schema.js";
-import { astSchema } from "./ast.js";
+import { strictASTSchema } from "./ast.js";
 //#region ../zero-protocol/src/queries-patch.ts
 var putOpSchema = valita_exports.object({
 	op: valita_exports.literal("put"),
@@ -8,7 +8,7 @@ var putOpSchema = valita_exports.object({
 	ttl: valita_exports.number().optional()
 });
 var upPutOpSchema = putOpSchema.extend({
-	ast: astSchema.optional(),
+	ast: strictASTSchema.optional(),
 	name: valita_exports.string().optional(),
 	args: readonly(valita_exports.array(jsonSchema)).optional()
 });

package/out/zero-protocol/src/queries-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries-patch.js","names":[],"sources":["../../../../zero-protocol/src/queries-patch.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {astSchema} from './ast.ts';\n\nexport const putOpSchema = v.object({\n  op: v.literal('put'),\n  hash: v.string(),\n  ttl: v.number().optional(),\n});\n\nexport const upPutOpSchema = putOpSchema.extend({\n  // All fields are optional in this transitional period.\n  // - ast is filled in for client queries\n  // - name and args are filled in for custom queries\n  ast: astSchema.optional(),\n  name: v.string().optional(),\n  args: v.readonly(v.array(jsonSchema)).optional(),\n});\n\nconst delOpSchema = v.object({\n  op: v.literal('del'),\n  hash: v.string(),\n});\n\nconst clearOpSchema = v.object({\n  op: v.literal('clear'),\n});\n\nconst patchOpSchema = v.union(putOpSchema, delOpSchema, clearOpSchema);\nconst upPatchOpSchema = v.union(upPutOpSchema, delOpSchema, clearOpSchema);\n\nexport const queriesPatchSchema = v.array(patchOpSchema);\nexport const upQueriesPatchSchema = v.array(upPatchOpSchema);\n\nexport type QueriesPutOp = v.Infer<typeof putOpSchema>;\nexport type QueriesDelOp = v.Infer<typeof delOpSchema>;\nexport type QueriesClearOp = v.Infer<typeof clearOpSchema>;\nexport type QueriesPatchOp = v.Infer<typeof patchOpSchema>;\nexport type UpQueriesPatchOp = v.Infer<typeof upPatchOpSchema>;\nexport type QueriesPatch = v.Infer<typeof queriesPatchSchema>;\nexport type UpQueriesPatch = v.Infer<typeof upQueriesPatchSchema>;\n"],"mappings":";;;;AAIA,IAAa,cAAc,eAAE,OAAO;CAClC,IAAI,eAAE,QAAQ,KAAK;CACnB,MAAM,eAAE,OAAO;CACf,KAAK,eAAE,OAAO,EAAE,SAAS;AAC3B,CAAC;AAED,IAAa,gBAAgB,YAAY,OAAO;CAI9C,KAAK,UAAU,SAAS;CACxB,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,SAAW,eAAE,MAAM,UAAU,CAAC,EAAE,SAAS;AACjD,CAAC;AAED,IAAM,cAAc,eAAE,OAAO;CAC3B,IAAI,eAAE,QAAQ,KAAK;CACnB,MAAM,eAAE,OAAO;AACjB,CAAC;AAED,IAAM,gBAAgB,eAAE,OAAO,EAC7B,IAAI,eAAE,QAAQ,OAAO,EACvB,CAAC;AAED,IAAM,gBAAgB,eAAE,MAAM,aAAa,aAAa,aAAa;AACrE,IAAM,kBAAkB,eAAE,MAAM,eAAe,aAAa,aAAa;AAEzE,IAAa,qBAAqB,eAAE,MAAM,aAAa;AACvD,IAAa,uBAAuB,eAAE,MAAM,eAAe"}
+{"version":3,"file":"queries-patch.js","names":[],"sources":["../../../../zero-protocol/src/queries-patch.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {strictASTSchema} from './ast.ts';\n\nexport const putOpSchema = v.object({\n  op: v.literal('put'),\n  hash: v.string(),\n  ttl: v.number().optional(),\n});\n\nexport const upPutOpSchema = putOpSchema.extend({\n  // All fields are optional in this transitional period.\n  // - ast is filled in for client queries\n  // - name and args are filled in for custom queries\n  ast: strictASTSchema.optional(),\n  name: v.string().optional(),\n  args: v.readonly(v.array(jsonSchema)).optional(),\n});\n\nconst delOpSchema = v.object({\n  op: v.literal('del'),\n  hash: v.string(),\n});\n\nconst clearOpSchema = v.object({\n  op: v.literal('clear'),\n});\n\nconst patchOpSchema = v.union(putOpSchema, delOpSchema, clearOpSchema);\nconst upPatchOpSchema = v.union(upPutOpSchema, delOpSchema, clearOpSchema);\n\nexport const queriesPatchSchema = v.array(patchOpSchema);\nexport const upQueriesPatchSchema = v.array(upPatchOpSchema);\n\nexport type QueriesPutOp = v.Infer<typeof putOpSchema>;\nexport type QueriesDelOp = v.Infer<typeof delOpSchema>;\nexport type QueriesClearOp = v.Infer<typeof clearOpSchema>;\nexport type QueriesPatchOp = v.Infer<typeof patchOpSchema>;\nexport type UpQueriesPatchOp = v.Infer<typeof upPatchOpSchema>;\nexport type QueriesPatch = v.Infer<typeof queriesPatchSchema>;\nexport type UpQueriesPatch = v.Infer<typeof upQueriesPatchSchema>;\n"],"mappings":";;;;AAIA,IAAa,cAAc,eAAE,OAAO;CAClC,IAAI,eAAE,QAAQ,KAAK;CACnB,MAAM,eAAE,OAAO;CACf,KAAK,eAAE,OAAO,EAAE,SAAS;AAC3B,CAAC;AAED,IAAa,gBAAgB,YAAY,OAAO;CAI9C,KAAK,gBAAgB,SAAS;CAC9B,MAAM,eAAE,OAAO,EAAE,SAAS;CAC1B,MAAM,SAAW,eAAE,MAAM,UAAU,CAAC,EAAE,SAAS;AACjD,CAAC;AAED,IAAM,cAAc,eAAE,OAAO;CAC3B,IAAI,eAAE,QAAQ,KAAK;CACnB,MAAM,eAAE,OAAO;AACjB,CAAC;AAED,IAAM,gBAAgB,eAAE,OAAO,EAC7B,IAAI,eAAE,QAAQ,OAAO,EACvB,CAAC;AAED,IAAM,gBAAgB,eAAE,MAAM,aAAa,aAAa,aAAa;AACrE,IAAM,kBAAkB,eAAE,MAAM,eAAe,aAAa,aAAa;AAEzE,IAAa,qBAAqB,eAAE,MAAM,aAAa;AACvD,IAAa,uBAAuB,eAAE,MAAM,eAAe"}

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

@@ -1 +1 @@
-{"version":3,"file":"query-hash.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/query-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,GAAG,EAAE,KAAK,aAAa,EAAC,MAAM,UAAU,CAAC;AAKpE,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAE1C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAQ9D;AAED,OAAO,EAAC,eAAe,IAAI,iBAAiB,EAAC,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"query-hash.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/query-hash.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,GAAG,EAAE,KAAK,aAAa,EAAC,MAAM,UAAU,CAAC;AAKpE,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAE1C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAE9D;AAED,OAAO,EAAC,eAAe,IAAI,iBAAiB,EAAC,MAAM,yBAAyB,CAAC"}

package/out/zero-protocol/src/query-hash.js

@@ -1,3 +1,4 @@
+import { getOrInsertComputed } from "../../shared/src/map.js";
 import { normalizeAST } from "./ast.js";
 import { hashAST } from "./query-hash-visitor.js";
 //#region ../zero-protocol/src/query-hash.ts
@@ -10,11 +11,7 @@ function hashOfAST(ast) {
 * whose builder kept it normalized as it built it.
 */
 function hashOfNormalizedAST(ast) {
-	const cached = hashCache.get(ast);
-	if (cached) return cached;
-	const hash = hashAST(ast);
-	hashCache.set(ast, hash);
-	return hash;
+	return getOrInsertComputed(hashCache, ast, hashAST);
 }
 //#endregion
 export { hashOfAST };

package/out/zero-protocol/src/query-hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-hash.js","names":[],"sources":["../../../../zero-protocol/src/query-hash.ts"],"sourcesContent":["import {normalizeAST, type AST, type NormalizedAST} from './ast.ts';\nimport {hashAST} from './query-hash-visitor.ts';\n\nconst hashCache = new WeakMap<AST, string>();\n\nexport function hashOfAST(ast: AST): string {\n  return hashOfNormalizedAST(normalizeAST(ast));\n}\n\n/**\n * The hash of an AST that is already normalized, e.g. the AST of a query\n * whose builder kept it normalized as it built it.\n */\nexport function hashOfNormalizedAST(ast: NormalizedAST): string {\n  const cached = hashCache.get(ast);\n  if (cached) {\n    return cached;\n  }\n  const hash = hashAST(ast);\n  hashCache.set(ast, hash);\n  return hash;\n}\n\nexport {hashNameAndArgs as hashOfNameAndArgs} from './query-hash-visitor.ts';\n"],"mappings":";;;AAGA,IAAM,4BAAY,IAAI,QAAqB;AAE3C,SAAgB,UAAU,KAAkB;CAC1C,OAAO,oBAAoB,aAAa,GAAG,CAAC;AAC9C;;;;;AAMA,SAAgB,oBAAoB,KAA4B;CAC9D,MAAM,SAAS,UAAU,IAAI,GAAG;CAChC,IAAI,QACF,OAAO;CAET,MAAM,OAAO,QAAQ,GAAG;CACxB,UAAU,IAAI,KAAK,IAAI;CACvB,OAAO;AACT"}
+{"version":3,"file":"query-hash.js","names":[],"sources":["../../../../zero-protocol/src/query-hash.ts"],"sourcesContent":["import {getOrInsertComputed} from '../../shared/src/map.ts';\nimport {normalizeAST, type AST, type NormalizedAST} from './ast.ts';\nimport {hashAST} from './query-hash-visitor.ts';\n\nconst hashCache = new WeakMap<AST, string>();\n\nexport function hashOfAST(ast: AST): string {\n  return hashOfNormalizedAST(normalizeAST(ast));\n}\n\n/**\n * The hash of an AST that is already normalized, e.g. the AST of a query\n * whose builder kept it normalized as it built it.\n */\nexport function hashOfNormalizedAST(ast: NormalizedAST): string {\n  return getOrInsertComputed(hashCache, ast, hashAST);\n}\n\nexport {hashNameAndArgs as hashOfNameAndArgs} from './query-hash-visitor.ts';\n"],"mappings":";;;;AAIA,IAAM,4BAAY,IAAI,QAAqB;AAE3C,SAAgB,UAAU,KAAkB;CAC1C,OAAO,oBAAoB,aAAa,GAAG,CAAC;AAC9C;;;;;AAMA,SAAgB,oBAAoB,KAA4B;CAC9D,OAAO,oBAAoB,WAAW,KAAK,OAAO;AACpD"}