@rocicorp/zero 1.11.0-canary.3 → 1.11.0-canary.30

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

@@ -1 +1 @@
-{"version":3,"file":"custom.js","names":["#repTx","#zeroContext"],"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<\n  TSchema extends Schema = DefaultSchema,\n> implements ClientTransaction<TSchema> {\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"],"mappings":";;;;;;;;;;AAoHA,IAAa,kBAAb,MAEwC;CACtC,WAAoB;CACpB;;;;CAIA;CAEA;CACA;CAEA,YAAY,IAAgB,OAAyB,QAAiB;EACpE,KAAK,MAAM,WAAW,aAAa,MAAM,WAAW,QAAQ;EAC5D,MAAM,SAAS,cAAc,KAAK;EAClC,MAAM,YAAY,OAAO;EAEzB,KAAKA,SAAS;EAEd,MAAM,WAAW,iBAAiB,OAAO,QAAQ,SAAS;EAC1D,KAAK,SAAS,sBAAsB,QAAQ,QAAQ;EAEpD,MAAM,cAAc,eAClB,IACA,OAAO,UACT;EAEA,KAAK,QAAQ,sBAAsB,aAAa,MAAM;EAEtD,KAAKC,eAAe;CACtB;CAEA,IAAI,WAAqB;EACvB,OAAO,KAAKD,OAAO;CACrB;CAEA,IAAI,aAAqB;EACvB,OAAO,KAAKA,OAAO;CACrB;CAEA,IAAI,SAAkC;EACpC,OAAO,KAAKA,OAAO,WAAW,YAAY,eAAe;CAC3D;CAEA,IAAI,QAA4B;EAC9B,OAAQ,KAAKA,OAAgC,WAAW;CAC1D;CAEA,IACE,OACA,SACiC;EACjC,OAAO,KAAKC,aAAa,IAAI,OAAO,OAAO;CAC7C;AACF;AAEA,SAAgB,cAAc,OAAqC;CAKjE,OAJe,KACZ,MAA+B,WAChC,kDAEK;AACT;AAEA,SAAgB,sBAKd,IACA,SACA,QACA,SACqE;CACrE,OAAO,OACL,OACA,SACkB;EAElB,MAAM,QAAQ,IADC,gBAAgB,IAAI,OAAO,MAC5B,GAAI,MAAM,OAAO;CACjC;AACF;AAEA,SAAS,sBAAsB,SAAuC;CAEpE,OACE,SAAS,SAAS,YAClB,sDACF;AACF;AAEA,SAAS,eAAe,IAAgB,WAA4B;CAClE,OAAO,IAAI,YACT,IACA,iBACM,qBACA,eACN,eACA,eACA,gBACA,qBAAoB,iBAAiB,GACrC,eACA,qBACF;AACF"}
+{"version":3,"file":"custom.js","names":["#repTx","#zeroContext"],"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      readonly data?: ReadonlyJSONValue | undefined;\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<ReadonlyJSONValue | 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<unknown>\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<unknown>\n  ? (...args: Args) => MutatorResult\n  : never;\n\nexport class TransactionImpl<\n  TSchema extends Schema = DefaultSchema,\n> implements ClientTransaction<TSchema> {\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): (\n  repTx: WriteTransaction,\n  args: ReadonlyJSONValue,\n) => Promise<ReadonlyJSONValue | void> {\n  return async (repTx: WriteTransaction, args: ReadonlyJSONValue) => {\n    const tx = new TransactionImpl(lc, repTx, schema);\n    return 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' && options?.type !== 'cached',\n    'Cannot wait for cached or complete results in custom mutations',\n  );\n}\n\nfunction newZeroContext(lc: LogContext, ivmBranch: IVMSourceBranch) {\n  // The forked branch is already populated, so there is nothing to defer.\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  ).markPipelinesReady();\n}\n"],"mappings":";;;;;;;;;;AAqHA,IAAa,kBAAb,MAEwC;CACtC,WAAoB;CACpB;;;;CAIA;CAEA;CACA;CAEA,YAAY,IAAgB,OAAyB,QAAiB;EACpE,KAAK,MAAM,WAAW,aAAa,MAAM,WAAW,QAAQ;EAC5D,MAAM,SAAS,cAAc,KAAK;EAClC,MAAM,YAAY,OAAO;EAEzB,KAAKA,SAAS;EAEd,MAAM,WAAW,iBAAiB,OAAO,QAAQ,SAAS;EAC1D,KAAK,SAAS,sBAAsB,QAAQ,QAAQ;EAEpD,MAAM,cAAc,eAClB,IACA,OAAO,UACT;EAEA,KAAK,QAAQ,sBAAsB,aAAa,MAAM;EAEtD,KAAKC,eAAe;CACtB;CAEA,IAAI,WAAqB;EACvB,OAAO,KAAKD,OAAO;CACrB;CAEA,IAAI,aAAqB;EACvB,OAAO,KAAKA,OAAO;CACrB;CAEA,IAAI,SAAkC;EACpC,OAAO,KAAKA,OAAO,WAAW,YAAY,eAAe;CAC3D;CAEA,IAAI,QAA4B;EAC9B,OAAQ,KAAKA,OAAgC,WAAW;CAC1D;CAEA,IACE,OACA,SACiC;EACjC,OAAO,KAAKC,aAAa,IAAI,OAAO,OAAO;CAC7C;AACF;AAEA,SAAgB,cAAc,OAAqC;CAKjE,OAJe,KACZ,MAA+B,WAChC,kDAEK;AACT;AAEA,SAAgB,sBAKd,IACA,SACA,QACA,SAIqC;CACrC,OAAO,OAAO,OAAyB,SAA4B;EAEjE,OAAO,MAAM,QAAQ,IADN,gBAAgB,IAAI,OAAO,MACrB,GAAI,MAAM,OAAO;CACxC;AACF;AAEA,SAAS,sBAAsB,SAAuC;CAEpE,OACE,SAAS,SAAS,cAAc,SAAS,SAAS,UAClD,gEACF;AACF;AAEA,SAAS,eAAe,IAAgB,WAA4B;CAElE,OAAO,IAAI,YACT,IACA,iBACM,qBACA,eACN,eACA,eACA,gBACA,qBAAoB,iBAAiB,GACrC,eACA,qBACF,EAAE,mBAAmB;AACvB"}

package/out/zero-client/src/client/inspector/lazy-inspector.js

@@ -8,9 +8,9 @@ import { asQueryInternals } from "../../../../zql/src/query/query-internals.js";
 import { inspectAnalyzeQueryDownSchema, inspectAuthenticatedDownSchema, inspectErrorDownSchema, inspectMetricsDownSchema, inspectQueriesDownSchema, inspectVersionDownSchema } from "../../../../zero-protocol/src/inspect-down.js";
 import { nanoid } from "../../util/nanoid.js";
 import "../keys.js";
+import { TDigest } from "../../../../shared/src/tdigest.js";
 import { Client } from "./client.js";
 import "./inspector.js";
-import { TDigest } from "../../../../shared/src/tdigest.js";
 import { createHTMLPasswordPrompt } from "./html-dialog-prompt.js";
 import { Query } from "./query.js";
 //#region ../zero-client/src/client/inspector/lazy-inspector.ts

package/out/zero-client/src/client/ivm-branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ivm-branch.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/ivm-branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAY,KAAK,KAAK,EAAC,MAAM,sCAAsC,CAAC;AAG3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,+CAA+C,CAAC;AASnF,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AASnE;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAe;;IAI1B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAEvB,YACE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACnC,IAAI,CAAC,EAAE,IAAI,EACX,OAAO,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAa,EAK3D;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAahD;IAED,KAAK,SAEJ;IAQD;;;OAGG;IACH,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,QAiBxE;IAED;;OAEG;IACG,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,IAAI,EACjB,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,eAAe,CAAC,CAY1B;IAED;;;;;;;OAOG;IACH,IAAI,oBAaH;CACF;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,iBAkBb"}
+{"version":3,"file":"ivm-branch.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/ivm-branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAY,KAAK,KAAK,EAAC,MAAM,sCAAsC,CAAC;AAG3E,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,+CAA+C,CAAC;AASnF,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAQnE;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAe;;IAI1B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAEvB,YACE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACnC,IAAI,CAAC,EAAE,IAAI,EACX,OAAO,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAa,EAK3D;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAahD;IAED,KAAK,SAEJ;IAQD;;;OAGG;IACH,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,QAiBxE;IAED;;OAEG;IACG,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,IAAI,EACjB,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,eAAe,CAAC,CAY1B;IAED;;;;;;;OAOG;IACH,IAAI,oBAaH;CACF;AAED,wBAAsB,aAAa,CACjC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,iBAkBb"}

package/out/zero-client/src/client/ivm-branch.js

@@ -6,7 +6,7 @@ import { using, withRead } from "../../../replicache/src/with-transactions.js";
 import { must } from "../../../shared/src/must.js";
 import { diffBinarySearch } from "../../../replicache/src/subscriptions.js";
 import { consume } from "../../../zql/src/ivm/stream.js";
-import { makeSourceChangeAdd, makeSourceChangeEdit, makeSourceChangeRemove } from "../../../zql/src/ivm/source.js";
+import { makeSourceChangeEdit, makeSourceChangeRemove } from "../../../zql/src/ivm/source.js";
 import { MemorySource } from "../../../zql/src/ivm/memory-source.js";
 import { sourceNameFromKey } from "./keys.js";
 //#region ../zero-client/src/client/ivm-branch.ts
@@ -119,15 +119,32 @@ function applyDiffs(diffs, branch) {
 			case "del":
 				consume(source.push(makeSourceChangeRemove(diff.oldValue)));
 				break;
-			case "add":
-				consume(source.push(makeSourceChangeAdd(diff.newValue)));
+			case "add": {
+				const rows = takeAddsForSource(diffs, i, name);
+				i += rows.length - 1;
+				source.pushAdds(rows);
 				break;
+			}
 			case "change":
 				consume(source.push(makeSourceChangeEdit(diff.newValue, diff.oldValue)));
 				break;
 		}
 	}
 }
+/**
+* Returns the rows of the run of `add` diffs for the source `name` that starts
+* at `start`. Diffs are ordered by key so a table's rows are contiguous.
+*/
+function takeAddsForSource(diffs, start, name) {
+	const prefix = "e/" + name + "/";
+	const rows = [];
+	for (let i = start; i < diffs.length; i++) {
+		const diff = diffs[i];
+		if (diff.op !== "add" || !diff.key.startsWith(prefix)) break;
+		rows.push(diff.newValue);
+	}
+	return rows;
+}
 //#endregion
 export { IVMSourceBranch };
 

