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

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

@@ -23,7 +23,7 @@ declare const inspectQueryRowSchema: v.ObjectType<{
 export type InspectQueryRow = v.Infer<typeof inspectQueryRowSchema>;
 export declare const inspectQueriesDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"queries">;
     value: v.ArrayType<v.ObjectType<{
         clientID: v.Type<string>;
@@ -45,7 +45,7 @@ export declare const inspectQueriesDownSchema: v.ObjectType<Omit<{
 export type InspectQueriesDown = v.Infer<typeof inspectQueriesDownSchema>;
 export declare const inspectMetricsDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
@@ -55,20 +55,20 @@ export declare const inspectMetricsDownSchema: v.ObjectType<Omit<{
 export type InspectMetricsDown = v.Infer<typeof inspectMetricsDownSchema>;
 export declare const inspectVersionDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"version">;
     value: v.Type<string>;
 }, undefined>;
 export declare const inspectAuthenticatedDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"authenticated">;
     value: v.Type<boolean>;
 }, undefined>;
 export type InspectAuthenticatedDown = v.Infer<typeof inspectAuthenticatedDownSchema>;
 export declare const inspectAnalyzeQueryDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"analyze-query">;
     value: v.ObjectType<{
         warnings: v.ArrayType<v.Type<string>>;
@@ -85,19 +85,118 @@ export declare const inspectAnalyzeQueryDownSchema: v.ObjectType<Omit<{
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
         dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
+        plannerEvents: v.Optional<({
+            type: "attempt-start";
+            attemptNumber: number;
+            totalAttempts: number;
+        } | {
+            type: "connection-costs";
+            attemptNumber: number;
+            costs: {
+                connection: string;
+                cost: number;
+                costEstimate: {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                };
+                pinned: boolean;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "connection-selected";
+            attemptNumber: number;
+            connection: string;
+            cost: number;
+            isRoot: boolean;
+        } | {
+            type: "constraints-propagated";
+            attemptNumber: number;
+            connectionConstraints: {
+                connection: string;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "plan-complete";
+            attemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            type: "plan-failed";
+            attemptNumber: number;
+            reason: string;
+        } | {
+            type: "best-plan-selected";
+            bestAttemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            attemptNumber?: number | undefined;
+            filters?: import("./ast.ts").Condition | undefined;
+            ordering?: readonly (readonly [string, "desc" | "asc"])[] | undefined;
+            joinType?: "semi" | "flipped" | "unflippable" | undefined;
+            type: "node-cost";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            downstreamChildSelectivity: number;
+            costEstimate: {
+                limit?: number | undefined;
+                startupCost: number;
+                scanEst: number;
+                cost: number;
+                returnedRows: number;
+                selectivity: number;
+            };
+        } | {
+            attemptNumber?: number | undefined;
+            constraint?: Record<string, unknown> | null | undefined;
+            type: "node-constraint";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            from: string;
+        })[]>;
     }, undefined>;
 }, undefined>;
 export type InspectAnalyzeQueryDown = v.Infer<typeof inspectAnalyzeQueryDownSchema>;
 export declare const inspectErrorDownSchema: v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"error">;
     value: v.Type<string>;
 }, undefined>;
 export type InspectErrorDown = v.Infer<typeof inspectErrorDownSchema>;
 export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"queries">;
     value: v.ArrayType<v.ObjectType<{
         clientID: v.Type<string>;
@@ -117,7 +216,7 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
     }, undefined>>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
@@ -125,17 +224,17 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"version">;
     value: v.Type<string>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"authenticated">;
     value: v.Type<boolean>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"analyze-query">;
     value: v.ObjectType<{
         warnings: v.ArrayType<v.Type<string>>;
@@ -152,16 +251,115 @@ export declare const inspectDownBodySchema: v.UnionType<[v.ObjectType<Omit<{
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
         dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
+        plannerEvents: v.Optional<({
+            type: "attempt-start";
+            attemptNumber: number;
+            totalAttempts: number;
+        } | {
+            type: "connection-costs";
+            attemptNumber: number;
+            costs: {
+                connection: string;
+                cost: number;
+                costEstimate: {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                };
+                pinned: boolean;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "connection-selected";
+            attemptNumber: number;
+            connection: string;
+            cost: number;
+            isRoot: boolean;
+        } | {
+            type: "constraints-propagated";
+            attemptNumber: number;
+            connectionConstraints: {
+                connection: string;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "plan-complete";
+            attemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            type: "plan-failed";
+            attemptNumber: number;
+            reason: string;
+        } | {
+            type: "best-plan-selected";
+            bestAttemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            attemptNumber?: number | undefined;
+            filters?: import("./ast.ts").Condition | undefined;
+            ordering?: readonly (readonly [string, "desc" | "asc"])[] | undefined;
+            joinType?: "semi" | "flipped" | "unflippable" | undefined;
+            type: "node-cost";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            downstreamChildSelectivity: number;
+            costEstimate: {
+                limit?: number | undefined;
+                startupCost: number;
+                scanEst: number;
+                cost: number;
+                returnedRows: number;
+                selectivity: number;
+            };
+        } | {
+            attemptNumber?: number | undefined;
+            constraint?: Record<string, unknown> | null | undefined;
+            type: "node-constraint";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            from: string;
+        })[]>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"error">;
     value: v.Type<string>;
 }, undefined>]>;
 export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v.UnionType<[v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"queries">;
     value: v.ArrayType<v.ObjectType<{
         clientID: v.Type<string>;
@@ -181,7 +379,7 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
     }, undefined>>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"metrics">;
     value: v.ObjectType<{
         'query-materialization-server': v.VariadicTupleType<[v.Type<number>], v.Type<number>, []>;
@@ -189,17 +387,17 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"version">;
     value: v.Type<string>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"authenticated">;
     value: v.Type<boolean>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"analyze-query">;
     value: v.ObjectType<{
         warnings: v.ArrayType<v.Type<string>>;
@@ -216,10 +414,109 @@ export declare const inspectDownMessageSchema: v.TupleType<[v.Type<"inspect">, v
         readRowCountsByQuery: v.Optional<Record<string, Record<string, number>>>;
         readRowCount: v.Optional<number>;
         dbScansByQuery: v.Optional<Record<string, Record<string, number>>>;
+        plannerEvents: v.Optional<({
+            type: "attempt-start";
+            attemptNumber: number;
+            totalAttempts: number;
+        } | {
+            type: "connection-costs";
+            attemptNumber: number;
+            costs: {
+                connection: string;
+                cost: number;
+                costEstimate: {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                };
+                pinned: boolean;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "connection-selected";
+            attemptNumber: number;
+            connection: string;
+            cost: number;
+            isRoot: boolean;
+        } | {
+            type: "constraints-propagated";
+            attemptNumber: number;
+            connectionConstraints: {
+                connection: string;
+                constraints: Record<string, Record<string, unknown> | null>;
+                constraintCosts: Record<string, {
+                    limit?: number | undefined;
+                    startupCost: number;
+                    scanEst: number;
+                    cost: number;
+                    returnedRows: number;
+                    selectivity: number;
+                }>;
+            }[];
+        } | {
+            type: "plan-complete";
+            attemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            type: "plan-failed";
+            attemptNumber: number;
+            reason: string;
+        } | {
+            type: "best-plan-selected";
+            bestAttemptNumber: number;
+            totalCost: number;
+            flipPattern: number;
+            joinStates: {
+                join: string;
+                type: "semi" | "flipped" | "unflippable";
+            }[];
+        } | {
+            attemptNumber?: number | undefined;
+            filters?: import("./ast.ts").Condition | undefined;
+            ordering?: readonly (readonly [string, "desc" | "asc"])[] | undefined;
+            joinType?: "semi" | "flipped" | "unflippable" | undefined;
+            type: "node-cost";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            downstreamChildSelectivity: number;
+            costEstimate: {
+                limit?: number | undefined;
+                startupCost: number;
+                scanEst: number;
+                cost: number;
+                returnedRows: number;
+                selectivity: number;
+            };
+        } | {
+            attemptNumber?: number | undefined;
+            constraint?: Record<string, unknown> | null | undefined;
+            type: "node-constraint";
+            nodeType: "join" | "connection" | "fan-out" | "fan-in" | "terminus";
+            node: string;
+            branchPattern: number[];
+            from: string;
+        })[]>;
     }, undefined>;
 }, undefined>, v.ObjectType<Omit<{
     id: v.Type<string>;
-}, "op" | "value"> & {
+}, "value" | "op"> & {
     op: v.Type<"error">;
     value: v.Type<string>;
 }, undefined>]>]>;

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

@@ -1 +1 @@
-{"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,QAAA,MAAM,mBAAmB;;;aAGvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;aAgBzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,8BAA8B;;;;;aAGzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;aAGxC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;aAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAOjC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"inspect-down.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,QAAA,MAAM,mBAAmB;;;aAGvB,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;aAgBzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAMpE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;;;;aAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,wBAAwB;;;;;aAGnC,CAAC;AAEH,eAAO,MAAM,8BAA8B;;;;;aAGzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAC5C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAGxC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;aAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAOjC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGnC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

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

@@ -1,59 +1,77 @@
 import { jsonSchema } from "../../shared/src/json-schema.js";
 import { tdigestSchema } from "../../shared/src/tdigest-schema.js";
-import * as v from "../../shared/src/valita.js";
+import { readonlyArray } from "../../shared/src/valita.js";
 import { analyzeQueryResultSchema } from "./analyze-query-result.js";
 import { astSchema } from "./ast.js";
-const serverMetricsSchema = v.object({
-    'query-materialization-server': tdigestSchema,
-    'query-update-server': tdigestSchema,
-});
-const inspectQueryRowSchema = v.object({
-    clientID: v.string(),
-    queryID: v.string(),
-    // This is the server return AST for custom queries
-    // TODO: Return server generated AST
-    ast: astSchema.nullable(),
-    // not null for custom queries
-    name: v.string().nullable(),
-    // not null for custom queries
-    args: v.readonlyArray(jsonSchema).nullable(),
-    got: v.boolean(),
-    deleted: v.boolean(),
-    ttl: v.number(),
-    inactivatedAt: v.number().nullable(),
-    rowCount: v.number(),
-    metrics: serverMetricsSchema.nullable().optional(),
-});
-const inspectBaseDownSchema = v.object({
-    id: v.string(),
-});
-export const inspectQueriesDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('queries'),
-    value: v.array(inspectQueryRowSchema),
-});
-export const inspectMetricsDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('metrics'),
-    value: serverMetricsSchema,
-});
-export const inspectVersionDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('version'),
-    value: v.string(),
-});
-export const inspectAuthenticatedDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('authenticated'),
-    value: v.boolean(),
-});
-export const inspectAnalyzeQueryDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('analyze-query'),
-    value: analyzeQueryResultSchema,
-});
-export const inspectErrorDownSchema = inspectBaseDownSchema.extend({
-    op: v.literal('error'),
-    value: v.string(),
-});
-export const inspectDownBodySchema = v.union(inspectQueriesDownSchema, inspectMetricsDownSchema, inspectVersionDownSchema, inspectAuthenticatedDownSchema, inspectAnalyzeQueryDownSchema, inspectErrorDownSchema);
-export const inspectDownMessageSchema = v.tuple([
-    v.literal('inspect'),
-    inspectDownBodySchema,
+import { object, number, boolean, string, array, literal, union, tuple } from "@badrap/valita";
+const serverMetricsSchema = object({
+  "query-materialization-server": tdigestSchema,
+  "query-update-server": tdigestSchema
+});
+const inspectQueryRowSchema = object({
+  clientID: string(),
+  queryID: string(),
+  // This is the server return AST for custom queries
+  // TODO: Return server generated AST
+  ast: astSchema.nullable(),
+  // not null for custom queries
+  name: string().nullable(),
+  // not null for custom queries
+  args: readonlyArray(jsonSchema).nullable(),
+  got: boolean(),
+  deleted: boolean(),
+  ttl: number(),
+  inactivatedAt: number().nullable(),
+  rowCount: number(),
+  metrics: serverMetricsSchema.nullable().optional()
+});
+const inspectBaseDownSchema = object({
+  id: string()
+});
+const inspectQueriesDownSchema = inspectBaseDownSchema.extend({
+  op: literal("queries"),
+  value: array(inspectQueryRowSchema)
+});
+const inspectMetricsDownSchema = inspectBaseDownSchema.extend({
+  op: literal("metrics"),
+  value: serverMetricsSchema
+});
+const inspectVersionDownSchema = inspectBaseDownSchema.extend({
+  op: literal("version"),
+  value: string()
+});
+const inspectAuthenticatedDownSchema = inspectBaseDownSchema.extend({
+  op: literal("authenticated"),
+  value: boolean()
+});
+const inspectAnalyzeQueryDownSchema = inspectBaseDownSchema.extend({
+  op: literal("analyze-query"),
+  value: analyzeQueryResultSchema
+});
+const inspectErrorDownSchema = inspectBaseDownSchema.extend({
+  op: literal("error"),
+  value: string()
+});
+const inspectDownBodySchema = union(
+  inspectQueriesDownSchema,
+  inspectMetricsDownSchema,
+  inspectVersionDownSchema,
+  inspectAuthenticatedDownSchema,
+  inspectAnalyzeQueryDownSchema,
+  inspectErrorDownSchema
+);
+const inspectDownMessageSchema = tuple([
+  literal("inspect"),
+  inspectDownBodySchema
 ]);
-//# sourceMappingURL=inspect-down.js.map
+export {
+  inspectAnalyzeQueryDownSchema,
+  inspectAuthenticatedDownSchema,
+  inspectDownBodySchema,
+  inspectDownMessageSchema,
+  inspectErrorDownSchema,
+  inspectMetricsDownSchema,
+  inspectQueriesDownSchema,
+  inspectVersionDownSchema
+};
+//# sourceMappingURL=inspect-down.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"inspect-down.js","sourceRoot":"","sources":["../../../../zero-protocol/src/inspect-down.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inspect-down.js","sources":["../../../../zero-protocol/src/inspect-down.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport {tdigestSchema} from '../../shared/src/tdigest-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {analyzeQueryResultSchema} from './analyze-query-result.ts';\nimport {astSchema} from './ast.ts';\n\nconst serverMetricsSchema = v.object({\n  'query-materialization-server': tdigestSchema,\n  'query-update-server': tdigestSchema,\n});\n\nexport type ServerMetrics = v.Infer<typeof serverMetricsSchema>;\n\nconst inspectQueryRowSchema = v.object({\n  clientID: v.string(),\n  queryID: v.string(),\n  // This is the server return AST for custom queries\n  // TODO: Return server generated AST\n  ast: astSchema.nullable(),\n  // not null for custom queries\n  name: v.string().nullable(),\n  // not null for custom queries\n  args: v.readonlyArray(jsonSchema).nullable(),\n  got: v.boolean(),\n  deleted: v.boolean(),\n  ttl: v.number(),\n  inactivatedAt: v.number().nullable(),\n  rowCount: v.number(),\n  metrics: serverMetricsSchema.nullable().optional(),\n});\n\nexport type InspectQueryRow = v.Infer<typeof inspectQueryRowSchema>;\n\nconst inspectBaseDownSchema = v.object({\n  id: v.string(),\n});\n\nexport const inspectQueriesDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('queries'),\n  value: v.array(inspectQueryRowSchema),\n});\n\nexport type InspectQueriesDown = v.Infer<typeof inspectQueriesDownSchema>;\n\nexport const inspectMetricsDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('metrics'),\n  value: serverMetricsSchema,\n});\n\nexport type InspectMetricsDown = v.Infer<typeof inspectMetricsDownSchema>;\n\nexport const inspectVersionDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('version'),\n  value: v.string(),\n});\n\nexport const inspectAuthenticatedDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('authenticated'),\n  value: v.boolean(),\n});\n\nexport type InspectAuthenticatedDown = v.Infer<\n  typeof inspectAuthenticatedDownSchema\n>;\n\nexport const inspectAnalyzeQueryDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('analyze-query'),\n  value: analyzeQueryResultSchema,\n});\n\nexport type InspectAnalyzeQueryDown = v.Infer<\n  typeof inspectAnalyzeQueryDownSchema\n>;\n\nexport const inspectErrorDownSchema = inspectBaseDownSchema.extend({\n  op: v.literal('error'),\n  value: v.string(),\n});\n\nexport type InspectErrorDown = v.Infer<typeof inspectErrorDownSchema>;\n\nexport const inspectDownBodySchema = v.union(\n  inspectQueriesDownSchema,\n  inspectMetricsDownSchema,\n  inspectVersionDownSchema,\n  inspectAuthenticatedDownSchema,\n  inspectAnalyzeQueryDownSchema,\n  inspectErrorDownSchema,\n);\n\nexport const inspectDownMessageSchema = v.tuple([\n  v.literal('inspect'),\n  inspectDownBodySchema,\n]);\n\nexport type InspectDownMessage = v.Infer<typeof inspectDownMessageSchema>;\n\nexport type InspectDownBody = v.Infer<typeof inspectDownBodySchema>;\n"],"names":["v.object","v.string","v.readonlyArray","v.boolean","v.number","v.literal","v.array","v.union","v.tuple"],"mappings":";;;;;;AAMA,MAAM,sBAAsBA,OAAS;AAAA,EACnC,gCAAgC;AAAA,EAChC,uBAAuB;AACzB,CAAC;AAID,MAAM,wBAAwBA,OAAS;AAAA,EACrC,UAAUC,OAAE;AAAA,EACZ,SAASA,OAAE;AAAA;AAAA;AAAA,EAGX,KAAK,UAAU,SAAA;AAAA;AAAA,EAEf,MAAMA,OAAE,EAAS,SAAA;AAAA;AAAA,EAEjB,MAAMC,cAAgB,UAAU,EAAE,SAAA;AAAA,EAClC,KAAKC,QAAE;AAAA,EACP,SAASA,QAAE;AAAA,EACX,KAAKC,OAAE;AAAA,EACP,eAAeA,OAAE,EAAS,SAAA;AAAA,EAC1B,UAAUA,OAAE;AAAA,EACZ,SAAS,oBAAoB,SAAA,EAAW,SAAA;AAC1C,CAAC;AAID,MAAM,wBAAwBJ,OAAS;AAAA,EACrC,IAAIC,OAAE;AACR,CAAC;AAEM,MAAM,2BAA2B,sBAAsB,OAAO;AAAA,EACnE,IAAII,QAAU,SAAS;AAAA,EACvB,OAAOC,MAAQ,qBAAqB;AACtC,CAAC;AAIM,MAAM,2BAA2B,sBAAsB,OAAO;AAAA,EACnE,IAAID,QAAU,SAAS;AAAA,EACvB,OAAO;AACT,CAAC;AAIM,MAAM,2BAA2B,sBAAsB,OAAO;AAAA,EACnE,IAAIA,QAAU,SAAS;AAAA,EACvB,OAAOJ,OAAE;AACX,CAAC;AAEM,MAAM,iCAAiC,sBAAsB,OAAO;AAAA,EACzE,IAAII,QAAU,eAAe;AAAA,EAC7B,OAAOF,QAAE;AACX,CAAC;AAMM,MAAM,gCAAgC,sBAAsB,OAAO;AAAA,EACxE,IAAIE,QAAU,eAAe;AAAA,EAC7B,OAAO;AACT,CAAC;AAMM,MAAM,yBAAyB,sBAAsB,OAAO;AAAA,EACjE,IAAIA,QAAU,OAAO;AAAA,EACrB,OAAOJ,OAAE;AACX,CAAC;AAIM,MAAM,wBAAwBM;AAAAA,EACnC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,2BAA2BC,MAAQ;AAAA,EAC9CH,QAAU,SAAS;AAAA,EACnB;AACF,CAAC;"}