@rocicorp/zero 0.25.0-canary.6 → 0.25.0-canary.8

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

@@ -0,0 +1,104 @@
+import { assert } from "../../../shared/src/asserts.js";
+import { Internal } from "../../../zero-protocol/src/error-kind-enum.js";
+import { MeasurePushOperator } from "../../../zql/src/query/measure-push-operator.js";
+import { QueryDelegateBase } from "../../../zql/src/query/query-delegate-base.js";
+import "../../../shared/src/config.js";
+import "../../../replicache/src/hash.js";
+import "../../../replicache/src/btree/node.js";
+import "compare-utf8";
+import "../../../shared/src/btree-set.js";
+import "../../../zero-protocol/src/ast.js";
+import "js-xxhash";
+import "../../../shared/src/valita.js";
+import "../../../zero-protocol/src/primary-key.js";
+class ZeroContext extends QueryDelegateBase {
+  #lc;
+  // It is a bummer to have to maintain separate MemorySources here and copy the
+  // data in from the Replicache db. But we want the data to be accessible via
+  // pipelines *synchronously* and the core Replicache infra is all async. So
+  // that needs to be fixed.
+  #mainSources;
+  addServerQuery;
+  addCustomQuery;
+  updateServerQuery;
+  updateCustomQuery;
+  flushQueryChanges;
+  #batchViewUpdates;
+  #commitListeners = /* @__PURE__ */ new Set();
+  assertValidRunOptions;
+  /**
+   * Client-side queries start out as "unknown" and are then updated to
+   * "complete" once the server has sent back the query result.
+   */
+  defaultQueryComplete = false;
+  addMetric;
+  constructor(lc, mainSources, addQuery, addCustomQuery, updateQuery, updateCustomQuery, flushQueryChanges, batchViewUpdates, addMetric, assertValidRunOptions) {
+    super();
+    this.#lc = lc;
+    this.#mainSources = mainSources;
+    this.addServerQuery = addQuery;
+    this.updateServerQuery = updateQuery;
+    this.updateCustomQuery = updateCustomQuery;
+    this.#batchViewUpdates = batchViewUpdates;
+    this.assertValidRunOptions = assertValidRunOptions;
+    this.addCustomQuery = addCustomQuery;
+    this.flushQueryChanges = flushQueryChanges;
+    this.addMetric = addMetric;
+  }
+  applyFiltersAnyway;
+  debug;
+  getSource(name) {
+    return this.#mainSources.getSource(name);
+  }
+  mapAst(ast) {
+    return ast;
+  }
+  decorateSourceInput(input, queryID) {
+    return new MeasurePushOperator(input, queryID, this, "query-update-client");
+  }
+  onTransactionCommit(cb) {
+    this.#commitListeners.add(cb);
+    return () => {
+      this.#commitListeners.delete(cb);
+    };
+  }
+  batchViewUpdates(applyViewUpdates) {
+    let result;
+    let viewChangesPerformed = false;
+    this.#batchViewUpdates(() => {
+      result = applyViewUpdates();
+      viewChangesPerformed = true;
+    });
+    assert(
+      viewChangesPerformed,
+      "batchViewUpdates must call applyViewUpdates synchronously."
+    );
+    return result;
+  }
+  processChanges(expectedHead, newHead, changes) {
+    this.batchViewUpdates(() => {
+      try {
+        this.#mainSources.advance(expectedHead, newHead, changes);
+      } finally {
+        this.#endTransaction();
+      }
+    });
+  }
+  #endTransaction() {
+    for (const listener of this.#commitListeners) {
+      try {
+        listener();
+      } catch (e) {
+        this.#lc.error?.(
+          Internal,
+          "Failed notifying a commit listener of IVM updates",
+          e
+        );
+      }
+    }
+  }
+}
+export {
+  ZeroContext
+};
+//# sourceMappingURL=context.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sources":["../../../../../zero-client/src/client/context.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {NoIndexDiff} from '../../../replicache/src/btree/node.ts';\nimport type {Hash} from '../../../replicache/src/hash.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport type {DebugDelegate} from '../../../zql/src/builder/debug-delegate.ts';\nimport type {Input} from '../../../zql/src/ivm/operator.ts';\nimport type {Source, SourceInput} from '../../../zql/src/ivm/source.ts';\nimport {MeasurePushOperator} from '../../../zql/src/query/measure-push-operator.ts';\nimport type {MetricsDelegate} from '../../../zql/src/query/metrics-delegate.ts';\nimport {QueryDelegateBase} from '../../../zql/src/query/query-delegate-base.ts';\nimport type {CommitListener} from '../../../zql/src/query/query-delegate.ts';\nimport type {RunOptions} from '../../../zql/src/query/query.ts';\nimport {type IVMSourceBranch} from './ivm-branch.ts';\nimport type {QueryManager} from './query-manager.ts';\n\nexport type AddQuery = QueryManager['addLegacy'];\nexport type AddCustomQuery = QueryManager['addCustom'];\n\nexport type UpdateQuery = QueryManager['updateLegacy'];\nexport type UpdateCustomQuery = QueryManager['updateCustom'];\nexport type FlushQueryChanges = QueryManager['flushBatch'];\n\n/**\n * ZeroContext glues together zql and Replicache. It listens to changes in\n * Replicache data and pushes them into IVM and on tells the server about new\n * queries.\n */\nexport class ZeroContext extends QueryDelegateBase {\n  readonly #lc: LogContext;\n\n  // It is a bummer to have to maintain separate MemorySources here and copy the\n  // data in from the Replicache db. But we want the data to be accessible via\n  // pipelines *synchronously* and the core Replicache infra is all async. So\n  // that needs to be fixed.\n  readonly #mainSources: IVMSourceBranch;\n\n  readonly addServerQuery: AddQuery;\n  readonly addCustomQuery: AddCustomQuery;\n  readonly updateServerQuery: UpdateQuery;\n  readonly updateCustomQuery: UpdateCustomQuery;\n  readonly flushQueryChanges: () => void;\n  readonly #batchViewUpdates: (applyViewUpdates: () => void) => void;\n  readonly #commitListeners: Set<CommitListener> = new Set();\n\n  readonly assertValidRunOptions: (options?: RunOptions) => void;\n\n  /**\n   * Client-side queries start out as \"unknown\" and are then updated to\n   * \"complete\" once the server has sent back the query result.\n   */\n  readonly defaultQueryComplete = false;\n\n  readonly addMetric: MetricsDelegate['addMetric'];\n\n  constructor(\n    lc: LogContext,\n    mainSources: IVMSourceBranch,\n    addQuery: AddQuery,\n    addCustomQuery: AddCustomQuery,\n    updateQuery: UpdateQuery,\n    updateCustomQuery: UpdateCustomQuery,\n    flushQueryChanges: () => void,\n    batchViewUpdates: (applyViewUpdates: () => void) => void,\n    addMetric: MetricsDelegate['addMetric'],\n    assertValidRunOptions: (options?: RunOptions) => void,\n  ) {\n    super();\n    this.#lc = lc;\n    this.#mainSources = mainSources;\n    this.addServerQuery = addQuery;\n    this.updateServerQuery = updateQuery;\n    this.updateCustomQuery = updateCustomQuery;\n    this.#batchViewUpdates = batchViewUpdates;\n    this.assertValidRunOptions = assertValidRunOptions;\n    this.addCustomQuery = addCustomQuery;\n    this.flushQueryChanges = flushQueryChanges;\n    this.addMetric = addMetric;\n  }\n\n  applyFiltersAnyway?: boolean | undefined;\n\n  debug?: DebugDelegate | undefined;\n\n  getSource(name: string): Source | undefined {\n    return this.#mainSources.getSource(name);\n  }\n\n  mapAst(ast: AST): AST {\n    return ast;\n  }\n\n  override decorateSourceInput(input: SourceInput, queryID: string): Input {\n    return new MeasurePushOperator(input, queryID, this, 'query-update-client');\n  }\n\n  onTransactionCommit(cb: CommitListener): () => void {\n    this.#commitListeners.add(cb);\n    return () => {\n      this.#commitListeners.delete(cb);\n    };\n  }\n\n  override batchViewUpdates<T>(applyViewUpdates: () => T) {\n    let result: T | undefined;\n    let viewChangesPerformed = false;\n    this.#batchViewUpdates(() => {\n      result = applyViewUpdates();\n      viewChangesPerformed = true;\n    });\n    assert(\n      viewChangesPerformed,\n      'batchViewUpdates must call applyViewUpdates synchronously.',\n    );\n    return result as T;\n  }\n\n  processChanges(\n    expectedHead: Hash | undefined,\n    newHead: Hash,\n    changes: NoIndexDiff,\n  ) {\n    this.batchViewUpdates(() => {\n      try {\n        this.#mainSources.advance(expectedHead, newHead, changes);\n      } finally {\n        this.#endTransaction();\n      }\n    });\n  }\n\n  #endTransaction() {\n    for (const listener of this.#commitListeners) {\n      try {\n        listener();\n      } catch (e) {\n        // We should not fatal the inner-workings of Zero due to the user's application\n        // code throwing an error.\n        // Hence we wrap notifications in a try-catch block.\n        this.#lc.error?.(\n          ErrorKind.Internal,\n          'Failed notifying a commit listener of IVM updates',\n          e,\n        );\n      }\n    }\n  }\n}\n"],"names":["ErrorKind.Internal"],"mappings":";;;;;;;;;;;;;AA6BO,MAAM,oBAAoB,kBAAkB;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,uCAA4C,IAAA;AAAA,EAE5C;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,uBAAuB;AAAA,EAEvB;AAAA,EAET,YACE,IACA,aACA,UACA,gBACA,aACA,mBACA,mBACA,kBACA,WACA,uBACA;AACA,UAAA;AACA,SAAK,MAAM;AACX,SAAK,eAAe;AACpB,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,oBAAoB;AACzB,SAAK,wBAAwB;AAC7B,SAAK,iBAAiB;AACtB,SAAK,oBAAoB;AACzB,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA,UAAU,MAAkC;AAC1C,WAAO,KAAK,aAAa,UAAU,IAAI;AAAA,EACzC;AAAA,EAEA,OAAO,KAAe;AACpB,WAAO;AAAA,EACT;AAAA,EAES,oBAAoB,OAAoB,SAAwB;AACvE,WAAO,IAAI,oBAAoB,OAAO,SAAS,MAAM,qBAAqB;AAAA,EAC5E;AAAA,EAEA,oBAAoB,IAAgC;AAClD,SAAK,iBAAiB,IAAI,EAAE;AAC5B,WAAO,MAAM;AACX,WAAK,iBAAiB,OAAO,EAAE;AAAA,IACjC;AAAA,EACF;AAAA,EAES,iBAAoB,kBAA2B;AACtD,QAAI;AACJ,QAAI,uBAAuB;AAC3B,SAAK,kBAAkB,MAAM;AAC3B,eAAS,iBAAA;AACT,6BAAuB;AAAA,IACzB,CAAC;AACD;AAAA,MACE;AAAA,MACA;AAAA,IAAA;AAEF,WAAO;AAAA,EACT;AAAA,EAEA,eACE,cACA,SACA,SACA;AACA,SAAK,iBAAiB,MAAM;AAC1B,UAAI;AACF,aAAK,aAAa,QAAQ,cAAc,SAAS,OAAO;AAAA,MAC1D,UAAA;AACE,aAAK,gBAAA;AAAA,MACP;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,kBAAkB;AAChB,eAAW,YAAY,KAAK,kBAAkB;AAC5C,UAAI;AACF,iBAAA;AAAA,MACF,SAAS,GAAG;AAIV,aAAK,IAAI;AAAA,UACPA;AAAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AAAA,IACF;AAAA,EACF;AACF;"}

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

