@rocicorp/zero 0.25.0-canary.9 → 0.25.1

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

@@ -1 +1 @@
-{"version":3,"file":"error.js","sources":["../../../../../zero-client/src/client/error.ts"],"sourcesContent":["import {unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {Expand} from '../../../shared/src/expand.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 type {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {\n  type BackoffBody,\n  type ErrorBody,\n  isProtocolError,\n  type PushFailedBody,\n  type TransformFailedBody,\n} from '../../../zero-protocol/src/error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\nexport type AuthError = ProtocolError<NeedsAuthReason>;\nexport type ClientErrorBody = {\n  kind: ClientErrorKind;\n  origin: typeof ErrorOrigin.Client;\n  message: string;\n};\nexport type ClosedError = ClientError<{\n  kind: ClientErrorKind.ClientClosed;\n  message: string;\n}>;\nexport type NeedsAuthReason = Expand<\n  | (ErrorBody & {\n      kind: ErrorKind.AuthInvalidated | ErrorKind.Unauthorized;\n    })\n  | (Extract<PushFailedBody, {reason: ErrorReason.HTTP}> & {status: 401 | 403})\n  | (Extract<TransformFailedBody, {reason: ErrorReason.HTTP}> & {\n      status: 401 | 403;\n    })\n>;\nexport type OfflineError = ClientError<{\n  kind: ClientErrorKind.Offline;\n  message: string;\n}>;\nexport type ServerError = ProtocolError<ErrorBody>;\nexport type ZeroError = ServerError | ClientError;\nexport type ZeroErrorBody = Expand<ErrorBody | ClientErrorBody>;\nexport type ZeroErrorDetails = Expand<Omit<ZeroErrorBody, 'message'>>;\nexport type ZeroErrorKind = Expand<ErrorKind | ClientErrorKind>;\n\n/**\n * Represents an error encountered by the Zero client.\n */\nexport class ClientError<\n  const T extends Omit<ClientErrorBody, 'origin'> = Omit<\n    ClientErrorBody,\n    'origin'\n  >,\n> extends Error {\n  readonly errorBody: {origin: typeof ErrorOrigin.Client} & T;\n\n  constructor(errorBody: T, options?: ErrorOptions) {\n    super(errorBody.message, options);\n    this.name = 'ClientError';\n    this.errorBody = {...errorBody, origin: ErrorOrigin.Client};\n  }\n\n  get kind(): T['kind'] {\n    return this.errorBody.kind;\n  }\n}\n\nexport function isZeroError(ex: unknown): ex is ZeroError {\n  return isClientError(ex) || isServerError(ex);\n}\n\nexport function isClientError(ex: unknown): ex is ClientError<ClientErrorBody> {\n  return (\n    ex instanceof ClientError && ex.errorBody.origin === ErrorOrigin.Client\n  );\n}\n\nexport function isServerError(ex: unknown): ex is ServerError {\n  return (\n    isProtocolError(ex) &&\n    (ex.errorBody.origin === ErrorOrigin.Server ||\n      ex.errorBody.origin === ErrorOrigin.ZeroCache)\n  );\n}\n\nexport function isOfflineError(ex: unknown): ex is OfflineError {\n  return isClientError(ex) && ex.kind === ClientErrorKind.Offline;\n}\n\nexport function isAuthError(ex: unknown): ex is AuthError {\n  if (isServerError(ex)) {\n    if (\n      ex.kind === ErrorKind.AuthInvalidated ||\n      ex.kind === ErrorKind.Unauthorized\n    ) {\n      return true;\n    }\n    if (\n      (ex.errorBody.kind === ErrorKind.PushFailed ||\n        ex.errorBody.kind === ErrorKind.TransformFailed) &&\n      ex.errorBody.reason === ErrorReason.HTTP &&\n      (ex.errorBody.status === 401 || ex.errorBody.status === 403)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport function getBackoffParams(error: ZeroError): BackoffBody | undefined {\n  if (isServerError(error)) {\n    switch (error.errorBody.kind) {\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return error.errorBody;\n    }\n  }\n  return undefined;\n}\n\nexport const NO_STATUS_TRANSITION = 'NO_STATUS_TRANSITION';\n\nexport type ErrorConnectionTransition =\n  | {status: typeof NO_STATUS_TRANSITION; reason: ZeroError}\n  | {status: ConnectionStatus.NeedsAuth; reason: AuthError}\n  | {status: ConnectionStatus.Error; reason: ZeroError}\n  | {status: ConnectionStatus.Disconnected; reason: OfflineError}\n  | {status: ConnectionStatus.Closed; reason: ZeroError};\n\n/**\n * Returns the status to transition to, or null if the error\n * indicates that the connection should continue in the current state.\n */\nexport function getErrorConnectionTransition(\n  ex: unknown,\n): ErrorConnectionTransition {\n  // Handle auth errors by transitioning to needs-auth state\n  if (isAuthError(ex)) {\n    return {\n      status: ConnectionStatus.NeedsAuth,\n      reason: ex,\n    } as const;\n  }\n\n  if (isClientError(ex)) {\n    switch (ex.kind) {\n      // Connecting errors that should continue in the current state\n      case ClientErrorKind.AbruptClose:\n      case ClientErrorKind.CleanClose:\n      case ClientErrorKind.ConnectTimeout:\n      case ClientErrorKind.PingTimeout:\n      case ClientErrorKind.PullTimeout:\n      case ClientErrorKind.Hidden:\n      case ClientErrorKind.NoSocketOrigin:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Fatal errors that should transition to error state\n      case ClientErrorKind.UnexpectedBaseCookie:\n      case ClientErrorKind.Internal:\n      case ClientErrorKind.InvalidMessage:\n      case ClientErrorKind.UserDisconnect:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Disconnected error (this should already result in a disconnected state)\n      case ClientErrorKind.Offline:\n        return {\n          status: ConnectionStatus.Disconnected,\n          reason: ex as OfflineError,\n        } as const;\n\n      // Closed error (this should already result in a closed state)\n      case ClientErrorKind.ClientClosed:\n        return {status: ConnectionStatus.Closed, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  if (isServerError(ex)) {\n    switch (ex.kind) {\n      // Errors that should transition to error state\n      case ErrorKind.ClientNotFound:\n      case ErrorKind.InvalidConnectionRequest:\n      case ErrorKind.InvalidConnectionRequestBaseCookie:\n      case ErrorKind.InvalidConnectionRequestLastMutationID:\n      case ErrorKind.InvalidConnectionRequestClientDeleted:\n      case ErrorKind.InvalidMessage:\n      case ErrorKind.InvalidPush:\n      case ErrorKind.VersionNotSupported:\n      case ErrorKind.SchemaVersionNotSupported:\n      case ErrorKind.Internal:\n      // PushFailed and TransformFailed can be auth errors (401/403)\n      // or other errors - handle non-auth cases here\n      case ErrorKind.PushFailed:\n      case ErrorKind.TransformFailed:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Errors that should continue with backoff/retry\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Auth errors are handled above by isAuthError check\n      case ErrorKind.AuthInvalidated:\n      case ErrorKind.Unauthorized:\n        return {\n          status: ConnectionStatus.NeedsAuth,\n          reason: ex as AuthError,\n        } as const;\n\n      // Mutation-specific errors don't affect connection state\n      case ErrorKind.MutationRateLimited:\n      case ErrorKind.MutationFailed:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  // we default to error state if we don't know what to do\n  // this is a catch-all for unexpected errors\n  return {\n    status: ConnectionStatus.Error,\n    reason: new ClientError(\n      {\n        kind: ClientErrorKind.Internal,\n        message: 'Unexpected internal error: ' + getErrorMessage(ex),\n      },\n      {cause: ex},\n    ),\n  } as const;\n}\n"],"names":["ErrorOrigin.Client","ErrorOrigin.Server","ErrorOrigin.ZeroCache","ErrorKind.AuthInvalidated","ErrorKind.Unauthorized","ErrorKind.PushFailed","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorKind.Rebalance","ErrorKind.Rehome","ErrorKind.ServerOverloaded","ConnectionStatus.NeedsAuth","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose","ClientErrorKind.ConnectTimeout","ClientErrorKind.PingTimeout","ClientErrorKind.PullTimeout","ClientErrorKind.Hidden","ClientErrorKind.NoSocketOrigin","ClientErrorKind.UnexpectedBaseCookie","ClientErrorKind.Internal","ClientErrorKind.InvalidMessage","ClientErrorKind.UserDisconnect","ConnectionStatus.Error","ClientErrorKind.Offline","ConnectionStatus.Disconnected","ClientErrorKind.ClientClosed","ConnectionStatus.Closed","ErrorKind.ClientNotFound","ErrorKind.InvalidConnectionRequest","ErrorKind.InvalidConnectionRequestBaseCookie","ErrorKind.InvalidConnectionRequestLastMutationID","ErrorKind.InvalidConnectionRequestClientDeleted","ErrorKind.InvalidMessage","ErrorKind.InvalidPush","ErrorKind.VersionNotSupported","ErrorKind.SchemaVersionNotSupported","ErrorKind.Internal","ErrorKind.MutationRateLimited","ErrorKind.MutationFailed"],"mappings":"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"}
+{"version":3,"file":"error.js","sources":["../../../../../zero-client/src/client/error.ts"],"sourcesContent":["import {unreachable} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {Expand} from '../../../shared/src/expand.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 type {ProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {\n  type BackoffBody,\n  type ErrorBody,\n  isProtocolError,\n  type PushFailedBody,\n  type TransformFailedBody,\n} from '../../../zero-protocol/src/error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {ConnectionStatus} from './connection-status.ts';\n\nexport type AuthError = ProtocolError<NeedsAuthReason>;\nexport type ClientErrorBody = {\n  kind: ClientErrorKind;\n  origin: typeof ErrorOrigin.Client;\n  message: string;\n};\nexport type ClosedError = ClientError<{\n  kind: ClientErrorKind.ClientClosed;\n  message: string;\n}>;\nexport type NeedsAuthReason = Expand<\n  | (ErrorBody & {\n      kind: ErrorKind.AuthInvalidated | ErrorKind.Unauthorized;\n    })\n  | (Extract<PushFailedBody, {reason: ErrorReason.HTTP}> & {status: 401 | 403})\n  | (Extract<TransformFailedBody, {reason: ErrorReason.HTTP}> & {\n      status: 401 | 403;\n    })\n>;\nexport type OfflineError = ClientError<{\n  kind: ClientErrorKind.Offline;\n  message: string;\n}>;\nexport type NoSocketOriginError = ClientError<{\n  kind: ClientErrorKind.NoSocketOrigin;\n  message: string;\n}>;\nexport type DisconnectedReason = OfflineError | NoSocketOriginError;\nexport type ServerError = ProtocolError<ErrorBody>;\nexport type ZeroError = ServerError | ClientError;\nexport type ZeroErrorBody = Expand<ErrorBody | ClientErrorBody>;\nexport type ZeroErrorDetails = Expand<Omit<ZeroErrorBody, 'message'>>;\nexport type ZeroErrorKind = Expand<ErrorKind | ClientErrorKind>;\n\n/**\n * Represents an error encountered by the Zero client.\n */\nexport class ClientError<\n  const T extends Omit<ClientErrorBody, 'origin'> = Omit<\n    ClientErrorBody,\n    'origin'\n  >,\n> extends Error {\n  readonly errorBody: {origin: typeof ErrorOrigin.Client} & T;\n\n  constructor(errorBody: T, options?: ErrorOptions) {\n    super(errorBody.message, options);\n    this.name = 'ClientError';\n    this.errorBody = {...errorBody, origin: ErrorOrigin.Client};\n  }\n\n  get kind(): T['kind'] {\n    return this.errorBody.kind;\n  }\n}\n\nexport function isZeroError(ex: unknown): ex is ZeroError {\n  return isClientError(ex) || isServerError(ex);\n}\n\nexport function isClientError(ex: unknown): ex is ClientError<ClientErrorBody> {\n  return (\n    ex instanceof ClientError && ex.errorBody.origin === ErrorOrigin.Client\n  );\n}\n\nexport function isServerError(ex: unknown): ex is ServerError {\n  return (\n    isProtocolError(ex) &&\n    (ex.errorBody.origin === ErrorOrigin.Server ||\n      ex.errorBody.origin === ErrorOrigin.ZeroCache)\n  );\n}\n\nexport function isOfflineError(ex: unknown): ex is OfflineError {\n  return isClientError(ex) && ex.kind === ClientErrorKind.Offline;\n}\n\nexport function isAuthError(ex: unknown): ex is AuthError {\n  if (isServerError(ex)) {\n    if (\n      ex.kind === ErrorKind.AuthInvalidated ||\n      ex.kind === ErrorKind.Unauthorized\n    ) {\n      return true;\n    }\n    if (\n      (ex.errorBody.kind === ErrorKind.PushFailed ||\n        ex.errorBody.kind === ErrorKind.TransformFailed) &&\n      ex.errorBody.reason === ErrorReason.HTTP &&\n      (ex.errorBody.status === 401 || ex.errorBody.status === 403)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport function getBackoffParams(error: ZeroError): BackoffBody | undefined {\n  if (isServerError(error)) {\n    switch (error.errorBody.kind) {\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return error.errorBody;\n    }\n  }\n  return undefined;\n}\n\nexport const NO_STATUS_TRANSITION = 'NO_STATUS_TRANSITION';\n\nexport type ErrorConnectionTransition =\n  | {status: typeof NO_STATUS_TRANSITION; reason: ZeroError}\n  | {status: ConnectionStatus.NeedsAuth; reason: AuthError}\n  | {status: ConnectionStatus.Error; reason: ZeroError}\n  | {status: ConnectionStatus.Disconnected; reason: DisconnectedReason}\n  | {status: ConnectionStatus.Closed; reason: ZeroError};\n\n/**\n * Returns the status to transition to, or null if the error\n * indicates that the connection should continue in the current state.\n */\nexport function getErrorConnectionTransition(\n  ex: unknown,\n): ErrorConnectionTransition {\n  // Handle auth errors by transitioning to needs-auth state\n  if (isAuthError(ex)) {\n    return {\n      status: ConnectionStatus.NeedsAuth,\n      reason: ex,\n    } as const;\n  }\n\n  if (isClientError(ex)) {\n    switch (ex.kind) {\n      // Connecting errors that should continue in the current state\n      case ClientErrorKind.AbruptClose:\n      case ClientErrorKind.CleanClose:\n      case ClientErrorKind.ConnectTimeout:\n      case ClientErrorKind.PingTimeout:\n      case ClientErrorKind.PullTimeout:\n      case ClientErrorKind.Hidden:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Fatal errors that should transition to error state\n      case ClientErrorKind.UnexpectedBaseCookie:\n      case ClientErrorKind.Internal:\n      case ClientErrorKind.InvalidMessage:\n      case ClientErrorKind.UserDisconnect:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Disconnected error (this should already result in a disconnected state)\n      case ClientErrorKind.Offline:\n      case ClientErrorKind.NoSocketOrigin:\n        return {\n          status: ConnectionStatus.Disconnected,\n          reason: ex as DisconnectedReason,\n        } as const;\n\n      // Closed error (this should already result in a closed state)\n      case ClientErrorKind.ClientClosed:\n        return {status: ConnectionStatus.Closed, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  if (isServerError(ex)) {\n    switch (ex.kind) {\n      // Errors that should transition to error state\n      case ErrorKind.ClientNotFound:\n      case ErrorKind.InvalidConnectionRequest:\n      case ErrorKind.InvalidConnectionRequestBaseCookie:\n      case ErrorKind.InvalidConnectionRequestLastMutationID:\n      case ErrorKind.InvalidConnectionRequestClientDeleted:\n      case ErrorKind.InvalidMessage:\n      case ErrorKind.InvalidPush:\n      case ErrorKind.VersionNotSupported:\n      case ErrorKind.SchemaVersionNotSupported:\n      case ErrorKind.Internal:\n      // PushFailed and TransformFailed can be auth errors (401/403)\n      // or other errors - handle non-auth cases here\n      case ErrorKind.PushFailed:\n      case ErrorKind.TransformFailed:\n        return {status: ConnectionStatus.Error, reason: ex} as const;\n\n      // Errors that should continue with backoff/retry\n      case ErrorKind.Rebalance:\n      case ErrorKind.Rehome:\n      case ErrorKind.ServerOverloaded:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      // Auth errors are handled above by isAuthError check\n      case ErrorKind.AuthInvalidated:\n      case ErrorKind.Unauthorized:\n        return {\n          status: ConnectionStatus.NeedsAuth,\n          reason: ex as AuthError,\n        } as const;\n\n      // Mutation-specific errors don't affect connection state\n      case ErrorKind.MutationRateLimited:\n      case ErrorKind.MutationFailed:\n        return {status: NO_STATUS_TRANSITION, reason: ex} as const;\n\n      default:\n        unreachable(ex.kind);\n    }\n  }\n\n  // we default to error state if we don't know what to do\n  // this is a catch-all for unexpected errors\n  return {\n    status: ConnectionStatus.Error,\n    reason: new ClientError(\n      {\n        kind: ClientErrorKind.Internal,\n        message: 'Unexpected internal error: ' + getErrorMessage(ex),\n      },\n      {cause: ex},\n    ),\n  } as const;\n}\n"],"names":["ErrorOrigin.Client","ErrorOrigin.Server","ErrorOrigin.ZeroCache","ErrorKind.AuthInvalidated","ErrorKind.Unauthorized","ErrorKind.PushFailed","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorKind.Rebalance","ErrorKind.Rehome","ErrorKind.ServerOverloaded","ConnectionStatus.NeedsAuth","ClientErrorKind.AbruptClose","ClientErrorKind.CleanClose","ClientErrorKind.ConnectTimeout","ClientErrorKind.PingTimeout","ClientErrorKind.PullTimeout","ClientErrorKind.Hidden","ClientErrorKind.UnexpectedBaseCookie","ClientErrorKind.Internal","ClientErrorKind.InvalidMessage","ClientErrorKind.UserDisconnect","ConnectionStatus.Error","ClientErrorKind.Offline","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Disconnected","ClientErrorKind.ClientClosed","ConnectionStatus.Closed","ErrorKind.ClientNotFound","ErrorKind.InvalidConnectionRequest","ErrorKind.InvalidConnectionRequestBaseCookie","ErrorKind.InvalidConnectionRequestLastMutationID","ErrorKind.InvalidConnectionRequestClientDeleted","ErrorKind.InvalidMessage","ErrorKind.InvalidPush","ErrorKind.VersionNotSupported","ErrorKind.SchemaVersionNotSupported","ErrorKind.Internal","ErrorKind.MutationRateLimited","ErrorKind.MutationFailed"],"mappings":"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"}

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;AAGnE;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAe;;IAG1B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;gBAGrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACnC,IAAI,CAAC,EAAE,IAAI,EACX,OAAO,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAa;IAO5D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAajD,KAAK;IAIL;;;OAGG;IACH,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW;IAWzE;;OAEG;IACG,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,IAAI,EACjB,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,eAAe,CAAC;IAY3B;;;;;;;OAOG;IACH,IAAI;CAYL;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;AAInE;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,eAAe;;IAG1B,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;gBAGrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACnC,IAAI,CAAC,EAAE,IAAI,EACX,OAAO,GAAE,GAAG,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAa;IAO5D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAajD,KAAK;IAIL;;;OAGG;IACH,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW;IAWzE;;OAEG;IACG,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,IAAI,EACjB,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,eAAe,CAAC;IAY3B;;;;;;;OAOG;IACH,IAAI;CAYL;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

