@rocicorp/zero 0.25.0 → 0.26.0-canary.0

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

@@ -1 +1 @@
-{"version":3,"file":"protocol-version.js","sourceRoot":"","sources":["../../../../zero-protocol/src/protocol-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,WAAW;AACX,yDAAyD;AACzD,yDAAyD;AACzD,wEAAwE;AACxE,mDAAmD;AACnD,6CAA6C;AAC7C,uHAAuH;AACvH,6FAA6F;AAC7F,yEAAyE;AACzE,sFAAsF;AACtF,4FAA4F;AAC5F,8EAA8E;AAC9E,6EAA6E;AAC7E,sDAAsD;AACtD,oIAAoI;AACpI,oFAAoF;AACpF,qDAAqD;AACrD,8DAA8D;AAC9D,4EAA4E;AAC5E,8EAA8E;AAC9E,4CAA4C;AAC5C,iDAAiD;AACjD,+DAA+D;AAC/D,uEAAuE;AACvE,iFAAiF;AACjF,qEAAqE;AACrE,yDAAyD;AACzD,2FAA2F;AAC3F,0GAA0G;AAC1G,sFAAsF;AACtF,4DAA4D;AAC5D,sEAAsE;AACtE,yFAAyF;AACzF,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAEnC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAC;AAErD,MAAM,CAAC,kCAAkC,GAAG,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"protocol-version.js","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)\nexport const PROTOCOL_VERSION = 44;\n\n/**\n * The minimum server-supported sync protocol version (i.e. the version\n * declared in the \"/sync/v{#}/connect\" URL). The contract for\n * backwards compatibility is that a `zero-cache` supports the current\n * `PROTOCOL_VERSION` and at least the previous one (i.e. `PROTOCOL_VERSION - 1`)\n * if not earlier ones as well. This corresponds to supporting clients running\n * the current release and the previous (major) release. Any client connections\n * from protocol versions before `MIN_SERVER_SUPPORTED_PROTOCOL_VERSION` are\n * closed with a `VersionNotSupported` error.\n */\nexport const MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 30;\n\nassert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);\n"],"names":[],"mappings":";AAoDO,MAAM,mBAAmB;AAYzB,MAAM,qCAAqC;AAElD,OAAO,qCAAqC,gBAAgB;"}

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

@@ -1,24 +1,31 @@
-import * as v from "../../shared/src/valita.js";
+import "../../shared/src/valita.js";
 import { nullableVersionSchema, versionSchema } from "./version.js";