package/out/zero-client/src/client/ivm-branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"ivm-branch.js","names":["#sources","#tables","#throwIfInvalid","#advanceError"],"sources":["../../../../../zero-client/src/client/ivm-branch.ts"],"sourcesContent":["import type {\n  InternalDiff,\n  InternalDiffOperation,\n  NoIndexDiff,\n} from '../../../replicache/src/btree/node.ts';\nimport type {LazyStore} from '../../../replicache/src/dag/lazy-store.ts';\nimport {type Read, type Store} from '../../../replicache/src/dag/store.ts';\nimport {readFromHash} from '../../../replicache/src/db/read.ts';\nimport * as FormatVersion from '../../../replicache/src/format-version-enum.ts';\nimport type {Hash} from '../../../replicache/src/hash.ts';\nimport type {ZeroReadOptions} from '../../../replicache/src/replicache-options.ts';\nimport {diffBinarySearch} from '../../../replicache/src/subscriptions.ts';\nimport type {DiffsMap} from '../../../replicache/src/sync/diff.ts';\nimport {diff} from '../../../replicache/src/sync/diff.ts';\nimport {using, withRead} from '../../../replicache/src/with-transactions.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {wrapIterable} from '../../../shared/src/iterables.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {TableSchema} from '../../../zero-schema/src/table-schema.ts';\nimport {MemorySource} from '../../../zql/src/ivm/memory-source.ts';\nimport {consume} from '../../../zql/src/ivm/stream.ts';\nimport {ENTITIES_KEY_PREFIX, sourceNameFromKey} from './keys.ts';\n\nimport {\n  makeSourceChangeAdd,\n  makeSourceChangeEdit,\n  makeSourceChangeRemove,\n} from '../../../zql/src/ivm/source.ts';\n/**\n * Replicache needs to rebase mutations onto different\n * commits of it's b-tree. These mutations can have reads\n * in them and those reads must be run against the IVM sources.\n *\n * To ensure the reads get the correct state, the IVM\n * sources need to reflect the state of the commit\n * being rebased onto. `IVMSourceBranch` allows us to:\n * 1. fork the IVM sources\n * 2. patch them up to match the desired head\n * 3. run the reads against the forked sources\n *\n * (2) is expected to be a cheap operation as there should only\n * ever be a few outstanding diffs to apply given Zero is meant\n * to be run in a connected state.\n */\nexport class IVMSourceBranch {\n  readonly #sources: Map<string, MemorySource | undefined>;\n  readonly #tables: Record<string, TableSchema>;\n  #advanceError: unknown;\n  hash: Hash | undefined;\n\n  constructor(\n    tables: Record<string, TableSchema>,\n    hash?: Hash,\n    sources: Map<string, MemorySource | undefined> = new Map(),\n  ) {\n    this.#tables = tables;\n    this.#sources = sources;\n    this.hash = hash;\n  }\n\n  getSource(name: string): MemorySource | undefined {\n    this.#throwIfInvalid();\n\n    if (this.#sources.has(name)) {\n      return this.#sources.get(name);\n    }\n\n    const schema = this.#tables[name];\n    const source = schema\n      ? new MemorySource(name, schema.columns, schema.primaryKey)\n      : undefined;\n    this.#sources.set(name, source);\n    return source;\n  }\n\n  clear() {\n    this.#sources.clear();\n  }\n\n  #throwIfInvalid() {\n    if (this.#advanceError) {\n      throw this.#advanceError;\n    }\n  }\n\n  /**\n   * Mutates the current branch, advancing it to the new head\n   * by applying the given diffs.\n   */\n  advance(expectedHead: Hash | undefined, newHead: Hash, diffs: NoIndexDiff) {\n    this.#throwIfInvalid();\n\n    assert(\n      this.hash === expectedHead,\n      () =>\n        `Expected head must match the main head. Got: ${this.hash}, expected: ${expectedHead}`,\n    );\n\n    try {\n      applyDiffs(diffs, this);\n      this.hash = newHead;\n    } catch (e) {\n      this.#advanceError = e;\n      this.clear();\n      throw e;\n    }\n  }\n\n  /**\n   * Fork the branch and patch it up to match the desired head.\n   */\n  async forkToHead(\n    store: LazyStore,\n    desiredHead: Hash,\n    readOptions?: ZeroReadOptions,\n  ): Promise<IVMSourceBranch> {\n    this.#throwIfInvalid();\n\n    const fork = this.fork();\n\n    if (fork.hash === desiredHead) {\n      return fork;\n    }\n\n    await patchBranch(desiredHead, store, fork, readOptions);\n    fork.hash = desiredHead;\n    return fork;\n  }\n\n  /**\n   * Creates a new IVMSourceBranch that is a copy of the current one.\n   * This is a cheap operation since the b-trees are shared until a write is performed\n   * and then only the modified nodes are copied.\n   *\n   * IVM branches are forked when we need to rebase mutations.\n   * The mutations modify the fork rather than original branch.\n   */\n  fork() {\n    this.#throwIfInvalid();\n\n    return new IVMSourceBranch(\n      this.#tables,\n      this.hash,\n      new Map(\n        wrapIterable(this.#sources.entries()).map(([name, source]) => [\n          name,\n          source?.fork(),\n        ]),\n      ),\n    );\n  }\n}\n\nexport async function initFromStore(\n  branch: IVMSourceBranch,\n  hash: Hash,\n  store: Store,\n) {\n  const diffs: InternalDiffOperation[] = [];\n  await withRead(store, async dagRead => {\n    const read = await readFromHash(hash, dagRead, FormatVersion.Latest);\n    for await (const entry of read.map.scan(ENTITIES_KEY_PREFIX, true)) {\n      if (!entry[0].startsWith(ENTITIES_KEY_PREFIX)) {\n        break;\n      }\n      diffs.push({\n        op: 'add',\n        key: entry[0],\n        newValue: entry[1],\n      });\n    }\n  });\n\n  branch.advance(undefined, hash, diffs);\n}\n\nasync function patchBranch(\n  desiredHead: Hash,\n  store: LazyStore,\n  fork: IVMSourceBranch,\n  readOptions: ZeroReadOptions | undefined,\n) {\n  const diffs = await computeDiffs(\n    must(fork.hash),\n    desiredHead,\n    store,\n    readOptions,\n  );\n  if (!diffs) {\n    return;\n  }\n  applyDiffs(diffs, fork);\n}\n\nasync function computeDiffs(\n  startHash: Hash,\n  endHash: Hash,\n  store: LazyStore,\n  readOptions: ZeroReadOptions | undefined,\n): Promise<InternalDiff | undefined> {\n  const readFn = (dagRead: Read) =>\n    diff(\n      startHash,\n      endHash,\n      dagRead,\n      {\n        shouldComputeDiffs: () => true,\n        shouldComputeDiffsForIndex(_name) {\n          return false;\n        },\n      },\n      FormatVersion.Latest,\n    );\n\n  let diffs: DiffsMap;\n  if (readOptions?.openLazySourceRead) {\n    diffs = await using(store.read(readOptions.openLazySourceRead), readFn);\n  } else if (readOptions?.openLazyRead) {\n    diffs = await readFn(readOptions.openLazyRead);\n  } else {\n    diffs = await withRead(store, readFn);\n  }\n\n  return diffs.get('');\n}\n\nfunction applyDiffs(diffs: NoIndexDiff, branch: IVMSourceBranch) {\n  for (\n    let i = diffBinarySearch(diffs, ENTITIES_KEY_PREFIX, diff => diff.key);\n    i < diffs.length;\n    i++\n  ) {\n    const diff = diffs[i];\n    const {key} = diff;\n    if (!key.startsWith(ENTITIES_KEY_PREFIX)) {\n      break;\n    }\n    const name = sourceNameFromKey(key);\n    const source = must(branch.getSource(name));\n    switch (diff.op) {\n      case 'del':\n        consume(source.push(makeSourceChangeRemove(diff.oldValue as Row)));\n        break;\n      case 'add':\n        consume(source.push(makeSourceChangeAdd(diff.newValue as Row)));\n        break;\n      case 'change':\n        consume(\n          source.push(\n            makeSourceChangeEdit(diff.newValue as Row, diff.oldValue as Row),\n          ),\n        );\n        break;\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"ivm-branch.js","names":["#sources","#tables","#throwIfInvalid","#advanceError"],"sources":["../../../../../zero-client/src/client/ivm-branch.ts"],"sourcesContent":["import type {\n  InternalDiff,\n  InternalDiffOperation,\n  NoIndexDiff,\n} from '../../../replicache/src/btree/node.ts';\nimport type {LazyStore} from '../../../replicache/src/dag/lazy-store.ts';\nimport {type Read, type Store} from '../../../replicache/src/dag/store.ts';\nimport {readFromHash} from '../../../replicache/src/db/read.ts';\nimport * as FormatVersion from '../../../replicache/src/format-version-enum.ts';\nimport type {Hash} from '../../../replicache/src/hash.ts';\nimport type {ZeroReadOptions} from '../../../replicache/src/replicache-options.ts';\nimport {diffBinarySearch} from '../../../replicache/src/subscriptions.ts';\nimport type {DiffsMap} from '../../../replicache/src/sync/diff.ts';\nimport {diff} from '../../../replicache/src/sync/diff.ts';\nimport {using, withRead} from '../../../replicache/src/with-transactions.ts';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {wrapIterable} from '../../../shared/src/iterables.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {TableSchema} from '../../../zero-schema/src/table-schema.ts';\nimport {MemorySource} from '../../../zql/src/ivm/memory-source.ts';\nimport {consume} from '../../../zql/src/ivm/stream.ts';\nimport {ENTITIES_KEY_PREFIX, sourceNameFromKey} from './keys.ts';\n\nimport {\n  makeSourceChangeEdit,\n  makeSourceChangeRemove,\n} from '../../../zql/src/ivm/source.ts';\n/**\n * Replicache needs to rebase mutations onto different\n * commits of it's b-tree. These mutations can have reads\n * in them and those reads must be run against the IVM sources.\n *\n * To ensure the reads get the correct state, the IVM\n * sources need to reflect the state of the commit\n * being rebased onto. `IVMSourceBranch` allows us to:\n * 1. fork the IVM sources\n * 2. patch them up to match the desired head\n * 3. run the reads against the forked sources\n *\n * (2) is expected to be a cheap operation as there should only\n * ever be a few outstanding diffs to apply given Zero is meant\n * to be run in a connected state.\n */\nexport class IVMSourceBranch {\n  readonly #sources: Map<string, MemorySource | undefined>;\n  readonly #tables: Record<string, TableSchema>;\n  #advanceError: unknown;\n  hash: Hash | undefined;\n\n  constructor(\n    tables: Record<string, TableSchema>,\n    hash?: Hash,\n    sources: Map<string, MemorySource | undefined> = new Map(),\n  ) {\n    this.#tables = tables;\n    this.#sources = sources;\n    this.hash = hash;\n  }\n\n  getSource(name: string): MemorySource | undefined {\n    this.#throwIfInvalid();\n\n    if (this.#sources.has(name)) {\n      return this.#sources.get(name);\n    }\n\n    const schema = this.#tables[name];\n    const source = schema\n      ? new MemorySource(name, schema.columns, schema.primaryKey)\n      : undefined;\n    this.#sources.set(name, source);\n    return source;\n  }\n\n  clear() {\n    this.#sources.clear();\n  }\n\n  #throwIfInvalid() {\n    if (this.#advanceError) {\n      throw this.#advanceError;\n    }\n  }\n\n  /**\n   * Mutates the current branch, advancing it to the new head\n   * by applying the given diffs.\n   */\n  advance(expectedHead: Hash | undefined, newHead: Hash, diffs: NoIndexDiff) {\n    this.#throwIfInvalid();\n\n    assert(\n      this.hash === expectedHead,\n      () =>\n        `Expected head must match the main head. Got: ${this.hash}, expected: ${expectedHead}`,\n    );\n\n    try {\n      applyDiffs(diffs, this);\n      this.hash = newHead;\n    } catch (e) {\n      this.#advanceError = e;\n      this.clear();\n      throw e;\n    }\n  }\n\n  /**\n   * Fork the branch and patch it up to match the desired head.\n   */\n  async forkToHead(\n    store: LazyStore,\n    desiredHead: Hash,\n    readOptions?: ZeroReadOptions,\n  ): Promise<IVMSourceBranch> {\n    this.#throwIfInvalid();\n\n    const fork = this.fork();\n\n    if (fork.hash === desiredHead) {\n      return fork;\n    }\n\n    await patchBranch(desiredHead, store, fork, readOptions);\n    fork.hash = desiredHead;\n    return fork;\n  }\n\n  /**\n   * Creates a new IVMSourceBranch that is a copy of the current one.\n   * This is a cheap operation since the b-trees are shared until a write is performed\n   * and then only the modified nodes are copied.\n   *\n   * IVM branches are forked when we need to rebase mutations.\n   * The mutations modify the fork rather than original branch.\n   */\n  fork() {\n    this.#throwIfInvalid();\n\n    return new IVMSourceBranch(\n      this.#tables,\n      this.hash,\n      new Map(\n        wrapIterable(this.#sources.entries()).map(([name, source]) => [\n          name,\n          source?.fork(),\n        ]),\n      ),\n    );\n  }\n}\n\nexport async function initFromStore(\n  branch: IVMSourceBranch,\n  hash: Hash,\n  store: Store,\n) {\n  const diffs: InternalDiffOperation[] = [];\n  await withRead(store, async dagRead => {\n    const read = await readFromHash(hash, dagRead, FormatVersion.Latest);\n    for await (const entry of read.map.scan(ENTITIES_KEY_PREFIX, true)) {\n      if (!entry[0].startsWith(ENTITIES_KEY_PREFIX)) {\n        break;\n      }\n      diffs.push({\n        op: 'add',\n        key: entry[0],\n        newValue: entry[1],\n      });\n    }\n  });\n\n  branch.advance(undefined, hash, diffs);\n}\n\nasync function patchBranch(\n  desiredHead: Hash,\n  store: LazyStore,\n  fork: IVMSourceBranch,\n  readOptions: ZeroReadOptions | undefined,\n) {\n  const diffs = await computeDiffs(\n    must(fork.hash),\n    desiredHead,\n    store,\n    readOptions,\n  );\n  if (!diffs) {\n    return;\n  }\n  applyDiffs(diffs, fork);\n}\n\nasync function computeDiffs(\n  startHash: Hash,\n  endHash: Hash,\n  store: LazyStore,\n  readOptions: ZeroReadOptions | undefined,\n): Promise<InternalDiff | undefined> {\n  const readFn = (dagRead: Read) =>\n    diff(\n      startHash,\n      endHash,\n      dagRead,\n      {\n        shouldComputeDiffs: () => true,\n        shouldComputeDiffsForIndex(_name) {\n          return false;\n        },\n      },\n      FormatVersion.Latest,\n    );\n\n  let diffs: DiffsMap;\n  if (readOptions?.openLazySourceRead) {\n    diffs = await using(store.read(readOptions.openLazySourceRead), readFn);\n  } else if (readOptions?.openLazyRead) {\n    diffs = await readFn(readOptions.openLazyRead);\n  } else {\n    diffs = await withRead(store, readFn);\n  }\n\n  return diffs.get('');\n}\n\nfunction applyDiffs(diffs: NoIndexDiff, branch: IVMSourceBranch) {\n  for (\n    let i = diffBinarySearch(diffs, ENTITIES_KEY_PREFIX, diff => diff.key);\n    i < diffs.length;\n    i++\n  ) {\n    const diff = diffs[i];\n    const {key} = diff;\n    if (!key.startsWith(ENTITIES_KEY_PREFIX)) {\n      break;\n    }\n    const name = sourceNameFromKey(key);\n    const source = must(branch.getSource(name));\n    switch (diff.op) {\n      case 'del':\n        consume(source.push(makeSourceChangeRemove(diff.oldValue as Row)));\n        break;\n      case 'add': {\n        const rows = takeAddsForSource(diffs, i, name);\n        i += rows.length - 1;\n        source.pushAdds(rows);\n        break;\n      }\n      case 'change':\n        consume(\n          source.push(\n            makeSourceChangeEdit(diff.newValue as Row, diff.oldValue as Row),\n          ),\n        );\n        break;\n    }\n  }\n}\n\n/**\n * Returns the rows of the run of `add` diffs for the source `name` that starts\n * at `start`. Diffs are ordered by key so a table's rows are contiguous.\n */\nfunction takeAddsForSource(\n  diffs: NoIndexDiff,\n  start: number,\n  name: string,\n): Row[] {\n  const prefix = ENTITIES_KEY_PREFIX + name + '/';\n  const rows: Row[] = [];\n  for (let i = start; i < diffs.length; i++) {\n    const diff = diffs[i];\n    if (diff.op !== 'add' || !diff.key.startsWith(prefix)) {\n      break;\n    }\n    rows.push(diff.newValue as Row);\n  }\n  return rows;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4CA,IAAa,kBAAb,MAAa,gBAAgB;CAC3B;CACA;CACA;CACA;CAEA,YACE,QACA,MACA,0BAAiD,IAAI,IAAI,GACzD;EACA,KAAKC,UAAU;EACf,KAAKD,WAAW;EAChB,KAAK,OAAO;CACd;CAEA,UAAU,MAAwC;EAChD,KAAKE,gBAAgB;EAErB,IAAI,KAAKF,SAAS,IAAI,IAAI,GACxB,OAAO,KAAKA,SAAS,IAAI,IAAI;EAG/B,MAAM,SAAS,KAAKC,QAAQ;EAC5B,MAAM,SAAS,SACX,IAAI,aAAa,MAAM,OAAO,SAAS,OAAO,UAAU,IACxD,KAAA;EACJ,KAAKD,SAAS,IAAI,MAAM,MAAM;EAC9B,OAAO;CACT;CAEA,QAAQ;EACN,KAAKA,SAAS,MAAM;CACtB;CAEA,kBAAkB;EAChB,IAAI,KAAKG,eACP,MAAM,KAAKA;CAEf;;;;;CAMA,QAAQ,cAAgC,SAAe,OAAoB;EACzE,KAAKD,gBAAgB;EAErB,OACE,KAAK,SAAS,oBAEZ,gDAAgD,KAAK,KAAK,cAAc,cAC5E;EAEA,IAAI;GACF,WAAW,OAAO,IAAI;GACtB,KAAK,OAAO;EACd,SAAS,GAAG;GACV,KAAKC,gBAAgB;GACrB,KAAK,MAAM;GACX,MAAM;EACR;CACF;;;;CAKA,MAAM,WACJ,OACA,aACA,aAC0B;EAC1B,KAAKD,gBAAgB;EAErB,MAAM,OAAO,KAAK,KAAK;EAEvB,IAAI,KAAK,SAAS,aAChB,OAAO;EAGT,MAAM,YAAY,aAAa,OAAO,MAAM,WAAW;EACvD,KAAK,OAAO;EACZ,OAAO;CACT;;;;;;;;;CAUA,OAAO;EACL,KAAKA,gBAAgB;EAErB,OAAO,IAAI,gBACT,KAAKD,SACL,KAAK,MACL,IAAI,IACF,aAAa,KAAKD,SAAS,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,YAAY,CAC5D,MACA,QAAQ,KAAK,CACf,CAAC,CACH,CACF;CACF;AACF;AAyBA,eAAe,YACb,aACA,OACA,MACA,aACA;CACA,MAAM,QAAQ,MAAM,aAClB,KAAK,KAAK,IAAI,GACd,aACA,OACA,WACF;CACA,IAAI,CAAC,OACH;CAEF,WAAW,OAAO,IAAI;AACxB;AAEA,eAAe,aACb,WACA,SACA,OACA,aACmC;CACnC,MAAM,UAAU,YACd,KACE,WACA,SACA,SACA;EACE,0BAA0B;EAC1B,2BAA2B,OAAO;GAChC,OAAO;EACT;CACF,GACA,CACF;CAEF,IAAI;CACJ,IAAI,aAAa,oBACf,QAAQ,MAAM,MAAM,MAAM,KAAK,YAAY,kBAAkB,GAAG,MAAM;MACjE,IAAI,aAAa,cACtB,QAAQ,MAAM,OAAO,YAAY,YAAY;MAE7C,QAAQ,MAAM,SAAS,OAAO,MAAM;CAGtC,OAAO,MAAM,IAAI,EAAE;AACrB;AAEA,SAAS,WAAW,OAAoB,QAAyB;CAC/D,KACE,IAAI,IAAI,iBAAiB,OAAA,OAA4B,SAAQ,KAAK,GAAG,GACrE,IAAI,MAAM,QACV,KACA;EACA,MAAM,OAAO,MAAM;EACnB,MAAM,EAAC,QAAO;EACd,IAAI,CAAC,IAAI,WAAA,IAA8B,GACrC;EAEF,MAAM,OAAO,kBAAkB,GAAG;EAClC,MAAM,SAAS,KAAK,OAAO,UAAU,IAAI,CAAC;EAC1C,QAAQ,KAAK,IAAb;GACE,KAAK;IACH,QAAQ,OAAO,KAAK,uBAAuB,KAAK,QAAe,CAAC,CAAC;IACjE;GACF,KAAK,OAAO;IACV,MAAM,OAAO,kBAAkB,OAAO,GAAG,IAAI;IAC7C,KAAK,KAAK,SAAS;IACnB,OAAO,SAAS,IAAI;IACpB;GACF;GACA,KAAK;IACH,QACE,OAAO,KACL,qBAAqB,KAAK,UAAiB,KAAK,QAAe,CACjE,CACF;IACA;EACJ;CACF;AACF;;;;;AAMA,SAAS,kBACP,OACA,OACA,MACO;CACP,MAAM,SAAA,OAA+B,OAAO;CAC5C,MAAM,OAAc,CAAC;CACrB,KAAK,IAAI,IAAI,OAAO,IAAI,MAAM,QAAQ,KAAK;EACzC,MAAM,OAAO,MAAM;EACnB,IAAI,KAAK,OAAO,SAAS,CAAC,KAAK,IAAI,WAAW,MAAM,GAClD;EAEF,KAAK,KAAK,KAAK,QAAe;CAChC;CACA,OAAO;AACT"}

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

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/keys.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAG1E,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAE7D;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,WAAW,EACvB,KAAK,EAAE,GAAG,GACT,MAAM,CAeR;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGrD"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/keys.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAG1E,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAC3C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AACxC,eAAO,MAAM,oBAAoB,OAAO,CAAC;AAEzC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAE7D;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,WAAW,EACvB,KAAK,EAAE,GAAG,GACT,MAAM,CAeR;AA0BD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGrD"}

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