@@ -0,0 +1,225 @@
+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) {
+  const { [CRUD_MUTATION_NAME]: zeroCRUD } = repMutate;
+  const mutateBatch = async (body) => {
+    const ops = [];
+    const m = {};
+    for (const name of Object.keys(schema.tables)) {
+      m[name] = makeBatchCRUDMutate(name, schema, ops);
+    }
+    const rv = await body(m);
+    await zeroCRUD({ ops });
+    return rv;
+  };
+  const mutate = {};
+  for (const [name, tableSchema] of Object.entries(schema.tables)) {
+    mutate[name] = makeEntityCRUDMutate(name, tableSchema.primaryKey, zeroCRUD);
+  }
+  return {
+    mutate,
+    mutateBatch
+  };
+}
+function makeEntityCRUDMutate(tableName, primaryKey, zeroCRUD) {
+  return {
+    insert: (value) => {
+      const op = {
+        op: "insert",
+        tableName,
+        primaryKey,
+        value
+      };
+      return zeroCRUD({ ops: [op] });
+    },
+    upsert: (value) => {
+      const op = {
+        op: "upsert",
+        tableName,
+        primaryKey,
+        value
+      };
+      return zeroCRUD({ ops: [op] });
+    },
+    update: (value) => {
+      const op = {
+        op: "update",
+        tableName,
+        primaryKey,
+        value
+      };
+      return zeroCRUD({ ops: [op] });
+    },
+    delete: (id) => {
+      const op = {
+        op: "delete",
+        tableName,
+        primaryKey,
+        value: id
+      };
+      return zeroCRUD({ ops: [op] });
+    }
+  };
+}
+function makeBatchCRUDMutate(tableName, schema, ops) {
+  const { primaryKey } = schema.tables[tableName];
+  return {
+    insert: (value) => {
+      const op = {
+        op: "insert",
+        tableName,
+        primaryKey,
+        value
+      };
+      ops.push(op);
+      return promiseVoid;
+    },
+    upsert: (value) => {
+      const op = {
+        op: "upsert",
+        tableName,
+        primaryKey,
+        value
+      };
+      ops.push(op);
+      return promiseVoid;
+    },
+    update: (value) => {
+      const op = {
+        op: "update",
+        tableName,
+        primaryKey,
+        value
+      };
+      ops.push(op);
+      return promiseVoid;
+    },
+    delete: (id) => {
+      const op = {
+        op: "delete",
+        tableName,
+        primaryKey,
+        value: id
+      };
+      ops.push(op);
+      return promiseVoid;
+    }
+  };
+}
+function makeCRUDMutator(schema) {
+  return async function zeroCRUDMutator(tx, crudArg) {
+    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;
+      }
+    }
+  };
+}
+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,
+  makeBatchCRUDMutate,
+  makeCRUDMutate,
+  makeCRUDMutator,
+  updateImpl,
+  upsertImpl
+};
+//# sourceMappingURL=crud.js.map

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

