@rocicorp/zero 0.25.0 → 0.26.0-canary.0

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-impl.d.ts

@@ -0,0 +1,11 @@
+import { type DeleteOp, type InsertOp, type UpdateOp, type UpsertOp } from '../../../zero-protocol/src/push.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { IVMSourceBranch } from './ivm-branch.ts';
+import type { WriteTransaction } from './replicache-types.ts';
+export type { TableMutator } from '../../../zql/src/mutate/crud.ts';
+export declare function insert(tx: WriteTransaction, arg: InsertOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
+export declare function upsert(tx: WriteTransaction, arg: InsertOp | UpsertOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
+export declare function update(tx: WriteTransaction, arg: UpdateOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
+declare function deleteImpl(tx: WriteTransaction, arg: DeleteOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
+export { deleteImpl as delete };
+//# sourceMappingURL=crud-impl.d.ts.map

package/out/zero-client/src/client/crud-impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crud-impl.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud-impl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACb,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAC5D,YAAY,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAelE,wBAAsB,MAAM,CAC1B,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED,wBAAsB,MAAM,CAC1B,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,QAAQ,GAAG,QAAQ,EACxB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,wBAAsB,MAAM,CAC1B,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,iBAAe,UAAU,CACvB,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED,OAAO,EAAC,UAAU,IAAI,MAAM,EAAC,CAAC"}

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

@@ -0,0 +1,102 @@
+import { must } from "../../../shared/src/must.js";
+import "../../../zero-protocol/src/push.js";
+import { consume } from "../../../zql/src/ivm/stream.js";
+import { toPrimaryKeyString } from "./keys.js";
+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 insert(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) {
+      consume(
+        must(ivmBranch.getSource(arg.tableName)).push({
+          type: "add",
+          row: arg.value
+        })
+      );
+    }
+  }
+}
+async function upsert(tx, arg, schema, ivmBranch) {
+  const key = toPrimaryKeyString(
+    arg.tableName,
+    schema.tables[arg.tableName].primaryKey,
+    arg.value
+  );
+  if (await tx.has(key)) {
+    await update(tx, { ...arg }, schema, ivmBranch);
+  } else {
+    await insert(tx, { ...arg }, schema, ivmBranch);
+  }
+}
+async function update(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 update2 = arg.value;
+  const next = { ...prev };
+  for (const k in update2) {
+    if (update2[k] !== void 0) {
+      next[k] = update2[k];
+    }
+  }
+  await tx.set(key, next);
+  if (ivmBranch) {
+    consume(
+      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) {
+    consume(
+      must(ivmBranch.getSource(arg.tableName)).push({
+        type: "remove",
+        row: prev
+      })
+    );
+  }
+}
+export {
+  deleteImpl as delete,
+  insert,
+  update,
+  upsert
+};
+//# sourceMappingURL=crud-impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"crud-impl.js","sources":["../../../../../zero-client/src/client/crud-impl.ts"],"sourcesContent":["import type {ReadonlyJSONObject} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport {\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 {consume} from '../../../zql/src/ivm/stream.ts';\nimport type {IVMSourceBranch} from './ivm-branch.ts';\nimport {toPrimaryKeyString} from './keys.ts';\nimport type {WriteTransaction} from './replicache-types.ts';\nexport type {TableMutator} from '../../../zql/src/mutate/crud.ts';\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 insert(\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      consume(\n        must(ivmBranch.getSource(arg.tableName)).push({\n          type: 'add',\n          row: arg.value,\n        }),\n      );\n    }\n  }\n}\n\nexport async function upsert(\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 update(tx, {...arg, op: 'update'}, schema, ivmBranch);\n  } else {\n    await insert(tx, {...arg, op: 'insert'}, schema, ivmBranch);\n  }\n}\n\nexport async function update(\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    consume(\n      must(ivmBranch.getSource(arg.tableName)).push({\n        type: 'edit',\n        oldRow: prev as Row,\n        row: next,\n      }),\n    );\n  }\n}\n\nasync 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    consume(\n      must(ivmBranch.getSource(arg.tableName)).push({\n        type: 'remove',\n        row: prev as Row,\n      }),\n    );\n  }\n}\n\nexport {deleteImpl as delete};\n"],"names":["update"],"mappings":";;;;AAiBA,SAAS,4BACP,QACA,OACoB;AACpB,MAAI,KAAK;AACT,aAAW,QAAQ,OAAO,SAAS;AACjC,QAAI,GAAG,IAAI,MAAM,QAAW;AAC1B,WAAK,EAAC,GAAG,IAAI,CAAC,IAAI,GAAG,KAAA;AAAA,IACvB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAsB,OACpB,IACA,KACA,QACA,WACe;AACf,QAAM,MAAM;AAAA,IACV,IAAI;AAAA,IACJ,OAAO,OAAO,IAAI,SAAS,EAAE;AAAA,IAC7B,IAAI;AAAA,EAAA;AAEN,MAAI,CAAE,MAAM,GAAG,IAAI,GAAG,GAAI;AACxB,UAAM,MAAM;AAAA,MACV,OAAO,OAAO,IAAI,SAAS;AAAA,MAC3B,IAAI;AAAA,IAAA;AAEN,UAAM,GAAG,IAAI,KAAK,GAAG;AACrB,QAAI,WAAW;AACb;AAAA,QACE,KAAK,UAAU,UAAU,IAAI,SAAS,CAAC,EAAE,KAAK;AAAA,UAC5C,MAAM;AAAA,UACN,KAAK,IAAI;AAAA,QAAA,CACV;AAAA,MAAA;AAAA,IAEL;AAAA,EACF;AACF;AAEA,eAAsB,OACpB,IACA,KACA,QACA,WACe;AACf,QAAM,MAAM;AAAA,IACV,IAAI;AAAA,IACJ,OAAO,OAAO,IAAI,SAAS,EAAE;AAAA,IAC7B,IAAI;AAAA,EAAA;AAEN,MAAI,MAAM,GAAG,IAAI,GAAG,GAAG;AACrB,UAAM,OAAO,IAAI,EAAC,GAAG,IAAiB,GAAG,QAAQ,SAAS;AAAA,EAC5D,OAAO;AACL,UAAM,OAAO,IAAI,EAAC,GAAG,IAAiB,GAAG,QAAQ,SAAS;AAAA,EAC5D;AACF;AAEA,eAAsB,OACpB,IACA,KACA,QACA,WACe;AACf,QAAM,MAAM;AAAA,IACV,IAAI;AAAA,IACJ,OAAO,OAAO,IAAI,SAAS,EAAE;AAAA,IAC7B,IAAI;AAAA,EAAA;AAEN,QAAM,OAAO,MAAM,GAAG,IAAI,GAAG;AAC7B,MAAI,SAAS,QAAW;AACtB;AAAA,EACF;AACA,QAAMA,UAAS,IAAI;AACnB,QAAM,OAAO,EAAC,GAAI,KAAA;AAClB,aAAW,KAAKA,SAAQ;AACtB,QAAIA,QAAO,CAAC,MAAM,QAAW;AAC3B,WAAK,CAAC,IAAIA,QAAO,CAAC;AAAA,IACpB;AAAA,EACF;AACA,QAAM,GAAG,IAAI,KAAK,IAAI;AACtB,MAAI,WAAW;AACb;AAAA,MACE,KAAK,UAAU,UAAU,IAAI,SAAS,CAAC,EAAE,KAAK;AAAA,QAC5C,MAAM;AAAA,QACN,QAAQ;AAAA,QACR,KAAK;AAAA,MAAA,CACN;AAAA,IAAA;AAAA,EAEL;AACF;AAEA,eAAe,WACb,IACA,KACA,QACA,WACe;AACf,QAAM,MAAM;AAAA,IACV,IAAI;AAAA,IACJ,OAAO,OAAO,IAAI,SAAS,EAAE;AAAA,IAC7B,IAAI;AAAA,EAAA;AAEN,QAAM,OAAO,MAAM,GAAG,IAAI,GAAG;AAC7B,MAAI,SAAS,QAAW;AACtB;AAAA,EACF;AACA,QAAM,GAAG,IAAI,GAAG;AAChB,MAAI,WAAW;AACb;AAAA,MACE,KAAK,UAAU,UAAU,IAAI,SAAS,CAAC,EAAE,KAAK;AAAA,QAC5C,MAAM;AAAA,QACN,KAAK;AAAA,MAAA,CACN;AAAA,IAAA;AAAA,EAEL;AACF;"}

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

@@ -1,58 +1,31 @@
 import type { MaybePromise } from '../../../shared/src/types.ts';
-import { CRUD_MUTATION_NAME, type CRUDMutationArg, type CRUDOp, type DeleteOp, type InsertOp, type UpdateOp, type UpsertOp } from '../../../zero-protocol/src/push.ts';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
+import { CRUD_MUTATION_NAME, type CRUDMutationArg, type CRUDOp } from '../../../zero-protocol/src/push.ts';
 import type { TableSchema } from '../../../zero-schema/src/table-schema.ts';
-import type { DeleteID, InsertValue, UpdateValue, UpsertValue } from '../../../zql/src/mutate/custom.ts';
+import type { Schema } from '../../../zero-types/src/schema.ts';
+import type { CRUDExecutor, TableMutator } from '../../../zql/src/mutate/crud.ts';
 import type { IVMSourceBranch } from './ivm-branch.ts';
 import type { MutatorDefs, WriteTransaction } from './replicache-types.ts';
-/**
- * This is the type of the generated mutate.<name>.<verb> function.
- */
-export type TableMutator<S extends TableSchema> = {
-    /**
-     * Writes a row if a row with the same primary key doesn't already exists.
-     * Non-primary-key fields that are 'optional' can be omitted or set to
-     * `undefined`. Such fields will be assigned the value `null` optimistically
-     * and then the default value as defined by the server.
-     */
-    insert: (value: InsertValue<S>) => Promise<void>;
-    /**
-     * Writes a row unconditionally, overwriting any existing row with the same
-     * primary key. Non-primary-key fields that are 'optional' can be omitted or
-     * set to `undefined`. Such fields will be assigned the value `null`
-     * optimistically and then the default value as defined by the server.
-     */
-    upsert: (value: UpsertValue<S>) => Promise<void>;
-    /**
-     * Updates a row with the same primary key. If no such row exists, this
-     * function does nothing. All non-primary-key fields can be omitted or set to
-     * `undefined`. Such fields will be left unchanged from previous value.
-     */
-    update: (value: UpdateValue<S>) => Promise<void>;
-    /**
-     * Deletes the row with the specified primary key. If no such row exists, this
-     * function does nothing.
-     */
-    delete: (id: DeleteID<S>) => Promise<void>;
-};
-export type DBMutator<S extends Schema> = S['enableLegacyMutators'] extends false ? {} : {
+export type DBMutator<S extends Schema> = S['enableLegacyMutators'] extends true ? {
     [K in keyof S['tables']]: TableMutator<S['tables'][K]>;
-};
-export type BatchMutator<S extends Schema> = <R>(body: (m: DBMutator<S>) => MaybePromise<R>) => Promise<R>;
+} : {};
+export type BatchMutator<S extends Schema> = S['enableLegacyMutators'] extends true ? <R>(body: (m: DBMutator<S>) => MaybePromise<R>) => Promise<R> : undefined;
 type ZeroCRUDMutate = {
     [CRUD_MUTATION_NAME]: CRUDMutate;
 };
 /**
- * This is the zero.mutate object part representing the CRUD operations. If the
- * queries are `issue` and `label`, then this object will have `issue` and
+ * This is the zero.mutateBatch function part representing the CRUD operations. If the
+ * tables are `issue` and `label`, then this object will have `issue` and
  * `label` properties.
+ *
+ * @param schema - The schema defining the tables
+ * @param repMutate - The replicache mutate object with the CRUD mutation
+ * @param mutate - The object to use as the mutate object. Properties for each
+ *                 table will be assigned to this object.
  */
-export declare function makeCRUDMutate<const S extends Schema>(schema: S, repMutate: ZeroCRUDMutate): {
-    mutate: DBMutator<S>;
-    mutateBatch: BatchMutator<S>;
-};
+export declare function makeCRUDMutateBatch<const S extends Schema>(schema: S, repMutate: ZeroCRUDMutate): BatchMutator<S>;
+export declare function addTableCRUDProperties<TSchema extends Schema>(schema: TSchema, mutate: object, repMutate: ZeroCRUDMutate): void;
 /**
- * Creates the `{inesrt, upsert, update, delete}` object for use inside a
+ * Creates the `{insert, upsert, update, delete}` object for use inside a
  * batch.
  */
 export declare function makeBatchCRUDMutate<S extends TableSchema>(tableName: string, schema: Schema, ops: CRUDOp[]): TableMutator<S>;
@@ -61,10 +34,7 @@ export type WithCRUD<MD extends MutatorDefs> = MD & {
 };
 export type CRUDMutate = (crudArg: CRUDMutationArg) => Promise<void>;
 export type CRUDMutator = (tx: WriteTransaction, crudArg: CRUDMutationArg) => Promise<void>;
+export declare function makeCRUDExecutor(tx: WriteTransaction, schema: Schema, ivmBranch: IVMSourceBranch | undefined): CRUDExecutor;
 export declare function makeCRUDMutator(schema: Schema): CRUDMutator;
-export declare function insertImpl(tx: WriteTransaction, arg: InsertOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
-export declare function upsertImpl(tx: WriteTransaction, arg: InsertOp | UpsertOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
-export declare function updateImpl(tx: WriteTransaction, arg: UpdateOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
-export declare function deleteImpl(tx: WriteTransaction, arg: DeleteOp, schema: Schema, ivmBranch: IVMSourceBranch | undefined): Promise<void>;
 export {};
 //# sourceMappingURL=crud.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/crud.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,MAAM,EAKZ,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAC1E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EACV,YAAY,EAGZ,YAAY,EAGb,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAEzE,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GAC5E;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD,GACD,EAAE,CAAC;AAEP,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,MAAM,IACvC,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GAClC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC7D,SAAS,CAAC;AAEhB,KAAK,cAAc,GAAG;IACpB,CAAC,kBAAkB,CAAC,EAAE,UAAU,CAAC;CAClC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EACxD,MAAM,EAAE,CAAC,EACT,SAAS,EAAE,cAAc,GACxB,YAAY,CAAC,CAAC,CAAC,CAoBjB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,MAAM,EAC3D,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,cAAc,GACxB,IAAI,CASN;AAmDD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,WAAW,EACvD,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EAAE,GACZ,YAAY,CAAC,CAAC,CAAC,CA4CjB;AAED,MAAM,MAAM,QAAQ,CAAC,EAAE,SAAS,WAAW,IAAI,EAAE,GAAG;IAClD,CAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG,CACxB,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,gBAAgB,EACpB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,YAAY,CAWd;AAMD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAU3D"}

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

@@ -0,0 +1,143 @@
+import { promiseVoid } from "../../../shared/src/resolved-promises.js";
+import { CRUD_MUTATION_NAME } from "../../../zero-protocol/src/push.js";
+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 = [];
+    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;
+  };
+  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,
+      tableSchema.primaryKey,
+      zeroCRUD
+    );
+  }
+}
+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 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 (tx, crudArg) => {
+    const executor = makeCRUDExecutor(tx, schema, void 0);
+    for (const op of crudArg.ops) {
+      await executor(op.tableName, op.op, op.value);
+    }
+  };
+}
+export {
+  addTableCRUDProperties,
+  makeBatchCRUDMutate,
+  makeCRUDExecutor,
+  makeCRUDMutateBatch,
+  makeCRUDMutator
+};
+//# 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 {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,45 +1,72 @@
+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 { MutationOk } from '../../../zero-protocol/src/push.ts';
-import type { Schema } from '../../../zero-schema/src/builder/schema-builder.ts';
-import type { ClientTransaction, SchemaCRUD, SchemaQuery, Transaction } from '../../../zql/src/mutate/custom.ts';
+import type { DefaultSchema } from '../../../zero-types/src/default-types.ts';
+import type { Schema } from '../../../zero-types/src/schema.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 { ConditionalSchemaQuery } from '../../../zql/src/query/schema-query.ts';
 import type { ClientID } from '../types/client-state.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]: CustomMutatorImpl<any> | CustomMutatorDefs;
 };
