@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/zero-client/src/client/crud.js

@@ -1,8 +1,10 @@
-import { must } from "../../../shared/src/must.js";
 import { promiseVoid } from "../../../shared/src/resolved-promises.js";
 import { CRUD_MUTATION_NAME } from "../../../zero-protocol/src/push.js";
-import { toPrimaryKeyString } from "./keys.js";
-function makeCRUDMutate(schema, repMutate, mutate) {
+import * as crudImpl from "./crud-impl.js";
+function makeCRUDMutateBatch(schema, repMutate) {
+  if (schema.enableLegacyMutators !== true) {
+    return void 0;
+  }
   const { [CRUD_MUTATION_NAME]: zeroCRUD } = repMutate;
   const mutateBatch = async (body) => {
     const ops = [];
@@ -14,6 +16,10 @@ function makeCRUDMutate(schema, repMutate, mutate) {
     await zeroCRUD({ ops });
     return rv;
   };
+  return mutateBatch;
+}
+function addTableCRUDProperties(schema, mutate, repMutate) {
+  const { [CRUD_MUTATION_NAME]: zeroCRUD } = repMutate;
   for (const [name, tableSchema] of Object.entries(schema.tables)) {
     mutate[name] = makeEntityCRUDMutate(
       name,
@@ -21,7 +27,6 @@ function makeCRUDMutate(schema, repMutate, mutate) {
       zeroCRUD
     );
   }
-  return mutateBatch;
 }
 function makeEntityCRUDMutate(tableName, primaryKey, zeroCRUD) {
   return {
@@ -108,118 +113,31 @@ function makeBatchCRUDMutate(tableName, schema, ops) {
     }
   };
 }
+function makeCRUDExecutor(tx, schema, ivmBranch) {
+  return (tableName, kind, value) => {
+    const { primaryKey } = schema.tables[tableName];
+    return crudImpl[kind](
+      tx,
+      // oxlint-disable-next-line @typescript-eslint/no-explicit-any
+      { op: kind, tableName, primaryKey, value },
+      schema,
+      ivmBranch
+    );
+  };
+}
 function makeCRUDMutator(schema) {
-  return async function zeroCRUDMutator(tx, crudArg) {
+  return async (tx, crudArg) => {
+    const executor = makeCRUDExecutor(tx, schema, void 0);
     for (const op of crudArg.ops) {
-      switch (op.op) {
-        case "insert":
-          await insertImpl(tx, op, schema, void 0);
-          break;
-        case "upsert":
-          await upsertImpl(tx, op, schema, void 0);
-          break;
-        case "update":
-          await updateImpl(tx, op, schema, void 0);
-          break;
-        case "delete":
-          await deleteImpl(tx, op, schema, void 0);
-          break;
-      }
+      await executor(op.tableName, op.op, op.value);
     }
   };
 }
-function defaultOptionalFieldsToNull(schema, value) {
-  let rv = value;
-  for (const name in schema.columns) {
-    if (rv[name] === void 0) {
-      rv = { ...rv, [name]: null };
-    }
-  }
-  return rv;
-}
-async function insertImpl(tx, arg, schema, ivmBranch) {
-  const key = toPrimaryKeyString(
-    arg.tableName,
-    schema.tables[arg.tableName].primaryKey,
-    arg.value
-  );
-  if (!await tx.has(key)) {
-    const val = defaultOptionalFieldsToNull(
-      schema.tables[arg.tableName],
-      arg.value
-    );
-    await tx.set(key, val);
-    if (ivmBranch) {
-      must(ivmBranch.getSource(arg.tableName)).push({
-        type: "add",
-        row: arg.value
-      });
-    }
-  }
-}
-async function upsertImpl(tx, arg, schema, ivmBranch) {
-  const key = toPrimaryKeyString(
-    arg.tableName,
-    schema.tables[arg.tableName].primaryKey,
-    arg.value
-  );
-  if (await tx.has(key)) {
-    await updateImpl(tx, { ...arg }, schema, ivmBranch);
-  } else {
-    await insertImpl(tx, { ...arg }, schema, ivmBranch);
-  }
-}
-async function updateImpl(tx, arg, schema, ivmBranch) {
-  const key = toPrimaryKeyString(
-    arg.tableName,
-    schema.tables[arg.tableName].primaryKey,
-    arg.value
-  );
-  const prev = await tx.get(key);
-  if (prev === void 0) {
-    return;
-  }
-  const update = arg.value;
-  const next = { ...prev };
-  for (const k in update) {
-    if (update[k] !== void 0) {
-      next[k] = update[k];
-    }
-  }
-  await tx.set(key, next);
-  if (ivmBranch) {
-    must(ivmBranch.getSource(arg.tableName)).push({
-      type: "edit",
-      oldRow: prev,
-      row: next
-    });
-  }
-}
-async function deleteImpl(tx, arg, schema, ivmBranch) {
-  const key = toPrimaryKeyString(
-    arg.tableName,
-    schema.tables[arg.tableName].primaryKey,
-    arg.value
-  );
-  const prev = await tx.get(key);
-  if (prev === void 0) {
-    return;
-  }
-  await tx.del(key);
-  if (ivmBranch) {
-    must(ivmBranch.getSource(arg.tableName)).push({
-      type: "remove",
-      row: prev
-    });
-  }
-}
 export {
-  deleteImpl,
-  insertImpl,
+  addTableCRUDProperties,
   makeBatchCRUDMutate,
-  makeCRUDMutate,
-  makeCRUDMutator,
-  updateImpl,
-  upsertImpl
+  makeCRUDExecutor,
+  makeCRUDMutateBatch,
+  makeCRUDMutator
 };
 //# sourceMappingURL=crud.js.map

package/out/zero-client/src/client/crud.js.map

@@ -1 +1 @@
-{"version":3,"file":"crud.js","sources":["../../../../../zero-client/src/client/crud.ts"],"sourcesContent":["import type {ReadonlyJSONObject} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {\n  CRUD_MUTATION_NAME,\n  type CRUDMutationArg,\n  type CRUDOp,\n  type DeleteOp,\n  type InsertOp,\n  type UpdateOp,\n  type UpsertOp,\n} from '../../../zero-protocol/src/push.ts';\nimport type {TableSchema} from '../../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {\n  DeleteID,\n  InsertValue,\n  UpdateValue,\n  UpsertValue,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {IVMSourceBranch} from './ivm-branch.ts';\nimport {toPrimaryKeyString} from './keys.ts';\nimport type {MutatorDefs, WriteTransaction} from './replicache-types.ts';\n\n/**\n * This is the type of the generated mutate.<name>.<verb> function.\n */\nexport type TableMutator<S extends TableSchema> = {\n  /**\n   * Writes a row if a row with the same primary key doesn't already exists.\n   * Non-primary-key fields that are 'optional' can be omitted or set to\n   * `undefined`. Such fields will be assigned the value `null` optimistically\n   * and then the default value as defined by the server.\n   */\n  insert: (value: InsertValue<S>) => Promise<void>;\n\n  /**\n   * Writes a row unconditionally, overwriting any existing row with the same\n   * primary key. Non-primary-key fields that are 'optional' can be omitted or\n   * set to `undefined`. Such fields will be assigned the value `null`\n   * optimistically and then the default value as defined by the server.\n   */\n  upsert: (value: UpsertValue<S>) => Promise<void>;\n\n  /**\n   * Updates a row with the same primary key. If no such row exists, this\n   * function does nothing. All non-primary-key fields can be omitted or set to\n   * `undefined`. Such fields will be left unchanged from previous value.\n   */\n  update: (value: UpdateValue<S>) => Promise<void>;\n\n  /**\n   * Deletes the row with the specified primary key. If no such row exists, this\n   * function does nothing.\n   */\n  delete: (id: DeleteID<S>) => Promise<void>;\n};\n\nexport type DBMutator<S extends Schema> =\n  S['enableLegacyMutators'] extends false\n    ? {} // {} is needed here for intersection type identity\n    : {\n        [K in keyof S['tables']]: TableMutator<S['tables'][K]>;\n      };\n\nexport type BatchMutator<S extends Schema> = <R>(\n  body: (m: DBMutator<S>) => MaybePromise<R>,\n) => Promise<R>;\n\ntype ZeroCRUDMutate = {\n  [CRUD_MUTATION_NAME]: CRUDMutate;\n};\n\n/**\n * This is the zero.mutate object part representing the CRUD operations. If the\n * tables are `issue` and `label`, then this object will have `issue` and\n * `label` properties.\n *\n * @param schema - The schema defining the tables\n * @param repMutate - The replicache mutate object with the CRUD mutation\n * @param mutate - The object to use as the mutate object. Properties for each\n *                 table will be assigned to this object.\n */\nexport function makeCRUDMutate<const S extends Schema>(\n  schema: S,\n  repMutate: ZeroCRUDMutate,\n  mutate: object,\n): BatchMutator<S> {\n  const {[CRUD_MUTATION_NAME]: zeroCRUD} = repMutate;\n\n  const mutateBatch = async <R>(body: (m: DBMutator<S>) => R): Promise<R> => {\n    const ops: CRUDOp[] = [];\n    const m = {} as Record<string, unknown>;\n    for (const name of Object.keys(schema.tables)) {\n      m[name] = makeBatchCRUDMutate(name, schema, ops);\n    }\n\n    const rv = await body(m as DBMutator<S>);\n    await zeroCRUD({ops});\n    return rv;\n  };\n\n  for (const [name, tableSchema] of Object.entries(schema.tables)) {\n    (mutate as Record<string, unknown>)[name] = makeEntityCRUDMutate(\n      name,\n      tableSchema.primaryKey,\n      zeroCRUD,\n    );\n  }\n  return mutateBatch as BatchMutator<S>;\n}\n\n/**\n * Creates the `{insert, upsert, update, delete}` object for use outside a\n * batch.\n */\nfunction makeEntityCRUDMutate<S extends TableSchema>(\n  tableName: string,\n  primaryKey: S['primaryKey'],\n  zeroCRUD: CRUDMutate,\n): TableMutator<S> {\n  return {\n    insert: (value: InsertValue<S>) => {\n      const op: InsertOp = {\n        op: 'insert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    upsert: (value: UpsertValue<S>) => {\n      const op: UpsertOp = {\n        op: 'upsert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    update: (value: UpdateValue<S>) => {\n      const op: UpdateOp = {\n        op: 'update',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    delete: (id: DeleteID<S>) => {\n      const op: DeleteOp = {\n        op: 'delete',\n        tableName,\n        primaryKey,\n        value: id,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n  };\n}\n\n/**\n * Creates the `{inesrt, upsert, update, delete}` object for use inside a\n * batch.\n */\nexport function makeBatchCRUDMutate<S extends TableSchema>(\n  tableName: string,\n  schema: Schema,\n  ops: CRUDOp[],\n): TableMutator<S> {\n  const {primaryKey} = schema.tables[tableName];\n  return {\n    insert: (value: InsertValue<S>) => {\n      const op: InsertOp = {\n        op: 'insert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    upsert: (value: UpsertValue<S>) => {\n      const op: UpsertOp = {\n        op: 'upsert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    update: (value: UpdateValue<S>) => {\n      const op: UpdateOp = {\n        op: 'update',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    delete: (id: DeleteID<S>) => {\n      const op: DeleteOp = {\n        op: 'delete',\n        tableName,\n        primaryKey,\n        value: id,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n  };\n}\n\nexport type WithCRUD<MD extends MutatorDefs> = MD & {\n  [CRUD_MUTATION_NAME]: CRUDMutator;\n};\n\nexport type CRUDMutate = (crudArg: CRUDMutationArg) => Promise<void>;\n\nexport type CRUDMutator = (\n  tx: WriteTransaction,\n  crudArg: CRUDMutationArg,\n) => Promise<void>;\n\n// Zero crud mutators cannot function at the same\n// time as custom mutators as the rebase of crud mutators will not\n// update the IVM branch. That's ok, we're removing crud mutators\n// in favor of custom mutators.\nexport function makeCRUDMutator(schema: Schema): CRUDMutator {\n  return async function zeroCRUDMutator(\n    tx: WriteTransaction,\n    crudArg: CRUDMutationArg,\n  ): Promise<void> {\n    for (const op of crudArg.ops) {\n      switch (op.op) {\n        case 'insert':\n          await insertImpl(tx, op, schema, undefined);\n          break;\n        case 'upsert':\n          await upsertImpl(tx, op, schema, undefined);\n          break;\n        case 'update':\n          await updateImpl(tx, op, schema, undefined);\n          break;\n        case 'delete':\n          await deleteImpl(tx, op, schema, undefined);\n          break;\n      }\n    }\n  };\n}\n\nfunction defaultOptionalFieldsToNull(\n  schema: TableSchema,\n  value: ReadonlyJSONObject,\n): ReadonlyJSONObject {\n  let rv = value;\n  for (const name in schema.columns) {\n    if (rv[name] === undefined) {\n      rv = {...rv, [name]: null};\n    }\n  }\n  return rv;\n}\n\nexport async function insertImpl(\n  tx: WriteTransaction,\n  arg: InsertOp,\n  schema: Schema,\n  ivmBranch: IVMSourceBranch | undefined,\n): Promise<void> {\n  const key = toPrimaryKeyString(\n    arg.tableName,\n    schema.tables[arg.tableName].primaryKey,\n    arg.value,\n  );\n  if (!(await tx.has(key))) {\n    const val = defaultOptionalFieldsToNull(\n      schema.tables[arg.tableName],\n      arg.value,\n    );\n    await tx.set(key, val);\n    if (ivmBranch) {\n      must(ivmBranch.getSource(arg.tableName)).push({\n        type: 'add',\n        row: arg.value,\n      });\n    }\n  }\n}\n\nexport async function upsertImpl(\n  tx: WriteTransaction,\n  arg: InsertOp | UpsertOp,\n  schema: Schema,\n  ivmBranch: IVMSourceBranch | undefined,\n): Promise<void> {\n  const key = toPrimaryKeyString(\n    arg.tableName,\n    schema.tables[arg.tableName].primaryKey,\n    arg.value,\n  );\n  if (await tx.has(key)) {\n    await updateImpl(tx, {...arg, op: 'update'}, schema, ivmBranch);\n  } else {\n    await insertImpl(tx, {...arg, op: 'insert'}, schema, ivmBranch);\n  }\n}\n\nexport async function updateImpl(\n  tx: WriteTransaction,\n  arg: UpdateOp,\n  schema: Schema,\n  ivmBranch: IVMSourceBranch | undefined,\n): Promise<void> {\n  const key = toPrimaryKeyString(\n    arg.tableName,\n    schema.tables[arg.tableName].primaryKey,\n    arg.value,\n  );\n  const prev = await tx.get(key);\n  if (prev === undefined) {\n    return;\n  }\n  const update = arg.value;\n  const next = {...(prev as ReadonlyJSONObject)};\n  for (const k in update) {\n    if (update[k] !== undefined) {\n      next[k] = update[k];\n    }\n  }\n  await tx.set(key, next);\n  if (ivmBranch) {\n    must(ivmBranch.getSource(arg.tableName)).push({\n      type: 'edit',\n      oldRow: prev as Row,\n      row: next,\n    });\n  }\n}\n\nexport async function deleteImpl(\n  tx: WriteTransaction,\n  arg: DeleteOp,\n  schema: Schema,\n  ivmBranch: IVMSourceBranch | undefined,\n): Promise<void> {\n  const key = toPrimaryKeyString(\n    arg.tableName,\n    schema.tables[arg.tableName].primaryKey,\n    arg.value,\n  );\n  const prev = await tx.get(key);\n  if (prev === undefined) {\n    return;\n  }\n  await tx.del(key);\n  if (ivmBranch) {\n    must(ivmBranch.getSource(arg.tableName)).push({\n      type: 'remove',\n      row: prev as Row,\n    });\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud.js","sources":["../../../../../zero-client/src/client/crud.ts"],"sourcesContent":["import {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport type {MaybePromise} from '../../../shared/src/types.ts';\nimport {\n  CRUD_MUTATION_NAME,\n  type CRUDMutationArg,\n  type CRUDOp,\n  type DeleteOp,\n  type InsertOp,\n  type UpdateOp,\n  type UpsertOp,\n} from '../../../zero-protocol/src/push.ts';\nimport type {TableSchema} from '../../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {\n  CRUDExecutor,\n  DeleteID,\n  InsertValue,\n  TableMutator,\n  UpdateValue,\n  UpsertValue,\n} from '../../../zql/src/mutate/crud.ts';\nimport * as crudImpl from './crud-impl.ts';\nimport type {IVMSourceBranch} from './ivm-branch.ts';\nimport type {MutatorDefs, WriteTransaction} from './replicache-types.ts';\n\nexport type DBMutator<S extends Schema> = S['enableLegacyMutators'] extends true\n  ? {\n      [K in keyof S['tables']]: TableMutator<S['tables'][K]>;\n    }\n  : {}; // {} is needed here for intersection type identity\n\nexport type BatchMutator<S extends Schema> =\n  S['enableLegacyMutators'] extends true\n    ? <R>(body: (m: DBMutator<S>) => MaybePromise<R>) => Promise<R>\n    : undefined;\n\ntype ZeroCRUDMutate = {\n  [CRUD_MUTATION_NAME]: CRUDMutate;\n};\n\n/**\n * This is the zero.mutateBatch function part representing the CRUD operations. If the\n * tables are `issue` and `label`, then this object will have `issue` and\n * `label` properties.\n *\n * @param schema - The schema defining the tables\n * @param repMutate - The replicache mutate object with the CRUD mutation\n * @param mutate - The object to use as the mutate object. Properties for each\n *                 table will be assigned to this object.\n */\nexport function makeCRUDMutateBatch<const S extends Schema>(\n  schema: S,\n  repMutate: ZeroCRUDMutate,\n): BatchMutator<S> {\n  if (schema.enableLegacyMutators !== true) {\n    return undefined as BatchMutator<S>;\n  }\n\n  const {[CRUD_MUTATION_NAME]: zeroCRUD} = repMutate;\n\n  const mutateBatch = async <R>(body: (m: DBMutator<S>) => R): Promise<R> => {\n    const ops: CRUDOp[] = [];\n    const m = {} as Record<string, unknown>;\n    for (const name of Object.keys(schema.tables)) {\n      m[name] = makeBatchCRUDMutate(name, schema, ops);\n    }\n\n    const rv = await body(m as DBMutator<S>);\n    await zeroCRUD({ops});\n    return rv;\n  };\n\n  return mutateBatch as BatchMutator<S>;\n}\n\nexport function addTableCRUDProperties<TSchema extends Schema>(\n  schema: TSchema,\n  mutate: object,\n  repMutate: ZeroCRUDMutate,\n): void {\n  const {[CRUD_MUTATION_NAME]: zeroCRUD} = repMutate;\n  for (const [name, tableSchema] of Object.entries(schema.tables)) {\n    (mutate as Record<string, unknown>)[name] = makeEntityCRUDMutate(\n      name,\n      tableSchema.primaryKey,\n      zeroCRUD,\n    );\n  }\n}\n\n/**\n * Creates the `{insert, upsert, update, delete}` object for use outside a\n * batch.\n */\nfunction makeEntityCRUDMutate<S extends TableSchema>(\n  tableName: string,\n  primaryKey: S['primaryKey'],\n  zeroCRUD: CRUDMutate,\n): TableMutator<S> {\n  return {\n    insert: (value: InsertValue<S>) => {\n      const op: InsertOp = {\n        op: 'insert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    upsert: (value: UpsertValue<S>) => {\n      const op: UpsertOp = {\n        op: 'upsert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    update: (value: UpdateValue<S>) => {\n      const op: UpdateOp = {\n        op: 'update',\n        tableName,\n        primaryKey,\n        value,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n    delete: (id: DeleteID<S>) => {\n      const op: DeleteOp = {\n        op: 'delete',\n        tableName,\n        primaryKey,\n        value: id,\n      };\n      return zeroCRUD({ops: [op]});\n    },\n  };\n}\n\n/**\n * Creates the `{insert, upsert, update, delete}` object for use inside a\n * batch.\n */\nexport function makeBatchCRUDMutate<S extends TableSchema>(\n  tableName: string,\n  schema: Schema,\n  ops: CRUDOp[],\n): TableMutator<S> {\n  const {primaryKey} = schema.tables[tableName];\n  return {\n    insert: (value: InsertValue<S>) => {\n      const op: InsertOp = {\n        op: 'insert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    upsert: (value: UpsertValue<S>) => {\n      const op: UpsertOp = {\n        op: 'upsert',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    update: (value: UpdateValue<S>) => {\n      const op: UpdateOp = {\n        op: 'update',\n        tableName,\n        primaryKey,\n        value,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n    delete: (id: DeleteID<S>) => {\n      const op: DeleteOp = {\n        op: 'delete',\n        tableName,\n        primaryKey,\n        value: id,\n      };\n      ops.push(op);\n      return promiseVoid;\n    },\n  };\n}\n\nexport type WithCRUD<MD extends MutatorDefs> = MD & {\n  [CRUD_MUTATION_NAME]: CRUDMutator;\n};\n\nexport type CRUDMutate = (crudArg: CRUDMutationArg) => Promise<void>;\n\nexport type CRUDMutator = (\n  tx: WriteTransaction,\n  crudArg: CRUDMutationArg,\n) => Promise<void>;\n\nexport function makeCRUDExecutor(\n  tx: WriteTransaction,\n  schema: Schema,\n  ivmBranch: IVMSourceBranch | undefined,\n): CRUDExecutor {\n  return (tableName, kind, value) => {\n    const {primaryKey} = schema.tables[tableName];\n    return crudImpl[kind](\n      tx,\n      // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n      {op: kind, tableName, primaryKey, value} as any,\n      schema,\n      ivmBranch,\n    );\n  };\n}\n\n// Zero crud mutators cannot function at the same\n// time as custom mutators as the rebase of crud mutators will not\n// update the IVM branch. That's ok, we're removing crud mutators\n// in favor of custom mutators.\nexport function makeCRUDMutator(schema: Schema): CRUDMutator {\n  return async (\n    tx: WriteTransaction,\n    crudArg: CRUDMutationArg,\n  ): Promise<void> => {\n    const executor = makeCRUDExecutor(tx, schema, undefined);\n    for (const op of crudArg.ops) {\n      await executor(op.tableName, op.op, op.value);\n    }\n  };\n}\n"],"names":[],"mappings":"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"}

package/out/zero-client/src/client/custom.d.ts

@@ -1,10 +1,12 @@
 import type { LogContext } from '@rocicorp/logger';
 import type { ZeroTxData } from '../../../replicache/src/replicache-options.ts';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
+import type { DefaultSchema } from '../../../zero-types/src/default-types.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { ClientTransaction, SchemaCRUD, Transaction } from '../../../zql/src/mutate/custom.ts';
+import { type TransactionMutate } from '../../../zql/src/mutate/crud.ts';
+import type { ClientTransaction, Transaction } from '../../../zql/src/mutate/custom.ts';
 import { type HumanReadable, type Query, type RunOptions } from '../../../zql/src/query/query.ts';
-import type { SchemaQuery } from '../../../zql/src/query/schema-query.ts';
+import type { ConditionalSchemaQuery } from '../../../zql/src/query/schema-query.ts';
 import type { ClientID } from '../types/client-state.ts';
 import type { WriteTransaction } from './replicache-types.ts';
 /**
@@ -50,17 +52,20 @@ export type MakeCustomMutatorInterfaces<S extends Schema, MD extends CustomMutat
     readonly [NamespaceOrName in keyof MD]: MD[NamespaceOrName] extends (tx: Transaction<S>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : MD[NamespaceOrName] extends CustomMutatorDefs ? MakeCustomMutatorInterfaces<S, MD[NamespaceOrName], TContext> : never;
 };
 export type MakeCustomMutatorInterface<TSchema extends Schema, F> = F extends (tx: ClientTransaction<TSchema>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : never;
-export declare class TransactionImpl<TSchema extends Schema> implements ClientTransaction<TSchema> {
+export declare class TransactionImpl<TSchema extends Schema = DefaultSchema> implements ClientTransaction<TSchema> {
     #private;
     readonly location = "client";
-    readonly mutate: SchemaCRUD<TSchema>;
-    readonly query: SchemaQuery<TSchema>;
+    readonly mutate: TransactionMutate<TSchema>;
+    /**
+     * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.
+     */
+    readonly query: ConditionalSchemaQuery<TSchema>;
     constructor(lc: LogContext, repTx: WriteTransaction, schema: TSchema);
     get clientID(): ClientID;
     get mutationID(): number;
     get reason(): 'optimistic' | 'rebase';
     get token(): string | undefined;
-    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TTable, TSchema, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
 export declare function getZeroTxData(repTx: WriteTransaction): ZeroTxData;
 export declare function makeReplicacheMutator<S extends Schema, TWrappedTransaction, Context>(lc: LogContext, mutator: CustomMutatorImpl<S, TWrappedTransaction>, schema: S, context: Context): (repTx: WriteTransaction, args: ReadonlyJSONValue) => Promise<void>;

package/out/zero-client/src/client/custom.d.ts.map

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

package/out/zero-client/src/client/custom.js

@@ -2,30 +2,33 @@ import { zeroData } from "../../../replicache/src/transactions.js";
 import { assert } from "../../../shared/src/asserts.js";
 import { must } from "../../../shared/src/must.js";
 import { emptyFunction } from "../../../shared/src/sentinels.js";
-import { createBuilder } from "../../../zql/src/query/create-builder.js";
+import { makeTransactionMutate } from "../../../zql/src/mutate/crud.js";
+import { createRunnableBuilder } from "../../../zql/src/query/create-builder.js";
 import "../../../zero-protocol/src/ast.js";
 import { ZeroContext } from "./context.js";
-import { deleteImpl, updateImpl, upsertImpl, insertImpl } from "./crud.js";
+import { makeCRUDExecutor } from "./crud.js";
 class TransactionImpl {
   location = "client";
   mutate;
+  /**
+   * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.
+   */
   query;
   #repTx;
   #zeroContext;
   constructor(lc, repTx, schema) {
     must(repTx.reason === "initial" || repTx.reason === "rebase");
     const txData = getZeroTxData(repTx);
+    const ivmBranch = txData.ivmSources;
     this.#repTx = repTx;
-    this.mutate = makeSchemaCRUD(
-      schema,
-      repTx,
-      txData.ivmSources
-    );
-    this.query = createBuilder(schema);
-    this.#zeroContext = newZeroContext(
+    const executor = makeCRUDExecutor(repTx, schema, ivmBranch);
+    this.mutate = makeTransactionMutate(schema, executor);
+    const zeroContext = newZeroContext(
       lc,
       txData.ivmSources
     );
+    this.query = createRunnableBuilder(zeroContext, schema);
+    this.#zeroContext = zeroContext;
   }
   get clientID() {
     return this.#repTx.clientID;
@@ -56,20 +59,6 @@ function makeReplicacheMutator(lc, mutator, schema, context) {
     await mutator(tx, args, context);
   };
 }
-function makeSchemaCRUD(schema, tx, ivmBranch) {
-  return new Proxy(
-    {},
-    {
-      get(target, prop) {
-        if (prop in target) {
-          return target[prop];
-        }
-        target[prop] = makeTableCRUD(schema, prop, tx, ivmBranch);
-        return target[prop];
-      }
-    }
-  );
-}
 function assertValidRunOptions(options) {
   assert(
     options?.type !== "complete",
@@ -90,36 +79,6 @@ function newZeroContext(lc, ivmBranch) {
     assertValidRunOptions
   );
 }
-function makeTableCRUD(schema, tableName, tx, ivmBranch) {
-  const table = must(schema.tables[tableName]);
-  const { primaryKey } = table;
-  return {
-    insert: (value) => insertImpl(
-      tx,
-      { tableName, value },
-      schema,
-      ivmBranch
-    ),
-    upsert: (value) => upsertImpl(
-      tx,
-      { op: "upsert", tableName, primaryKey, value },
-      schema,
-      ivmBranch
-    ),
-    update: (value) => updateImpl(
-      tx,
-      { tableName, value },
-      schema,
-      ivmBranch
-    ),
-    delete: (id) => deleteImpl(
-      tx,
-      { tableName, value: id },
-      schema,
-      ivmBranch
-    )
-  };
-}
 export {
   TransactionImpl,
   getZeroTxData,

package/out/zero-client/src/client/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sources":["../../../../../zero-client/src/client/custom.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {ZeroTxData} from '../../../replicache/src/replicache-options.ts';\nimport type {WriteTransactionImpl} from '../../../replicache/src/transactions.ts';\nimport {zeroData} from '../../../replicache/src/transactions.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {emptyFunction} from '../../../shared/src/sentinels.ts';\nimport type {TableSchema} from '../../../zero-schema/src/table-schema.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport type {\n  ClientTransaction,\n  DeleteID,\n  InsertValue,\n  SchemaCRUD,\n  TableCRUD,\n  Transaction,\n  UpdateValue,\n  UpsertValue,\n} from '../../../zql/src/mutate/custom.ts';\nimport {createBuilder} from '../../../zql/src/query/create-builder.ts';\nimport {\n  type HumanReadable,\n  type Query,\n  type RunOptions,\n} from '../../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../../zql/src/query/schema-query.ts';\nimport type {ClientID} from '../types/client-state.ts';\nimport {ZeroContext} from './context.ts';\nimport {deleteImpl, insertImpl, updateImpl, upsertImpl} from './crud.ts';\nimport type {IVMSourceBranch} from './ivm-branch.ts';\nimport type {WriteTransaction} from './replicache-types.ts';\n\n/**\n * The shape which a user's custom mutator definitions must conform to.\n * Supports arbitrary depth nesting of namespaces.\n */\nexport type CustomMutatorDefs = {\n  // oxlint-disable-next-line no-explicit-any\n  [namespaceOrKey: string]: CustomMutatorImpl<any> | CustomMutatorDefs;\n};\n\nexport type MutatorResultDetails =\n  | {\n      readonly type: 'success';\n    }\n  | {\n      readonly type: 'error';\n      readonly error:\n        | {\n            readonly type: 'app';\n            readonly message: string;\n            readonly details: ReadonlyJSONValue | undefined;\n          }\n        | {\n            readonly type: 'zero';\n            readonly message: string;\n          };\n    };\n\nexport type MutatorResultSuccessDetails = Extract<\n  MutatorResultDetails,\n  {type: 'success'}\n>;\nexport type MutatorResultErrorDetails = Extract<\n  MutatorResultDetails,\n  {type: 'error'}\n>;\n\nexport type MutatorResult = {\n  client: Promise<MutatorResultDetails & {}>;\n  server: Promise<MutatorResultDetails & {}>;\n} & {};\n\nexport type CustomMutatorImpl<\n  S extends Schema,\n  TWrappedTransaction = unknown,\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  TArgs = any,\n  Context = unknown,\n> = (\n  tx: Transaction<S, TWrappedTransaction>,\n  // TODO: many args. See commit: 52657c2f934b4a458d628ea77e56ce92b61eb3c6 which did have many args.\n  // The issue being that it will be a protocol change to support varargs.\n  args: TArgs,\n  ctx: Context,\n) => Promise<void>;\n\n/**\n * The shape exposed on the `Zero.mutate` instance.\n * The signature of a custom mutator takes a `transaction` as its first arg\n * but the user does not provide this arg when calling the mutator.\n *\n * This utility strips the `tx` arg from the user's custom mutator signatures.\n * Supports arbitrary depth nesting of namespaces.\n */\nexport type MakeCustomMutatorInterfaces<\n  S extends Schema,\n  MD extends CustomMutatorDefs,\n  TContext,\n> = {\n  readonly [NamespaceOrName in keyof MD]: MD[NamespaceOrName] extends (\n    tx: Transaction<S>,\n    ...args: infer Args\n  ) => Promise<void>\n    ? (...args: Args) => MutatorResult\n    : MD[NamespaceOrName] extends CustomMutatorDefs\n      ? MakeCustomMutatorInterfaces<S, MD[NamespaceOrName], TContext>\n      : never;\n};\n\nexport type MakeCustomMutatorInterface<TSchema extends Schema, F> = F extends (\n  tx: ClientTransaction<TSchema>,\n  ...args: infer Args\n) => Promise<void>\n  ? (...args: Args) => MutatorResult\n  : never;\n\nexport class TransactionImpl<TSchema extends Schema>\n  implements ClientTransaction<TSchema>\n{\n  readonly location = 'client';\n  readonly mutate: SchemaCRUD<TSchema>;\n  readonly query: SchemaQuery<TSchema>;\n  readonly #repTx: WriteTransaction;\n  readonly #zeroContext: ZeroContext;\n\n  constructor(lc: LogContext, repTx: WriteTransaction, schema: TSchema) {\n    must(repTx.reason === 'initial' || repTx.reason === 'rebase');\n    const txData = getZeroTxData(repTx);\n\n    this.#repTx = repTx;\n    this.mutate = makeSchemaCRUD(\n      schema,\n      repTx,\n      txData.ivmSources as IVMSourceBranch,\n    );\n    this.query = createBuilder(schema);\n\n    this.#zeroContext = newZeroContext(\n      lc,\n      txData.ivmSources as IVMSourceBranch,\n    );\n  }\n\n  get clientID(): ClientID {\n    return this.#repTx.clientID;\n  }\n\n  get mutationID(): number {\n    return this.#repTx.mutationID;\n  }\n\n  get reason(): 'optimistic' | 'rebase' {\n    return this.#repTx.reason === 'initial' ? 'optimistic' : 'rebase';\n  }\n\n  get token(): string | undefined {\n    return (this.#repTx as WriteTransactionImpl)[zeroData]?.token;\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TSchema, TTable, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.#zeroContext.run(query, options);\n  }\n}\n\nexport function getZeroTxData(repTx: WriteTransaction): ZeroTxData {\n  const txData = must(\n    (repTx as WriteTransactionImpl)[zeroData],\n    'zero was not set on replicache internal options!',\n  );\n  return txData as ZeroTxData;\n}\n\nexport function makeReplicacheMutator<\n  S extends Schema,\n  TWrappedTransaction,\n  Context,\n>(\n  lc: LogContext,\n  mutator: CustomMutatorImpl<S, TWrappedTransaction>,\n  schema: S,\n  context: Context,\n): (repTx: WriteTransaction, args: ReadonlyJSONValue) => Promise<void> {\n  return async (\n    repTx: WriteTransaction,\n    args: ReadonlyJSONValue,\n  ): Promise<void> => {\n    const tx = new TransactionImpl(lc, repTx, schema);\n    await mutator(tx, args, context);\n  };\n}\n\nfunction makeSchemaCRUD<S extends Schema>(\n  schema: S,\n  tx: WriteTransaction,\n  ivmBranch: IVMSourceBranch,\n) {\n  // Only creates the CRUD mutators on demand\n  // rather than creating them all up-front for each mutation.\n  return new Proxy(\n    {},\n    {\n      get(target: Record<string, TableCRUD<TableSchema>>, prop: string) {\n        if (prop in target) {\n          return target[prop];\n        }\n\n        target[prop] = makeTableCRUD(schema, prop, tx, ivmBranch);\n        return target[prop];\n      },\n    },\n  ) as SchemaCRUD<S>;\n}\n\nfunction assertValidRunOptions(options: RunOptions | undefined): void {\n  // TODO(arv): We should enforce this with the type system too.\n  assert(\n    options?.type !== 'complete',\n    'Cannot wait for complete results in custom mutations',\n  );\n}\n\nfunction newZeroContext(lc: LogContext, ivmBranch: IVMSourceBranch) {\n  return new ZeroContext(\n    lc,\n    ivmBranch,\n    () => emptyFunction,\n    () => emptyFunction,\n    emptyFunction,\n    emptyFunction,\n    emptyFunction,\n    applyViewUpdates => applyViewUpdates(),\n    emptyFunction,\n    assertValidRunOptions,\n  );\n}\n\nfunction makeTableCRUD(\n  schema: Schema,\n  tableName: string,\n  tx: WriteTransaction,\n  ivmBranch: IVMSourceBranch,\n) {\n  const table = must(schema.tables[tableName]);\n  const {primaryKey} = table;\n  return {\n    insert: (value: InsertValue<TableSchema>) =>\n      insertImpl(\n        tx,\n        {op: 'insert', tableName, primaryKey, value},\n        schema,\n        ivmBranch,\n      ),\n    upsert: (value: UpsertValue<TableSchema>) =>\n      upsertImpl(\n        tx,\n        {op: 'upsert', tableName, primaryKey, value},\n        schema,\n        ivmBranch,\n      ),\n    update: (value: UpdateValue<TableSchema>) =>\n      updateImpl(\n        tx,\n        {op: 'update', tableName, primaryKey, value},\n        schema,\n        ivmBranch,\n      ),\n    delete: (id: DeleteID<TableSchema>) =>\n      deleteImpl(\n        tx,\n        {op: 'delete', tableName, primaryKey, value: id},\n        schema,\n        ivmBranch,\n      ),\n  };\n}\n"],"names":[],"mappings":";;;;;;;;AAsHO,MAAM,gBAEb;AAAA,EACW,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY,IAAgB,OAAyB,QAAiB;AACpE,SAAK,MAAM,WAAW,aAAa,MAAM,WAAW,QAAQ;AAC5D,UAAM,SAAS,cAAc,KAAK;AAElC,SAAK,SAAS;AACd,SAAK,SAAS;AAAA,MACZ;AAAA,MACA;AAAA,MACA,OAAO;AAAA,IAAA;AAET,SAAK,QAAQ,cAAc,MAAM;AAEjC,SAAK,eAAe;AAAA,MAClB;AAAA,MACA,OAAO;AAAA,IAAA;AAAA,EAEX;AAAA,EAEA,IAAI,WAAqB;AACvB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,IAAI,aAAqB;AACvB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,IAAI,SAAkC;AACpC,WAAO,KAAK,OAAO,WAAW,YAAY,eAAe;AAAA,EAC3D;AAAA,EAEA,IAAI,QAA4B;AAC9B,WAAQ,KAAK,OAAgC,QAAQ,GAAG;AAAA,EAC1D;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,aAAa,IAAI,OAAO,OAAO;AAAA,EAC7C;AACF;AAEO,SAAS,cAAc,OAAqC;AACjE,QAAM,SAAS;AAAA,IACZ,MAA+B,QAAQ;AAAA,IACxC;AAAA,EAAA;AAEF,SAAO;AACT;AAEO,SAAS,sBAKd,IACA,SACA,QACA,SACqE;AACrE,SAAO,OACL,OACA,SACkB;AAClB,UAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAChD,UAAM,QAAQ,IAAI,MAAM,OAAO;AAAA,EACjC;AACF;AAEA,SAAS,eACP,QACA,IACA,WACA;AAGA,SAAO,IAAI;AAAA,IACT,CAAA;AAAA,IACA;AAAA,MACE,IAAI,QAAgD,MAAc;AAChE,YAAI,QAAQ,QAAQ;AAClB,iBAAO,OAAO,IAAI;AAAA,QACpB;AAEA,eAAO,IAAI,IAAI,cAAc,QAAQ,MAAM,IAAI,SAAS;AACxD,eAAO,OAAO,IAAI;AAAA,MACpB;AAAA,IAAA;AAAA,EACF;AAEJ;AAEA,SAAS,sBAAsB,SAAuC;AAEpE;AAAA,IACE,SAAS,SAAS;AAAA,IAClB;AAAA,EAAA;AAEJ;AAEA,SAAS,eAAe,IAAgB,WAA4B;AAClE,SAAO,IAAI;AAAA,IACT;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA,sBAAoB,iBAAA;AAAA,IACpB;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,SAAS,cACP,QACA,WACA,IACA,WACA;AACA,QAAM,QAAQ,KAAK,OAAO,OAAO,SAAS,CAAC;AAC3C,QAAM,EAAC,eAAc;AACrB,SAAO;AAAA,IACL,QAAQ,CAAC,UACP;AAAA,MACE;AAAA,MACA,EAAe,WAAuB,MAAA;AAAA,MACtC;AAAA,MACA;AAAA,IAAA;AAAA,IAEJ,QAAQ,CAAC,UACP;AAAA,MACE;AAAA,MACA,EAAC,IAAI,UAAU,WAAW,YAAY,MAAA;AAAA,MACtC;AAAA,MACA;AAAA,IAAA;AAAA,IAEJ,QAAQ,CAAC,UACP;AAAA,MACE;AAAA,MACA,EAAe,WAAuB,MAAA;AAAA,MACtC;AAAA,MACA;AAAA,IAAA;AAAA,IAEJ,QAAQ,CAAC,OACP;AAAA,MACE;AAAA,MACA,EAAe,WAAuB,OAAO,GAAA;AAAA,MAC7C;AAAA,MACA;AAAA,IAAA;AAAA,EACF;AAEN;"}
+{"version":3,"file":"custom.js","sources":["../../../../../zero-client/src/client/custom.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {ZeroTxData} from '../../../replicache/src/replicache-options.ts';\nimport type {WriteTransactionImpl} from '../../../replicache/src/transactions.ts';\nimport {zeroData} from '../../../replicache/src/transactions.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {emptyFunction} from '../../../shared/src/sentinels.ts';\nimport type {DefaultSchema} from '../../../zero-types/src/default-types.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {\n  makeTransactionMutate,\n  type TransactionMutate,\n} from '../../../zql/src/mutate/crud.ts';\nimport type {\n  ClientTransaction,\n  Transaction,\n} from '../../../zql/src/mutate/custom.ts';\nimport {createRunnableBuilder} from '../../../zql/src/query/create-builder.ts';\nimport {\n  type HumanReadable,\n  type Query,\n  type RunOptions,\n} from '../../../zql/src/query/query.ts';\nimport type {ConditionalSchemaQuery} from '../../../zql/src/query/schema-query.ts';\nimport type {ClientID} from '../types/client-state.ts';\nimport {ZeroContext} from './context.ts';\nimport {makeCRUDExecutor} from './crud.ts';\nimport type {IVMSourceBranch} from './ivm-branch.ts';\nimport type {WriteTransaction} from './replicache-types.ts';\n\n/**\n * The shape which a user's custom mutator definitions must conform to.\n * Supports arbitrary depth nesting of namespaces.\n */\nexport type CustomMutatorDefs = {\n  // oxlint-disable-next-line no-explicit-any\n  [namespaceOrKey: string]: CustomMutatorImpl<any> | CustomMutatorDefs;\n};\n\nexport type MutatorResultDetails =\n  | {\n      readonly type: 'success';\n    }\n  | {\n      readonly type: 'error';\n      readonly error:\n        | {\n            readonly type: 'app';\n            readonly message: string;\n            readonly details: ReadonlyJSONValue | undefined;\n          }\n        | {\n            readonly type: 'zero';\n            readonly message: string;\n          };\n    };\n\nexport type MutatorResultSuccessDetails = Extract<\n  MutatorResultDetails,\n  {type: 'success'}\n>;\nexport type MutatorResultErrorDetails = Extract<\n  MutatorResultDetails,\n  {type: 'error'}\n>;\n\nexport type MutatorResult = {\n  client: Promise<MutatorResultDetails & {}>;\n  server: Promise<MutatorResultDetails & {}>;\n} & {};\n\nexport type CustomMutatorImpl<\n  S extends Schema,\n  TWrappedTransaction = unknown,\n  // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  TArgs = any,\n  Context = unknown,\n> = (\n  tx: Transaction<S, TWrappedTransaction>,\n  // TODO: many args. See commit: 52657c2f934b4a458d628ea77e56ce92b61eb3c6 which did have many args.\n  // The issue being that it will be a protocol change to support varargs.\n  args: TArgs,\n  ctx: Context,\n) => Promise<void>;\n\n/**\n * The shape exposed on the `Zero.mutate` instance.\n * The signature of a custom mutator takes a `transaction` as its first arg\n * but the user does not provide this arg when calling the mutator.\n *\n * This utility strips the `tx` arg from the user's custom mutator signatures.\n * Supports arbitrary depth nesting of namespaces.\n */\nexport type MakeCustomMutatorInterfaces<\n  S extends Schema,\n  MD extends CustomMutatorDefs,\n  TContext,\n> = {\n  readonly [NamespaceOrName in keyof MD]: MD[NamespaceOrName] extends (\n    tx: Transaction<S>,\n    ...args: infer Args\n  ) => Promise<void>\n    ? (...args: Args) => MutatorResult\n    : MD[NamespaceOrName] extends CustomMutatorDefs\n      ? MakeCustomMutatorInterfaces<S, MD[NamespaceOrName], TContext>\n      : never;\n};\n\nexport type MakeCustomMutatorInterface<TSchema extends Schema, F> = F extends (\n  tx: ClientTransaction<TSchema>,\n  ...args: infer Args\n) => Promise<void>\n  ? (...args: Args) => MutatorResult\n  : never;\n\nexport class TransactionImpl<TSchema extends Schema = DefaultSchema>\n  implements ClientTransaction<TSchema>\n{\n  readonly location = 'client';\n  readonly mutate: TransactionMutate<TSchema>;\n  /**\n   * @deprecated Use {@linkcode createBuilder} with `tx.run(zql.table.where(...))` instead.\n   */\n  readonly query: ConditionalSchemaQuery<TSchema>;\n\n  readonly #repTx: WriteTransaction;\n  readonly #zeroContext: ZeroContext;\n\n  constructor(lc: LogContext, repTx: WriteTransaction, schema: TSchema) {\n    must(repTx.reason === 'initial' || repTx.reason === 'rebase');\n    const txData = getZeroTxData(repTx);\n    const ivmBranch = txData.ivmSources as IVMSourceBranch;\n\n    this.#repTx = repTx;\n\n    const executor = makeCRUDExecutor(repTx, schema, ivmBranch);\n    this.mutate = makeTransactionMutate(schema, executor);\n\n    const zeroContext = newZeroContext(\n      lc,\n      txData.ivmSources as IVMSourceBranch,\n    );\n\n    this.query = createRunnableBuilder(zeroContext, schema);\n\n    this.#zeroContext = zeroContext;\n  }\n\n  get clientID(): ClientID {\n    return this.#repTx.clientID;\n  }\n\n  get mutationID(): number {\n    return this.#repTx.mutationID;\n  }\n\n  get reason(): 'optimistic' | 'rebase' {\n    return this.#repTx.reason === 'initial' ? 'optimistic' : 'rebase';\n  }\n\n  get token(): string | undefined {\n    return (this.#repTx as WriteTransactionImpl)[zeroData]?.token;\n  }\n\n  run<TTable extends keyof TSchema['tables'] & string, TReturn>(\n    query: Query<TTable, TSchema, TReturn>,\n    options?: RunOptions,\n  ): Promise<HumanReadable<TReturn>> {\n    return this.#zeroContext.run(query, options);\n  }\n}\n\nexport function getZeroTxData(repTx: WriteTransaction): ZeroTxData {\n  const txData = must(\n    (repTx as WriteTransactionImpl)[zeroData],\n    'zero was not set on replicache internal options!',\n  );\n  return txData as ZeroTxData;\n}\n\nexport function makeReplicacheMutator<\n  S extends Schema,\n  TWrappedTransaction,\n  Context,\n>(\n  lc: LogContext,\n  mutator: CustomMutatorImpl<S, TWrappedTransaction>,\n  schema: S,\n  context: Context,\n): (repTx: WriteTransaction, args: ReadonlyJSONValue) => Promise<void> {\n  return async (\n    repTx: WriteTransaction,\n    args: ReadonlyJSONValue,\n  ): Promise<void> => {\n    const tx = new TransactionImpl(lc, repTx, schema);\n    await mutator(tx, args, context);\n  };\n}\n\nfunction assertValidRunOptions(options: RunOptions | undefined): void {\n  // TODO(arv): We should enforce this with the type system too.\n  assert(\n    options?.type !== 'complete',\n    'Cannot wait for complete results in custom mutations',\n  );\n}\n\nfunction newZeroContext(lc: LogContext, ivmBranch: IVMSourceBranch) {\n  return new ZeroContext(\n    lc,\n    ivmBranch,\n    () => emptyFunction,\n    () => emptyFunction,\n    emptyFunction,\n    emptyFunction,\n    emptyFunction,\n    applyViewUpdates => applyViewUpdates(),\n    emptyFunction,\n    assertValidRunOptions,\n  );\n}\n"],"names":[],"mappings":";;;;;;;;;AAoHO,MAAM,gBAEb;AAAA,EACW,WAAW;AAAA,EACX;AAAA;AAAA;AAAA;AAAA,EAIA;AAAA,EAEA;AAAA,EACA;AAAA,EAET,YAAY,IAAgB,OAAyB,QAAiB;AACpE,SAAK,MAAM,WAAW,aAAa,MAAM,WAAW,QAAQ;AAC5D,UAAM,SAAS,cAAc,KAAK;AAClC,UAAM,YAAY,OAAO;AAEzB,SAAK,SAAS;AAEd,UAAM,WAAW,iBAAiB,OAAO,QAAQ,SAAS;AAC1D,SAAK,SAAS,sBAAsB,QAAQ,QAAQ;AAEpD,UAAM,cAAc;AAAA,MAClB;AAAA,MACA,OAAO;AAAA,IAAA;AAGT,SAAK,QAAQ,sBAAsB,aAAa,MAAM;AAEtD,SAAK,eAAe;AAAA,EACtB;AAAA,EAEA,IAAI,WAAqB;AACvB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,IAAI,aAAqB;AACvB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,IAAI,SAAkC;AACpC,WAAO,KAAK,OAAO,WAAW,YAAY,eAAe;AAAA,EAC3D;AAAA,EAEA,IAAI,QAA4B;AAC9B,WAAQ,KAAK,OAAgC,QAAQ,GAAG;AAAA,EAC1D;AAAA,EAEA,IACE,OACA,SACiC;AACjC,WAAO,KAAK,aAAa,IAAI,OAAO,OAAO;AAAA,EAC7C;AACF;AAEO,SAAS,cAAc,OAAqC;AACjE,QAAM,SAAS;AAAA,IACZ,MAA+B,QAAQ;AAAA,IACxC;AAAA,EAAA;AAEF,SAAO;AACT;AAEO,SAAS,sBAKd,IACA,SACA,QACA,SACqE;AACrE,SAAO,OACL,OACA,SACkB;AAClB,UAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAChD,UAAM,QAAQ,IAAI,MAAM,OAAO;AAAA,EACjC;AACF;AAEA,SAAS,sBAAsB,SAAuC;AAEpE;AAAA,IACE,SAAS,SAAS;AAAA,IAClB;AAAA,EAAA;AAEJ;AAEA,SAAS,eAAe,IAAgB,WAA4B;AAClE,SAAO,IAAI;AAAA,IACT;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA,sBAAoB,iBAAA;AAAA,IACpB;AAAA,IACA;AAAA,EAAA;AAEJ;"}

package/out/zero-client/src/client/delete-clients-manager.d.ts

@@ -14,7 +14,7 @@ import type { DeleteClientsBody, DeleteClientsMessage } from '../../../zero-prot
  */
 export declare class DeleteClientsManager {
     #private;
-    constructor(send: (msg: DeleteClientsMessage) => void, dagStore: Store, lc: LogContext, clientGroupID: Promise<ClientGroupID>);
+    constructor(send: (msg: DeleteClientsMessage) => void, dagStore: Store, lc: LogContext, clientGroupID: Promise<ClientGroupID>, clientID: string);
     /**
      * This gets called by Replicache when it deletes clients from the persistent
      * storage.

package/out/zero-client/src/client/delete-clients-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete-clients-manager.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/delete-clients-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAMvE,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,8CAA8C,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,oBAAoB;;gBAO7B,IAAI,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,EACzC,QAAQ,EAAE,KAAK,EACf,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC;IAQvC;;;OAGG;IACG,gBAAgB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAarE;;;OAGG;IACG,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjD;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC;CAOnD"}
+{"version":3,"file":"delete-clients-manager.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/delete-clients-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAOvE,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,8CAA8C,CAAC;AAiBtD;;;;;;;;GAQG;AACH,qBAAa,oBAAoB;;gBAQ7B,IAAI,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,EACzC,QAAQ,EAAE,KAAK,EACf,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EACrC,QAAQ,EAAE,MAAM;IASlB;;;OAGG;IACG,gBAAgB,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBrE;;;OAGG;IACG,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBjD;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAalE,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC;CAanD"}

package/out/zero-client/src/client/delete-clients-manager.js

@@ -1,16 +1,26 @@
 import { getDeletedClients, confirmDeletedClients } from "../../../replicache/src/deleted-clients.js";
 import { withRead, withWrite } from "../../../replicache/src/with-transactions.js";
+import { assert } from "../../../shared/src/asserts.js";
 import { promiseVoid } from "../../../shared/src/resolved-promises.js";
+function filterAndAssert(deletedClients, clientGroupID, clientID, caller) {
+  const clientIDs = deletedClients.filter((dc) => dc.clientGroupID === clientGroupID).map((dc) => dc.clientID);
+  for (const cid of clientIDs) {
+    assert(cid !== clientID, `cannot delete self in ${caller}`);
+  }
+  return clientIDs;
+}
 class DeleteClientsManager {
   #send;
   #lc;
   #dagStore;
   #clientGroupID;
-  constructor(send, dagStore, lc, clientGroupID) {
+  #clientID;
+  constructor(send, dagStore, lc, clientGroupID, clientID) {
     this.#send = send;
     this.#dagStore = dagStore;
     this.#lc = lc;
     this.#clientGroupID = clientGroupID;
+    this.#clientID = clientID;
   }
   /**
    * This gets called by Replicache when it deletes clients from the persistent
@@ -19,10 +29,16 @@ class DeleteClientsManager {
   async onClientsDeleted(deletedClients) {
     this.#lc.debug?.("DeletedClientsManager, send:", deletedClients);
     const clientGroupID = await this.#clientGroupID;
+    const clientIDs = filterAndAssert(
+      deletedClients,
+      clientGroupID,
+      this.#clientID,
+      "onClientsDeleted"
+    );
     this.#send([
       "deleteClients",
       {
-        clientIDs: deletedClients.filter((dc) => dc.clientGroupID === clientGroupID).map((dc) => dc.clientID)
+        clientIDs
       }
     ]);
   }
@@ -36,7 +52,12 @@ class DeleteClientsManager {
       this.#dagStore,
       (dagRead) => getDeletedClients(dagRead)
     );
-    const clientIDs = deleted.filter((d) => d.clientGroupID === clientGroupID).map((d) => d.clientID);
+    const clientIDs = filterAndAssert(
+      deleted,
+      clientGroupID,
+      this.#clientID,
+      "sendDeletedClientsToServer"
+    );
     if (clientIDs.length > 0) {
       this.#send(["deleteClients", { clientIDs }]);
       this.#lc.debug?.("DeletedClientsManager, send:", deleted);
@@ -62,6 +83,12 @@ class DeleteClientsManager {
       (read) => getDeletedClients(read)
     );
     const clientGroupID = await this.#clientGroupID;
+    filterAndAssert(
+      deletedClients,
+      clientGroupID,
+      this.#clientID,
+      "getDeletedClients"
+    );
     return deletedClients.filter((d) => d.clientGroupID === clientGroupID);
   }
 }

package/out/zero-client/src/client/delete-clients-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-clients-manager.js","sources":["../../../../../zero-client/src/client/delete-clients-manager.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {Store} from '../../../replicache/src/dag/store.ts';\nimport {\n  confirmDeletedClients,\n  getDeletedClients,\n  type DeletedClients,\n} from '../../../replicache/src/deleted-clients.ts';\nimport type {ClientGroupID} from '../../../replicache/src/sync/ids.ts';\nimport {\n  withRead,\n  withWrite,\n} from '../../../replicache/src/with-transactions.ts';\nimport {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport type {\n  DeleteClientsBody,\n  DeleteClientsMessage,\n} from '../../../zero-protocol/src/delete-clients.ts';\n\n/**\n * Replicache will tell us when it deletes clients from the persistent storage\n * due to GC. When this happens we tell the server about the deleted clients.\n * Replicache also store the deleted clients in IDB in case the server is\n * currently offline.\n *\n * The server will reply with the client it actually deleted. When we get that\n * we remove those IDs from our local storage.\n */\nexport class DeleteClientsManager {\n  readonly #send: (msg: DeleteClientsMessage) => void;\n  readonly #lc: LogContext;\n  readonly #dagStore: Store;\n  readonly #clientGroupID: Promise<ClientGroupID>;\n\n  constructor(\n    send: (msg: DeleteClientsMessage) => void,\n    dagStore: Store,\n    lc: LogContext,\n    clientGroupID: Promise<ClientGroupID>,\n  ) {\n    this.#send = send;\n    this.#dagStore = dagStore;\n    this.#lc = lc;\n    this.#clientGroupID = clientGroupID;\n  }\n\n  /**\n   * This gets called by Replicache when it deletes clients from the persistent\n   * storage.\n   */\n  async onClientsDeleted(deletedClients: DeletedClients): Promise<void> {\n    this.#lc.debug?.('DeletedClientsManager, send:', deletedClients);\n    const clientGroupID = await this.#clientGroupID;\n    this.#send([\n      'deleteClients',\n      {\n        clientIDs: deletedClients\n          .filter(dc => dc.clientGroupID === clientGroupID)\n          .map(dc => dc.clientID),\n      },\n    ]);\n  }\n\n  /**\n   * Zero calls this after it connects to ensure that the server knows about all\n   * the clients that might have been deleted locally since the last connection.\n   */\n  async sendDeletedClientsToServer(): Promise<void> {\n    const clientGroupID = await this.#clientGroupID;\n    const deleted = await withRead(this.#dagStore, dagRead =>\n      getDeletedClients(dagRead),\n    );\n\n    // Only send client ids that belong to this client group\n    const clientIDs = deleted\n      .filter(d => d.clientGroupID === clientGroupID)\n      .map(d => d.clientID);\n\n    if (clientIDs.length > 0) {\n      this.#send(['deleteClients', {clientIDs}]);\n      this.#lc.debug?.('DeletedClientsManager, send:', deleted);\n    }\n  }\n\n  /**\n   * This is called as a response to the server telling us which clients it\n   * actually deleted.\n   */\n  clientsDeletedOnServer(deletedClients: DeleteClientsBody): Promise<void> {\n    const {clientIDs = [], clientGroupIDs = []} = deletedClients;\n    if (clientIDs.length > 0 || clientGroupIDs.length > 0) {\n      // Get the deleted clients from the dag and remove the ones from the server.\n      // then write them back to the dag.\n      return withWrite(this.#dagStore, async dagWrite => {\n        this.#lc.debug?.('clientsDeletedOnServer:', clientIDs, clientGroupIDs);\n        await confirmDeletedClients(dagWrite, clientIDs, clientGroupIDs);\n      });\n    }\n    return promiseVoid;\n  }\n\n  async getDeletedClients(): Promise<DeletedClients> {\n    const deletedClients = await withRead(this.#dagStore, read =>\n      getDeletedClients(read),\n    );\n    const clientGroupID = await this.#clientGroupID;\n    return deletedClients.filter(d => d.clientGroupID === clientGroupID);\n  }\n}\n"],"names":[],"mappings":";;;AA2BO,MAAM,qBAAqB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,MACA,UACA,IACA,eACA;AACA,SAAK,QAAQ;AACb,SAAK,YAAY;AACjB,SAAK,MAAM;AACX,SAAK,iBAAiB;AAAA,EACxB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,iBAAiB,gBAA+C;AACpE,SAAK,IAAI,QAAQ,gCAAgC,cAAc;AAC/D,UAAM,gBAAgB,MAAM,KAAK;AACjC,SAAK,MAAM;AAAA,MACT;AAAA,MACA;AAAA,QACE,WAAW,eACR,OAAO,CAAA,OAAM,GAAG,kBAAkB,aAAa,EAC/C,IAAI,CAAA,OAAM,GAAG,QAAQ;AAAA,MAAA;AAAA,IAC1B,CACD;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,6BAA4C;AAChD,UAAM,gBAAgB,MAAM,KAAK;AACjC,UAAM,UAAU,MAAM;AAAA,MAAS,KAAK;AAAA,MAAW,CAAA,YAC7C,kBAAkB,OAAO;AAAA,IAAA;AAI3B,UAAM,YAAY,QACf,OAAO,CAAA,MAAK,EAAE,kBAAkB,aAAa,EAC7C,IAAI,CAAA,MAAK,EAAE,QAAQ;AAEtB,QAAI,UAAU,SAAS,GAAG;AACxB,WAAK,MAAM,CAAC,iBAAiB,EAAC,UAAA,CAAU,CAAC;AACzC,WAAK,IAAI,QAAQ,gCAAgC,OAAO;AAAA,IAC1D;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,uBAAuB,gBAAkD;AACvE,UAAM,EAAC,YAAY,CAAA,GAAI,iBAAiB,CAAA,MAAM;AAC9C,QAAI,UAAU,SAAS,KAAK,eAAe,SAAS,GAAG;AAGrD,aAAO,UAAU,KAAK,WAAW,OAAM,aAAY;AACjD,aAAK,IAAI,QAAQ,2BAA2B,WAAW,cAAc;AACrE,cAAM,sBAAsB,UAAU,WAAW,cAAc;AAAA,MACjE,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,oBAA6C;AACjD,UAAM,iBAAiB,MAAM;AAAA,MAAS,KAAK;AAAA,MAAW,CAAA,SACpD,kBAAkB,IAAI;AAAA,IAAA;AAExB,UAAM,gBAAgB,MAAM,KAAK;AACjC,WAAO,eAAe,OAAO,CAAA,MAAK,EAAE,kBAAkB,aAAa;AAAA,EACrE;AACF;"}
+{"version":3,"file":"delete-clients-manager.js","sources":["../../../../../zero-client/src/client/delete-clients-manager.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {Store} from '../../../replicache/src/dag/store.ts';\nimport {\n  confirmDeletedClients,\n  getDeletedClients,\n  type DeletedClients,\n} from '../../../replicache/src/deleted-clients.ts';\nimport type {ClientGroupID} from '../../../replicache/src/sync/ids.ts';\nimport {\n  withRead,\n  withWrite,\n} from '../../../replicache/src/with-transactions.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {promiseVoid} from '../../../shared/src/resolved-promises.ts';\nimport type {\n  DeleteClientsBody,\n  DeleteClientsMessage,\n} from '../../../zero-protocol/src/delete-clients.ts';\n\nfunction filterAndAssert(\n  deletedClients: DeletedClients,\n  clientGroupID: ClientGroupID,\n  clientID: string,\n  caller: string,\n): string[] {\n  const clientIDs = deletedClients\n    .filter(dc => dc.clientGroupID === clientGroupID)\n    .map(dc => dc.clientID);\n  for (const cid of clientIDs) {\n    assert(cid !== clientID, `cannot delete self in ${caller}`);\n  }\n  return clientIDs;\n}\n\n/**\n * Replicache will tell us when it deletes clients from the persistent storage\n * due to GC. When this happens we tell the server about the deleted clients.\n * Replicache also store the deleted clients in IDB in case the server is\n * currently offline.\n *\n * The server will reply with the client it actually deleted. When we get that\n * we remove those IDs from our local storage.\n */\nexport class DeleteClientsManager {\n  readonly #send: (msg: DeleteClientsMessage) => void;\n  readonly #lc: LogContext;\n  readonly #dagStore: Store;\n  readonly #clientGroupID: Promise<ClientGroupID>;\n  readonly #clientID: string;\n\n  constructor(\n    send: (msg: DeleteClientsMessage) => void,\n    dagStore: Store,\n    lc: LogContext,\n    clientGroupID: Promise<ClientGroupID>,\n    clientID: string,\n  ) {\n    this.#send = send;\n    this.#dagStore = dagStore;\n    this.#lc = lc;\n    this.#clientGroupID = clientGroupID;\n    this.#clientID = clientID;\n  }\n\n  /**\n   * This gets called by Replicache when it deletes clients from the persistent\n   * storage.\n   */\n  async onClientsDeleted(deletedClients: DeletedClients): Promise<void> {\n    this.#lc.debug?.('DeletedClientsManager, send:', deletedClients);\n    const clientGroupID = await this.#clientGroupID;\n    const clientIDs = filterAndAssert(\n      deletedClients,\n      clientGroupID,\n      this.#clientID,\n      'onClientsDeleted',\n    );\n    this.#send([\n      'deleteClients',\n      {\n        clientIDs,\n      },\n    ]);\n  }\n\n  /**\n   * Zero calls this after it connects to ensure that the server knows about all\n   * the clients that might have been deleted locally since the last connection.\n   */\n  async sendDeletedClientsToServer(): Promise<void> {\n    const clientGroupID = await this.#clientGroupID;\n    const deleted = await withRead(this.#dagStore, dagRead =>\n      getDeletedClients(dagRead),\n    );\n\n    const clientIDs = filterAndAssert(\n      deleted,\n      clientGroupID,\n      this.#clientID,\n      'sendDeletedClientsToServer',\n    );\n\n    if (clientIDs.length > 0) {\n      this.#send(['deleteClients', {clientIDs}]);\n      this.#lc.debug?.('DeletedClientsManager, send:', deleted);\n    }\n  }\n\n  /**\n   * This is called as a response to the server telling us which clients it\n   * actually deleted.\n   */\n  clientsDeletedOnServer(deletedClients: DeleteClientsBody): Promise<void> {\n    const {clientIDs = [], clientGroupIDs = []} = deletedClients;\n    if (clientIDs.length > 0 || clientGroupIDs.length > 0) {\n      // Get the deleted clients from the dag and remove the ones from the server.\n      // then write them back to the dag.\n      return withWrite(this.#dagStore, async dagWrite => {\n        this.#lc.debug?.('clientsDeletedOnServer:', clientIDs, clientGroupIDs);\n        await confirmDeletedClients(dagWrite, clientIDs, clientGroupIDs);\n      });\n    }\n    return promiseVoid;\n  }\n\n  async getDeletedClients(): Promise<DeletedClients> {\n    const deletedClients = await withRead(this.#dagStore, read =>\n      getDeletedClients(read),\n    );\n    const clientGroupID = await this.#clientGroupID;\n    filterAndAssert(\n      deletedClients,\n      clientGroupID,\n      this.#clientID,\n      'getDeletedClients',\n    );\n    return deletedClients.filter(d => d.clientGroupID === clientGroupID);\n  }\n}\n"],"names":[],"mappings":";;;;AAmBA,SAAS,gBACP,gBACA,eACA,UACA,QACU;AACV,QAAM,YAAY,eACf,OAAO,CAAA,OAAM,GAAG,kBAAkB,aAAa,EAC/C,IAAI,CAAA,OAAM,GAAG,QAAQ;AACxB,aAAW,OAAO,WAAW;AAC3B,WAAO,QAAQ,UAAU,yBAAyB,MAAM,EAAE;AAAA,EAC5D;AACA,SAAO;AACT;AAWO,MAAM,qBAAqB;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,MACA,UACA,IACA,eACA,UACA;AACA,SAAK,QAAQ;AACb,SAAK,YAAY;AACjB,SAAK,MAAM;AACX,SAAK,iBAAiB;AACtB,SAAK,YAAY;AAAA,EACnB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,iBAAiB,gBAA+C;AACpE,SAAK,IAAI,QAAQ,gCAAgC,cAAc;AAC/D,UAAM,gBAAgB,MAAM,KAAK;AACjC,UAAM,YAAY;AAAA,MAChB;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL;AAAA,IAAA;AAEF,SAAK,MAAM;AAAA,MACT;AAAA,MACA;AAAA,QACE;AAAA,MAAA;AAAA,IACF,CACD;AAAA,EACH;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,6BAA4C;AAChD,UAAM,gBAAgB,MAAM,KAAK;AACjC,UAAM,UAAU,MAAM;AAAA,MAAS,KAAK;AAAA,MAAW,CAAA,YAC7C,kBAAkB,OAAO;AAAA,IAAA;AAG3B,UAAM,YAAY;AAAA,MAChB;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL;AAAA,IAAA;AAGF,QAAI,UAAU,SAAS,GAAG;AACxB,WAAK,MAAM,CAAC,iBAAiB,EAAC,UAAA,CAAU,CAAC;AACzC,WAAK,IAAI,QAAQ,gCAAgC,OAAO;AAAA,IAC1D;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,uBAAuB,gBAAkD;AACvE,UAAM,EAAC,YAAY,CAAA,GAAI,iBAAiB,CAAA,MAAM;AAC9C,QAAI,UAAU,SAAS,KAAK,eAAe,SAAS,GAAG;AAGrD,aAAO,UAAU,KAAK,WAAW,OAAM,aAAY;AACjD,aAAK,IAAI,QAAQ,2BAA2B,WAAW,cAAc;AACrE,cAAM,sBAAsB,UAAU,WAAW,cAAc;AAAA,MACjE,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,oBAA6C;AACjD,UAAM,iBAAiB,MAAM;AAAA,MAAS,KAAK;AAAA,MAAW,CAAA,SACpD,kBAAkB,IAAI;AAAA,IAAA;AAExB,UAAM,gBAAgB,MAAM,KAAK;AACjC;AAAA,MACE;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL;AAAA,IAAA;AAEF,WAAO,eAAe,OAAO,CAAA,MAAK,EAAE,kBAAkB,aAAa;AAAA,EACrE;AACF;"}

package/out/zero-client/src/client/error.d.ts

@@ -31,6 +31,11 @@ export type OfflineError = ClientError<{
     kind: ClientErrorKind.Offline;
     message: string;
 }>;
+export type NoSocketOriginError = ClientError<{
+    kind: ClientErrorKind.NoSocketOrigin;
+    message: string;
+}>;
+export type DisconnectedReason = OfflineError | NoSocketOriginError;
 export type ServerError = ProtocolError<ErrorBody>;
 export type ZeroError = ServerError | ClientError;
 export type ZeroErrorBody = Expand<ErrorBody | ClientErrorBody>;
@@ -64,7 +69,7 @@ export type ErrorConnectionTransition = {
     reason: ZeroError;
 } | {
     status: ConnectionStatus.Disconnected;
-    reason: OfflineError;
+    reason: DisconnectedReason;
 } | {
     status: ConnectionStatus.Closed;
     reason: ZeroError;

package/out/zero-client/src/client/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/error.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAC,SAAS,EAAC,MAAM,0CAA0C,CAAC;AACnE,OAAO,EAAC,WAAW,EAAC,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,4CAA4C,CAAC;AACvE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AACvE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC,eAAe,CAAC,CAAC;AACvD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,OAAO,WAAW,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;IACpC,IAAI,EAAE,eAAe,CAAC,YAAY,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAChC,CAAC,SAAS,GAAG;IACX,IAAI,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC;CAC1D,CAAC,GACF,CAAC,OAAO,CAAC,cAAc,EAAE;IAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAA;CAAC,CAAC,GAAG;IAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAA;CAAC,CAAC,GAC3E,CAAC,OAAO,CAAC,mBAAmB,EAAE;IAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAA;CAAC,CAAC,GAAG;IAC1D,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC;CACnB,CAAC,CACL,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC;IACrC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AACnD,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAClD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC;AACtE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,GAAG,eAAe,CAAC,CAAC;AAEhE;;GAEG;AACH,qBAAa,WAAW,CACtB,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,IAAI,CACpD,eAAe,EACf,QAAQ,CACT,CACD,SAAQ,KAAK;IACb,QAAQ,CAAC,SAAS,EAAE;QAAC,MAAM,EAAE,OAAO,WAAW,CAAC,MAAM,CAAA;KAAC,GAAG,CAAC,CAAC;gBAEhD,SAAS,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY;IAMhD,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,CAEpB;CACF;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,SAAS,CAExD;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,WAAW,CAAC,eAAe,CAAC,CAI7E;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,WAAW,CAM5D;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,YAAY,CAE9D;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,IAAI,SAAS,CAmBxD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,CAU1E;AAED,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,MAAM,MAAM,yBAAyB,GACjC;IAAC,MAAM,EAAE,OAAO,oBAAoB,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GACxD;IAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GACvD;IAAC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GACnD;IAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAC,GAC7D;IAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,CAAC;AAEzD;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,EAAE,EAAE,OAAO,GACV,yBAAyB,CAmG3B"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/error.ts"],"names":[],"mappings":"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"}

package/out/zero-client/src/client/error.js

@@ -4,7 +4,7 @@ import { MutationFailed, MutationRateLimited, Unauthorized, AuthInvalidated, Ser
 import { Client, Server, ZeroCache } from "../../../zero-protocol/src/error-origin-enum.js";
 import { HTTP } from "../../../zero-protocol/src/error-reason-enum.js";
 import { isProtocolError } from "../../../zero-protocol/src/error.js";
-import { ClientClosed, Offline, UserDisconnect, InvalidMessage, Internal, UnexpectedBaseCookie, NoSocketOrigin, Hidden, PullTimeout, PingTimeout, ConnectTimeout, CleanClose, AbruptClose } from "./client-error-kind-enum.js";
+import { ClientClosed, NoSocketOrigin, Offline, UserDisconnect, InvalidMessage, Internal, UnexpectedBaseCookie, Hidden, PullTimeout, PingTimeout, ConnectTimeout, CleanClose, AbruptClose } from "./client-error-kind-enum.js";
 import { NeedsAuth, Closed, Disconnected, Error as Error$1 } from "./connection-status-enum.js";
 class ClientError extends Error {
   errorBody;
@@ -65,7 +65,6 @@ function getErrorConnectionTransition(ex) {
       case PingTimeout:
       case PullTimeout:
       case Hidden:
-      case NoSocketOrigin:
         return { status: NO_STATUS_TRANSITION, reason: ex };
       // Fatal errors that should transition to error state
       case UnexpectedBaseCookie:
@@ -75,6 +74,7 @@ function getErrorConnectionTransition(ex) {
         return { status: Error$1, reason: ex };
       // Disconnected error (this should already result in a disconnected state)
       case Offline:
+      case NoSocketOrigin:
         return {
           status: Disconnected,
           reason: ex