@@ -9,6 +9,7 @@ import { using, withRead } from "../../../replicache/src/with-transactions.js";
 import { wrapIterable } from "../../../shared/src/iterables.js";
 import { must } from "../../../shared/src/must.js";
 import { MemorySource } from "../../../zql/src/ivm/memory-source.js";
+import { consume } from "../../../zql/src/ivm/stream.js";
 import { ENTITIES_KEY_PREFIX, sourceNameFromKey } from "./keys.js";
 class IVMSourceBranch {
   #sources;
@@ -122,23 +123,29 @@ function applyDiffs(diffs, branch) {
     const source = must(branch.getSource(name));
     switch (diff2.op) {
       case "del":
-        source.push({
-          type: "remove",
-          row: diff2.oldValue
-        });
+        consume(
+          source.push({
+            type: "remove",
+            row: diff2.oldValue
+          })
+        );
         break;
       case "add":
-        source.push({
-          type: "add",
-          row: diff2.newValue
-        });
+        consume(
+          source.push({
+            type: "add",
+            row: diff2.newValue
+          })
+        );
         break;
       case "change":
-        source.push({
-          type: "edit",
-          row: diff2.newValue,
-          oldRow: diff2.oldValue
-        });
+        consume(
+          source.push({
+            type: "edit",
+            row: diff2.newValue,
+            oldRow: diff2.oldValue
+          })
+        );
         break;
     }
   }

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

@@ -1 +1 @@
-{"version":3,"file":"ivm-branch.js","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 {ENTITIES_KEY_PREFIX, sourceNameFromKey} from './keys.ts';\n\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  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    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  /**\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    assert(\n      this.hash === expectedHead,\n      () =>\n        `Expected head must match the main head. Got: ${this.hash}, expected: ${expectedHead}`,\n    );\n\n    applyDiffs(diffs, this);\n    this.hash = newHead;\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    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    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)) {\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        source.push({\n          type: 'remove',\n          row: diff.oldValue as Row,\n        });\n        break;\n      case 'add':\n        source.push({\n          type: 'add',\n          row: diff.newValue as Row,\n        });\n        break;\n      case 'change':\n        source.push({\n          type: 'edit',\n          row: diff.newValue as Row,\n          oldRow: diff.oldValue as Row,\n        });\n        break;\n    }\n  }\n}\n"],"names":["FormatVersion.Latest","diff"],"mappings":"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"}
+{"version":3,"file":"ivm-branch.js","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\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  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    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  /**\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    assert(\n      this.hash === expectedHead,\n      () =>\n        `Expected head must match the main head. Got: ${this.hash}, expected: ${expectedHead}`,\n    );\n\n    applyDiffs(diffs, this);\n    this.hash = newHead;\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    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    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)) {\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(\n          source.push({\n            type: 'remove',\n            row: diff.oldValue as Row,\n          }),\n        );\n        break;\n      case 'add':\n        consume(\n          source.push({\n            type: 'add',\n            row: diff.newValue as Row,\n          }),\n        );\n        break;\n      case 'change':\n        consume(\n          source.push({\n            type: 'edit',\n            row: diff.newValue as Row,\n            oldRow: diff.oldValue as Row,\n          }),\n        );\n        break;\n    }\n  }\n}\n"],"names":["FormatVersion.Latest","diff"],"mappings":"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"}

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