-export const pullRequestBodySchema = v.object({
-    clientGroupID: v.string(),
-    cookie: nullableVersionSchema,
-    requestID: v.string(),
+import { object, string, record, number, tuple, literal } from "@badrap/valita";
+const pullRequestBodySchema = object({
+  clientGroupID: string(),
+  cookie: nullableVersionSchema,
+  requestID: string()
 });
-export const pullResponseBodySchema = v.object({
-    cookie: versionSchema,
-    // Matches pullRequestBodySchema requestID that initiated this response
-    requestID: v.string(),
-    lastMutationIDChanges: v.record(v.number()),
-    // Pull is currently only used for mutation recovery which does not use
-    // the patch so we save work by not computing the patch.
+const pullResponseBodySchema = object({
+  cookie: versionSchema,
+  // Matches pullRequestBodySchema requestID that initiated this response
+  requestID: string(),
+  lastMutationIDChanges: record(number())
+  // Pull is currently only used for mutation recovery which does not use
+  // the patch so we save work by not computing the patch.
 });
-export const pullRequestMessageSchema = v.tuple([
-    v.literal('pull'),
-    pullRequestBodySchema,
+const pullRequestMessageSchema = tuple([
+  literal("pull"),
+  pullRequestBodySchema
 ]);
-export const pullResponseMessageSchema = v.tuple([
-    v.literal('pull'),
-    pullResponseBodySchema,
+const pullResponseMessageSchema = tuple([
+  literal("pull"),
+  pullResponseBodySchema
 ]);
-//# sourceMappingURL=pull.js.map
+export {
+  pullRequestBodySchema,
+  pullRequestMessageSchema,
+  pullResponseBodySchema,
+  pullResponseMessageSchema
+};
+//# sourceMappingURL=pull.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../zero-protocol/src/pull.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,qBAAqB,EAAE,aAAa,EAAC,MAAM,cAAc,CAAC;AAElE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,MAAM,EAAE,aAAa;IACrB,uEAAuE;IACvE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3C,uEAAuE;IACvE,wDAAwD;CACzD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC9C,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjB,qBAAqB;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC;IAC/C,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjB,sBAAsB;CACvB,CAAC,CAAC"}
+{"version":3,"file":"pull.js","sources":["../../../../zero-protocol/src/pull.ts"],"sourcesContent":["import * as v from '../../shared/src/valita.ts';\nimport {nullableVersionSchema, versionSchema} from './version.ts';\n\nexport const pullRequestBodySchema = v.object({\n  clientGroupID: v.string(),\n  cookie: nullableVersionSchema,\n  requestID: v.string(),\n});\n\nexport const pullResponseBodySchema = v.object({\n  cookie: versionSchema,\n  // Matches pullRequestBodySchema requestID that initiated this response\n  requestID: v.string(),\n  lastMutationIDChanges: v.record(v.number()),\n  // Pull is currently only used for mutation recovery which does not use\n  // the patch so we save work by not computing the patch.\n});\n\nexport const pullRequestMessageSchema = v.tuple([\n  v.literal('pull'),\n  pullRequestBodySchema,\n]);\n\nexport const pullResponseMessageSchema = v.tuple([\n  v.literal('pull'),\n  pullResponseBodySchema,\n]);\n\nexport type PullRequestBody = v.Infer<typeof pullRequestBodySchema>;\nexport type PullResponseBody = v.Infer<typeof pullResponseBodySchema>;\n\nexport type PullRequestMessage = v.Infer<typeof pullRequestMessageSchema>;\nexport type PullResponseMessage = v.Infer<typeof pullResponseMessageSchema>;\n"],"names":["v.object","v.string","v.record","v.number","v.tuple","v.literal"],"mappings":";;;AAGO,MAAM,wBAAwBA,OAAS;AAAA,EAC5C,eAAeC,OAAE;AAAA,EACjB,QAAQ;AAAA,EACR,WAAWA,OAAE;AACf,CAAC;AAEM,MAAM,yBAAyBD,OAAS;AAAA,EAC7C,QAAQ;AAAA;AAAA,EAER,WAAWC,OAAE;AAAA,EACb,uBAAuBC,OAASC,QAAU;AAAA;AAAA;AAG5C,CAAC;AAEM,MAAM,2BAA2BC,MAAQ;AAAA,EAC9CC,QAAU,MAAM;AAAA,EAChB;AACF,CAAC;AAEM,MAAM,4BAA4BD,MAAQ;AAAA,EAC/CC,QAAU,MAAM;AAAA,EAChB;AACF,CAAC;"}

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

@@ -461,9 +461,9 @@ export declare const pushResponseSchema: v.UnionType<[v.UnionType<[v.ObjectType<
         clientID: v.Type<string>;
     }, undefined>>;
     message: v.Type<string>;
-}, "origin" | "reason"> & {
+}, "reason" | "origin"> & {
     origin: v.Type<"server">;
-    reason: v.Type<"database" | "parse" | "oooMutation" | "unsupportedPushVersion" | "internal">;
+    reason: v.Type<"parse" | "database" | "internal" | "oooMutation" | "unsupportedPushVersion">;
 }, undefined>, v.ObjectType<Omit<{
     kind: v.Type<"PushFailed">;
     details: v.Optional<import("../../shared/src/json.ts").ReadonlyJSONValue>;
@@ -472,7 +472,7 @@ export declare const pushResponseSchema: v.UnionType<[v.UnionType<[v.ObjectType<
         clientID: v.Type<string>;
     }, undefined>>;
     message: v.Type<string>;
-}, "status" | "origin" | "reason" | "bodyPreview"> & {
+}, "reason" | "status" | "origin" | "bodyPreview"> & {
     origin: v.Type<"zeroCache">;
     reason: v.Type<"http">;
     status: v.Type<number>;
@@ -485,7 +485,7 @@ export declare const pushResponseSchema: v.UnionType<[v.UnionType<[v.ObjectType<
         clientID: v.Type<string>;
     }, undefined>>;
     message: v.Type<string>;
-}, "origin" | "reason"> & {
+}, "reason" | "origin"> & {
     origin: v.Type<"zeroCache">;
     reason: v.Type<"parse" | "internal" | "timeout">;
 }, undefined>]>]>;

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

@@ -1,185 +1,188 @@
 import { jsonSchema } from "../../shared/src/json-schema.js";
-import * as v from "../../shared/src/valita.js";
+import "../../shared/src/valita.js";
 import { rowSchema } from "./data.js";
 import { pushFailedBodySchema } from "./error.js";
 import { mutationIDSchema } from "./mutation-id.js";
-import * as MutationType from "./mutation-type-enum.js";
+import { CRUD, Custom } from "./mutation-type-enum.js";
 import { primaryKeySchema, primaryKeyValueRecordSchema } from "./primary-key.js";
-// NOTE! If you change this name you must also change the
-// string in `replicache-impl.ts` But CRUD mutators are being
-// deleted soon so this should not happen.
-export const CRUD_MUTATION_NAME = '_zero_crud';
-/**
- * Inserts if entity with id does not already exist.
- */
-const insertOpSchema = v.object({
-    op: v.literal('insert'),
-    tableName: v.string(),
-    primaryKey: primaryKeySchema,
-    value: rowSchema,
-});
-/**
- * Upsert semantics. Inserts if entity with id does not already exist,
- * otherwise updates existing entity with id.
- */
-const upsertOpSchema = v.object({
-    op: v.literal('upsert'),
-    tableName: v.string(),
-    primaryKey: primaryKeySchema,
-    value: rowSchema,
-});
-/**
- * Updates if entity with id exists, otherwise does nothing.
- */
-const updateOpSchema = v.object({
-    op: v.literal('update'),
-    tableName: v.string(),
-    primaryKey: primaryKeySchema,
-    // Partial value with at least the primary key fields
-    value: rowSchema,
-});
-/**
- * Deletes entity with id if it exists, otherwise does nothing.
- */
-const deleteOpSchema = v.object({
-    op: v.literal('delete'),
-    tableName: v.string(),
-    primaryKey: primaryKeySchema,
-    // Partial value representing the primary key
-    value: primaryKeyValueRecordSchema,
-});
-const crudOpSchema = v.union(insertOpSchema, upsertOpSchema, updateOpSchema, deleteOpSchema);
-const crudArgSchema = v.object({
-    ops: v.array(crudOpSchema),
-});
-const crudArgsSchema = v.tuple([crudArgSchema]);
-export const crudMutationSchema = v.object({
-    type: v.literal(MutationType.CRUD),
-    id: v.number(),
-    clientID: v.string(),
-    name: v.literal(CRUD_MUTATION_NAME),
-    args: crudArgsSchema,
-    timestamp: v.number(),
-});
-export const customMutationSchema = v.object({
-    type: v.literal(MutationType.Custom),
-    id: v.number(),
-    clientID: v.string(),
-    name: v.string(),
-    args: v.array(jsonSchema),
-    timestamp: v.number(),
-});
-export const mutationSchema = v.union(crudMutationSchema, customMutationSchema);
-export const pushBodySchema = v.object({
-    clientGroupID: v.string(),
-    mutations: v.array(mutationSchema),
-    pushVersion: v.number(),
-    // For legacy (CRUD) mutations, the schema is tied to the client group /
-    // sync connection. For custom mutations, schema versioning is delegated
-    // to the custom protocol / api-server.
-    schemaVersion: v.number().optional(),
-    timestamp: v.number(),
-    requestID: v.string(),
-});
-export const pushMessageSchema = v.tuple([v.literal('push'), pushBodySchema]);
-const appErrorSchema = v.object({
-    error: v.literal('app'),
-    // The user can return any additional data here
-    message: v.string().optional(),
-    details: jsonSchema.optional(),
-});
-const zeroErrorSchema = v.object({
-    error: v.union(
+import { object, string, literal, union, array, tuple, number } from "@badrap/valita";
+const CRUD_MUTATION_NAME = "_zero_crud";
+const insertOpSchema = object({
+  op: literal("insert"),
+  tableName: string(),
+  primaryKey: primaryKeySchema,
+  value: rowSchema
+});
+const upsertOpSchema = object({
+  op: literal("upsert"),
+  tableName: string(),
+  primaryKey: primaryKeySchema,
+  value: rowSchema
+});
+const updateOpSchema = object({
+  op: literal("update"),
+  tableName: string(),
+  primaryKey: primaryKeySchema,
+  // Partial value with at least the primary key fields
+  value: rowSchema
+});
+const deleteOpSchema = object({
+  op: literal("delete"),
+  tableName: string(),
+  primaryKey: primaryKeySchema,
+  // Partial value representing the primary key
+  value: primaryKeyValueRecordSchema
+});
+const crudOpSchema = union(
+  insertOpSchema,
+  upsertOpSchema,
+  updateOpSchema,
+  deleteOpSchema
+);
+const crudArgSchema = object({
+  ops: array(crudOpSchema)
+});
+const crudArgsSchema = tuple([crudArgSchema]);
+const crudMutationSchema = object({
+  type: literal(CRUD),
+  id: number(),
+  clientID: string(),
+  name: literal(CRUD_MUTATION_NAME),
+  args: crudArgsSchema,
+  timestamp: number()
+});
+const customMutationSchema = object({
+  type: literal(Custom),
+  id: number(),
+  clientID: string(),
+  name: string(),
+  args: array(jsonSchema),
+  timestamp: number()
+});
+const mutationSchema = union(crudMutationSchema, customMutationSchema);
+const pushBodySchema = object({
+  clientGroupID: string(),
+  mutations: array(mutationSchema),
+  pushVersion: number(),
+  // For legacy (CRUD) mutations, the schema is tied to the client group /
+  // sync connection. For custom mutations, schema versioning is delegated
+  // to the custom protocol / api-server.
+  schemaVersion: number().optional(),
+  timestamp: number(),
+  requestID: string()
+});
+const pushMessageSchema = tuple([literal("push"), pushBodySchema]);
+const appErrorSchema = object({
+  error: literal("app"),
+  // The user can return any additional data here
+  message: string().optional(),
+  details: jsonSchema.optional()
+});
+const zeroErrorSchema = object({
+  error: union(
     /** @deprecated push oooMutation errors are now represented as ['error', { ... }] messages */
-    v.literal('oooMutation'), v.literal('alreadyProcessed')),
-    details: jsonSchema.optional(),
-});
-const mutationOkSchema = v.object({
-    // The user can return any additional data here
-    data: jsonSchema.optional(),
-});
-const mutationErrorSchema = v.union(appErrorSchema, zeroErrorSchema);
-export const mutationResultSchema = v.union(mutationOkSchema, mutationErrorSchema);
-export const mutationResponseSchema = v.object({
-    id: mutationIDSchema,
-    result: mutationResultSchema,
-});
-const pushOkSchema = v.object({
-    mutations: v.array(mutationResponseSchema),
-});
-/**
- * @deprecated push errors are now represented as ['error', { ... }] messages
- */
-const unsupportedPushVersionSchema = v.object({
-    /** @deprecated */
-    error: v.literal('unsupportedPushVersion'),
-    /** @deprecated */
-    mutationIDs: v.array(mutationIDSchema).optional(),
-});
-/**
- * @deprecated push errors are now represented as ['error', { ... }] messages
- */
-const unsupportedSchemaVersionSchema = v.object({
-    /** @deprecated */
-    error: v.literal('unsupportedSchemaVersion'),
-    /** @deprecated */
-    mutationIDs: v.array(mutationIDSchema).optional(),
-});
-/**
- * @deprecated push http errors are now represented as ['error', { ... }] messages
- */
-const httpErrorSchema = v.object({
-    /** @deprecated */
-    error: v.literal('http'),
-    /** @deprecated */
-    status: v.number(),
-    /** @deprecated */
-    details: v.string(),
-    /** @deprecated */
-    mutationIDs: v.array(mutationIDSchema).optional(),
-});
-/**
- * @deprecated push zero errors are now represented as ['error', { ... }] messages
- */
-const zeroPusherErrorSchema = v.object({
-    /** @deprecated */
-    error: v.literal('zeroPusher'),
-    /** @deprecated */
-    details: v.string(),
-    /** @deprecated */
-    mutationIDs: v.array(mutationIDSchema).optional(),
-});
-/**
- * @deprecated push errors are now represented as ['error', { ... }] messages
- */
-const pushErrorSchema = v.union(unsupportedPushVersionSchema, unsupportedSchemaVersionSchema, httpErrorSchema, zeroPusherErrorSchema);
-export const pushResponseBodySchema = v.union(pushOkSchema, pushErrorSchema);
-export const pushResponseSchema = v.union(pushResponseBodySchema, pushFailedBodySchema);
-export const pushResponseMessageSchema = v.tuple([
-    v.literal('pushResponse'),
-    pushResponseBodySchema,
+    literal("oooMutation"),
+    literal("alreadyProcessed")
+  ),
+  details: jsonSchema.optional()
+});
+const mutationOkSchema = object({
+  // The user can return any additional data here
+  data: jsonSchema.optional()
+});
+const mutationErrorSchema = union(appErrorSchema, zeroErrorSchema);
+const mutationResultSchema = union(
+  mutationOkSchema,
+  mutationErrorSchema
+);
+const mutationResponseSchema = object({
+  id: mutationIDSchema,
+  result: mutationResultSchema
+});
+const pushOkSchema = object({
+  mutations: array(mutationResponseSchema)
+});
+const unsupportedPushVersionSchema = object({
+  /** @deprecated */
+  error: literal("unsupportedPushVersion"),
+  /** @deprecated */
+  mutationIDs: array(mutationIDSchema).optional()
+});
+const unsupportedSchemaVersionSchema = object({
+  /** @deprecated */
+  error: literal("unsupportedSchemaVersion"),
+  /** @deprecated */
+  mutationIDs: array(mutationIDSchema).optional()
+});
+const httpErrorSchema = object({
+  /** @deprecated */
+  error: literal("http"),
+  /** @deprecated */
+  status: number(),
+  /** @deprecated */
+  details: string(),
+  /** @deprecated */
+  mutationIDs: array(mutationIDSchema).optional()
+});
+const zeroPusherErrorSchema = object({
+  /** @deprecated */
+  error: literal("zeroPusher"),
+  /** @deprecated */
+  details: string(),
+  /** @deprecated */
+  mutationIDs: array(mutationIDSchema).optional()
+});
+const pushErrorSchema = union(
+  unsupportedPushVersionSchema,
+  unsupportedSchemaVersionSchema,
+  httpErrorSchema,
+  zeroPusherErrorSchema
+);
+const pushResponseBodySchema = union(pushOkSchema, pushErrorSchema);
+const pushResponseSchema = union(
+  pushResponseBodySchema,
+  pushFailedBodySchema
+);
+const pushResponseMessageSchema = tuple([
+  literal("pushResponse"),
+  pushResponseBodySchema
 ]);
-export const ackMutationResponsesMessageSchema = v.tuple([
-    v.literal('ackMutationResponses'),
-    mutationIDSchema,
+const ackMutationResponsesMessageSchema = tuple([
+  literal("ackMutationResponses"),
+  mutationIDSchema
 ]);
-/**
- * The schema for the querystring parameters of the custom push endpoint.
- */
-export const pushParamsSchema = v.object({
-    schema: v.string(),
-    appID: v.string(),
-});
-export function mapCRUD(arg, map) {
-    return {
-        ops: arg.ops.map(({ op, tableName, primaryKey, value }) => ({
-            op,
-            tableName: map.tableName(tableName),
-            primaryKey: map.columns(tableName, primaryKey),
-            value: map.row(tableName, value),
-            // The cast is necessary because ts objects to the `value` field
-            // for "delete" ops being different.
-        })),
-    };
+const pushParamsSchema = object({
+  schema: string(),
+  appID: string()
+});
+function mapCRUD(arg, map) {
+  return {
+    ops: arg.ops.map(
+      ({ op, tableName, primaryKey, value }) => ({
+        op,
+        tableName: map.tableName(tableName),
+        primaryKey: map.columns(tableName, primaryKey),
+        value: map.row(tableName, value)
+        // The cast is necessary because ts objects to the `value` field
+        // for "delete" ops being different.
+      })
+    )
+  };
 }
-//# sourceMappingURL=push.js.map
+export {
+  CRUD_MUTATION_NAME,
+  ackMutationResponsesMessageSchema,
+  crudMutationSchema,
+  customMutationSchema,
+  mapCRUD,
+  mutationResponseSchema,
+  mutationResultSchema,
+  mutationSchema,
+  pushBodySchema,
+  pushMessageSchema,
+  pushParamsSchema,
+  pushResponseBodySchema,
+  pushResponseMessageSchema,
+  pushResponseSchema
+};
+//# sourceMappingURL=push.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../zero-protocol/src/push.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push.js","sources":["../../../../zero-protocol/src/push.ts"],"sourcesContent":["import {jsonSchema} from '../../shared/src/json-schema.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport type {NameMapper} from '../../zero-types/src/name-mapper.ts';\nimport {rowSchema} from './data.ts';\nimport {pushFailedBodySchema} from './error.ts';\nimport {mutationIDSchema} from './mutation-id.ts';\nimport * as MutationType from './mutation-type-enum.ts';\nimport {primaryKeySchema, primaryKeyValueRecordSchema} from './primary-key.ts';\n\n// NOTE! If you change this name you must also change the\n// string in `replicache-impl.ts` But CRUD mutators are being\n// deleted soon so this should not happen.\nexport const CRUD_MUTATION_NAME = '_zero_crud';\n\n/**\n * Inserts if entity with id does not already exist.\n */\nconst insertOpSchema = v.object({\n  op: v.literal('insert'),\n  tableName: v.string(),\n  primaryKey: primaryKeySchema,\n  value: rowSchema,\n});\n\n/**\n * Upsert semantics. Inserts if entity with id does not already exist,\n * otherwise updates existing entity with id.\n */\nconst upsertOpSchema = v.object({\n  op: v.literal('upsert'),\n  tableName: v.string(),\n  primaryKey: primaryKeySchema,\n  value: rowSchema,\n});\n\n/**\n * Updates if entity with id exists, otherwise does nothing.\n */\nconst updateOpSchema = v.object({\n  op: v.literal('update'),\n  tableName: v.string(),\n  primaryKey: primaryKeySchema,\n  // Partial value with at least the primary key fields\n  value: rowSchema,\n});\n\n/**\n * Deletes entity with id if it exists, otherwise does nothing.\n */\nconst deleteOpSchema = v.object({\n  op: v.literal('delete'),\n  tableName: v.string(),\n  primaryKey: primaryKeySchema,\n  // Partial value representing the primary key\n  value: primaryKeyValueRecordSchema,\n});\n\nconst crudOpSchema = v.union(\n  insertOpSchema,\n  upsertOpSchema,\n  updateOpSchema,\n  deleteOpSchema,\n);\n\nconst crudArgSchema = v.object({\n  ops: v.array(crudOpSchema),\n});\n\nconst crudArgsSchema = v.tuple([crudArgSchema]);\n\nexport const crudMutationSchema = v.object({\n  type: v.literal(MutationType.CRUD),\n  id: v.number(),\n  clientID: v.string(),\n  name: v.literal(CRUD_MUTATION_NAME),\n  args: crudArgsSchema,\n  timestamp: v.number(),\n});\n\nexport const customMutationSchema = v.object({\n  type: v.literal(MutationType.Custom),\n  id: v.number(),\n  clientID: v.string(),\n  name: v.string(),\n  args: v.array(jsonSchema),\n  timestamp: v.number(),\n});\n\nexport const mutationSchema = v.union(crudMutationSchema, customMutationSchema);\n\nexport const pushBodySchema = v.object({\n  clientGroupID: v.string(),\n  mutations: v.array(mutationSchema),\n  pushVersion: v.number(),\n  // For legacy (CRUD) mutations, the schema is tied to the client group /\n  // sync connection. For custom mutations, schema versioning is delegated\n  // to the custom protocol / api-server.\n  schemaVersion: v.number().optional(),\n  timestamp: v.number(),\n  requestID: v.string(),\n});\n\nexport const pushMessageSchema = v.tuple([v.literal('push'), pushBodySchema]);\n\nconst appErrorSchema = v.object({\n  error: v.literal('app'),\n  // The user can return any additional data here\n  message: v.string().optional(),\n  details: jsonSchema.optional(),\n});\nconst zeroErrorSchema = v.object({\n  error: v.union(\n    /** @deprecated push oooMutation errors are now represented as ['error', { ... }] messages */\n    v.literal('oooMutation'),\n    v.literal('alreadyProcessed'),\n  ),\n  details: jsonSchema.optional(),\n});\n\nconst mutationOkSchema = v.object({\n  // The user can return any additional data here\n  data: jsonSchema.optional(),\n});\nconst mutationErrorSchema = v.union(appErrorSchema, zeroErrorSchema);\n\nexport const mutationResultSchema = v.union(\n  mutationOkSchema,\n  mutationErrorSchema,\n);\n\nexport const mutationResponseSchema = v.object({\n  id: mutationIDSchema,\n  result: mutationResultSchema,\n});\n\nconst pushOkSchema = v.object({\n  mutations: v.array(mutationResponseSchema),\n});\n\n/**\n * @deprecated push errors are now represented as ['error', { ... }] messages\n */\nconst unsupportedPushVersionSchema = v.object({\n  /** @deprecated */\n  error: v.literal('unsupportedPushVersion'),\n  /** @deprecated */\n  mutationIDs: v.array(mutationIDSchema).optional(),\n});\n/**\n * @deprecated push errors are now represented as ['error', { ... }] messages\n */\nconst unsupportedSchemaVersionSchema = v.object({\n  /** @deprecated */\n  error: v.literal('unsupportedSchemaVersion'),\n  /** @deprecated */\n  mutationIDs: v.array(mutationIDSchema).optional(),\n});\n/**\n * @deprecated push http errors are now represented as ['error', { ... }] messages\n */\nconst httpErrorSchema = v.object({\n  /** @deprecated */\n  error: v.literal('http'),\n  /** @deprecated */\n  status: v.number(),\n  /** @deprecated */\n  details: v.string(),\n  /** @deprecated */\n  mutationIDs: v.array(mutationIDSchema).optional(),\n});\n/**\n * @deprecated push zero errors are now represented as ['error', { ... }] messages\n */\nconst zeroPusherErrorSchema = v.object({\n  /** @deprecated */\n  error: v.literal('zeroPusher'),\n  /** @deprecated */\n  details: v.string(),\n  /** @deprecated */\n  mutationIDs: v.array(mutationIDSchema).optional(),\n});\n/**\n * @deprecated push errors are now represented as ['error', { ... }] messages\n */\nconst pushErrorSchema = v.union(\n  unsupportedPushVersionSchema,\n  unsupportedSchemaVersionSchema,\n  httpErrorSchema,\n  zeroPusherErrorSchema,\n);\n\nexport const pushResponseBodySchema = v.union(pushOkSchema, pushErrorSchema);\n\nexport const pushResponseSchema = v.union(\n  pushResponseBodySchema,\n  pushFailedBodySchema,\n);\nexport const pushResponseMessageSchema = v.tuple([\n  v.literal('pushResponse'),\n  pushResponseBodySchema,\n]);\n\nexport const ackMutationResponsesMessageSchema = v.tuple([\n  v.literal('ackMutationResponses'),\n  mutationIDSchema,\n]);\n\n/**\n * The schema for the querystring parameters of the custom push endpoint.\n */\nexport const pushParamsSchema = v.object({\n  schema: v.string(),\n  appID: v.string(),\n});\n\nexport type InsertOp = v.Infer<typeof insertOpSchema>;\nexport type UpsertOp = v.Infer<typeof upsertOpSchema>;\nexport type UpdateOp = v.Infer<typeof updateOpSchema>;\nexport type DeleteOp = v.Infer<typeof deleteOpSchema>;\nexport type CRUDOp = v.Infer<typeof crudOpSchema>;\nexport type CRUDOpKind = CRUDOp['op'];\nexport type CRUDMutationArg = v.Infer<typeof crudArgSchema>;\nexport type CRUDMutation = v.Infer<typeof crudMutationSchema>;\nexport type CustomMutation = v.Infer<typeof customMutationSchema>;\nexport type Mutation = v.Infer<typeof mutationSchema>;\nexport type PushBody = v.Infer<typeof pushBodySchema>;\nexport type PushMessage = v.Infer<typeof pushMessageSchema>;\nexport type PushResponseBody = v.Infer<typeof pushResponseBodySchema>;\nexport type PushResponse = v.Infer<typeof pushResponseSchema>;\nexport type PushResponseMessage = v.Infer<typeof pushResponseMessageSchema>;\nexport type MutationResponse = v.Infer<typeof mutationResponseSchema>;\nexport type MutationOk = v.Infer<typeof mutationOkSchema>;\nexport type MutationError = v.Infer<typeof mutationErrorSchema>;\n/**\n * @deprecated push errors are now represented as ['error', { ... }] messages\n */\nexport type PushError = v.Infer<typeof pushErrorSchema>;\nexport type PushOk = v.Infer<typeof pushOkSchema>;\nexport type MutationResult = v.Infer<typeof mutationResultSchema>;\nexport type AckMutationMessage = v.Infer<\n  typeof ackMutationResponsesMessageSchema\n>;\nexport type {MutationID} from './mutation-id.ts';\n\nexport function mapCRUD(\n  arg: CRUDMutationArg,\n  map: NameMapper,\n): CRUDMutationArg {\n  return {\n    ops: arg.ops.map(\n      ({op, tableName, primaryKey, value}) =>\n        ({\n          op,\n          tableName: map.tableName(tableName),\n          primaryKey: map.columns(tableName, primaryKey),\n          value: map.row(tableName, value),\n          // The cast is necessary because ts objects to the `value` field\n          // for \"delete\" ops being different.\n        }) as unknown as CRUDOp,\n    ),\n  };\n}\n"],"names":["v.object","v.literal","v.string","v.union","v.array","v.tuple","MutationType.CRUD","v.number","MutationType.Custom"],"mappings":"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"}

package/out/zero-protocol/src/queries-patch.d.ts

@@ -8,7 +8,7 @@ export declare const upPutOpSchema: v.ObjectType<Omit<{
     op: v.Type<"put">;
     hash: v.Type<string>;
     ttl: v.Optional<number>;
-}, "name" | "args" | "ast"> & {
+}, "name" | "ast" | "args"> & {
     ast: v.Optional<import("./ast.ts").AST>;
     name: v.Optional<string>;
     args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;
@@ -34,7 +34,7 @@ declare const upPatchOpSchema: v.UnionType<[v.ObjectType<Omit<{
     op: v.Type<"put">;
     hash: v.Type<string>;
     ttl: v.Optional<number>;
-}, "name" | "args" | "ast"> & {
+}, "name" | "ast" | "args"> & {
     ast: v.Optional<import("./ast.ts").AST>;
     name: v.Optional<string>;
     args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;
@@ -58,7 +58,7 @@ export declare const upQueriesPatchSchema: v.ArrayType<v.UnionType<[v.ObjectType
     op: v.Type<"put">;
     hash: v.Type<string>;
     ttl: v.Optional<number>;
-}, "name" | "args" | "ast"> & {
+}, "name" | "ast" | "args"> & {
     ast: v.Optional<import("./ast.ts").AST>;
     name: v.Optional<string>;
     args: v.Optional<readonly import("../../shared/src/json.ts").ReadonlyJSONValue[]>;

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

@@ -1,28 +1,35 @@
 import { jsonSchema } from "../../shared/src/json-schema.js";
-import * as v from "../../shared/src/valita.js";
+import { readonly } from "../../shared/src/valita.js";
 import { astSchema } from "./ast.js";
-export const putOpSchema = v.object({
-    op: v.literal('put'),
-    hash: v.string(),
-    ttl: v.number().optional(),
+import { object, number, string, literal, array, union } from "@badrap/valita";
+const putOpSchema = object({
+  op: literal("put"),
+  hash: string(),
+  ttl: number().optional()
 });
-export const upPutOpSchema = putOpSchema.extend({
-    // All fields are optional in this transitional period.
-    // - ast is filled in for client queries
-    // - name and args are filled in for custom queries
-    ast: astSchema.optional(),
-    name: v.string().optional(),
-    args: v.readonly(v.array(jsonSchema)).optional(),
+const upPutOpSchema = putOpSchema.extend({
+  // All fields are optional in this transitional period.
+  // - ast is filled in for client queries
+  // - name and args are filled in for custom queries
+  ast: astSchema.optional(),
+  name: string().optional(),
+  args: readonly(array(jsonSchema)).optional()
 });
-const delOpSchema = v.object({
-    op: v.literal('del'),
-    hash: v.string(),
+const delOpSchema = object({
+  op: literal("del"),
+  hash: string()
 });
-const clearOpSchema = v.object({
-    op: v.literal('clear'),
+const clearOpSchema = object({
+  op: literal("clear")
 });
-const patchOpSchema = v.union(putOpSchema, delOpSchema, clearOpSchema);
-const upPatchOpSchema = v.union(upPutOpSchema, delOpSchema, clearOpSchema);
-export const queriesPatchSchema = v.array(patchOpSchema);
-export const upQueriesPatchSchema = v.array(upPatchOpSchema);
-//# sourceMappingURL=queries-patch.js.map
+const patchOpSchema = union(putOpSchema, delOpSchema, clearOpSchema);
+const upPatchOpSchema = union(upPutOpSchema, delOpSchema, clearOpSchema);
+const queriesPatchSchema = array(patchOpSchema);
+const upQueriesPatchSchema = array(upPatchOpSchema);
+export {
+  putOpSchema,
+  queriesPatchSchema,
+  upPutOpSchema,
+  upQueriesPatchSchema
+};
+//# sourceMappingURL=queries-patch.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"queries-patch.js","sourceRoot":"","sources":["../../../../zero-protocol/src/queries-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC3B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC;IAC9C,uDAAuD;IACvD,wCAAwC;IACxC,mDAAmD;IACnD,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE;IACzB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AACvE,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"queries-patch.js","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"],"names":["v.object","v.literal","v.string","v.number","v.readonly","v.array","v.union"],"mappings":";;;;AAIO,MAAM,cAAcA,OAAS;AAAA,EAClC,IAAIC,QAAU,KAAK;AAAA,EACnB,MAAMC,OAAE;AAAA,EACR,KAAKC,OAAE,EAAS,SAAA;AAClB,CAAC;AAEM,MAAM,gBAAgB,YAAY,OAAO;AAAA;AAAA;AAAA;AAAA,EAI9C,KAAK,UAAU,SAAA;AAAA,EACf,MAAMD,OAAE,EAAS,SAAA;AAAA,EACjB,MAAME,SAAWC,MAAQ,UAAU,CAAC,EAAE,SAAA;AACxC,CAAC;AAED,MAAM,cAAcL,OAAS;AAAA,EAC3B,IAAIC,QAAU,KAAK;AAAA,EACnB,MAAMC,OAAE;AACV,CAAC;AAED,MAAM,gBAAgBF,OAAS;AAAA,EAC7B,IAAIC,QAAU,OAAO;AACvB,CAAC;AAED,MAAM,gBAAgBK,MAAQ,aAAa,aAAa,aAAa;AACrE,MAAM,kBAAkBA,MAAQ,eAAe,aAAa,aAAa;AAElE,MAAM,qBAAqBD,MAAQ,aAAa;AAChD,MAAM,uBAAuBA,MAAQ,eAAe;"}