@rocicorp/zero 0.2.2024101101 → 0.3.2024102500

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

@@ -9,9 +9,9 @@ export declare enum MutationType {
  */
 declare const createOpSchema: v.ObjectType<{
     op: v.Type<"create">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>;
 /**
  * Upsert semantics. Inserts if entity with id does not already exist,
@@ -19,67 +19,70 @@ declare const createOpSchema: v.ObjectType<{
  */
 declare const setOpSchema: v.ObjectType<{
     op: v.Type<"set">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>;
 /**
  * Updates if entity with id exists, otherwise does nothing.
  */
 declare const updateOpSchema: v.ObjectType<{
     op: v.Type<"update">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>;
 /**
  * Deletes entity with id if it exists, otherwise does nothing.
  */
 declare const deleteOpSchema: v.ObjectType<{
     op: v.Type<"delete">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Readonly<Record<string, string | number | boolean>>>;
 }, undefined>;
 declare const crudOpSchema: v.UnionType<[v.ObjectType<{
     op: v.Type<"create">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>, v.ObjectType<{
     op: v.Type<"set">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>, v.ObjectType<{
     op: v.Type<"update">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-    partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
 }, undefined>, v.ObjectType<{
     op: v.Type<"delete">;
-    entityType: v.Type<string>;
-    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+    tableName: v.Type<string>;
+    primaryKey: v.Type<readonly [string, ...string[]]>;
+    value: v.Type<Readonly<Record<string, string | number | boolean>>>;
 }, undefined>]>;
 declare const crudArgSchema: v.ObjectType<{
-    ops: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+    ops: v.ArrayType<v.UnionType<[v.ObjectType<{
         op: v.Type<"create">;
-        entityType: v.Type<string>;
-        id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-        value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+        tableName: v.Type<string>;
+        primaryKey: v.Type<readonly [string, ...string[]]>;
+        value: v.Type<Record<string, string | number | boolean | null | undefined>>;
     }, undefined>, v.ObjectType<{
         op: v.Type<"set">;
-        entityType: v.Type<string>;
-        id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-        value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+        tableName: v.Type<string>;
+        primaryKey: v.Type<readonly [string, ...string[]]>;
+        value: v.Type<Record<string, string | number | boolean | null | undefined>>;
     }, undefined>, v.ObjectType<{
         op: v.Type<"update">;
-        entityType: v.Type<string>;
-        id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-        partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+        tableName: v.Type<string>;
+        primaryKey: v.Type<readonly [string, ...string[]]>;
+        value: v.Type<Record<string, string | number | boolean | null | undefined>>;
     }, undefined>, v.ObjectType<{
         op: v.Type<"delete">;
-        entityType: v.Type<string>;
-        id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+        tableName: v.Type<string>;
+        primaryKey: v.Type<readonly [string, ...string[]]>;
+        value: v.Type<Readonly<Record<string, string | number | boolean>>>;
     }, undefined>]>>;
 }, undefined>;
 export declare const crudMutationSchema: v.ObjectType<{
@@ -87,28 +90,29 @@ export declare const crudMutationSchema: v.ObjectType<{
     id: v.Type<number>;
     clientID: v.Type<string>;
     name: v.Type<"_zero_crud">;
-    args: v.ArrayType<[v.ObjectType<{
-        ops: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+    args: v.TupleType<[v.ObjectType<{
+        ops: v.ArrayType<v.UnionType<[v.ObjectType<{
             op: v.Type<"create">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"set">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"update">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"delete">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Readonly<Record<string, string | number | boolean>>>;
         }, undefined>]>>;
-    }, undefined>], undefined>;
+    }, undefined>]>;
     timestamp: v.Type<number>;
 }, undefined>;
 export declare const customMutationSchema: v.ObjectType<{
@@ -116,7 +120,7 @@ export declare const customMutationSchema: v.ObjectType<{
     id: v.Type<number>;
     clientID: v.Type<string>;
     name: v.Type<string>;
-    args: v.ArrayType<[], v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
+    args: v.ArrayType<v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
     timestamp: v.Type<number>;
 }, undefined>;
 export declare const mutationSchema: v.UnionType<[v.ObjectType<{
@@ -124,73 +128,75 @@ export declare const mutationSchema: v.UnionType<[v.ObjectType<{
     id: v.Type<number>;
     clientID: v.Type<string>;
     name: v.Type<"_zero_crud">;
-    args: v.ArrayType<[v.ObjectType<{
-        ops: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+    args: v.TupleType<[v.ObjectType<{
+        ops: v.ArrayType<v.UnionType<[v.ObjectType<{
             op: v.Type<"create">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"set">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"update">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-            partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Record<string, string | number | boolean | null | undefined>>;
         }, undefined>, v.ObjectType<{
             op: v.Type<"delete">;
-            entityType: v.Type<string>;
-            id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+            tableName: v.Type<string>;
+            primaryKey: v.Type<readonly [string, ...string[]]>;
+            value: v.Type<Readonly<Record<string, string | number | boolean>>>;
         }, undefined>]>>;
-    }, undefined>], undefined>;
+    }, undefined>]>;
     timestamp: v.Type<number>;
 }, undefined>, v.ObjectType<{
     type: v.Type<MutationType.Custom>;
     id: v.Type<number>;
     clientID: v.Type<string>;
     name: v.Type<string>;
-    args: v.ArrayType<[], v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
+    args: v.ArrayType<v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
     timestamp: v.Type<number>;
 }, undefined>]>;
 export declare const pushBodySchema: v.ObjectType<{
     clientGroupID: v.Type<string>;
-    mutations: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+    mutations: v.ArrayType<v.UnionType<[v.ObjectType<{
         type: v.Type<MutationType.CRUD>;
         id: v.Type<number>;
         clientID: v.Type<string>;
         name: v.Type<"_zero_crud">;
-        args: v.ArrayType<[v.ObjectType<{
-            ops: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+        args: v.TupleType<[v.ObjectType<{
+            ops: v.ArrayType<v.UnionType<[v.ObjectType<{
                 op: v.Type<"create">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"set">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"update">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"delete">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Readonly<Record<string, string | number | boolean>>>;
             }, undefined>]>>;
-        }, undefined>], undefined>;
+        }, undefined>]>;
         timestamp: v.Type<number>;
     }, undefined>, v.ObjectType<{
         type: v.Type<MutationType.Custom>;
         id: v.Type<number>;
         clientID: v.Type<string>;
         name: v.Type<string>;
-        args: v.ArrayType<[], v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
+        args: v.ArrayType<v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
         timestamp: v.Type<number>;
     }, undefined>]>>;
     pushVersion: v.Type<number>;
@@ -198,49 +204,50 @@ export declare const pushBodySchema: v.ObjectType<{
     timestamp: v.Type<number>;
     requestID: v.Type<string>;
 }, undefined>;
-export declare const pushMessageSchema: v.ArrayType<[v.Type<"push">, v.ObjectType<{
+export declare const pushMessageSchema: v.TupleType<[v.Type<"push">, v.ObjectType<{
     clientGroupID: v.Type<string>;
-    mutations: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+    mutations: v.ArrayType<v.UnionType<[v.ObjectType<{
         type: v.Type<MutationType.CRUD>;
         id: v.Type<number>;
         clientID: v.Type<string>;
         name: v.Type<"_zero_crud">;
-        args: v.ArrayType<[v.ObjectType<{
-            ops: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+        args: v.TupleType<[v.ObjectType<{
+            ops: v.ArrayType<v.UnionType<[v.ObjectType<{
                 op: v.Type<"create">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"set">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                value: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"update">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
-                partialValue: v.Type<import("../../shared/src/json.js").ReadonlyJSONObject>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Record<string, string | number | boolean | null | undefined>>;
             }, undefined>, v.ObjectType<{
                 op: v.Type<"delete">;
-                entityType: v.Type<string>;
-                id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+                tableName: v.Type<string>;
+                primaryKey: v.Type<readonly [string, ...string[]]>;
+                value: v.Type<Readonly<Record<string, string | number | boolean>>>;
             }, undefined>]>>;
-        }, undefined>], undefined>;
+        }, undefined>]>;
         timestamp: v.Type<number>;
     }, undefined>, v.ObjectType<{
         type: v.Type<MutationType.Custom>;
         id: v.Type<number>;
         clientID: v.Type<string>;
         name: v.Type<string>;
-        args: v.ArrayType<[], v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
+        args: v.ArrayType<v.Type<import("../../shared/src/json.js").ReadonlyJSONValue>>;
         timestamp: v.Type<number>;
     }, undefined>]>>;
     pushVersion: v.Type<number>;
     schemaVersion: v.Type<number>;
     timestamp: v.Type<number>;
     requestID: v.Type<string>;
-}, undefined>], undefined>;
+}, undefined>]>;
 export type CreateOp = v.Infer<typeof createOpSchema>;
 export type SetOp = v.Infer<typeof setOpSchema>;
 export type UpdateOp = v.Infer<typeof updateOpSchema>;

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

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAGhD,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAC/C,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,QAAA,MAAM,cAAc;;;;;aAKlB,CAAC;AAEH;;;GAGG;AACH,QAAA,MAAM,WAAW;;;;;aAKf,CAAC;AAEH;;GAEG;AACH,QAAA,MAAM,cAAc;;;;;aAKlB,CAAC;AAEH;;GAEG;AACH,QAAA,MAAM,cAAc;;;;aAIlB,CAAC;AAEH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;eAKjB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;aAEjB,CAAC;AAIH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAO7B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;aAO/B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAoD,CAAC;AAEhF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAOzB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAA+C,CAAC;AAE9E,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AACtC,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAC5D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAIhD,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,QAAA,MAAM,cAAc;;;;;aAKlB,CAAC;AAEH;;;GAGG;AACH,QAAA,MAAM,WAAW;;;;;aAKf,CAAC;AAEH;;GAEG;AACH,QAAA,MAAM,cAAc;;;;;aAMlB,CAAC;AAEH;;GAEG;AACH,QAAA,MAAM,cAAc;;;;;aAMlB,CAAC;AAEH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;eAKjB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;aAEjB,CAAC;AAIH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAO7B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;aAO/B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAAoD,CAAC;AAEhF,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAOzB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAA+C,CAAC;AAE9E,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;AACtC,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAC5D,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AACtD,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

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

@@ -1,6 +1,7 @@
-import { jsonObjectSchema, jsonSchema } from '../../shared/src/json-schema.js';
+import { jsonSchema } from '../../shared/src/json-schema.js';
 import * as v from '../../shared/src/valita.js';
-import { primaryKeyValueRecordSchema } from './primary-key.js';
+import { rowSchema } from './data.js';
+import { primaryKeySchema, primaryKeyValueRecordSchema } from './primary-key.js';
 export const CRUD_MUTATION_NAME = '_zero_crud';
 export var MutationType;
 (function (MutationType) {
@@ -12,9 +13,9 @@ export var MutationType;
  */
 const createOpSchema = v.object({
     op: v.literal('create'),
-    entityType: v.string(),
-    id: primaryKeyValueRecordSchema,
-    value: jsonObjectSchema,
+    tableName: v.string(),
+    primaryKey: primaryKeySchema,
+    value: rowSchema,
 });
 /**
  * Upsert semantics. Inserts if entity with id does not already exist,
@@ -22,26 +23,29 @@ const createOpSchema = v.object({
  */
 const setOpSchema = v.object({
     op: v.literal('set'),
-    entityType: v.string(),
-    id: primaryKeyValueRecordSchema,
-    value: jsonObjectSchema,
+    tableName: v.string(),
+    primaryKey: primaryKeySchema,
+    value: rowSchema,
 });
 /**
  * Updates if entity with id exists, otherwise does nothing.
  */
 const updateOpSchema = v.object({
     op: v.literal('update'),
-    entityType: v.string(),
-    id: primaryKeyValueRecordSchema,
-    partialValue: jsonObjectSchema,
+    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'),
-    entityType: v.string(),
-    id: primaryKeyValueRecordSchema,
+    tableName: v.string(),
+    primaryKey: primaryKeySchema,
+    // Partial value representing the primary key
+    value: primaryKeyValueRecordSchema,
 });
 const crudOpSchema = v.union(createOpSchema, setOpSchema, updateOpSchema, deleteOpSchema);
 const crudArgSchema = v.object({

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

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../zero-protocol/src/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,2BAA2B,EAAC,MAAM,kBAAkB,CAAC;AAE7D,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAC/C,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,iCAAiB,CAAA;AACnB,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAED;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACvB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,EAAE,EAAE,2BAA2B;IAC/B,KAAK,EAAE,gBAAgB;CACxB,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,EAAE,EAAE,2BAA2B;IAC/B,KAAK,EAAE,gBAAgB;CACxB,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACvB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,EAAE,EAAE,2BAA2B;IAC/B,YAAY,EAAE,gBAAgB;CAC/B,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACvB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,EAAE,EAAE,2BAA2B;CAChC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAC1B,cAAc,EACd,WAAW,EACX,cAAc,EACd,cAAc,CACf,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;CAC3B,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAEhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;IACnC,IAAI,EAAE,cAAc;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC;IACpC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;IACzB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../zero-protocol/src/push.ts"],"names":[],"mappings":"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"}

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

@@ -16,7 +16,7 @@ declare const putOpSchema: v.ObjectType<{
                 field: string;
             };
         }[]>;
-        related: v.Optional<readonly import("../../zql/src/zql/ast/ast.js").CorrelatedSubQuery[]>;
+        related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
         start: v.Optional<{
@@ -49,7 +49,7 @@ declare const patchOpSchema: v.UnionType<[v.ObjectType<{
                 field: string;
             };
         }[]>;
-        related: v.Optional<readonly import("../../zql/src/zql/ast/ast.js").CorrelatedSubQuery[]>;
+        related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
         start: v.Optional<{
@@ -63,7 +63,7 @@ declare const patchOpSchema: v.UnionType<[v.ObjectType<{
 }, undefined>, v.ObjectType<{
     op: v.Type<"clear">;
 }, undefined>]>;
-export declare const queriesPatchSchema: v.ArrayType<[], v.UnionType<[v.ObjectType<{
+export declare const queriesPatchSchema: v.ArrayType<v.UnionType<[v.ObjectType<{
     op: v.Type<"put">;
     hash: v.Type<string>;
     ast: v.ObjectType<{
@@ -80,7 +80,7 @@ export declare const queriesPatchSchema: v.ArrayType<[], v.UnionType<[v.ObjectTy
                 field: string;
             };
         }[]>;
-        related: v.Optional<readonly import("../../zql/src/zql/ast/ast.js").CorrelatedSubQuery[]>;
+        related: v.Optional<readonly import("./ast.js").CorrelatedSubQuery[]>;
         limit: v.Optional<number>;
         orderBy: v.Optional<readonly (readonly [string, "asc" | "desc"])[]>;
         start: v.Optional<{

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

@@ -0,0 +1,38 @@
+import * as v from '../../shared/src/valita.js';
+declare const rowPatchOpSchema: v.UnionType<[v.ObjectType<{
+    op: v.Type<"put">;
+    tableName: v.Type<string>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"update">;
+    tableName: v.Type<string>;
+    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+    merge: v.Optional<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    constrain: v.Optional<string[]>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"del">;
+    tableName: v.Type<string>;
+    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"clear">;
+}, undefined>]>;
+export declare const rowsPatchSchema: v.ArrayType<v.UnionType<[v.ObjectType<{
+    op: v.Type<"put">;
+    tableName: v.Type<string>;
+    value: v.Type<Record<string, string | number | boolean | null | undefined>>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"update">;
+    tableName: v.Type<string>;
+    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+    merge: v.Optional<import("../../shared/src/json.js").ReadonlyJSONObject>;
+    constrain: v.Optional<string[]>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"del">;
+    tableName: v.Type<string>;
+    id: v.Type<Readonly<Record<string, string | number | boolean>>>;
+}, undefined>, v.ObjectType<{
+    op: v.Type<"clear">;
+}, undefined>]>>;
+export type RowPatchOp = v.Infer<typeof rowPatchOpSchema>;
+export {};
+//# sourceMappingURL=row-patch.d.ts.map

package/out/zero-protocol/src/row-patch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"row-patch.d.ts","sourceRoot":"","sources":["../../../../zero-protocol/src/row-patch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AA4BhD,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;eAKrB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;gBAA4B,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}

package/out/zero-protocol/src/{entities-patch.js → row-patch.js}

@@ -1,28 +1,27 @@
 import { jsonObjectSchema } from '../../shared/src/json-schema.js';
 import * as v from '../../shared/src/valita.js';
+import { rowSchema } from './data.js';
 import { primaryKeyValueRecordSchema } from './primary-key.js';
 const putOpSchema = v.object({
     op: v.literal('put'),
-    entityType: v.string(),
-    entityID: primaryKeyValueRecordSchema,
-    value: jsonObjectSchema,
+    tableName: v.string(),
+    value: rowSchema,
 });
 const updateOpSchema = v.object({
     op: v.literal('update'),
-    entityType: v.string(),
-    entityID: primaryKeyValueRecordSchema,
+    tableName: v.string(),
+    id: primaryKeyValueRecordSchema,
     merge: jsonObjectSchema.optional(),
     constrain: v.array(v.string()).optional(),
 });
 const delOpSchema = v.object({
     op: v.literal('del'),
-    entityType: v.string(),
-    entityID: primaryKeyValueRecordSchema,
+    tableName: v.string(),
+    id: primaryKeyValueRecordSchema,
 });
 const clearOpSchema = v.object({
     op: v.literal('clear'),
 });
-const entityPatchOpSchema = v.union(putOpSchema, updateOpSchema, delOpSchema, clearOpSchema);
-// TODO: Rename to entities -> row?
-export const entitiesPatchSchema = v.array(entityPatchOpSchema);
-//# sourceMappingURL=entities-patch.js.map
+const rowPatchOpSchema = v.union(putOpSchema, updateOpSchema, delOpSchema, clearOpSchema);
+export const rowsPatchSchema = v.array(rowPatchOpSchema);
+//# sourceMappingURL=row-patch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"row-patch.js","sourceRoot":"","sources":["../../../../zero-protocol/src/row-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AACpC,OAAO,EAAC,2BAA2B,EAAC,MAAM,kBAAkB,CAAC;AAE7D,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,KAAK,EAAE,SAAS;CACjB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACvB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,EAAE,EAAE,2BAA2B;IAC/B,KAAK,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IAClC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,EAAE,EAAE,2BAA2B;CAChC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAC9B,WAAW,EACX,cAAc,EACd,WAAW,EACX,aAAa,CACd,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC"}