-export type MutatorResult = {
-    client: Promise<void>;
-    server: Promise<MutationOk>;
+export type MutatorResultDetails = {
+    readonly type: 'success';
+} | {
+    readonly type: 'error';
+    readonly error: {
+        readonly type: 'app';
+        readonly message: string;
+        readonly details: ReadonlyJSONValue | undefined;
+    } | {
+        readonly type: 'zero';
+        readonly message: string;
+    };
 };
-export type CustomMutatorImpl<S extends Schema, TWrappedTransaction = unknown, TArgs = any> = (tx: Transaction<S, TWrappedTransaction>, args: TArgs) => Promise<void>;
+export type MutatorResultSuccessDetails = Extract<MutatorResultDetails, {
+    type: 'success';
+}>;
+export type MutatorResultErrorDetails = Extract<MutatorResultDetails, {
+    type: 'error';
+}>;
+export type MutatorResult = {
+    client: Promise<MutatorResultDetails & {}>;
+    server: Promise<MutatorResultDetails & {}>;
+} & {};
+export type CustomMutatorImpl<S extends Schema, TWrappedTransaction = unknown, TArgs = any, Context = unknown> = (tx: Transaction<S, TWrappedTransaction>, args: TArgs, ctx: Context) => Promise<void>;
 /**
  * The shape exposed on the `Zero.mutate` instance.
  * The signature of a custom mutator takes a `transaction` as its first arg
  * 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> = {
-    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]>;
-    };
+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 : MD[NamespaceOrName] extends CustomMutatorDefs ? MakeCustomMutatorInterfaces<S, MD[NamespaceOrName], TContext> : never;
 };
-export type MakeCustomMutatorInterface<S extends Schema, F> = F extends (tx: ClientTransaction<S>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : never;
-export declare class TransactionImpl<S extends Schema> implements ClientTransaction<S> {
-    constructor(lc: ZeroLogContext, repTx: WriteTransaction, schema: S);
-    readonly clientID: ClientID;
-    readonly mutationID: number;
-    readonly reason: 'optimistic' | 'rebase';
+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 = DefaultSchema> implements ClientTransaction<TSchema> {
+    #private;
     readonly location = "client";
-    readonly mutate: SchemaCRUD<S>;
-    readonly query: SchemaQuery<S>;
-    readonly token: string | undefined;
+    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<TTable, TSchema, 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 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>;
 //# 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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"}