@@ -16,9 +16,27 @@ function toMutationResponseKey(mid) {
 function toPrimaryKeyString(tableName, primaryKey, value) {
 	if (primaryKey.length === 1) return "e/" + tableName + "/" + parse(value[primaryKey[0]], primaryKeyValueSchema);
 	const values = primaryKey.map((k) => parse(value[k], primaryKeyValueSchema));
-	const idSegment = h128(JSON.stringify(values));
+	const idSegment = u128ToDecimal(h128(JSON.stringify(values)));
 	return "e/" + tableName + "/" + idSegment;
 }
+var E19 = 10n ** 19n;
+/**
+* `String(x)` for an unsigned 128-bit `x`: the decimal form entity keys have
+* always used for compound primary keys, so it must not change.
+*
+* Chromium 148 (V8 14.8) takes ~4us to stringify a bigint wider than 64 bits
+* in base 10, against ~100ns in node 24, Firefox and WebKit; bigints that fit
+* in 64 bits stay fast everywhere. Splitting `x` into base-10^19 pieces, each
+* under 2^64, keeps every conversion on that fast path: ~35x faster in
+* Chromium and within ~10% elsewhere.
+*/
+function u128ToDecimal(x) {
+	if (x < E19) return String(x);
+	const t = x / E19;
+	const low = String(x % E19).padStart(19, "0");
+	if (t < E19) return String(t) + low;
+	return String(t / E19) + String(t % E19).padStart(19, "0") + low;
+}
 function sourceNameFromKey(key) {
 	const slash = key.indexOf("/", 2);
 	return key.slice(2, slash);

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

@@ -1 +1 @@
-{"version":3,"file":"keys.js","names":[],"sources":["../../../../../zero-client/src/client/keys.ts"],"sourcesContent":["import {h128} from '../../../shared/src/hash.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {MutationID} from '../../../zero-protocol/src/mutation-id.ts';\nimport {primaryKeyValueSchema} from '../../../zero-protocol/src/primary-key.ts';\n\nexport const DESIRED_QUERIES_KEY_PREFIX = 'd/';\nexport const GOT_QUERIES_KEY_PREFIX = 'g/';\nexport const ENTITIES_KEY_PREFIX = 'e/';\nexport const MUTATIONS_KEY_PREFIX = 'm/';\n\nexport function toDesiredQueriesKey(clientID: string, hash: string): string {\n  return DESIRED_QUERIES_KEY_PREFIX + clientID + '/' + hash;\n}\n\nexport function desiredQueriesPrefixForClient(clientID: string): string {\n  return DESIRED_QUERIES_KEY_PREFIX + clientID + '/';\n}\n\nexport function toGotQueriesKey(hash: string): string {\n  return GOT_QUERIES_KEY_PREFIX + hash;\n}\n\nexport function toMutationResponseKey(mid: MutationID): string {\n  return MUTATIONS_KEY_PREFIX + mid.clientID + '/' + mid.id;\n}\n\nexport function toPrimaryKeyString(\n  tableName: string,\n  primaryKey: CompoundKey,\n  value: Row,\n): string {\n  if (primaryKey.length === 1) {\n    return (\n      ENTITIES_KEY_PREFIX +\n      tableName +\n      '/' +\n      v.parse(value[primaryKey[0]], primaryKeyValueSchema)\n    );\n  }\n\n  const values = primaryKey.map(k => v.parse(value[k], primaryKeyValueSchema));\n  const str = JSON.stringify(values);\n\n  const idSegment = h128(str);\n  return ENTITIES_KEY_PREFIX + tableName + '/' + idSegment;\n}\n\nexport function sourceNameFromKey(key: string): string {\n  const slash = key.indexOf('/', ENTITIES_KEY_PREFIX.length);\n  return key.slice(ENTITIES_KEY_PREFIX.length, slash);\n}\n"],"mappings":";;;AAYA,SAAgB,oBAAoB,UAAkB,MAAsB;CAC1E,OAAA,OAAoC,WAAW,MAAM;AACvD;AAEA,SAAgB,8BAA8B,UAA0B;CACtE,OAAA,OAAoC,WAAW;AACjD;AAEA,SAAgB,gBAAgB,MAAsB;CACpD,OAAA,OAAgC;AAClC;AAEA,SAAgB,sBAAsB,KAAyB;CAC7D,OAAA,OAA8B,IAAI,WAAW,MAAM,IAAI;AACzD;AAEA,SAAgB,mBACd,WACA,YACA,OACQ;CACR,IAAI,WAAW,WAAW,GACxB,OAAA,OAEE,YACA,MACA,MAAQ,MAAM,WAAW,KAAK,qBAAqB;CAIvD,MAAM,SAAS,WAAW,KAAI,MAAK,MAAQ,MAAM,IAAI,qBAAqB,CAAC;CAG3E,MAAM,YAAY,KAFN,KAAK,UAAU,MAEJ,CAAG;CAC1B,OAAA,OAA6B,YAAY,MAAM;AACjD;AAEA,SAAgB,kBAAkB,KAAqB;CACrD,MAAM,QAAQ,IAAI,QAAQ,KAAK,CAA0B;CACzD,OAAO,IAAI,MAAM,GAA4B,KAAK;AACpD"}
+{"version":3,"file":"keys.js","names":[],"sources":["../../../../../zero-client/src/client/keys.ts"],"sourcesContent":["import {h128} from '../../../shared/src/hash.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport type {CompoundKey} from '../../../zero-protocol/src/ast.ts';\nimport type {Row} from '../../../zero-protocol/src/data.ts';\nimport type {MutationID} from '../../../zero-protocol/src/mutation-id.ts';\nimport {primaryKeyValueSchema} from '../../../zero-protocol/src/primary-key.ts';\n\nexport const DESIRED_QUERIES_KEY_PREFIX = 'd/';\nexport const GOT_QUERIES_KEY_PREFIX = 'g/';\nexport const ENTITIES_KEY_PREFIX = 'e/';\nexport const MUTATIONS_KEY_PREFIX = 'm/';\n\nexport function toDesiredQueriesKey(clientID: string, hash: string): string {\n  return DESIRED_QUERIES_KEY_PREFIX + clientID + '/' + hash;\n}\n\nexport function desiredQueriesPrefixForClient(clientID: string): string {\n  return DESIRED_QUERIES_KEY_PREFIX + clientID + '/';\n}\n\nexport function toGotQueriesKey(hash: string): string {\n  return GOT_QUERIES_KEY_PREFIX + hash;\n}\n\nexport function toMutationResponseKey(mid: MutationID): string {\n  return MUTATIONS_KEY_PREFIX + mid.clientID + '/' + mid.id;\n}\n\nexport function toPrimaryKeyString(\n  tableName: string,\n  primaryKey: CompoundKey,\n  value: Row,\n): string {\n  if (primaryKey.length === 1) {\n    return (\n      ENTITIES_KEY_PREFIX +\n      tableName +\n      '/' +\n      v.parse(value[primaryKey[0]], primaryKeyValueSchema)\n    );\n  }\n\n  const values = primaryKey.map(k => v.parse(value[k], primaryKeyValueSchema));\n  const str = JSON.stringify(values);\n\n  const idSegment = u128ToDecimal(h128(str));\n  return ENTITIES_KEY_PREFIX + tableName + '/' + idSegment;\n}\n\nconst E19 = 10n ** 19n;\n\n/**\n * `String(x)` for an unsigned 128-bit `x`: the decimal form entity keys have\n * always used for compound primary keys, so it must not change.\n *\n * Chromium 148 (V8 14.8) takes ~4us to stringify a bigint wider than 64 bits\n * in base 10, against ~100ns in node 24, Firefox and WebKit; bigints that fit\n * in 64 bits stay fast everywhere. Splitting `x` into base-10^19 pieces, each\n * under 2^64, keeps every conversion on that fast path: ~35x faster in\n * Chromium and within ~10% elsewhere.\n */\nfunction u128ToDecimal(x: bigint): string {\n  if (x < E19) {\n    return String(x);\n  }\n  const t = x / E19;\n  const low = String(x % E19).padStart(19, '0');\n  if (t < E19) {\n    return String(t) + low;\n  }\n  return String(t / E19) + String(t % E19).padStart(19, '0') + low;\n}\n\nexport function sourceNameFromKey(key: string): string {\n  const slash = key.indexOf('/', ENTITIES_KEY_PREFIX.length);\n  return key.slice(ENTITIES_KEY_PREFIX.length, slash);\n}\n"],"mappings":";;;AAYA,SAAgB,oBAAoB,UAAkB,MAAsB;CAC1E,OAAA,OAAoC,WAAW,MAAM;AACvD;AAEA,SAAgB,8BAA8B,UAA0B;CACtE,OAAA,OAAoC,WAAW;AACjD;AAEA,SAAgB,gBAAgB,MAAsB;CACpD,OAAA,OAAgC;AAClC;AAEA,SAAgB,sBAAsB,KAAyB;CAC7D,OAAA,OAA8B,IAAI,WAAW,MAAM,IAAI;AACzD;AAEA,SAAgB,mBACd,WACA,YACA,OACQ;CACR,IAAI,WAAW,WAAW,GACxB,OAAA,OAEE,YACA,MACA,MAAQ,MAAM,WAAW,KAAK,qBAAqB;CAIvD,MAAM,SAAS,WAAW,KAAI,MAAK,MAAQ,MAAM,IAAI,qBAAqB,CAAC;CAG3E,MAAM,YAAY,cAAc,KAFpB,KAAK,UAAU,MAEU,CAAG,CAAC;CACzC,OAAA,OAA6B,YAAY,MAAM;AACjD;AAEA,IAAM,MAAM,OAAO;;;;;;;;;;;AAYnB,SAAS,cAAc,GAAmB;CACxC,IAAI,IAAI,KACN,OAAO,OAAO,CAAC;CAEjB,MAAM,IAAI,IAAI;CACd,MAAM,MAAM,OAAO,IAAI,GAAG,EAAE,SAAS,IAAI,GAAG;CAC5C,IAAI,IAAI,KACN,OAAO,OAAO,CAAC,IAAI;CAErB,OAAO,OAAO,IAAI,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,SAAS,IAAI,GAAG,IAAI;AAC/D;AAEA,SAAgB,kBAAkB,KAAqB;CACrD,MAAM,QAAQ,IAAI,QAAQ,KAAK,CAA0B;CACzD,OAAO,IAAI,MAAM,GAA4B,KAAK;AACpD"}

package/out/zero-client/src/client/make-mutate-property.d.ts

@@ -33,7 +33,7 @@ export declare function addCustomMutatorsProperties(mutators: CustomMutatorDefs,
  * Each node can be either a CustomMutatorImpl function or a namespace containing more mutators.
  */
 type MakeFromMutatorDefinitions<S extends Schema, MD extends CustomMutatorDefs, C> = {
-    readonly [K in keyof MD]: MD[K] extends (tx: Transaction<S>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : MD[K] extends CustomMutatorDefs ? MakeFromMutatorDefinitions<S, MD[K], C> : never;
+    readonly [K in keyof MD]: MD[K] extends (tx: Transaction<S>, ...args: infer Args) => Promise<unknown> ? (...args: Args) => MutatorResult : MD[K] extends CustomMutatorDefs ? MakeFromMutatorDefinitions<S, MD[K], C> : never;
 };
 export type MakeMutatePropertyType<S extends Schema, MD extends CustomMutatorDefs | undefined, C> = MD extends CustomMutatorDefs ? S['enableLegacyMutators'] extends true ? DeepMerge<DBMutator<S>, MakeFromMutatorDefinitions<S, MD, C>> : MakeFromMutatorDefinitions<S, MD, C> : DBMutator<S>;
 export {};

package/out/zero-client/src/client/make-mutate-property.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-mutate-property.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/make-mutate-property.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAEjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACxC,IAAI,CAkCN;AAED;;;GAGG;AACH,KAAK,0BAA0B,CAC7B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,EAC5B,CAAC,IACC;IACF,QAAQ,EAAE,CAAC,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CACtC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,EAClB,GAAG,IAAI,EAAE,MAAM,IAAI,KAChB,OAAO,CAAC,IAAI,CAAC,GACd,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,aAAa,GAChC,EAAE,CAAC,CAAC,CAAC,SAAS,iBAAiB,GAC7B,0BAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACvC,KAAK;CACZ,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,EACxC,CAAC,IACC,EAAE,SAAS,iBAAiB,GAC5B,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GACpC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,GAC7D,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GACtC,SAAS,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"make-mutate-property.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/make-mutate-property.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAEjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACxC,IAAI,CAkCN;AAED;;;GAGG;AACH,KAAK,0BAA0B,CAC7B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,EAC5B,CAAC,IACC;IACF,QAAQ,EAAE,CAAC,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CACtC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,EAClB,GAAG,IAAI,EAAE,MAAM,IAAI,KAChB,OAAO,CAAC,OAAO,CAAC,GACjB,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,aAAa,GAChC,EAAE,CAAC,CAAC,CAAC,SAAS,iBAAiB,GAC7B,0BAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACvC,KAAK;CACZ,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,GAAG,SAAS,EACxC,CAAC,IACC,EAAE,SAAS,iBAAiB,GAC5B,CAAC,CAAC,sBAAsB,CAAC,SAAS,IAAI,GACpC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,GAC7D,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GACtC,SAAS,CAAC,CAAC,CAAC,CAAC"}

package/out/zero-client/src/client/make-mutate-property.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-mutate-property.js","names":[],"sources":["../../../../../zero-client/src/client/make-mutate-property.ts"],"sourcesContent":["import type {DeepMerge} from '../../../shared/src/deep-merge.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {\n  customMutatorKey,\n  type Transaction,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {DBMutator} from './crud.ts';\nimport type {CustomMutatorDefs, MutatorResult} from './custom.ts';\nimport type {MutatorProxy} from './mutator-proxy.ts';\n\n/**\n * Creates and populates a mutate property object by processing mutator definitions recursively.\n *\n * This function traverses through mutator definitions (either schema-based or custom) and builds\n * a corresponding object structure where each mutator is wrapped by the mutator proxy. It handles\n * both flat mutator functions and nested mutator definition objects.\n *\n * @template S - The schema type that defines the structure of the data\n * @template C - The context type used by mutators, defaults to unknown\n *\n * @param mutators - The mutator definitions to process, can be schema-based or custom mutator definitions\n * @param mutatorProxy - The proxy object responsible for wrapping mutators with additional functionality\n * @param mutateObject - The target object to populate with wrapped mutators\n * @param replicacheMutate - The source object containing the actual mutator implementations to wrap\n *\n * @returns void - This function mutates the mutateObject parameter directly\n *\n * @remarks\n * The function recursively processes nested mutator structures, creating corresponding nested objects\n * in the mutateObject. For leaf mutators (functions or mutator definitions), it generates a full key\n * using different separators ('.' for mutator definitions, '|' for custom functions) and wraps them\n * using the mutator proxy.\n */\nexport function addCustomMutatorsProperties(\n  mutators: CustomMutatorDefs,\n  mutatorProxy: MutatorProxy,\n  mutateObject: Record<string, unknown>,\n  replicacheMutate: Record<string, unknown>,\n): void {\n  const processMutators = (\n    mutators: CustomMutatorDefs,\n    path: string[],\n    mutateObject: Record<string, unknown>,\n  ) => {\n    for (const [key, mutator] of Object.entries(mutators)) {\n      path.push(key);\n      if (typeof mutator === 'function') {\n        const fullKey = customMutatorKey('|', path);\n        mutateObject[key] = mutatorProxy.wrapCustomMutator(\n          fullKey,\n          must(replicacheMutate[fullKey]) as unknown as (\n            ...args: unknown[]\n          ) => MutatorResult,\n        );\n      } else {\n        // Nested namespace - recursive build and process.\n        let existing = mutateObject[key];\n        if (existing === undefined) {\n          existing = {};\n          mutateObject[key] = existing;\n        }\n        processMutators(\n          mutator as CustomMutatorDefs,\n          path,\n          existing as Record<string, unknown>,\n        );\n      }\n      path.pop();\n    }\n  };\n\n  processMutators(mutators, [], mutateObject);\n}\n\n/**\n * Builds the mutate type from legacy CustomMutatorDefs, handling arbitrary nesting.\n * Each node can be either a CustomMutatorImpl function or a namespace containing more mutators.\n */\ntype MakeFromMutatorDefinitions<\n  S extends Schema,\n  MD extends CustomMutatorDefs,\n  C,\n> = {\n  readonly [K in keyof MD]: MD[K] extends (\n    tx: Transaction<S>,\n    ...args: infer Args\n  ) => Promise<void>\n    ? (...args: Args) => MutatorResult\n    : MD[K] extends CustomMutatorDefs\n      ? MakeFromMutatorDefinitions<S, MD[K], C>\n      : never;\n};\n\nexport type MakeMutatePropertyType<\n  S extends Schema,\n  MD extends CustomMutatorDefs | undefined,\n  C,\n> = MD extends CustomMutatorDefs\n  ? S['enableLegacyMutators'] extends true\n    ? DeepMerge<DBMutator<S>, MakeFromMutatorDefinitions<S, MD, C>>\n    : MakeFromMutatorDefinitions<S, MD, C>\n  : DBMutator<S>;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAkCA,SAAgB,4BACd,UACA,cACA,cACA,kBACM;CACN,MAAM,mBACJ,UACA,MACA,iBACG;EACH,KAAK,MAAM,CAAC,KAAK,YAAY,OAAO,QAAQ,QAAQ,GAAG;GACrD,KAAK,KAAK,GAAG;GACb,IAAI,OAAO,YAAY,YAAY;IACjC,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,OAAO,aAAa,kBAC/B,SACA,KAAK,iBAAiB,QAAQ,CAGhC;GACF,OAAO;IAEL,IAAI,WAAW,aAAa;IAC5B,IAAI,aAAa,KAAA,GAAW;KAC1B,WAAW,CAAC;KACZ,aAAa,OAAO;IACtB;IACA,gBACE,SACA,MACA,QACF;GACF;GACA,KAAK,IAAI;EACX;CACF;CAEA,gBAAgB,UAAU,CAAC,GAAG,YAAY;AAC5C"}
+{"version":3,"file":"make-mutate-property.js","names":[],"sources":["../../../../../zero-client/src/client/make-mutate-property.ts"],"sourcesContent":["import type {DeepMerge} from '../../../shared/src/deep-merge.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {\n  customMutatorKey,\n  type Transaction,\n} from '../../../zql/src/mutate/custom.ts';\nimport type {DBMutator} from './crud.ts';\nimport type {CustomMutatorDefs, MutatorResult} from './custom.ts';\nimport type {MutatorProxy} from './mutator-proxy.ts';\n\n/**\n * Creates and populates a mutate property object by processing mutator definitions recursively.\n *\n * This function traverses through mutator definitions (either schema-based or custom) and builds\n * a corresponding object structure where each mutator is wrapped by the mutator proxy. It handles\n * both flat mutator functions and nested mutator definition objects.\n *\n * @template S - The schema type that defines the structure of the data\n * @template C - The context type used by mutators, defaults to unknown\n *\n * @param mutators - The mutator definitions to process, can be schema-based or custom mutator definitions\n * @param mutatorProxy - The proxy object responsible for wrapping mutators with additional functionality\n * @param mutateObject - The target object to populate with wrapped mutators\n * @param replicacheMutate - The source object containing the actual mutator implementations to wrap\n *\n * @returns void - This function mutates the mutateObject parameter directly\n *\n * @remarks\n * The function recursively processes nested mutator structures, creating corresponding nested objects\n * in the mutateObject. For leaf mutators (functions or mutator definitions), it generates a full key\n * using different separators ('.' for mutator definitions, '|' for custom functions) and wraps them\n * using the mutator proxy.\n */\nexport function addCustomMutatorsProperties(\n  mutators: CustomMutatorDefs,\n  mutatorProxy: MutatorProxy,\n  mutateObject: Record<string, unknown>,\n  replicacheMutate: Record<string, unknown>,\n): void {\n  const processMutators = (\n    mutators: CustomMutatorDefs,\n    path: string[],\n    mutateObject: Record<string, unknown>,\n  ) => {\n    for (const [key, mutator] of Object.entries(mutators)) {\n      path.push(key);\n      if (typeof mutator === 'function') {\n        const fullKey = customMutatorKey('|', path);\n        mutateObject[key] = mutatorProxy.wrapCustomMutator(\n          fullKey,\n          must(replicacheMutate[fullKey]) as unknown as (\n            ...args: unknown[]\n          ) => MutatorResult,\n        );\n      } else {\n        // Nested namespace - recursive build and process.\n        let existing = mutateObject[key];\n        if (existing === undefined) {\n          existing = {};\n          mutateObject[key] = existing;\n        }\n        processMutators(\n          mutator as CustomMutatorDefs,\n          path,\n          existing as Record<string, unknown>,\n        );\n      }\n      path.pop();\n    }\n  };\n\n  processMutators(mutators, [], mutateObject);\n}\n\n/**\n * Builds the mutate type from legacy CustomMutatorDefs, handling arbitrary nesting.\n * Each node can be either a CustomMutatorImpl function or a namespace containing more mutators.\n */\ntype MakeFromMutatorDefinitions<\n  S extends Schema,\n  MD extends CustomMutatorDefs,\n  C,\n> = {\n  readonly [K in keyof MD]: MD[K] extends (\n    tx: Transaction<S>,\n    ...args: infer Args\n  ) => Promise<unknown>\n    ? (...args: Args) => MutatorResult\n    : MD[K] extends CustomMutatorDefs\n      ? MakeFromMutatorDefinitions<S, MD[K], C>\n      : never;\n};\n\nexport type MakeMutatePropertyType<\n  S extends Schema,\n  MD extends CustomMutatorDefs | undefined,\n  C,\n> = MD extends CustomMutatorDefs\n  ? S['enableLegacyMutators'] extends true\n    ? DeepMerge<DBMutator<S>, MakeFromMutatorDefinitions<S, MD, C>>\n    : MakeFromMutatorDefinitions<S, MD, C>\n  : DBMutator<S>;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAkCA,SAAgB,4BACd,UACA,cACA,cACA,kBACM;CACN,MAAM,mBACJ,UACA,MACA,iBACG;EACH,KAAK,MAAM,CAAC,KAAK,YAAY,OAAO,QAAQ,QAAQ,GAAG;GACrD,KAAK,KAAK,GAAG;GACb,IAAI,OAAO,YAAY,YAAY;IACjC,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,OAAO,aAAa,kBAC/B,SACA,KAAK,iBAAiB,QAAQ,CAGhC;GACF,OAAO;IAEL,IAAI,WAAW,aAAa;IAC5B,IAAI,aAAa,KAAA,GAAW;KAC1B,WAAW,CAAC;KACZ,aAAa,OAAO;IACtB;IACA,gBACE,SACA,MACA,QACF;GACF;GACA,KAAK,IAAI;EACX;CACF;CAEA,gBAAgB,UAAU,CAAC,GAAG,YAAY;AAC5C"}

package/out/zero-client/src/client/make-replicache-mutators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-replicache-mutators.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/make-replicache-mutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAGlE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAkB,KAAK,WAAW,EAAC,MAAM,WAAW,CAAC;AAC5D,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,aAAa,CAAC;AAQtE,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAC1D,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,kBAAkB,GAAG,iBAAiB,EAChD,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,IAAI,CAmCN;AA2BD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAC9D,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,EAC5D,OAAO,EAAE,CAAC,EACV,EAAE,EAAE,UAAU,GACb,WAAW,GAAG;IAAC,UAAU,EAAE,WAAW,CAAA;CAAC,CAsCzC"}
+{"version":3,"file":"make-replicache-mutators.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/make-replicache-mutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAGlE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAkB,KAAK,WAAW,EAAC,MAAM,WAAW,CAAC;AAC5D,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,aAAa,CAAC;AAQtE,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAC1D,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,CAAC,EACV,QAAQ,EAAE,kBAAkB,GAAG,iBAAiB,EAChD,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,IAAI,CAmCN;AA8BD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAC9D,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,EAC5D,OAAO,EAAE,CAAC,EACV,EAAE,EAAE,UAAU,GACb,WAAW,GAAG;IAAC,UAAU,EAAE,WAAW,CAAA;CAAC,CAsCzC"}

package/out/zero-client/src/client/make-replicache-mutators.js

@@ -27,7 +27,7 @@ function extendReplicacheMutators(lc, context, mutators, schema, mutateObject) {
 function makeReplicacheMutator(lc, mutator, schema, context) {
 	return async (repTx, args) => {
 		const tx = new TransactionImpl(lc, repTx, schema);
-		await mutator.fn({
+		return await mutator.fn({
 			args,
 			ctx: context,
 			tx

package/out/zero-client/src/client/make-replicache-mutators.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-replicache-mutators.js","names":[],"sources":["../../../../../zero-client/src/client/make-replicache-mutators.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {MutatorDefs} from '../../../replicache/src/types.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {CRUD_MUTATION_NAME} from '../../../zero-protocol/src/mutation.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {customMutatorKey} from '../../../zql/src/mutate/custom.ts';\nimport {\n  isMutatorRegistry,\n  type AnyMutatorRegistry,\n} from '../../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator, type Mutator} from '../../../zql/src/mutate/mutator.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {makeCRUDMutator, type CRUDMutator} from './crud.ts';\nimport type {CustomMutatorDefs, CustomMutatorImpl} from './custom.ts';\nimport {\n  makeReplicacheMutator as makeReplicacheMutatorLegacy,\n  TransactionImpl,\n} from './custom.ts';\nimport {ClientError} from './error.ts';\nimport type {WriteTransaction} from './replicache-types.ts';\n\nexport function extendReplicacheMutators<S extends Schema, C>(\n  lc: LogContext,\n  context: C,\n  mutators: AnyMutatorRegistry | CustomMutatorDefs,\n  schema: S,\n  mutateObject: Record<string, unknown>,\n): void {\n  // Recursively process mutator definitions at arbitrary depth\n  const processMutators = (mutators: object, path: string[]) => {\n    for (const [key, mutator] of Object.entries(mutators)) {\n      if (key === '~') {\n        // Skip phantom type\n        continue;\n      }\n\n      path.push(key);\n      if (isMutator(mutator)) {\n        const fullKey = customMutatorKey('.', path);\n        mutateObject[fullKey] = makeReplicacheMutator(\n          lc,\n          mutator,\n          schema,\n          context,\n        );\n      } else if (typeof mutator === 'function') {\n        const fullKey = customMutatorKey('|', path);\n        mutateObject[fullKey] = makeReplicacheMutatorLegacy(\n          lc,\n          // oxlint-disable-next-line no-explicit-any\n          mutator as CustomMutatorImpl<any>,\n          schema,\n          context,\n        );\n      } else if (mutator !== null && typeof mutator === 'object') {\n        processMutators(mutator, path);\n      }\n      path.pop();\n    }\n  };\n\n  processMutators(mutators, []);\n}\n\nfunction makeReplicacheMutator<\n  TArgs extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TContext,\n  TWrappedTransaction,\n>(\n  lc: LogContext,\n  mutator: Mutator<TArgs, TSchema, TContext, TWrappedTransaction>,\n  schema: TSchema,\n  context: TContext,\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    // fn does input validation internally\n    await mutator.fn({\n      args: args as TArgs,\n      ctx: context,\n      tx: tx,\n    });\n  };\n}\n\n/**\n * Creates Replicache mutators from mutator definitions.\n *\n * This function processes mutator definitions at arbitrary depth, supporting both\n * new-style mutator definitions and legacy custom mutator implementations. It creates\n * a mutator object with the CRUD mutator and any provided custom mutators, with keys\n * generated based on their path in the mutator definition hierarchy.\n *\n * @template S - The schema type that defines the structure of the data\n * @template C - The type of the context object passed to mutators\n *\n * @param schema - The schema instance used for validation and type checking\n * @param mutators - The mutator definitions to process, can be nested objects or custom mutator definitions\n * @param context - The context to be passed to mutators\n * @param lc - The log context used for logging operations\n *\n * @returns A mutator definitions object containing the CRUD mutator and any custom mutators\n *\n * @remarks\n * - New-style mutator definitions use '.' as a separator in their keys\n * - Legacy custom mutator implementations use '|' as a separator in their keys\n * - The CRUD mutator can be disabled by setting `enableLegacyMutators: false` in the schema\n */\nexport function makeReplicacheMutators<const S extends Schema, C>(\n  schema: S,\n  mutators: AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  context: C,\n  lc: LogContext,\n): MutatorDefs & {_zero_crud: CRUDMutator} {\n  const {enableLegacyMutators = false} = schema;\n\n  const replicacheMutators = {\n    [CRUD_MUTATION_NAME]: enableLegacyMutators\n      ? makeCRUDMutator(schema)\n      : // TODO(arv): This code is unreachable since the public API prevents\n        // calling CRUD mutators when enableLegacyMutators is false. Remove this.\n        () =>\n          Promise.reject(\n            new ClientError({\n              kind: ClientErrorKind.Internal,\n              message: 'Zero CRUD mutators are not enabled.',\n            }),\n          ),\n  };\n\n  if (mutators) {\n    if (isMutatorRegistry(mutators)) {\n      extendFromMutatorRegistry(\n        lc,\n        context,\n        mutators,\n        schema,\n        replicacheMutators,\n      );\n    } else {\n      extendReplicacheMutators(\n        lc,\n        context,\n        mutators as CustomMutatorDefs,\n        schema,\n        replicacheMutators,\n      );\n    }\n  }\n\n  return replicacheMutators;\n}\n\n/**\n * Extends replicache mutators from a MutatorRegistry.\n * Walks the registry tree and wraps each Mutator.fn for Replicache.\n */\nfunction extendFromMutatorRegistry<S extends Schema, C>(\n  lc: LogContext,\n  context: C,\n  registry: AnyMutatorRegistry,\n  schema: S,\n  mutateObject: Record<string, unknown>,\n): void {\n  const walk = (node: unknown) => {\n    if (typeof node !== 'object' || node === null) {\n      return;\n    }\n    for (const value of Object.values(node)) {\n      if (isMutator<S>(value)) {\n        // Mutator.fn already handles validation internally\n        mutateObject[value.mutatorName] = (\n          repTx: WriteTransaction,\n          args: ReadonlyJSONValue,\n        ): Promise<void> => {\n          const tx = new TransactionImpl(lc, repTx, schema);\n          return value.fn({args, ctx: context, tx});\n        };\n      } else if (typeof value === 'object' && value !== null) {\n        // Nested namespace\n        walk(value);\n      }\n    }\n  };\n  walk(registry);\n}\n"],"mappings":";;;;;;;;;AAqBA,SAAgB,yBACd,IACA,SACA,UACA,QACA,cACM;CAEN,MAAM,mBAAmB,UAAkB,SAAmB;EAC5D,KAAK,MAAM,CAAC,KAAK,YAAY,OAAO,QAAQ,QAAQ,GAAG;GACrD,IAAI,QAAQ,KAEV;GAGF,KAAK,KAAK,GAAG;GACb,IAAI,UAAU,OAAO,GAAG;IACtB,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,WAAW,sBACtB,IACA,SACA,QACA,OACF;GACF,OAAO,IAAI,OAAO,YAAY,YAAY;IACxC,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,WAAW,wBACtB,IAEA,SACA,QACA,OACF;GACF,OAAO,IAAI,YAAY,QAAQ,OAAO,YAAY,UAChD,gBAAgB,SAAS,IAAI;GAE/B,KAAK,IAAI;EACX;CACF;CAEA,gBAAgB,UAAU,CAAC,CAAC;AAC9B;AAEA,SAAS,sBAMP,IACA,SACA,QACA,SACqE;CACrE,OAAO,OACL,OACA,SACkB;EAClB,MAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;EAEhD,MAAM,QAAQ,GAAG;GACT;GACN,KAAK;GACD;EACN,CAAC;CACH;AACF;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,SAAgB,uBACd,QACA,UACA,SACA,IACyC;CACzC,MAAM,EAAC,uBAAuB,UAAS;CAEvC,MAAM,qBAAqB,GACxB,qBAAqB,uBAClB,gBAAgB,MAAM,UAIpB,QAAQ,OACN,IAAI,YAAY;EACd,MAAM;EACN,SAAS;CACX,CAAC,CACH,EACR;CAEA,IAAI,UACF,IAAI,kBAAkB,QAAQ,GAC5B,0BACE,IACA,SACA,UACA,QACA,kBACF;MAEA,yBACE,IACA,SACA,UACA,QACA,kBACF;CAIJ,OAAO;AACT;;;;;AAMA,SAAS,0BACP,IACA,SACA,UACA,QACA,cACM;CACN,MAAM,QAAQ,SAAkB;EAC9B,IAAI,OAAO,SAAS,YAAY,SAAS,MACvC;EAEF,KAAK,MAAM,SAAS,OAAO,OAAO,IAAI,GACpC,IAAI,UAAa,KAAK,GAEpB,aAAa,MAAM,gBACjB,OACA,SACkB;GAClB,MAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;GAChD,OAAO,MAAM,GAAG;IAAC;IAAM,KAAK;IAAS;GAAE,CAAC;EAC1C;OACK,IAAI,OAAO,UAAU,YAAY,UAAU,MAEhD,KAAK,KAAK;CAGhB;CACA,KAAK,QAAQ;AACf"}
+{"version":3,"file":"make-replicache-mutators.js","names":[],"sources":["../../../../../zero-client/src/client/make-replicache-mutators.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {MutatorDefs} from '../../../replicache/src/types.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {CRUD_MUTATION_NAME} from '../../../zero-protocol/src/mutation.ts';\nimport type {Schema} from '../../../zero-types/src/schema.ts';\nimport {customMutatorKey} from '../../../zql/src/mutate/custom.ts';\nimport {\n  isMutatorRegistry,\n  type AnyMutatorRegistry,\n} from '../../../zql/src/mutate/mutator-registry.ts';\nimport {isMutator, type Mutator} from '../../../zql/src/mutate/mutator.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {makeCRUDMutator, type CRUDMutator} from './crud.ts';\nimport type {CustomMutatorDefs, CustomMutatorImpl} from './custom.ts';\nimport {\n  makeReplicacheMutator as makeReplicacheMutatorLegacy,\n  TransactionImpl,\n} from './custom.ts';\nimport {ClientError} from './error.ts';\nimport type {WriteTransaction} from './replicache-types.ts';\n\nexport function extendReplicacheMutators<S extends Schema, C>(\n  lc: LogContext,\n  context: C,\n  mutators: AnyMutatorRegistry | CustomMutatorDefs,\n  schema: S,\n  mutateObject: Record<string, unknown>,\n): void {\n  // Recursively process mutator definitions at arbitrary depth\n  const processMutators = (mutators: object, path: string[]) => {\n    for (const [key, mutator] of Object.entries(mutators)) {\n      if (key === '~') {\n        // Skip phantom type\n        continue;\n      }\n\n      path.push(key);\n      if (isMutator(mutator)) {\n        const fullKey = customMutatorKey('.', path);\n        mutateObject[fullKey] = makeReplicacheMutator(\n          lc,\n          mutator,\n          schema,\n          context,\n        );\n      } else if (typeof mutator === 'function') {\n        const fullKey = customMutatorKey('|', path);\n        mutateObject[fullKey] = makeReplicacheMutatorLegacy(\n          lc,\n          // oxlint-disable-next-line no-explicit-any\n          mutator as CustomMutatorImpl<any>,\n          schema,\n          context,\n        );\n      } else if (mutator !== null && typeof mutator === 'object') {\n        processMutators(mutator, path);\n      }\n      path.pop();\n    }\n  };\n\n  processMutators(mutators, []);\n}\n\nfunction makeReplicacheMutator<\n  TArgs extends ReadonlyJSONValue | undefined,\n  TSchema extends Schema,\n  TContext,\n  TWrappedTransaction,\n>(\n  lc: LogContext,\n  mutator: Mutator<TArgs, TSchema, TContext, TWrappedTransaction>,\n  schema: TSchema,\n  context: TContext,\n): (\n  repTx: WriteTransaction,\n  args: ReadonlyJSONValue,\n) => Promise<ReadonlyJSONValue | void> {\n  return async (\n    repTx: WriteTransaction,\n    args: ReadonlyJSONValue,\n  ): Promise<ReadonlyJSONValue | void> => {\n    const tx = new TransactionImpl(lc, repTx, schema);\n    // fn does input validation internally\n    return await mutator.fn({\n      args: args as TArgs,\n      ctx: context,\n      tx: tx,\n    });\n  };\n}\n\n/**\n * Creates Replicache mutators from mutator definitions.\n *\n * This function processes mutator definitions at arbitrary depth, supporting both\n * new-style mutator definitions and legacy custom mutator implementations. It creates\n * a mutator object with the CRUD mutator and any provided custom mutators, with keys\n * generated based on their path in the mutator definition hierarchy.\n *\n * @template S - The schema type that defines the structure of the data\n * @template C - The type of the context object passed to mutators\n *\n * @param schema - The schema instance used for validation and type checking\n * @param mutators - The mutator definitions to process, can be nested objects or custom mutator definitions\n * @param context - The context to be passed to mutators\n * @param lc - The log context used for logging operations\n *\n * @returns A mutator definitions object containing the CRUD mutator and any custom mutators\n *\n * @remarks\n * - New-style mutator definitions use '.' as a separator in their keys\n * - Legacy custom mutator implementations use '|' as a separator in their keys\n * - The CRUD mutator can be disabled by setting `enableLegacyMutators: false` in the schema\n */\nexport function makeReplicacheMutators<const S extends Schema, C>(\n  schema: S,\n  mutators: AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  context: C,\n  lc: LogContext,\n): MutatorDefs & {_zero_crud: CRUDMutator} {\n  const {enableLegacyMutators = false} = schema;\n\n  const replicacheMutators = {\n    [CRUD_MUTATION_NAME]: enableLegacyMutators\n      ? makeCRUDMutator(schema)\n      : // TODO(arv): This code is unreachable since the public API prevents\n        // calling CRUD mutators when enableLegacyMutators is false. Remove this.\n        () =>\n          Promise.reject(\n            new ClientError({\n              kind: ClientErrorKind.Internal,\n              message: 'Zero CRUD mutators are not enabled.',\n            }),\n          ),\n  };\n\n  if (mutators) {\n    if (isMutatorRegistry(mutators)) {\n      extendFromMutatorRegistry(\n        lc,\n        context,\n        mutators,\n        schema,\n        replicacheMutators,\n      );\n    } else {\n      extendReplicacheMutators(\n        lc,\n        context,\n        mutators as CustomMutatorDefs,\n        schema,\n        replicacheMutators,\n      );\n    }\n  }\n\n  return replicacheMutators;\n}\n\n/**\n * Extends replicache mutators from a MutatorRegistry.\n * Walks the registry tree and wraps each Mutator.fn for Replicache.\n */\nfunction extendFromMutatorRegistry<S extends Schema, C>(\n  lc: LogContext,\n  context: C,\n  registry: AnyMutatorRegistry,\n  schema: S,\n  mutateObject: Record<string, unknown>,\n): void {\n  const walk = (node: unknown) => {\n    if (typeof node !== 'object' || node === null) {\n      return;\n    }\n    for (const value of Object.values(node)) {\n      if (isMutator<S>(value)) {\n        // Mutator.fn already handles validation internally\n        mutateObject[value.mutatorName] = (\n          repTx: WriteTransaction,\n          args: ReadonlyJSONValue,\n        ): Promise<ReadonlyJSONValue | void> => {\n          const tx = new TransactionImpl(lc, repTx, schema);\n          return value.fn({args, ctx: context, tx});\n        };\n      } else if (typeof value === 'object' && value !== null) {\n        // Nested namespace\n        walk(value);\n      }\n    }\n  };\n  walk(registry);\n}\n"],"mappings":";;;;;;;;;AAqBA,SAAgB,yBACd,IACA,SACA,UACA,QACA,cACM;CAEN,MAAM,mBAAmB,UAAkB,SAAmB;EAC5D,KAAK,MAAM,CAAC,KAAK,YAAY,OAAO,QAAQ,QAAQ,GAAG;GACrD,IAAI,QAAQ,KAEV;GAGF,KAAK,KAAK,GAAG;GACb,IAAI,UAAU,OAAO,GAAG;IACtB,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,WAAW,sBACtB,IACA,SACA,QACA,OACF;GACF,OAAO,IAAI,OAAO,YAAY,YAAY;IACxC,MAAM,UAAU,iBAAiB,KAAK,IAAI;IAC1C,aAAa,WAAW,wBACtB,IAEA,SACA,QACA,OACF;GACF,OAAO,IAAI,YAAY,QAAQ,OAAO,YAAY,UAChD,gBAAgB,SAAS,IAAI;GAE/B,KAAK,IAAI;EACX;CACF;CAEA,gBAAgB,UAAU,CAAC,CAAC;AAC9B;AAEA,SAAS,sBAMP,IACA,SACA,QACA,SAIqC;CACrC,OAAO,OACL,OACA,SACsC;EACtC,MAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;EAEhD,OAAO,MAAM,QAAQ,GAAG;GAChB;GACN,KAAK;GACD;EACN,CAAC;CACH;AACF;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,SAAgB,uBACd,QACA,UACA,SACA,IACyC;CACzC,MAAM,EAAC,uBAAuB,UAAS;CAEvC,MAAM,qBAAqB,GACxB,qBAAqB,uBAClB,gBAAgB,MAAM,UAIpB,QAAQ,OACN,IAAI,YAAY;EACd,MAAM;EACN,SAAS;CACX,CAAC,CACH,EACR;CAEA,IAAI,UACF,IAAI,kBAAkB,QAAQ,GAC5B,0BACE,IACA,SACA,UACA,QACA,kBACF;MAEA,yBACE,IACA,SACA,UACA,QACA,kBACF;CAIJ,OAAO;AACT;;;;;AAMA,SAAS,0BACP,IACA,SACA,UACA,QACA,cACM;CACN,MAAM,QAAQ,SAAkB;EAC9B,IAAI,OAAO,SAAS,YAAY,SAAS,MACvC;EAEF,KAAK,MAAM,SAAS,OAAO,OAAO,IAAI,GACpC,IAAI,UAAa,KAAK,GAEpB,aAAa,MAAM,gBACjB,OACA,SACsC;GACtC,MAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;GAChD,OAAO,MAAM,GAAG;IAAC;IAAM,KAAK;IAAS;GAAE,CAAC;EAC1C;OACK,IAAI,OAAO,UAAU,YAAY,UAAU,MAEhD,KAAK,KAAK;CAGhB;CACA,KAAK,QAAQ;AACf"}

package/out/zero-client/src/client/mutation-tracker.d.ts

@@ -1,11 +1,11 @@
 import type { LogContext } from '@rocicorp/logger';
 import type { ReplicacheImpl } from '../../../replicache/src/impl.ts';
 import type { EphemeralID, MutationTrackingData } from '../../../replicache/src/replicache-options.ts';
+import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { MutationID } from '../../../zero-protocol/src/mutation-id.ts';
 import type { PushResponseBody } from '../../../zero-protocol/src/push.ts';
-import type { MutatorResultSuccessDetails } from './custom.ts';
 import { type ZeroError } from './error.ts';
-type MutationSuccessType = MutatorResultSuccessDetails;
+type MutationSuccessType = ReadonlyJSONValue | undefined;
 /**
  * Tracks what pushes are in-flight and resolves promises when they're acked.
  */

package/out/zero-client/src/client/mutation-tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation-tracker.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACrB,MAAM,+CAA+C,CAAC;AAevD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAM1E,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAC,2BAA2B,EAAC,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AAGvD,KAAK,mBAAmB,GAAG,2BAA2B,CAAC;AAUvD;;GAEG;AACH,qBAAa,eAAe;;IAmB1B,YACE,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,EACxC,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,EAUzC;IAED,mBAAmB,CACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,cAAc,CAAC,mBAAmB,CAAC,QAavD;IAED,aAAa,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAQzD;IAED,kBAAkB,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAU5D;IAED;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI,CAKhD;IAED;;;OAGG;IACH,6BAA6B,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CASpD;IA0CD,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAapD;IA0CD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM,QAEjC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAkBzC;IAED,IAAI,IAAI,WAEP;IAwJD;;;;;;;;;OASG;IACH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAEhD;CAOF"}
+{"version":3,"file":"mutation-tracker.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACrB,MAAM,+CAA+C,CAAC;AAGvD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAanE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAC;AAM1E,OAAO,KAAK,EAGV,gBAAgB,EACjB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AAGvD,KAAK,mBAAmB,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAQzD;;GAEG;AACH,qBAAa,eAAe;;IAmB1B,YACE,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,EACxC,YAAY,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,EAUzC;IAED,mBAAmB,CACjB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,cAAc,CAAC,mBAAmB,CAAC,QAavD;IAED,aAAa,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAQzD;IAED,kBAAkB,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAU5D;IAED;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI,CAKhD;IAED;;;OAGG;IACH,6BAA6B,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CASpD;IAiDD,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAapD;IA0CD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM,QAEjC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAkBzC;IAED,IAAI,IAAI,WAEP;IA2JD;;;;;;;;;OASG;IACH,qBAAqB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAEhD;CAOF"}

package/out/zero-client/src/client/mutation-tracker.js

@@ -17,7 +17,6 @@ var currentEphemeralID = 0;
 function nextEphemeralID() {
 	return ++currentEphemeralID;
 }
-var successResultDetails = { type: "success" };
 /**
 * Tracks what pushes are in-flight and resolves promises when they're acked.
 */
@@ -98,7 +97,7 @@ var MutationTracker = class {
 			largestLmid = Math.max(largestLmid, mutationID);
 			switch (diff.op) {
 				case "add": {
-					const result = parse(diff.newValue, mutationResultSchema);
+					const result = parse(diff.newValue, mutationResultSchema, "passthrough");
 					if ("error" in result) this.#processMutationError(clientID, mutationID, result);
 					else this.#processMutationOk(clientID, mutationID, result);
 					break;
@@ -214,10 +213,7 @@ var MutationTracker = class {
 		}
 		const entry = this.#outstandingMutations.get(ephemeralID);
 		assert(entry && entry.mutationID === mid, `outstanding mutation not found for mutation ID ${mid} and ephemeral ID ${ephemeralID}`);
-		if (error.error === "alreadyProcessed") {
-			this.#settleMutation(ephemeralID, entry, emptyObject);
-			return;
-		}
+		if (error.error === "alreadyProcessed") return;
 		this.#settleMutation(ephemeralID, entry, error.error === "app" ? new ApplicationError(error.message ?? `Unknown application error: ${error.error}`, error.details ? { details: error.details } : void 0) : new ProtocolError({
 			kind: InvalidPush,
 			origin: Server,
@@ -246,7 +242,7 @@ var MutationTracker = class {
 	}
 	#settleMutation(ephemeralID, entry, result) {
 		if (isApplicationError(result) || isZeroError(result)) entry.resolver.reject(result);
-		else entry.resolver.resolve(successResultDetails);
+		else entry.resolver.resolve(result.data);
 		this.#outstandingMutations.delete(ephemeralID);
 		if (entry.mutationID) this.#ephemeralIDsByMutationID.delete(entry.mutationID);
 	}

package/out/zero-client/src/client/mutation-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutation-tracker.js","names":["#outstandingMutations","#ephemeralIDsByMutationID","#allMutationsAppliedListeners","#lc","#ackMutations","#onFatalError","#largestOutstandingMutationID","#currentMutationID","#clientID","#processMutationResponses","#settleMutation","#notifyAllMutationsAppliedListeners","#processMutationError","#processMutationOk","#fatalErrorFromPushError","#processPushOk","#resolveMutations"],"sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver, type Resolver} from '@rocicorp/resolver';\nimport type {NoIndexDiff} from '../../../replicache/src/btree/node.ts';\nimport type {ReplicacheImpl} from '../../../replicache/src/impl.ts';\nimport type {\n  EphemeralID,\n  MutationTrackingData,\n} from '../../../replicache/src/replicache-options.ts';\nimport {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorDetails} from '../../../shared/src/error.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {emptyObject} from '../../../shared/src/sentinels.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {\n  ApplicationError,\n  isApplicationError,\n  wrapWithApplicationError,\n} from '../../../zero-protocol/src/application-error.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport type {MutationID} from '../../../zero-protocol/src/mutation-id.ts';\nimport {\n  mutationResultSchema,\n  type MutationError,\n  type MutationOk,\n} from '../../../zero-protocol/src/mutation.ts';\nimport type {\n  PushError,\n  PushOk,\n  PushResponseBody,\n} from '../../../zero-protocol/src/push.ts';\nimport type {MutatorResultSuccessDetails} from './custom.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport {MUTATIONS_KEY_PREFIX} from './keys.ts';\n\ntype MutationSuccessType = MutatorResultSuccessDetails;\ntype MutationErrorType = ApplicationError | ZeroError;\n\nlet currentEphemeralID = 0;\nfunction nextEphemeralID(): EphemeralID {\n  return ++currentEphemeralID as EphemeralID;\n}\n\nconst successResultDetails: MutationSuccessType = {type: 'success'};\n\n/**\n * Tracks what pushes are in-flight and resolves promises when they're acked.\n */\nexport class MutationTracker {\n  readonly #outstandingMutations: Map<\n    EphemeralID,\n    {\n      mutationID?: number | undefined;\n      resolver: Resolver<MutationSuccessType, MutationErrorType>;\n    }\n  >;\n  readonly #ephemeralIDsByMutationID: Map<number, EphemeralID>;\n  readonly #allMutationsAppliedListeners: Set<() => void>;\n  readonly #lc: LogContext;\n\n  readonly #ackMutations: (upTo: MutationID) => void;\n  readonly #onFatalError: (error: ZeroError) => void;\n\n  #clientID: string | undefined;\n  #largestOutstandingMutationID: number;\n  #currentMutationID: number;\n\n  constructor(\n    lc: LogContext,\n    ackMutations: (upTo: MutationID) => void,\n    onFatalError: (error: ZeroError) => void,\n  ) {\n    this.#lc = lc.withContext('MutationTracker');\n    this.#outstandingMutations = new Map();\n    this.#ephemeralIDsByMutationID = new Map();\n    this.#allMutationsAppliedListeners = new Set();\n    this.#largestOutstandingMutationID = 0;\n    this.#currentMutationID = 0;\n    this.#ackMutations = ackMutations;\n    this.#onFatalError = onFatalError;\n  }\n\n  setClientIDAndWatch(\n    clientID: string,\n    experimentalWatch: ReplicacheImpl['experimentalWatch'],\n  ) {\n    assert(this.#clientID === undefined, 'clientID already set');\n    this.#clientID = clientID;\n    experimentalWatch(\n      diffs => {\n        this.#processMutationResponses(diffs);\n      },\n      {\n        prefix: MUTATIONS_KEY_PREFIX + clientID + '/',\n        initialValuesInFirstDiff: true,\n      },\n    );\n  }\n\n  trackMutation(): MutationTrackingData<MutationSuccessType> {\n    const id = nextEphemeralID();\n    const mutationResolver = resolver<MutationSuccessType, MutationErrorType>();\n\n    this.#outstandingMutations.set(id, {\n      resolver: mutationResolver,\n    });\n    return {ephemeralID: id, serverPromise: mutationResolver.promise};\n  }\n\n  mutationIDAssigned(id: EphemeralID, mutationID: number): void {\n    const entry = this.#outstandingMutations.get(id);\n    if (entry) {\n      entry.mutationID = mutationID;\n      this.#ephemeralIDsByMutationID.set(mutationID, id);\n      this.#largestOutstandingMutationID = Math.max(\n        this.#largestOutstandingMutationID,\n        mutationID,\n      );\n    }\n  }\n\n  /**\n   * Reject the mutation due to an unhandled exception on the client.\n   * The mutation must not have been persisted to the client store.\n   */\n  rejectMutation(id: EphemeralID, e: unknown): void {\n    const entry = this.#outstandingMutations.get(id);\n    if (entry) {\n      this.#settleMutation(id, entry, wrapWithApplicationError(e));\n    }\n  }\n\n  /**\n   * Reject all outstanding mutations. Called when the client is in a state\n   * that prevents mutations from being applied, such as offline or closed.\n   */\n  rejectAllOutstandingMutations(error: ZeroError): void {\n    if (this.#outstandingMutations.size === 0) {\n      return;\n    }\n    for (const [id, entry] of this.#outstandingMutations) {\n      this.#settleMutation(id, entry, error);\n    }\n    this.#largestOutstandingMutationID = this.#currentMutationID;\n    this.#notifyAllMutationsAppliedListeners();\n  }\n\n  /**\n   * Used when zero-cache pokes down mutation results.\n   */\n  #processMutationResponses(diffs: NoIndexDiff): void {\n    const clientID = must(this.#clientID);\n    let largestLmid = 0;\n    for (const diff of diffs) {\n      const mutationID = Number(\n        diff.key.slice(MUTATIONS_KEY_PREFIX.length + clientID.length + 1),\n      );\n      assert(\n        !isNaN(mutationID),\n        `MutationTracker received a diff with an invalid mutation ID: ${diff.key}`,\n      );\n      largestLmid = Math.max(largestLmid, mutationID);\n      switch (diff.op) {\n        case 'add': {\n          const result = v.parse(diff.newValue, mutationResultSchema);\n          if ('error' in result) {\n            this.#processMutationError(clientID, mutationID, result);\n          } else {\n            this.#processMutationOk(clientID, mutationID, result);\n          }\n          break;\n        }\n        case 'del':\n          break;\n        case 'change':\n          throw new Error('MutationTracker does not expect change operations');\n      }\n    }\n\n    if (largestLmid > 0) {\n      this.#ackMutations({\n        clientID: must(this.#clientID),\n        id: largestLmid,\n      });\n    }\n  }\n\n  processPushResponse(response: PushResponseBody): void {\n    if ('error' in response) {\n      this.#lc.error?.(\n        'Received an error response when pushing mutations',\n        response,\n      );\n      const fatalError = this.#fatalErrorFromPushError(response);\n      if (fatalError) {\n        this.#onFatalError(fatalError);\n      }\n    } else {\n      this.#processPushOk(response);\n    }\n  }\n\n  #fatalErrorFromPushError(error: PushError): ZeroError | undefined {\n    switch (error.error) {\n      case 'unsupportedPushVersion':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `Unsupported push version`,\n          mutationIDs: [],\n        });\n      case 'unsupportedSchemaVersion':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `Unsupported schema version`,\n          mutationIDs: [],\n        });\n      case 'http':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.HTTP,\n          status: error.status,\n          message: `Fetch from API server returned non-OK status ${error.status}: ${error.details ?? 'unknown'}`,\n          mutationIDs: [],\n        });\n      case 'zeroPusher':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `ZeroPusher error: ${error.details ?? 'unknown'}`,\n          mutationIDs: [],\n        });\n      default:\n        unreachable(error);\n    }\n  }\n\n  /**\n   * DEPRECATED: to be removed when we switch to fully driving\n   * mutation resolution via poke.\n   *\n   * When we reconnect to zero-cache, we resolve all outstanding mutations\n   * whose ID is less than or equal to the lastMutationID.\n   *\n   * The reason is that any responses the API server sent\n   * to those mutations have been lost.\n   *\n   * An example case: the API server responds while the connection\n   * is down. Those responses are lost.\n   *\n   * Mutations whose LMID is > the lastMutationID are not resolved\n   * since they will be retried by the client, giving us another chance\n   * at getting a response.\n   *\n   * The only way to ensure that all API server responses are\n   * received would be to have the API server write them\n   * to the DB while writing the LMID.\n   */\n  onConnected(lastMutationID: number) {\n    this.lmidAdvanced(lastMutationID);\n  }\n\n  /**\n   * lmid advance will:\n   * 1. notify \"allMutationsApplied\" listeners if the lastMutationID\n   *    is greater than or equal to the largest outstanding mutation ID.\n   * 2. resolve all mutations whose mutation ID is less than or equal to\n   *    the lastMutationID.\n   */\n  lmidAdvanced(lastMutationID: number): void {\n    assert(\n      lastMutationID >= this.#currentMutationID,\n      'lmid must be greater than or equal to current lmid',\n    );\n    if (lastMutationID === this.#currentMutationID) {\n      return;\n    }\n\n    try {\n      this.#currentMutationID = lastMutationID;\n      this.#resolveMutations(lastMutationID);\n    } finally {\n      if (lastMutationID >= this.#largestOutstandingMutationID) {\n        // this is very important otherwise we hang query de-registration\n        this.#notifyAllMutationsAppliedListeners();\n      }\n    }\n  }\n\n  get size() {\n    return this.#outstandingMutations.size;\n  }\n\n  #resolveMutations(upTo: number): void {\n    // We resolve all mutations whose mutation ID is less than or equal to\n    // the upTo mutation ID.\n    for (const [id, entry] of this.#outstandingMutations) {\n      if (entry.mutationID && entry.mutationID <= upTo) {\n        this.#settleMutation(id, entry, emptyObject);\n      } else {\n        break; // the map is in insertion order which is in mutation ID order\n      }\n    }\n  }\n\n  #processPushOk(success: PushOk): void {\n    for (const mutation of success.mutations) {\n      if ('error' in mutation.result) {\n        this.#processMutationError(\n          mutation.id.clientID,\n          mutation.id.id,\n          mutation.result,\n        );\n      } else {\n        this.#processMutationOk(\n          mutation.id.clientID,\n          mutation.id.id,\n          mutation.result,\n        );\n      }\n    }\n  }\n\n  #processMutationError(\n    clientID: string,\n    mid: number,\n    error: MutationError | Omit<PushError, 'mutationIDs'>,\n  ): void {\n    assert(\n      clientID === this.#clientID,\n      'received mutation for the wrong client',\n    );\n\n    // Each tab sends all mutations for the client group\n    // and the server responds back to the individual client that actually\n    // ran the mutation. This means that N clients can send the same\n    // mutation concurrently. If that happens, the promise for the mutation tracked\n    // by this class will try to be resolved N times.\n    // Every time after the first, the ephemeral ID will not be found.\n    //\n    // We also reject all outstanding mutations when the client is in a state\n    // that prevents mutations from being applied, such as offline or closed.\n    // In this case, the ephemeral ID will also not be found.\n    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);\n    if (!ephemeralID) {\n      this.#lc.debug?.(\n        'Mutation already resolved or rejected (e.g. due to disconnect); ignore late reject.',\n      );\n      return;\n    }\n\n    const entry = this.#outstandingMutations.get(ephemeralID);\n    assert(\n      entry && entry.mutationID === mid,\n      `outstanding mutation not found for mutation ID ${mid} and ephemeral ID ${ephemeralID}`,\n    );\n\n    if (error.error === 'alreadyProcessed') {\n      this.#settleMutation(ephemeralID, entry, emptyObject);\n      return;\n    }\n\n    this.#settleMutation(\n      ephemeralID,\n      entry,\n      error.error === 'app'\n        ? new ApplicationError(\n            error.message ?? `Unknown application error: ${error.error}`,\n            error.details ? {details: error.details} : undefined,\n          )\n        : new ProtocolError({\n            kind: ErrorKind.InvalidPush,\n            origin: ErrorOrigin.Server,\n            reason: ErrorReason.Internal,\n            message:\n              error.error === 'oooMutation'\n                ? 'Server reported an out-of-order mutation'\n                : `Unknown fallback error with mutation ID ${mid}: ${error.error}`,\n            details: getErrorDetails(error),\n          }),\n    );\n\n    // this is included for backwards compatibility with the per-mutation fatal error responses\n    if (error.error === 'oooMutation') {\n      this.#onFatalError(\n        new ProtocolError({\n          kind: ErrorKind.InvalidPush,\n          origin: ErrorOrigin.Server,\n          reason: ErrorReason.Internal,\n          message: 'Server reported an out-of-order mutation',\n          details: error.details,\n        }),\n      );\n    }\n  }\n\n  #processMutationOk(clientID: string, mid: number, result: MutationOk): void {\n    assert(\n      clientID === this.#clientID,\n      'received mutation for the wrong client',\n    );\n\n    // We reject all outstanding mutations when the client is in a state\n    // that prevents mutations from being applied, such as offline or closed.\n    // In this case, the ephemeral ID will not be found.\n    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);\n    if (!ephemeralID) {\n      this.#lc.debug?.(\n        'Mutation already resolved or rejected (e.g. due to disconnect); ignore late resolve.',\n      );\n      return;\n    }\n\n    const entry = this.#outstandingMutations.get(ephemeralID);\n    assert(\n      entry && entry.mutationID === mid,\n      `outstanding mutation not found for mutation ID ${mid} and ephemeral ID ${ephemeralID}`,\n    );\n    this.#settleMutation(ephemeralID, entry, result);\n  }\n\n  #settleMutation<Result extends MutationOk | ApplicationError | ZeroError>(\n    ephemeralID: EphemeralID,\n    entry: {\n      mutationID?: number | undefined;\n      resolver: Resolver<MutationSuccessType, MutationErrorType>;\n    },\n    result: Result,\n  ): void {\n    if (isApplicationError(result) || isZeroError(result)) {\n      // we reject here and catch in the mutator proxy\n      // the mutator proxy catches both client and server errors\n      entry.resolver.reject(result);\n    } else {\n      entry.resolver.resolve(successResultDetails);\n    }\n\n    this.#outstandingMutations.delete(ephemeralID);\n    if (entry.mutationID) {\n      this.#ephemeralIDsByMutationID.delete(entry.mutationID);\n    }\n  }\n\n  /**\n   * Be notified when all mutations have been included in the server snapshot.\n   *\n   * The query manager will not de-register queries from the server until there\n   * are no pending mutations.\n   *\n   * The reason is that a mutation may need to be rebased. We do not want\n   * data that was available the first time it was run to not be available\n   * on a rebase.\n   */\n  onAllMutationsApplied(listener: () => void): void {\n    this.#allMutationsAppliedListeners.add(listener);\n  }\n\n  #notifyAllMutationsAppliedListeners() {\n    for (const listener of this.#allMutationsAppliedListeners) {\n      listener();\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"mutation-tracker.js","names":["#outstandingMutations","#ephemeralIDsByMutationID","#allMutationsAppliedListeners","#lc","#ackMutations","#onFatalError","#largestOutstandingMutationID","#currentMutationID","#clientID","#processMutationResponses","#settleMutation","#notifyAllMutationsAppliedListeners","#processMutationError","#processMutationOk","#fatalErrorFromPushError","#processPushOk","#resolveMutations"],"sources":["../../../../../zero-client/src/client/mutation-tracker.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {resolver, type Resolver} from '@rocicorp/resolver';\nimport type {NoIndexDiff} from '../../../replicache/src/btree/node.ts';\nimport type {ReplicacheImpl} from '../../../replicache/src/impl.ts';\nimport type {\n  EphemeralID,\n  MutationTrackingData,\n} from '../../../replicache/src/replicache-options.ts';\nimport {assert, unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorDetails} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {emptyObject} from '../../../shared/src/sentinels.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {\n  ApplicationError,\n  isApplicationError,\n  wrapWithApplicationError,\n} from '../../../zero-protocol/src/application-error.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport type {MutationID} from '../../../zero-protocol/src/mutation-id.ts';\nimport {\n  mutationResultSchema,\n  type MutationError,\n  type MutationOk,\n} from '../../../zero-protocol/src/mutation.ts';\nimport type {\n  PushError,\n  PushOk,\n  PushResponseBody,\n} from '../../../zero-protocol/src/push.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport {MUTATIONS_KEY_PREFIX} from './keys.ts';\n\ntype MutationSuccessType = ReadonlyJSONValue | undefined;\ntype MutationErrorType = ApplicationError | ZeroError;\n\nlet currentEphemeralID = 0;\nfunction nextEphemeralID(): EphemeralID {\n  return ++currentEphemeralID as EphemeralID;\n}\n\n/**\n * Tracks what pushes are in-flight and resolves promises when they're acked.\n */\nexport class MutationTracker {\n  readonly #outstandingMutations: Map<\n    EphemeralID,\n    {\n      mutationID?: number | undefined;\n      resolver: Resolver<MutationSuccessType, MutationErrorType>;\n    }\n  >;\n  readonly #ephemeralIDsByMutationID: Map<number, EphemeralID>;\n  readonly #allMutationsAppliedListeners: Set<() => void>;\n  readonly #lc: LogContext;\n\n  readonly #ackMutations: (upTo: MutationID) => void;\n  readonly #onFatalError: (error: ZeroError) => void;\n\n  #clientID: string | undefined;\n  #largestOutstandingMutationID: number;\n  #currentMutationID: number;\n\n  constructor(\n    lc: LogContext,\n    ackMutations: (upTo: MutationID) => void,\n    onFatalError: (error: ZeroError) => void,\n  ) {\n    this.#lc = lc.withContext('MutationTracker');\n    this.#outstandingMutations = new Map();\n    this.#ephemeralIDsByMutationID = new Map();\n    this.#allMutationsAppliedListeners = new Set();\n    this.#largestOutstandingMutationID = 0;\n    this.#currentMutationID = 0;\n    this.#ackMutations = ackMutations;\n    this.#onFatalError = onFatalError;\n  }\n\n  setClientIDAndWatch(\n    clientID: string,\n    experimentalWatch: ReplicacheImpl['experimentalWatch'],\n  ) {\n    assert(this.#clientID === undefined, 'clientID already set');\n    this.#clientID = clientID;\n    experimentalWatch(\n      diffs => {\n        this.#processMutationResponses(diffs);\n      },\n      {\n        prefix: MUTATIONS_KEY_PREFIX + clientID + '/',\n        initialValuesInFirstDiff: true,\n      },\n    );\n  }\n\n  trackMutation(): MutationTrackingData<MutationSuccessType> {\n    const id = nextEphemeralID();\n    const mutationResolver = resolver<MutationSuccessType, MutationErrorType>();\n\n    this.#outstandingMutations.set(id, {\n      resolver: mutationResolver,\n    });\n    return {ephemeralID: id, serverPromise: mutationResolver.promise};\n  }\n\n  mutationIDAssigned(id: EphemeralID, mutationID: number): void {\n    const entry = this.#outstandingMutations.get(id);\n    if (entry) {\n      entry.mutationID = mutationID;\n      this.#ephemeralIDsByMutationID.set(mutationID, id);\n      this.#largestOutstandingMutationID = Math.max(\n        this.#largestOutstandingMutationID,\n        mutationID,\n      );\n    }\n  }\n\n  /**\n   * Reject the mutation due to an unhandled exception on the client.\n   * The mutation must not have been persisted to the client store.\n   */\n  rejectMutation(id: EphemeralID, e: unknown): void {\n    const entry = this.#outstandingMutations.get(id);\n    if (entry) {\n      this.#settleMutation(id, entry, wrapWithApplicationError(e));\n    }\n  }\n\n  /**\n   * Reject all outstanding mutations. Called when the client is in a state\n   * that prevents mutations from being applied, such as offline or closed.\n   */\n  rejectAllOutstandingMutations(error: ZeroError): void {\n    if (this.#outstandingMutations.size === 0) {\n      return;\n    }\n    for (const [id, entry] of this.#outstandingMutations) {\n      this.#settleMutation(id, entry, error);\n    }\n    this.#largestOutstandingMutationID = this.#currentMutationID;\n    this.#notifyAllMutationsAppliedListeners();\n  }\n\n  /**\n   * Used when zero-cache pokes down mutation results.\n   */\n  #processMutationResponses(diffs: NoIndexDiff): void {\n    const clientID = must(this.#clientID);\n    let largestLmid = 0;\n    for (const diff of diffs) {\n      const mutationID = Number(\n        diff.key.slice(MUTATIONS_KEY_PREFIX.length + clientID.length + 1),\n      );\n      assert(\n        !isNaN(mutationID),\n        `MutationTracker received a diff with an invalid mutation ID: ${diff.key}`,\n      );\n      largestLmid = Math.max(largestLmid, mutationID);\n      switch (diff.op) {\n        case 'add': {\n          // Results are stored as the server sent them, so a newer server can\n          // add fields. Don't use 'strip': mutationResultSchema's OK branch\n          // has no discriminator, so it would turn every error into `{}`.\n          const result = v.parse(\n            diff.newValue,\n            mutationResultSchema,\n            'passthrough',\n          );\n          if ('error' in result) {\n            this.#processMutationError(clientID, mutationID, result);\n          } else {\n            this.#processMutationOk(clientID, mutationID, result);\n          }\n          break;\n        }\n        case 'del':\n          break;\n        case 'change':\n          throw new Error('MutationTracker does not expect change operations');\n      }\n    }\n\n    if (largestLmid > 0) {\n      this.#ackMutations({\n        clientID: must(this.#clientID),\n        id: largestLmid,\n      });\n    }\n  }\n\n  processPushResponse(response: PushResponseBody): void {\n    if ('error' in response) {\n      this.#lc.error?.(\n        'Received an error response when pushing mutations',\n        response,\n      );\n      const fatalError = this.#fatalErrorFromPushError(response);\n      if (fatalError) {\n        this.#onFatalError(fatalError);\n      }\n    } else {\n      this.#processPushOk(response);\n    }\n  }\n\n  #fatalErrorFromPushError(error: PushError): ZeroError | undefined {\n    switch (error.error) {\n      case 'unsupportedPushVersion':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `Unsupported push version`,\n          mutationIDs: [],\n        });\n      case 'unsupportedSchemaVersion':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `Unsupported schema version`,\n          mutationIDs: [],\n        });\n      case 'http':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.HTTP,\n          status: error.status,\n          message: `Fetch from API server returned non-OK status ${error.status}: ${error.details ?? 'unknown'}`,\n          mutationIDs: [],\n        });\n      case 'zeroPusher':\n        return new ProtocolError({\n          kind: ErrorKind.PushFailed,\n          origin: ErrorOrigin.ZeroCache,\n          reason: ErrorReason.Internal,\n          message: `ZeroPusher error: ${error.details ?? 'unknown'}`,\n          mutationIDs: [],\n        });\n      default:\n        unreachable(error);\n    }\n  }\n\n  /**\n   * DEPRECATED: to be removed when we switch to fully driving\n   * mutation resolution via poke.\n   *\n   * When we reconnect to zero-cache, we resolve all outstanding mutations\n   * whose ID is less than or equal to the lastMutationID.\n   *\n   * The reason is that any responses the API server sent\n   * to those mutations have been lost.\n   *\n   * An example case: the API server responds while the connection\n   * is down. Those responses are lost.\n   *\n   * Mutations whose LMID is > the lastMutationID are not resolved\n   * since they will be retried by the client, giving us another chance\n   * at getting a response.\n   *\n   * The only way to ensure that all API server responses are\n   * received would be to have the API server write them\n   * to the DB while writing the LMID.\n   */\n  onConnected(lastMutationID: number) {\n    this.lmidAdvanced(lastMutationID);\n  }\n\n  /**\n   * lmid advance will:\n   * 1. notify \"allMutationsApplied\" listeners if the lastMutationID\n   *    is greater than or equal to the largest outstanding mutation ID.\n   * 2. resolve all mutations whose mutation ID is less than or equal to\n   *    the lastMutationID.\n   */\n  lmidAdvanced(lastMutationID: number): void {\n    assert(\n      lastMutationID >= this.#currentMutationID,\n      'lmid must be greater than or equal to current lmid',\n    );\n    if (lastMutationID === this.#currentMutationID) {\n      return;\n    }\n\n    try {\n      this.#currentMutationID = lastMutationID;\n      this.#resolveMutations(lastMutationID);\n    } finally {\n      if (lastMutationID >= this.#largestOutstandingMutationID) {\n        // this is very important otherwise we hang query de-registration\n        this.#notifyAllMutationsAppliedListeners();\n      }\n    }\n  }\n\n  get size() {\n    return this.#outstandingMutations.size;\n  }\n\n  #resolveMutations(upTo: number): void {\n    // We resolve all mutations whose mutation ID is less than or equal to\n    // the upTo mutation ID.\n    for (const [id, entry] of this.#outstandingMutations) {\n      if (entry.mutationID && entry.mutationID <= upTo) {\n        this.#settleMutation(id, entry, emptyObject);\n      } else {\n        break; // the map is in insertion order which is in mutation ID order\n      }\n    }\n  }\n\n  #processPushOk(success: PushOk): void {\n    for (const mutation of success.mutations) {\n      if ('error' in mutation.result) {\n        this.#processMutationError(\n          mutation.id.clientID,\n          mutation.id.id,\n          mutation.result,\n        );\n      } else {\n        this.#processMutationOk(\n          mutation.id.clientID,\n          mutation.id.id,\n          mutation.result,\n        );\n      }\n    }\n  }\n\n  #processMutationError(\n    clientID: string,\n    mid: number,\n    error: MutationError | Omit<PushError, 'mutationIDs'>,\n  ): void {\n    assert(\n      clientID === this.#clientID,\n      'received mutation for the wrong client',\n    );\n\n    // Each tab sends all mutations for the client group\n    // and the server responds back to the individual client that actually\n    // ran the mutation. This means that N clients can send the same\n    // mutation concurrently. If that happens, the promise for the mutation tracked\n    // by this class will try to be resolved N times.\n    // Every time after the first, the ephemeral ID will not be found.\n    //\n    // We also reject all outstanding mutations when the client is in a state\n    // that prevents mutations from being applied, such as offline or closed.\n    // In this case, the ephemeral ID will also not be found.\n    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);\n    if (!ephemeralID) {\n      this.#lc.debug?.(\n        'Mutation already resolved or rejected (e.g. due to disconnect); ignore late reject.',\n      );\n      return;\n    }\n\n    const entry = this.#outstandingMutations.get(ephemeralID);\n    assert(\n      entry && entry.mutationID === mid,\n      `outstanding mutation not found for mutation ID ${mid} and ephemeral ID ${ephemeralID}`,\n    );\n\n    if (error.error === 'alreadyProcessed') {\n      // An earlier push committed this mutation, but its response was lost.\n      // Leave it outstanding: its persisted result (if the mutator returned\n      // data) or the lastMutationID advance arrives in a poke and settles it,\n      // so returned data isn't dropped.\n      return;\n    }\n\n    this.#settleMutation(\n      ephemeralID,\n      entry,\n      error.error === 'app'\n        ? new ApplicationError(\n            error.message ?? `Unknown application error: ${error.error}`,\n            error.details ? {details: error.details} : undefined,\n          )\n        : new ProtocolError({\n            kind: ErrorKind.InvalidPush,\n            origin: ErrorOrigin.Server,\n            reason: ErrorReason.Internal,\n            message:\n              error.error === 'oooMutation'\n                ? 'Server reported an out-of-order mutation'\n                : `Unknown fallback error with mutation ID ${mid}: ${error.error}`,\n            details: getErrorDetails(error),\n          }),\n    );\n\n    // this is included for backwards compatibility with the per-mutation fatal error responses\n    if (error.error === 'oooMutation') {\n      this.#onFatalError(\n        new ProtocolError({\n          kind: ErrorKind.InvalidPush,\n          origin: ErrorOrigin.Server,\n          reason: ErrorReason.Internal,\n          message: 'Server reported an out-of-order mutation',\n          details: error.details,\n        }),\n      );\n    }\n  }\n\n  #processMutationOk(clientID: string, mid: number, result: MutationOk): void {\n    assert(\n      clientID === this.#clientID,\n      'received mutation for the wrong client',\n    );\n\n    // We reject all outstanding mutations when the client is in a state\n    // that prevents mutations from being applied, such as offline or closed.\n    // In this case, the ephemeral ID will not be found.\n    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);\n    if (!ephemeralID) {\n      this.#lc.debug?.(\n        'Mutation already resolved or rejected (e.g. due to disconnect); ignore late resolve.',\n      );\n      return;\n    }\n\n    const entry = this.#outstandingMutations.get(ephemeralID);\n    assert(\n      entry && entry.mutationID === mid,\n      `outstanding mutation not found for mutation ID ${mid} and ephemeral ID ${ephemeralID}`,\n    );\n    this.#settleMutation(ephemeralID, entry, result);\n  }\n\n  #settleMutation<Result extends MutationOk | ApplicationError | ZeroError>(\n    ephemeralID: EphemeralID,\n    entry: {\n      mutationID?: number | undefined;\n      resolver: Resolver<MutationSuccessType, MutationErrorType>;\n    },\n    result: Result,\n  ): void {\n    if (isApplicationError(result) || isZeroError(result)) {\n      // we reject here and catch in the mutator proxy\n      // the mutator proxy catches both client and server errors\n      entry.resolver.reject(result);\n    } else {\n      entry.resolver.resolve(result.data);\n    }\n\n    this.#outstandingMutations.delete(ephemeralID);\n    if (entry.mutationID) {\n      this.#ephemeralIDsByMutationID.delete(entry.mutationID);\n    }\n  }\n\n  /**\n   * Be notified when all mutations have been included in the server snapshot.\n   *\n   * The query manager will not de-register queries from the server until there\n   * are no pending mutations.\n   *\n   * The reason is that a mutation may need to be rebased. We do not want\n   * data that was available the first time it was run to not be available\n   * on a rebase.\n   */\n  onAllMutationsApplied(listener: () => void): void {\n    this.#allMutationsAppliedListeners.add(listener);\n  }\n\n  #notifyAllMutationsAppliedListeners() {\n    for (const listener of this.#allMutationsAppliedListeners) {\n      listener();\n    }\n  }\n}\n"],"mappings":"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"}

package/out/zero-client/src/client/mutator-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutator-proxy.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAInE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAuB3D,qBAAa,YAAY;;IAMvB,YACE,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,EAUjC;IAED,IAAI,sBAAsB,IAAI,SAAS,GAAG,SAAS,CAElD;IA0CD,iBAAiB,CACf,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,iBAAiB,CAAC,KAAK;QAC/C,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1B,EACD,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa,CA4E/D;CAgCF"}
+{"version":3,"file":"mutator-proxy.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAInE,OAAO,KAAK,EACV,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAc,KAAK,SAAS,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAuB3D,qBAAa,YAAY;;IAMvB,YACE,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,EAUjC;IAED,IAAI,sBAAsB,IAAI,SAAS,GAAG,SAAS,CAElD;IA2CD,iBAAiB,CACf,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,iBAAiB,CAAC,KAAK;QAC/C,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACzB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1B,EACD,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa,CAuF/D;CAgCF"}

package/out/zero-client/src/client/mutator-proxy.js

@@ -1,11 +1,14 @@
 import { unreachable } from "../../../shared/src/asserts.js";
+import { getStorageFailure } from "../../../replicache/src/storage-failure.js";
 import { wrapWithApplicationError } from "../../../zero-protocol/src/application-error.js";
-import { Closed, Connected, Connecting, Disconnected, Error, NeedsAuth } from "./connection-status-enum.js";
+import { Closed, Connected, Connecting, Disconnected, Error, Initializing, NeedsAuth } from "./connection-status-enum.js";
 import { ClientClosed, Offline } from "./client-error-kind-enum.js";
 import { isZeroError } from "./error.js";
 //#region ../zero-client/src/client/mutator-proxy.ts
-var successResultDetails = { type: "success" };
-var successResult = () => successResultDetails;
+var successResult = (data) => ({
+	type: "success",
+	data
+});
 function getStateDescription(error) {
 	switch (error.kind) {
 		case Offline: return "offline";
@@ -50,6 +53,7 @@ var MutatorProxy = class {
 				};
 				this.#mutationTracker.rejectAllOutstandingMutations(state.reason);
 				break;
+			case Initializing:
 			case Connected:
 			case Connecting:
 			case NeedsAuth:
@@ -80,7 +84,8 @@ var MutatorProxy = class {
 					return zeroErrorPromise;
 				}
 				const applicationError = wrapWithApplicationError(error);
-				this.#lc.error?.(`Mutator "${name}" app error on ${origin}`, applicationError);
+				if (getStorageFailure(error) === void 0) this.#lc.error?.(`Mutator "${name}" app error on ${origin}`, applicationError);
+				else this.#lc.warn?.(`Mutator "${name}" storage failure on ${origin}`, applicationError);
 				const applicationErrorPromise = this.#makeApplicationErrorResultDetails(applicationError);
 				cachedMutationPromises[origin] = applicationErrorPromise;
 				return applicationErrorPromise;