@@ -1,8 +1,6 @@
 import type { DeepMerge } from '../../../shared/src/deep-merge.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import { type Transaction } from '../../../zql/src/mutate/custom.ts';
-import type { AnyMutatorRegistry } from '../../../zql/src/mutate/mutator-registry.ts';
-import { type MutatorDefinition } from '../../../zql/src/mutate/mutator.ts';
 import type { DBMutator } from './crud.ts';
 import type { CustomMutatorDefs, MutatorResult } from './custom.ts';
 import type { MutatorProxy } from './mutator-proxy.ts';
@@ -29,15 +27,14 @@ import type { MutatorProxy } from './mutator-proxy.ts';
  * using different separators ('.' for mutator definitions, '|' for custom functions) and wraps them
  * using the mutator proxy.
  */
-export declare function makeMutateProperty(mutators: AnyMutatorRegistry | CustomMutatorDefs, mutatorProxy: MutatorProxy, mutateObject: Record<string, unknown>, replicacheMutate: Record<string, unknown>): void;
+export declare function addCustomMutatorsProperties(mutators: CustomMutatorDefs, mutatorProxy: MutatorProxy, mutateObject: Record<string, unknown>, replicacheMutate: Record<string, unknown>): void;
 /**
- * Builds the mutate type from mutator definitions, handling arbitrary nesting.
- * Each node can be either a MutatorDefinition or a CustomMutatorImpl function,
- * or a namespace containing more mutators.
+ * Builds the mutate type from legacy CustomMutatorDefs, handling arbitrary nesting.
+ * Each node can be either a CustomMutatorImpl function or a namespace containing more mutators.
  */