@@ -0,0 +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 * queries are `issue` and `label`, then this object will have `issue` and\n * `label` properties.\n */\nexport function makeCRUDMutate<const S extends Schema>(\n  schema: S,\n  repMutate: ZeroCRUDMutate,\n): {mutate: DBMutator<S>; mutateBatch: 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  const mutate: Record<string, TableMutator<TableSchema>> = {};\n  for (const [name, tableSchema] of Object.entries(schema.tables)) {\n    mutate[name] = makeEntityCRUDMutate(name, tableSchema.primaryKey, zeroCRUD);\n  }\n  return {\n    mutate: mutate as DBMutator<S>,\n    mutateBatch: mutateBatch as BatchMutator<S>,\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 `{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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"}

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

@@ -1,18 +1,17 @@
+import type { LogContext } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { ClientTransaction, SchemaCRUD, SchemaQuery, Transaction } from '../../../zql/src/mutate/custom.ts';
 import { type HumanReadable, type Query, type RunOptions } from '../../../zql/src/query/query.ts';
 import type { ClientID } from '../types/client-state.ts';
-import type { ZeroErrorDetails } from './error.ts';
 import type { WriteTransaction } from './replicache-types.ts';
-import type { ZeroLogContext } from './zero-log-context.ts';
 /**
  * The shape which a user's custom mutator definitions must conform to.
+ * Supports arbitrary depth nesting of namespaces.
  */
 export type CustomMutatorDefs = {
-    [namespaceOrKey: string]: {
-        [key: string]: CustomMutatorImpl<any>;
-    } | CustomMutatorImpl<any>;
+    [namespaceOrKey: string]: // oxlint-disable-next-line @typescript-eslint/no-explicit-any
+    CustomMutatorImpl<any> | CustomMutatorDefs;
 };
 export type MutatorResultDetails = {
     readonly type: 'success';
@@ -25,7 +24,6 @@ export type MutatorResultDetails = {
     } | {
         readonly type: 'zero';
         readonly message: string;
-        readonly details: ZeroErrorDetails;
     };
 };
 export type MutatorResultSuccessDetails = Extract<MutatorResultDetails, {
@@ -45,24 +43,23 @@ export type CustomMutatorImpl<S extends Schema, TWrappedTransaction = unknown, T
  * but the user does not provide this arg when calling the mutator.
  *
  * This utility strips the `tx` arg from the user's custom mutator signatures.
+ * Supports arbitrary depth nesting of namespaces.
  */
 export type MakeCustomMutatorInterfaces<S extends Schema, MD extends CustomMutatorDefs, TContext> = {
-    readonly [NamespaceOrName in keyof MD]: MD[NamespaceOrName] extends (tx: Transaction<S>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : {
-        readonly [P in keyof MD[NamespaceOrName]]: MakeCustomMutatorInterface<S, MD[NamespaceOrName][P], TContext>;
-    };
+    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, TContext> = F extends (tx: ClientTransaction<TSchema, TContext>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : never;
-export declare class TransactionImpl<TSchema extends Schema, TContext> implements ClientTransaction<TSchema, TContext> {
+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> {
     #private;
     readonly location = "client";
     readonly mutate: SchemaCRUD<TSchema>;
-    readonly query: SchemaQuery<TSchema, TContext>;
-    constructor(lc: ZeroLogContext, repTx: WriteTransaction, schema: TSchema);
+    readonly query: SchemaQuery<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, TContext>(query: Query<TSchema, TTable, TReturn, TContext>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
+    run<TTable extends keyof TSchema['tables'] & string, TReturn>(query: Query<TSchema, TTable, TReturn>, options?: RunOptions): Promise<HumanReadable<TReturn>>;
 }
-export declare function makeReplicacheMutator<S extends Schema, TWrappedTransaction>(lc: ZeroLogContext, mutator: CustomMutatorImpl<S, TWrappedTransaction>, schema: S): (repTx: WriteTransaction, args: ReadonlyJSONValue) => Promise<void>;
+export declare function makeReplicacheMutator<S extends Schema, TWrappedTransaction>(lc: LogContext, mutator: CustomMutatorImpl<S, TWrappedTransaction>, schema: S): (repTx: WriteTransaction, args: ReadonlyJSONValue) => Promise<void>;
 //# sourceMappingURL=custom.d.ts.map

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

@@ -0,0 +1,123 @@
+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/named.js";
+import "../../../zero-protocol/src/ast.js";
+import { ZeroContext } from "./context.js";
+import { deleteImpl, updateImpl, upsertImpl, insertImpl } from "./crud.js";
+class TransactionImpl {
+  location = "client";
+  mutate;
+  query;
+  #repTx;
+  #zeroContext;
+  constructor(lc, repTx, schema) {
+    must(repTx.reason === "initial" || repTx.reason === "rebase");
+    const txData = must(
+      repTx[zeroData],
+      "zero was not set on replicache internal options!"
+    );
+    this.#repTx = repTx;
+    this.mutate = makeSchemaCRUD(
+      schema,
+      repTx,
+      txData.ivmSources
+    );
+    this.query = createBuilder(schema);
+    this.#zeroContext = newZeroContext(
+      lc,
+      txData.ivmSources
+    );
+  }
+  get clientID() {
+    return this.#repTx.clientID;
+  }
+  get mutationID() {
+    return this.#repTx.mutationID;
+  }
+  get reason() {
+    return this.#repTx.reason === "initial" ? "optimistic" : "rebase";
+  }
+  get token() {
+    return this.#repTx[zeroData]?.token;
+  }
+  run(query, options) {
+    return this.#zeroContext.run(query, options);
+  }
+}
+function makeReplicacheMutator(lc, mutator, schema) {
+  return async (repTx, args) => {
+    const tx = new TransactionImpl(lc, repTx, schema);
+    await mutator(tx, args);
+  };
+}
+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",
+    "Cannot wait for complete results in custom mutations"
+  );
+}
+function newZeroContext(lc, ivmBranch) {
+  return new ZeroContext(
+    lc,
+    ivmBranch,
+    () => emptyFunction,
+    () => emptyFunction,
+    emptyFunction,
+    emptyFunction,
+    emptyFunction,
+    (applyViewUpdates) => applyViewUpdates(),
+    emptyFunction,
+    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,
+  makeReplicacheMutator
+};
+//# sourceMappingURL=custom.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"custom.js","sources":["../../../../../zero-client/src/client/custom.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\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  SchemaQuery,\n  TableCRUD,\n  Transaction,\n  UpdateValue,\n  UpsertValue,\n} from '../../../zql/src/mutate/custom.ts';\nimport {createBuilder} from '../../../zql/src/query/named.ts';\nimport {\n  type HumanReadable,\n  type Query,\n  type RunOptions,\n} from '../../../zql/src/query/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  [\n    namespaceOrKey: string\n  ]: // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n  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> = (\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) => 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 = must(\n      (repTx as WriteTransactionImpl)[zeroData],\n      'zero was not set on replicache internal options!',\n    );\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 makeReplicacheMutator<S extends Schema, TWrappedTransaction>(\n  lc: LogContext,\n  mutator: CustomMutatorImpl<S, TWrappedTransaction>,\n  schema: S,\n) {\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);\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":";;;;;;;;AAqHO,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;AAAA,MACZ,MAA+B,QAAQ;AAAA,MACxC;AAAA,IAAA;AAGF,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,sBACd,IACA,SACA,QACA;AACA,SAAO,OACL,OACA,SACkB;AAClB,UAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAChD,UAAM,QAAQ,IAAI,IAAI;AAAA,EACxB;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;"}

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

@@ -1,8 +1,8 @@
+import type { LogContext } from '@rocicorp/logger';
 import type { Store } from '../../../replicache/src/dag/store.ts';
 import { type DeletedClients } from '../../../replicache/src/deleted-clients.ts';
 import type { ClientGroupID } from '../../../replicache/src/sync/ids.ts';
 import type { DeleteClientsBody, DeleteClientsMessage } from '../../../zero-protocol/src/delete-clients.ts';
-import type { ZeroLogContext } from './zero-log-context.ts';
 /**
  * Replicache will tell us when it deletes clients from the persistent storage
  * due to GC. When this happens we tell the server about the deleted clients.
@@ -14,7 +14,7 @@ import type { ZeroLogContext } from './zero-log-context.ts';
  */
 export declare class DeleteClientsManager {
     #private;
-    constructor(send: (msg: DeleteClientsMessage) => void, dagStore: Store, lc: ZeroLogContext, clientGroupID: Promise<ClientGroupID>);
+    constructor(send: (msg: DeleteClientsMessage) => void, dagStore: Store, lc: LogContext, clientGroupID: Promise<ClientGroupID>);
     /**
      * 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,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;AACtD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,oBAAoB;;gBAO7B,IAAI,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,IAAI,EACzC,QAAQ,EAAE,KAAK,EACf,EAAE,EAAE,cAAc,EAClB,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;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"}