-type MakeFromMutatorDefinitions<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs, C> = {
-    readonly [K in keyof MD]: MD[K] extends MutatorDefinition<S, C, infer TInput, any, any> ? [TInput] extends [undefined] ? () => MutatorResult : undefined extends TInput ? (args?: TInput) => MutatorResult : (args: TInput) => MutatorResult : MD[K] extends (tx: Transaction<S>, ...args: infer Args) => Promise<void> ? (...args: Args) => MutatorResult : MD[K] extends AnyMutatorRegistry | CustomMutatorDefs ? MakeFromMutatorDefinitions<S, MD[K], C> : never;
+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;
 };
-export type MakeMutatePropertyType<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined, C> = MD extends AnyMutatorRegistry ? {} : MD extends AnyMutatorRegistry | CustomMutatorDefs ? S['enableLegacyMutators'] extends false ? MakeFromMutatorDefinitions<S, MD, C> : DeepMerge<DBMutator<S>, MakeFromMutatorDefinitions<S, MD, C>> : DBMutator<S>;
+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 {};
 //# sourceMappingURL=make-mutate-property.d.ts.map

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,kBAAkB,EAAC,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,oCAAoC,CAAC;AAC5C,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,kBAAkB,CAChC,QAAQ,EAAE,kBAAkB,GAAG,iBAAiB,EAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACxC,IAAI,CAwCN;AAED;;;;GAIG;AACH,KAAK,0BAA0B,CAC7B,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,EACjD,CAAC,IACC;IACF,QAAQ,EAAE,CAAC,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,iBAAiB,CACvD,CAAC,EACD,CAAC,EACD,MAAM,MAAM,EAEZ,GAAG,EAEH,GAAG,CACJ,GACG,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,GAC1B,MAAM,aAAa,GACnB,SAAS,SAAS,MAAM,GACtB,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,aAAa,GAChC,CAAC,IAAI,EAAE,MAAM,KAAK,aAAa,GACnC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,GACtE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,aAAa,GAChC,EAAE,CAAC,CAAC,CAAC,SAAS,kBAAkB,GAAG,iBAAiB,GAClD,0BAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACvC,KAAK;CACd,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAChC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAAG,SAAS,EAC7D,CAAC,IACC,EAAE,SAAS,kBAAkB,GAE7B,EAAE,GACF,EAAE,SAAS,kBAAkB,GAAG,iBAAiB,GAC/C,CAAC,CAAC,sBAAsB,CAAC,SAAS,KAAK,GACrC,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GACpC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,GAC/D,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,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"}

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

@@ -1,18 +1,13 @@
 import { must } from "../../../shared/src/must.js";
 import { customMutatorKey } from "../../../zql/src/mutate/custom.js";
-import { isMutator } from "../../../zql/src/mutate/mutator.js";
-function makeMutateProperty(mutators, mutatorProxy, mutateObject, replicacheMutate) {
+function addCustomMutatorsProperties(mutators, mutatorProxy, mutateObject, replicacheMutate) {
   const processMutators = (mutators2, path, mutateObject2) => {
     for (const [key, mutator] of Object.entries(mutators2)) {
       path.push(key);
-      let fullKey;
-      if (isMutator(mutator)) {
-        fullKey = customMutatorKey(".", path);
-      } else if (typeof mutator === "function") {
-        fullKey = customMutatorKey("|", path);
-      }
-      if (fullKey) {
+      if (typeof mutator === "function") {
+        const fullKey = customMutatorKey("|", path);
         mutateObject2[key] = mutatorProxy.wrapCustomMutator(
+          fullKey,
           must(replicacheMutate[fullKey])
         );
       } else {
@@ -33,6 +28,6 @@ function makeMutateProperty(mutators, mutatorProxy, mutateObject, replicacheMuta
   processMutators(mutators, [], mutateObject);
 }
 export {
-  makeMutateProperty
+  addCustomMutatorsProperties
 };
 //# sourceMappingURL=make-mutate-property.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"make-mutate-property.js","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 {AnyMutatorRegistry} from '../../../zql/src/mutate/mutator-registry.ts';\nimport {\n  isMutator,\n  type MutatorDefinition,\n} from '../../../zql/src/mutate/mutator.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 makeMutateProperty(\n  mutators: AnyMutatorRegistry | CustomMutatorDefs,\n  mutatorProxy: MutatorProxy,\n  mutateObject: Record<string, unknown>,\n  replicacheMutate: Record<string, unknown>,\n): void {\n  const processMutators = (\n    mutators: AnyMutatorRegistry | CustomMutatorDefs,\n    path: string[],\n    mutateObject: Record<string, unknown>,\n  ) => {\n    for (const [key, mutator] of Object.entries(mutators)) {\n      path.push(key);\n      let fullKey: string | undefined;\n      if (isMutator(mutator)) {\n        fullKey = customMutatorKey('.', path);\n      } else if (typeof mutator === 'function') {\n        // Legacy CustomMutatorImpl\n        fullKey = customMutatorKey('|', path);\n      }\n\n      if (fullKey) {\n        mutateObject[key] = mutatorProxy.wrapCustomMutator(\n          must(replicacheMutate[fullKey]) as unknown as (\n            ...args: unknown[]\n          ) => MutatorResult,\n        );\n      } else {\n        // 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 AnyMutatorRegistry | 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 mutator definitions, handling arbitrary nesting.\n * Each node can be either a MutatorDefinition or a CustomMutatorImpl function,\n * or a namespace containing more mutators.\n */\ntype MakeFromMutatorDefinitions<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs,\n  C,\n> = {\n  readonly [K in keyof MD]: MD[K] extends MutatorDefinition<\n    S,\n    C,\n    infer TInput,\n    // oxlint-disable-next-line no-explicit-any\n    any,\n    // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n    any\n  >\n    ? [TInput] extends [undefined]\n      ? () => MutatorResult\n      : undefined extends TInput\n        ? (args?: TInput) => MutatorResult\n        : (args: TInput) => MutatorResult\n    : MD[K] extends (tx: Transaction<S>, ...args: infer Args) => Promise<void>\n      ? (...args: Args) => MutatorResult\n      : MD[K] extends AnyMutatorRegistry | CustomMutatorDefs\n        ? MakeFromMutatorDefinitions<S, MD[K], C>\n        : never;\n};\n\nexport type MakeMutatePropertyType<\n  S extends Schema,\n  MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined,\n  C,\n> = MD extends AnyMutatorRegistry\n  ? // MutatorRegistry: no property tree, user calls zero.mutate(mr) directly\n    {}\n  : MD extends AnyMutatorRegistry | CustomMutatorDefs\n    ? S['enableLegacyMutators'] extends false\n      ? MakeFromMutatorDefinitions<S, MD, C>\n      : DeepMerge<DBMutator<S>, MakeFromMutatorDefinitions<S, MD, C>>\n    : DBMutator<S>;\n"],"names":["mutators","mutateObject"],"mappings":";;;AAuCO,SAAS,mBACd,UACA,cACA,cACA,kBACM;AACN,QAAM,kBAAkB,CACtBA,WACA,MACAC,kBACG;AACH,eAAW,CAAC,KAAK,OAAO,KAAK,OAAO,QAAQD,SAAQ,GAAG;AACrD,WAAK,KAAK,GAAG;AACb,UAAI;AACJ,UAAI,UAAU,OAAO,GAAG;AACtB,kBAAU,iBAAiB,KAAK,IAAI;AAAA,MACtC,WAAW,OAAO,YAAY,YAAY;AAExC,kBAAU,iBAAiB,KAAK,IAAI;AAAA,MACtC;AAEA,UAAI,SAAS;AACXC,sBAAa,GAAG,IAAI,aAAa;AAAA,UAC/B,KAAK,iBAAiB,OAAO,CAAC;AAAA,QAAA;AAAA,MAIlC,OAAO;AAEL,YAAI,WAAWA,cAAa,GAAG;AAC/B,YAAI,aAAa,QAAW;AAC1B,qBAAW,CAAA;AACXA,wBAAa,GAAG,IAAI;AAAA,QACtB;AACA;AAAA,UACE;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AACA,WAAK,IAAA;AAAA,IACP;AAAA,EACF;AAEA,kBAAgB,UAAU,CAAA,GAAI,YAAY;AAC5C;"}
+{"version":3,"file":"make-mutate-property.js","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"],"names":["mutators","mutateObject"],"mappings":";;AAkCO,SAAS,4BACd,UACA,cACA,cACA,kBACM;AACN,QAAM,kBAAkB,CACtBA,WACA,MACAC,kBACG;AACH,eAAW,CAAC,KAAK,OAAO,KAAK,OAAO,QAAQD,SAAQ,GAAG;AACrD,WAAK,KAAK,GAAG;AACb,UAAI,OAAO,YAAY,YAAY;AACjC,cAAM,UAAU,iBAAiB,KAAK,IAAI;AAC1CC,sBAAa,GAAG,IAAI,aAAa;AAAA,UAC/B;AAAA,UACA,KAAK,iBAAiB,OAAO,CAAC;AAAA,QAAA;AAAA,MAIlC,OAAO;AAEL,YAAI,WAAWA,cAAa,GAAG;AAC/B,YAAI,aAAa,QAAW;AAC1B,qBAAW,CAAA;AACXA,wBAAa,GAAG,IAAI;AAAA,QACtB;AACA;AAAA,UACE;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ;AACA,WAAK,IAAA;AAAA,IACP;AAAA,EACF;AAEA,kBAAgB,UAAU,CAAA,GAAI,YAAY;AAC5C;"}

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

@@ -1,9 +1,9 @@
 import type { LogContext } from '@rocicorp/logger';
+import type { MutatorDefs } from '../../../replicache/src/types.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import { type AnyMutatorRegistry } from '../../../zql/src/mutate/mutator-registry.ts';
-import type { CustomMutatorDefs } from './custom.ts';
-import type { MutatorDefs } from '../../../replicache/src/types.ts';
 import { type CRUDMutator } from './crud.ts';
+import type { CustomMutatorDefs } from './custom.ts';
 export declare function extendReplicacheMutators<S extends Schema, C>(lc: LogContext, context: C, mutators: AnyMutatorRegistry | CustomMutatorDefs, schema: S, mutateObject: Record<string, unknown>): void;
 /**
  * Creates Replicache mutators from mutator definitions.

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,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAIlE,OAAO,EAAkB,KAAK,WAAW,EAAC,MAAM,WAAW,CAAC;AAQ5D,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,CA8BN;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,CAoCzC"}
+{"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"}

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

@@ -1,6 +1,7 @@
+import { CRUD_MUTATION_NAME } from "../../../zero-protocol/src/push.js";
 import { customMutatorKey } from "../../../zql/src/mutate/custom.js";
 import { isMutatorRegistry } from "../../../zql/src/mutate/mutator-registry.js";
-import { CRUD_MUTATION_NAME } from "../../../zero-protocol/src/push.js";
+import { isMutator } from "../../../zql/src/mutate/mutator.js";
 import { Internal } from "./client-error-kind-enum.js";
 import { makeCRUDMutator } from "./crud.js";
 import { TransactionImpl, makeReplicacheMutator as makeReplicacheMutator$1 } from "./custom.js";
@@ -8,6 +9,9 @@ import { ClientError } from "./error.js";
 function extendReplicacheMutators(lc, context, mutators, schema, mutateObject) {
   const processMutators = (mutators2, path) => {
     for (const [key, mutator] of Object.entries(mutators2)) {
+      if (key === "~") {
+        continue;
+      }
       path.push(key);
       if (isMutator(mutator)) {
         const fullKey = customMutatorKey(".", path);
@@ -26,7 +30,7 @@ function extendReplicacheMutators(lc, context, mutators, schema, mutateObject) {
           schema,
           context
         );
-      } else {
+      } else if (mutator !== null && typeof mutator === "object") {
         processMutators(mutator, path);
       }
       path.pop();
@@ -45,13 +49,17 @@ function makeReplicacheMutator(lc, mutator, schema, context) {
   };
 }
 function makeReplicacheMutators(schema, mutators, context, lc) {
-  const { enableLegacyMutators = true } = schema;
+  const { enableLegacyMutators = false } = schema;
   const replicacheMutators = {
-    [CRUD_MUTATION_NAME]: enableLegacyMutators ? makeCRUDMutator(schema) : () => Promise.reject(
-      new ClientError({
-        kind: Internal,
-        message: "Zero CRUD mutators are not enabled."
-      })
+    [CRUD_MUTATION_NAME]: enableLegacyMutators ? makeCRUDMutator(schema) : (
+      // TODO(arv): This code is unreachable since the public API prevents
+      // calling CRUD mutators when enableLegacyMutators is false. Remove this.
+      (() => Promise.reject(
+        new ClientError({
+          kind: Internal,
+          message: "Zero CRUD mutators are not enabled."
+        })
+      ))
     )
   };
   if (mutators) {
@@ -75,9 +83,6 @@ function makeReplicacheMutators(schema, mutators, context, lc) {
   }
   return replicacheMutators;
 }
-function isMutator(value) {
-  return typeof value === "function" && "mutatorName" in value && typeof value.mutatorName === "string" && "fn" in value && typeof value.fn === "function";
-}
 function extendFromMutatorRegistry(lc, context, registry, schema, mutateObject) {
   const walk = (node) => {
     if (typeof node !== "object" || node === null) {

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

@@ -1 +1 @@
-{"version":3,"file":"make-replicache-mutators.js","sources":["../../../../../zero-client/src/client/make-replicache-mutators.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\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 {type Mutator} from '../../../zql/src/mutate/mutator.ts';\nimport type {CustomMutatorDefs, CustomMutatorImpl} from './custom.ts';\n\nimport type {MutatorDefs} from '../../../replicache/src/types.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {CRUD_MUTATION_NAME} from '../../../zero-protocol/src/push.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport {makeCRUDMutator, type CRUDMutator} from './crud.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      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 {\n        processMutators(mutator, path);\n      }\n      path.pop();\n    }\n  };\n\n  processMutators(mutators, []);\n}\n\nfunction makeReplicacheMutator<\n  TSchema extends Schema,\n  TContext,\n  TArgs extends ReadonlyJSONValue | undefined,\n  TWrappedTransaction,\n>(\n  lc: LogContext,\n  mutator: Mutator<TSchema, TContext, TArgs, 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 = true} = schema;\n\n  const replicacheMutators = {\n    [CRUD_MUTATION_NAME]: enableLegacyMutators\n      ? makeCRUDMutator(schema)\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 * Checks if a value is a Mutator (from MutatorRegistry).\n * Mutators have `mutatorName` and `fn` properties.\n */\nfunction isMutator(\n  value: unknown,\n  // oxlint-disable-next-line no-explicit-any\n): value is Mutator<any, any, any, any> {\n  return (\n    typeof value === 'function' &&\n    'mutatorName' in value &&\n    typeof value.mutatorName === 'string' &&\n    'fn' in value &&\n    typeof value.fn === 'function'\n  );\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(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"],"names":["mutators","makeReplicacheMutatorLegacy","ClientErrorKind.Internal"],"mappings":";;;;;;;AAsBO,SAAS,yBACd,IACA,SACA,UACA,QACA,cACM;AAEN,QAAM,kBAAkB,CAACA,WAAkB,SAAmB;AAC5D,eAAW,CAAC,KAAK,OAAO,KAAK,OAAO,QAAQA,SAAQ,GAAG;AACrD,WAAK,KAAK,GAAG;AACb,UAAI,UAAU,OAAO,GAAG;AACtB,cAAM,UAAU,iBAAiB,KAAK,IAAI;AAC1C,qBAAa,OAAO,IAAI;AAAA,UACtB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,WAAW,OAAO,YAAY,YAAY;AACxC,cAAM,UAAU,iBAAiB,KAAK,IAAI;AAC1C,qBAAa,OAAO,IAAIC;AAAAA,UACtB;AAAA;AAAA,UAEA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,OAAO;AACL,wBAAgB,SAAS,IAAI;AAAA,MAC/B;AACA,WAAK,IAAA;AAAA,IACP;AAAA,EACF;AAEA,kBAAgB,UAAU,EAAE;AAC9B;AAEA,SAAS,sBAMP,IACA,SACA,QACA,SACqE;AACrE,SAAO,OACL,OACA,SACkB;AAClB,UAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAEhD,UAAM,QAAQ,GAAG;AAAA,MACf;AAAA,MACA,KAAK;AAAA,MACL;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAyBO,SAAS,uBACd,QACA,UACA,SACA,IACyC;AACzC,QAAM,EAAC,uBAAuB,KAAA,IAAQ;AAEtC,QAAM,qBAAqB;AAAA,IACzB,CAAC,kBAAkB,GAAG,uBAClB,gBAAgB,MAAM,IACtB,MACE,QAAQ;AAAA,MACN,IAAI,YAAY;AAAA,QACd,MAAMC;AAAAA,QACN,SAAS;AAAA,MAAA,CACV;AAAA,IAAA;AAAA,EACH;AAGR,MAAI,UAAU;AACZ,QAAI,kBAAkB,QAAQ,GAAG;AAC/B;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;AAMA,SAAS,UACP,OAEsC;AACtC,SACE,OAAO,UAAU,cACjB,iBAAiB,SACjB,OAAO,MAAM,gBAAgB,YAC7B,QAAQ,SACR,OAAO,MAAM,OAAO;AAExB;AAMA,SAAS,0BACP,IACA,SACA,UACA,QACA,cACM;AACN,QAAM,OAAO,CAAC,SAAkB;AAC9B,QAAI,OAAO,SAAS,YAAY,SAAS,MAAM;AAC7C;AAAA,IACF;AACA,eAAW,SAAS,OAAO,OAAO,IAAI,GAAG;AACvC,UAAI,UAAU,KAAK,GAAG;AAEpB,qBAAa,MAAM,WAAW,IAAI,CAChC,OACA,SACkB;AAClB,gBAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAChD,iBAAO,MAAM,GAAG,EAAC,MAAM,KAAK,SAAS,IAAG;AAAA,QAC1C;AAAA,MACF,WAAW,OAAO,UAAU,YAAY,UAAU,MAAM;AAEtD,aAAK,KAAK;AAAA,MACZ;AAAA,IACF;AAAA,EACF;AACA,OAAK,QAAQ;AACf;"}
+{"version":3,"file":"make-replicache-mutators.js","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/push.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"],"names":["mutators","makeReplicacheMutatorLegacy","ClientErrorKind.Internal"],"mappings":";;;;;;;;AAqBO,SAAS,yBACd,IACA,SACA,UACA,QACA,cACM;AAEN,QAAM,kBAAkB,CAACA,WAAkB,SAAmB;AAC5D,eAAW,CAAC,KAAK,OAAO,KAAK,OAAO,QAAQA,SAAQ,GAAG;AACrD,UAAI,QAAQ,KAAK;AAEf;AAAA,MACF;AAEA,WAAK,KAAK,GAAG;AACb,UAAI,UAAU,OAAO,GAAG;AACtB,cAAM,UAAU,iBAAiB,KAAK,IAAI;AAC1C,qBAAa,OAAO,IAAI;AAAA,UACtB;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,WAAW,OAAO,YAAY,YAAY;AACxC,cAAM,UAAU,iBAAiB,KAAK,IAAI;AAC1C,qBAAa,OAAO,IAAIC;AAAAA,UACtB;AAAA;AAAA,UAEA;AAAA,UACA;AAAA,UACA;AAAA,QAAA;AAAA,MAEJ,WAAW,YAAY,QAAQ,OAAO,YAAY,UAAU;AAC1D,wBAAgB,SAAS,IAAI;AAAA,MAC/B;AACA,WAAK,IAAA;AAAA,IACP;AAAA,EACF;AAEA,kBAAgB,UAAU,EAAE;AAC9B;AAEA,SAAS,sBAMP,IACA,SACA,QACA,SACqE;AACrE,SAAO,OACL,OACA,SACkB;AAClB,UAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAEhD,UAAM,QAAQ,GAAG;AAAA,MACf;AAAA,MACA,KAAK;AAAA,MACL;AAAA,IAAA,CACD;AAAA,EACH;AACF;AAyBO,SAAS,uBACd,QACA,UACA,SACA,IACyC;AACzC,QAAM,EAAC,uBAAuB,MAAA,IAAS;AAEvC,QAAM,qBAAqB;AAAA,IACzB,CAAC,kBAAkB,GAAG,uBAClB,gBAAgB,MAAM;AAAA;AAAA;AAAA,OAGtB,MACE,QAAQ;AAAA,QACN,IAAI,YAAY;AAAA,UACd,MAAMC;AAAAA,UACN,SAAS;AAAA,QAAA,CACV;AAAA,MAAA;AAAA;AAAA,EACH;AAGR,MAAI,UAAU;AACZ,QAAI,kBAAkB,QAAQ,GAAG;AAC/B;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ,OAAO;AACL;AAAA,QACE;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MAAA;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;AAMA,SAAS,0BACP,IACA,SACA,UACA,QACA,cACM;AACN,QAAM,OAAO,CAAC,SAAkB;AAC9B,QAAI,OAAO,SAAS,YAAY,SAAS,MAAM;AAC7C;AAAA,IACF;AACA,eAAW,SAAS,OAAO,OAAO,IAAI,GAAG;AACvC,UAAI,UAAa,KAAK,GAAG;AAEvB,qBAAa,MAAM,WAAW,IAAI,CAChC,OACA,SACkB;AAClB,gBAAM,KAAK,IAAI,gBAAgB,IAAI,OAAO,MAAM;AAChD,iBAAO,MAAM,GAAG,EAAC,MAAM,KAAK,SAAS,IAAG;AAAA,QAC1C;AAAA,MACF,WAAW,OAAO,UAAU,YAAY,UAAU,MAAM;AAEtD,aAAK,KAAK;AAAA,MACZ;AAAA,IACF;AAAA,EACF;AACA,OAAK,QAAQ;AACf;"}

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

@@ -1,3 +1,4 @@
+import type { LogContext } from '@rocicorp/logger';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { ConnectionManager } from './connection-manager.ts';
 import type { MutatorResult } from './custom.ts';
@@ -5,11 +6,11 @@ import { type ZeroError } from './error.ts';
 import type { MutationTracker } from './mutation-tracker.ts';
 export declare class MutatorProxy {
     #private;
-    constructor(connectionManager: ConnectionManager, mutationTracker: MutationTracker);
+    constructor(lc: LogContext, connectionManager: ConnectionManager, mutationTracker: MutationTracker);
     get mutationRejectionError(): ZeroError | undefined;
     wrapCustomMutator<F extends (...args: [] | [ReadonlyJSONValue]) => {
         client: Promise<unknown>;
         server: Promise<unknown>;
-    }>(f: F): (...args: Parameters<F>) => MutatorResult;
+    }>(name: string, f: F): (...args: Parameters<F>) => MutatorResult;
 }
 //# sourceMappingURL=mutator-proxy.d.ts.map

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":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAGnE,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;AAY3D,qBAAa,YAAY;;gBAMrB,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe;IAWlC,IAAI,sBAAsB,IAAI,SAAS,GAAG,SAAS,CAElD;IAgCD,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,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa;CAkGnD"}
+{"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;AAY3D,qBAAa,YAAY;;gBAOrB,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe;IAYlC,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;CAwGjE"}

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

@@ -1,16 +1,19 @@
 import { unreachable } from "../../../shared/src/asserts.js";
 import { wrapWithApplicationError } from "../../../zero-protocol/src/application-error.js";
-import { NeedsAuth, Connecting, Connected, Closed, Error, Disconnected } from "./connection-status-enum.js";
+import { NoSocketOrigin } from "./client-error-kind-enum.js";
+import { Disconnected, NeedsAuth, Connecting, Connected, Closed, Error } from "./connection-status-enum.js";
 import { isZeroError } from "./error.js";
 const successResultDetails = {
   type: "success"
 };
 const successResult = () => successResultDetails;
 class MutatorProxy {
+  #lc;
   #connectionManager;
   #mutationTracker;
   #mutationRejection;
-  constructor(connectionManager, mutationTracker) {
+  constructor(lc, connectionManager, mutationTracker) {
+    this.#lc = lc;
     this.#connectionManager = connectionManager;
     this.#mutationTracker = mutationTracker;
     this.#connectionManager.subscribe(
@@ -29,6 +32,10 @@ class MutatorProxy {
    * the mutation tracker are rejected with the error.
    */
   #onConnectionStateChange(state) {
+    if (state.name === Disconnected && state.reason.kind === NoSocketOrigin) {
+      this.#mutationRejection = void 0;
+      return;
+    }
     switch (state.name) {
       case Disconnected:
       case Error:
@@ -50,7 +57,7 @@ class MutatorProxy {
         unreachable();
     }
   }
-  wrapCustomMutator(f) {
+  wrapCustomMutator(name, f) {
     return (...args) => {
       if (this.#mutationRejection) {
         return {
@@ -66,13 +73,17 @@ class MutatorProxy {
           return cachedPromise;
         }
         if (isZeroError(error)) {
+          this.#lc.error?.(`Mutator "${name}" error on ${origin}`, error);
           const zeroErrorPromise = this.#makeZeroErrorResultDetails(error);
           cachedMutationPromises[origin] = zeroErrorPromise;
           return zeroErrorPromise;
         }
-        const applicationErrorPromise = this.#makeApplicationErrorResultDetails(
-          wrapWithApplicationError(error)
+        const applicationError = wrapWithApplicationError(error);
+        this.#lc.error?.(
+          `Mutator "${name}" app error on ${origin}`,
+          applicationError
         );
+        const applicationErrorPromise = this.#makeApplicationErrorResultDetails(applicationError);
         cachedMutationPromises[origin] = applicationErrorPromise;
         return applicationErrorPromise;
       };

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

@@ -1 +1 @@
-{"version":3,"file":"mutator-proxy.js","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"sourcesContent":["import {unreachable} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {ApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {wrapWithApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport type {\n  MutatorResult,\n  MutatorResultErrorDetails,\n  MutatorResultSuccessDetails,\n} from './custom.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport type {MutationTracker} from './mutation-tracker.ts';\n\nconst successResultDetails = {\n  type: 'success',\n} as const satisfies MutatorResultSuccessDetails;\nconst successResult = () => successResultDetails;\n\ntype CachedMutationRejection = {\n  readonly error: ZeroError;\n  readonly promise: Promise<MutatorResultErrorDetails>;\n};\n\nexport class MutatorProxy {\n  readonly #connectionManager: ConnectionManager;\n  readonly #mutationTracker: MutationTracker;\n  #mutationRejection: CachedMutationRejection | undefined;\n\n  constructor(\n    connectionManager: ConnectionManager,\n    mutationTracker: MutationTracker,\n  ) {\n    this.#connectionManager = connectionManager;\n    this.#mutationTracker = mutationTracker;\n\n    this.#connectionManager.subscribe(state =>\n      this.#onConnectionStateChange(state),\n    );\n    this.#onConnectionStateChange(connectionManager.state);\n  }\n\n  get mutationRejectionError(): ZeroError | undefined {\n    return this.#mutationRejection?.error;\n  }\n\n  /**\n   * Called when the connection state changes.\n   *\n   * If the connection state is disconnected, error, or closed, the\n   * mutation rejection error is set and all outstanding `.server` promises in\n   * the mutation tracker are rejected with the error.\n   */\n  #onConnectionStateChange(state: ConnectionManagerState) {\n    switch (state.name) {\n      case ConnectionStatus.Disconnected:\n      case ConnectionStatus.Error:\n      case ConnectionStatus.Closed:\n        this.#mutationRejection = {\n          error: state.reason,\n          promise: Promise.resolve(\n            this.#makeZeroErrorResultDetails(state.reason),\n          ),\n        };\n        this.#mutationTracker.rejectAllOutstandingMutations(state.reason);\n        break;\n      case ConnectionStatus.Connected:\n      case ConnectionStatus.Connecting:\n      case ConnectionStatus.NeedsAuth:\n        this.#mutationRejection = undefined;\n        return;\n      default:\n        unreachable(state);\n    }\n  }\n\n  wrapCustomMutator<\n    F extends (...args: [] | [ReadonlyJSONValue]) => {\n      client: Promise<unknown>;\n      server: Promise<unknown>;\n    },\n  >(f: F): (...args: Parameters<F>) => MutatorResult {\n    return (...args) => {\n      if (this.#mutationRejection) {\n        return {\n          client: this.#mutationRejection.promise,\n          server: this.#mutationRejection.promise,\n        } as const satisfies MutatorResult;\n      }\n\n      let result: {\n        client: Promise<unknown>;\n        server: Promise<unknown>;\n      };\n\n      const cachedMutationPromises: Partial<\n        Record<'client' | 'server', Promise<MutatorResultErrorDetails>>\n      > = {};\n\n      const wrapErrorFor =\n        (origin: 'client' | 'server') =>\n        (error: unknown): Promise<MutatorResultErrorDetails> => {\n          const cachedPromise = cachedMutationPromises[origin];\n          if (cachedPromise) {\n            return cachedPromise;\n          }\n\n          if (isZeroError(error)) {\n            const zeroErrorPromise = this.#makeZeroErrorResultDetails(error);\n            cachedMutationPromises[origin] = zeroErrorPromise;\n            return zeroErrorPromise;\n          }\n\n          const applicationErrorPromise =\n            this.#makeApplicationErrorResultDetails(\n              wrapWithApplicationError(error),\n            );\n          cachedMutationPromises[origin] = applicationErrorPromise;\n          return applicationErrorPromise;\n        };\n\n      try {\n        result = f(...args);\n      } catch (error) {\n        const clientPromise = wrapErrorFor('client')(error);\n        const serverPromise = wrapErrorFor('server')(error);\n\n        return {\n          client: clientPromise,\n          server: serverPromise,\n        } as const satisfies MutatorResult;\n      }\n\n      const client = this.#normalizeResultPromise(\n        result.client,\n        wrapErrorFor('client'),\n      );\n      const server = this.#normalizeResultPromise(\n        result.server,\n        wrapErrorFor('server'),\n      );\n\n      return {\n        client,\n        server,\n      };\n    };\n  }\n\n  #normalizeResultPromise(\n    promise: Promise<unknown>,\n    wrapError: (error: unknown) => Promise<MutatorResultErrorDetails>,\n  ) {\n    return promise.then<MutatorResultSuccessDetails, MutatorResultErrorDetails>(\n      successResult,\n      wrapError,\n    );\n  }\n\n  #makeZeroErrorResultDetails(zeroError: ZeroError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'zero',\n        message: zeroError.message,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n\n  #makeApplicationErrorResultDetails(applicationError: ApplicationError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'app',\n        message: applicationError.message,\n        details: applicationError.details,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n}\n"],"names":["ConnectionStatus.Disconnected","ConnectionStatus.Error","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Connecting","ConnectionStatus.NeedsAuth"],"mappings":"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"}
+{"version":3,"file":"mutator-proxy.js","sources":["../../../../../zero-client/src/client/mutator-proxy.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../shared/src/asserts.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport type {ApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {wrapWithApplicationError} from '../../../zero-protocol/src/application-error.ts';\nimport {ClientErrorKind} from './client-error-kind.ts';\nimport type {\n  ConnectionManager,\n  ConnectionManagerState,\n} from './connection-manager.ts';\nimport {ConnectionStatus} from './connection-status.ts';\nimport type {\n  MutatorResult,\n  MutatorResultErrorDetails,\n  MutatorResultSuccessDetails,\n} from './custom.ts';\nimport {isZeroError, type ZeroError} from './error.ts';\nimport type {MutationTracker} from './mutation-tracker.ts';\n\nconst successResultDetails = {\n  type: 'success',\n} as const satisfies MutatorResultSuccessDetails;\nconst successResult = () => successResultDetails;\n\ntype CachedMutationRejection = {\n  readonly error: ZeroError;\n  readonly promise: Promise<MutatorResultErrorDetails>;\n};\n\nexport class MutatorProxy {\n  readonly #lc: LogContext;\n  readonly #connectionManager: ConnectionManager;\n  readonly #mutationTracker: MutationTracker;\n  #mutationRejection: CachedMutationRejection | undefined;\n\n  constructor(\n    lc: LogContext,\n    connectionManager: ConnectionManager,\n    mutationTracker: MutationTracker,\n  ) {\n    this.#lc = lc;\n    this.#connectionManager = connectionManager;\n    this.#mutationTracker = mutationTracker;\n\n    this.#connectionManager.subscribe(state =>\n      this.#onConnectionStateChange(state),\n    );\n    this.#onConnectionStateChange(connectionManager.state);\n  }\n\n  get mutationRejectionError(): ZeroError | undefined {\n    return this.#mutationRejection?.error;\n  }\n\n  /**\n   * Called when the connection state changes.\n   *\n   * If the connection state is disconnected, error, or closed, the\n   * mutation rejection error is set and all outstanding `.server` promises in\n   * the mutation tracker are rejected with the error.\n   */\n  #onConnectionStateChange(state: ConnectionManagerState) {\n    // we short circuit the rejection if the error is due to a missing cacheURL\n    // this allows local writes to continue\n    if (\n      state.name === ConnectionStatus.Disconnected &&\n      state.reason.kind === ClientErrorKind.NoSocketOrigin\n    ) {\n      this.#mutationRejection = undefined;\n      return;\n    }\n\n    switch (state.name) {\n      case ConnectionStatus.Disconnected:\n      case ConnectionStatus.Error:\n      case ConnectionStatus.Closed:\n        this.#mutationRejection = {\n          error: state.reason,\n          promise: Promise.resolve(\n            this.#makeZeroErrorResultDetails(state.reason),\n          ),\n        };\n        this.#mutationTracker.rejectAllOutstandingMutations(state.reason);\n        break;\n      case ConnectionStatus.Connected:\n      case ConnectionStatus.Connecting:\n      case ConnectionStatus.NeedsAuth:\n        this.#mutationRejection = undefined;\n        return;\n      default:\n        unreachable(state);\n    }\n  }\n\n  wrapCustomMutator<\n    F extends (...args: [] | [ReadonlyJSONValue]) => {\n      client: Promise<unknown>;\n      server: Promise<unknown>;\n    },\n  >(name: string, f: F): (...args: Parameters<F>) => MutatorResult {\n    return (...args) => {\n      if (this.#mutationRejection) {\n        return {\n          client: this.#mutationRejection.promise,\n          server: this.#mutationRejection.promise,\n        } as const satisfies MutatorResult;\n      }\n\n      let result: {\n        client: Promise<unknown>;\n        server: Promise<unknown>;\n      };\n\n      const cachedMutationPromises: Partial<\n        Record<'client' | 'server', Promise<MutatorResultErrorDetails>>\n      > = {};\n\n      const wrapErrorFor =\n        (origin: 'client' | 'server') =>\n        (error: unknown): Promise<MutatorResultErrorDetails> => {\n          const cachedPromise = cachedMutationPromises[origin];\n          if (cachedPromise) {\n            return cachedPromise;\n          }\n\n          if (isZeroError(error)) {\n            this.#lc.error?.(`Mutator \"${name}\" error on ${origin}`, error);\n\n            const zeroErrorPromise = this.#makeZeroErrorResultDetails(error);\n            cachedMutationPromises[origin] = zeroErrorPromise;\n            return zeroErrorPromise;\n          }\n\n          const applicationError = wrapWithApplicationError(error);\n          this.#lc.error?.(\n            `Mutator \"${name}\" app error on ${origin}`,\n            applicationError,\n          );\n\n          const applicationErrorPromise =\n            this.#makeApplicationErrorResultDetails(applicationError);\n          cachedMutationPromises[origin] = applicationErrorPromise;\n          return applicationErrorPromise;\n        };\n\n      try {\n        result = f(...args);\n      } catch (error) {\n        const clientPromise = wrapErrorFor('client')(error);\n        const serverPromise = wrapErrorFor('server')(error);\n\n        return {\n          client: clientPromise,\n          server: serverPromise,\n        } as const satisfies MutatorResult;\n      }\n\n      const client = this.#normalizeResultPromise(\n        result.client,\n        wrapErrorFor('client'),\n      );\n      const server = this.#normalizeResultPromise(\n        result.server,\n        wrapErrorFor('server'),\n      );\n\n      return {\n        client,\n        server,\n      };\n    };\n  }\n\n  #normalizeResultPromise(\n    promise: Promise<unknown>,\n    wrapError: (error: unknown) => Promise<MutatorResultErrorDetails>,\n  ) {\n    return promise.then<MutatorResultSuccessDetails, MutatorResultErrorDetails>(\n      successResult,\n      wrapError,\n    );\n  }\n\n  #makeZeroErrorResultDetails(zeroError: ZeroError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'zero',\n        message: zeroError.message,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n\n  #makeApplicationErrorResultDetails(applicationError: ApplicationError) {\n    return Promise.resolve({\n      type: 'error',\n      error: {\n        type: 'app',\n        message: applicationError.message,\n        details: applicationError.details,\n      },\n    } as const satisfies MutatorResultErrorDetails);\n  }\n}\n"],"names":["ConnectionStatus.Disconnected","ClientErrorKind.NoSocketOrigin","ConnectionStatus.Error","ConnectionStatus.Closed","ConnectionStatus.Connected","ConnectionStatus.Connecting","ConnectionStatus.NeedsAuth"],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 import type { LogLevel } from '@rocicorp/logger';
 import type { StoreProvider } from '../../../replicache/src/kv/store.ts';
 import * as v from '../../../shared/src/valita.ts';
+import type { DefaultContext, DefaultSchema } from '../../../zero-types/src/default-types.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { AnyMutatorRegistry } from '../../../zql/src/mutate/mutator-registry.ts';
 import type { CustomMutatorDefs } from './custom.ts';
@@ -8,7 +9,7 @@ import { UpdateNeededReasonType } from './update-needed-reason-type.ts';
 /**
  * Configuration for {@linkcode Zero}.
  */
-export interface ZeroOptions<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined = undefined, C = unknown> {
+export interface ZeroOptions<S extends Schema = DefaultSchema, MD extends CustomMutatorDefs | undefined = undefined, C = DefaultContext> {
     /**
      * URL to the zero-cache. This can be a simple hostname, e.g.
      * - "https://myapp-myteam.zero.ms"
@@ -112,7 +113,7 @@ export interface ZeroOptions<S extends Schema, MD extends AnyMutatorRegistry | C
      * await z.mutate.issues.close({id: 'issue-123'}).client;
      * ```
      */
-    mutators?: MD | undefined;
+    mutators?: MD extends CustomMutatorDefs ? MD : AnyMutatorRegistry | undefined;
     /**
      * Custom URL for mutation requests sent to your API server.
      * If not provided, uses the default configured in zero-cache.
@@ -141,7 +142,7 @@ export interface ZeroOptions<S extends Schema, MD extends AnyMutatorRegistry | C
      * });
      * ```
      *
-     * Or use a hook like {@linkcode useZeroConnectionState} to subscribe to state changes.
+     * Or use a hook like {@linkcode useConnectionState} to subscribe to state changes.
      */
     onOnlineChange?: ((online: boolean) => void) | undefined;
     /**
@@ -278,7 +279,7 @@ export interface ZeroOptions<S extends Schema, MD extends AnyMutatorRegistry | C
 /**
  * @deprecated Use {@link ZeroOptions} instead.
  */
-export interface ZeroAdvancedOptions<S extends Schema, MD extends AnyMutatorRegistry | CustomMutatorDefs | undefined, Context> extends ZeroOptions<S, MD, Context> {
+export interface ZeroAdvancedOptions<S extends Schema, MD extends CustomMutatorDefs | undefined, Context> extends ZeroOptions<S, MD, Context> {
 }
 type UpdateNeededReasonBase = {
     message?: string;