@rocicorp/zero 0.25.0-canary.15 → 0.25.0-canary.18

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

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

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

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

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

@@ -3,7 +3,7 @@ import type { ZeroTxData } from '../../../replicache/src/replicache-options.ts';
 import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import type { DefaultSchema } from '../../../zero-types/src/default-types.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
-import type { ClientTransaction, SchemaCRUD, Transaction } from '../../../zql/src/mutate/custom.ts';
+import type { ClientTransaction, MutateCRUD, Transaction } from '../../../zql/src/mutate/custom.ts';
 import { type HumanReadable, type Query, type RunOptions } from '../../../zql/src/query/query.ts';
 import type { SchemaQuery } from '../../../zql/src/query/schema-query.ts';
 import type { ClientID } from '../types/client-state.ts';
@@ -54,7 +54,7 @@ export type MakeCustomMutatorInterface<TSchema extends Schema, F> = F extends (t
 export declare class TransactionImpl<TSchema extends Schema = DefaultSchema> implements ClientTransaction<TSchema> {
     #private;
     readonly location = "client";
-    readonly mutate: SchemaCRUD<TSchema>;
+    readonly mutate: MutateCRUD<TSchema>;
     readonly query: SchemaQuery<TSchema>;
     constructor(lc: LogContext, repTx: WriteTransaction, schema: TSchema);
     get clientID(): ClientID;

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

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/custom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+CAA+C,CAAC;AAI9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAKnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EACV,iBAAiB,EAGjB,UAAU,EACV,WAAW,EAGZ,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,wCAAwC,CAAC;AACxE,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAIvD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE5D;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAE9B,CAAC,cAAc,EAAE,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC;CACtE,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EACV;QACE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;QACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS,CAAC;KACjD,GACD;QACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;KAC1B,CAAC;CACP,CAAC;AAEN,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAC/C,oBAAoB,EACpB;IAAC,IAAI,EAAE,SAAS,CAAA;CAAC,CAClB,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAC7C,oBAAoB,EACpB;IAAC,IAAI,EAAE,OAAO,CAAA;CAAC,CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;CAC5C,GAAG,EAAE,CAAC;AAEP,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,MAAM,EAChB,mBAAmB,GAAG,OAAO,EAE7B,KAAK,GAAG,GAAG,EACX,OAAO,GAAG,OAAO,IACf,CACF,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAGvC,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,OAAO,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB;;;;;;;GAOG;AACH,MAAM,MAAM,2BAA2B,CACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,iBAAiB,EAC5B,QAAQ,IACN;IACF,QAAQ,EAAE,eAAe,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,SAAS,CAClE,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,eAAe,CAAC,SAAS,iBAAiB,GAC3C,2BAA2B,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,GAC7D,KAAK;CACZ,CAAC;AAEF,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAC5E,EAAE,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAC9B,GAAG,IAAI,EAAE,MAAM,IAAI,KAChB,OAAO,CAAC,IAAI,CAAC,GACd,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,aAAa,GAChC,KAAK,CAAC;AAEV,qBAAa,eAAe,CAAC,OAAO,SAAS,MAAM,GAAG,aAAa,CACjE,YAAW,iBAAiB,CAAC,OAAO,CAAC;;IAErC,QAAQ,CAAC,QAAQ,YAAY;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBAIzB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO;IAoBpE,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,MAAM,IAAI,YAAY,GAAG,QAAQ,CAEpC;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,GAAG,CAAC,MAAM,SAAS,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,EAC1D,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,GACnB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;CAGnC;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU,CAMjE;AAED,wBAAgB,qBAAqB,CACnC,CAAC,SAAS,MAAM,EAChB,mBAAmB,EACnB,OAAO,EAEP,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAClD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,OAAO,GACf,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAQrE"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/custom.ts"],"names":[],"mappings":"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"}

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

@@ -1,12 +1,12 @@
 import { zeroData } from "../../../replicache/src/transactions.js";
 import { assert } from "../../../shared/src/asserts.js";
 import { must } from "../../../shared/src/must.js";
-import { recordProxy } from "../../../shared/src/record-proxy.js";
 import { emptyFunction } from "../../../shared/src/sentinels.js";
+import { makeMutateCRUDFunction } from "../../../zql/src/mutate/crud.js";
 import { createRunnableBuilder } from "../../../zql/src/query/create-builder.js";
 import "../../../zero-protocol/src/ast.js";
 import { ZeroContext } from "./context.js";
-import { deleteImpl, updateImpl, upsertImpl, insertImpl } from "./crud.js";
+import { makeCRUDExecutor } from "./crud.js";
 class TransactionImpl {
   location = "client";
   mutate;
@@ -16,12 +16,10 @@ class TransactionImpl {
   constructor(lc, repTx, schema) {
     must(repTx.reason === "initial" || repTx.reason === "rebase");
     const txData = getZeroTxData(repTx);
+    const ivmBranch = txData.ivmSources;
     this.#repTx = repTx;
-    this.mutate = makeSchemaCRUD(
-      schema,
-      repTx,
-      txData.ivmSources
-    );
+    const executor = makeCRUDExecutor(repTx, schema, ivmBranch);
+    this.mutate = makeMutateCRUDFunction(schema, executor);
     const zeroContext = newZeroContext(
       lc,
       txData.ivmSources
@@ -58,12 +56,6 @@ function makeReplicacheMutator(lc, mutator, schema, context) {
     await mutator(tx, args, context);
   };
 }
-function makeSchemaCRUD(schema, tx, ivmBranch) {
-  return recordProxy(
-    schema.tables,
-    (_tableSchema, tableName) => makeTableCRUD(schema, tableName, tx, ivmBranch)
-  );
-}
 function assertValidRunOptions(options) {
   assert(
     options?.type !== "complete",
@@ -84,36 +76,6 @@ function newZeroContext(lc, ivmBranch) {
     assertValidRunOptions
   );
 }
-function makeTableCRUD(schema, tableName, tx, ivmBranch) {
-  const table = must(schema.tables[tableName]);
-  const { primaryKey } = table;
-  return {
-    insert: (value) => insertImpl(
-      tx,
-      { tableName, value },
-      schema,
-      ivmBranch
-    ),
-    upsert: (value) => upsertImpl(
-      tx,
-      { op: "upsert", tableName, primaryKey, value },
-      schema,
-      ivmBranch
-    ),
-    update: (value) => updateImpl(
-      tx,
-      { tableName, value },
-      schema,
-      ivmBranch
-    ),
-    delete: (id) => deleteImpl(
-      tx,
-      { tableName, value: id },
-      schema,
-      ivmBranch
-    )
-  };
-}
 export {
   TransactionImpl,
   getZeroTxData,

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

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

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

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

@@ -8,6 +8,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 +29,7 @@ function extendReplicacheMutators(lc, context, mutators, schema, mutateObject) {
           schema,
           context
         );
-      } else {
+      } else if (mutator !== null && typeof mutator === "object") {
         processMutators(mutator, path);
       }
       path.pop();

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 {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 {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      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  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 * 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> {\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":";;;;;;;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,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,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,UACP,OAEiC;AACjC,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 {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 * 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> {\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":";;;;;;;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,UACP,OAEiC;AACjC,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;"}

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

@@ -1,4 +1,4 @@
-const version = "0.25.0-canary.15";
+const version = "0.25.0-canary.18";
 export {
   version
 };

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

@@ -5,6 +5,7 @@ import type { Puller } from '../../../replicache/src/puller.ts';
 import type { Pusher } from '../../../replicache/src/pusher.ts';
 import type { ClientGroupID, ClientID } from '../../../replicache/src/sync/ids.ts';
 import type { MutatorDefs } from '../../../replicache/src/types.ts';
+import type { ReadonlyJSONValue } from '../../../shared/src/json.ts';
 import { Subscribable } from '../../../shared/src/subscribable.ts';
 import { type ClientSchema } from '../../../zero-protocol/src/client-schema.ts';
 import type { DeleteClientsBody } from '../../../zero-protocol/src/delete-clients.ts';
@@ -13,9 +14,10 @@ import type { NullableVersion } from '../../../zero-protocol/src/version.ts';
 import type { DefaultContext, DefaultSchema } from '../../../zero-types/src/default-types.ts';
 import type { Schema } from '../../../zero-types/src/schema.ts';
 import type { ViewFactory } from '../../../zql/src/ivm/view.ts';
-import type { MutationRequest } from '../../../zql/src/mutate/mutator.ts';
+import type { MutateRequest } from '../../../zql/src/mutate/mutator.ts';
 import type { QueryDelegate } from '../../../zql/src/query/query-delegate.ts';
-import { type HumanReadable, type MaterializeOptions, type PreloadOptions, type PullRow, type RunOptions, type ToQuery } from '../../../zql/src/query/query.ts';
+import { type QueryOrQueryRequest } from '../../../zql/src/query/query-registry.ts';
+import { type HumanReadable, type MaterializeOptions, type PreloadOptions, type PullRow, type RunOptions } from '../../../zql/src/query/query.ts';
 import type { SchemaQuery } from '../../../zql/src/query/schema-query.ts';
 import type { TypedView } from '../../../zql/src/query/typed-view.ts';
 import { ActiveClientsManager } from './active-clients-manager.ts';
@@ -114,7 +116,7 @@ export declare class Zero<const S extends Schema = DefaultSchema, MD extends Cus
      * // Now the data is cached and can be used immediately
      * ```
      */
-    preload<TTable extends keyof S['tables'] & string, TReturn extends PullRow<TTable, S>>(query: ToQuery<TTable, S, TReturn, C>, options?: PreloadOptions): {
+    preload<TTable extends keyof S['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TReturn extends PullRow<TTable, S>>(query: QueryOrQueryRequest<TTable, TInput, TOutput, S, TReturn, C>, options?: PreloadOptions): {
         cleanup: () => void;
         complete: Promise<void>;
     };
@@ -138,7 +140,7 @@ export declare class Zero<const S extends Schema = DefaultSchema, MD extends Cus
      * const cachedUsers = await zero.run(userQuery, {type: 'unknown'});
      * ```
      */
-    run<TTable extends keyof S['tables'] & string, TReturn>(query: ToQuery<TTable, S, TReturn, C>, runOptions?: RunOptions): Promise<HumanReadable<TReturn>>;
+    run<TTable extends keyof S['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TReturn>(query: QueryOrQueryRequest<TTable, TInput, TOutput, S, TReturn, C>, runOptions?: RunOptions): Promise<HumanReadable<TReturn>>;
     get context(): C;
     /**
      * Creates a materialized view of a query that stays synchronized with the database.
@@ -164,8 +166,8 @@ export declare class Zero<const S extends Schema = DefaultSchema, MD extends Cus
      * const customView = zero.materialize(userQuery, (query) => new MyCustomView(query));
      * ```
      */
-    materialize<TTable extends keyof S['tables'] & string, TReturn>(query: ToQuery<TTable, S, TReturn, C>, options?: MaterializeOptions): TypedView<HumanReadable<TReturn>>;
-    materialize<T, TTable extends keyof S['tables'] & string, TReturn>(query: ToQuery<TTable, S, TReturn, C>, factory: ViewFactory<TTable, S, TReturn, T>, options?: MaterializeOptions): T;
+    materialize<TTable extends keyof S['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TReturn>(query: QueryOrQueryRequest<TTable, TInput, TOutput, S, TReturn, C>, options?: MaterializeOptions): TypedView<HumanReadable<TReturn>>;
+    materialize<T, TTable extends keyof S['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TReturn>(query: QueryOrQueryRequest<TTable, TInput, TOutput, S, TReturn, C>, factory: ViewFactory<TTable, S, TReturn, T>, options?: MaterializeOptions): T;
     /**
      * The server URL that this Zero instance is configured with.
      */
@@ -223,7 +225,7 @@ export declare class Zero<const S extends Schema = DefaultSchema, MD extends Cus
      * await zero.mutate.issue.update({id: '1', title: 'Updated title'});
      * ```
      */
-    readonly mutate: MakeMutatePropertyType<S, MD, C> & ((mr: MutationRequest<any, S, C, any>) => MutatorResult);
+    readonly mutate: MakeMutatePropertyType<S, MD, C> & ((mr: MutateRequest<any, S, C, any>) => MutatorResult);
     /**
      * Provides a way to batch multiple CRUD mutations together:
      *

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

@@ -1 +1 @@
-{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAgB,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAC,KAAK,QAAQ,EAAW,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAC,MAAM,EAAe,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAC,MAAM,EAAe,MAAM,mCAAmC,CAAC;AAE5E,OAAO,KAAK,EACV,aAAa,EACb,QAAQ,EACT,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EACV,WAAW,EAEZ,MAAM,kCAAkC,CAAC;AAS1C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAMnE,OAAO,EAAC,YAAY,EAAC,MAAM,qCAAqC,CAAC;AAGjE,OAAO,EAAC,KAAK,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAG9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AA6BpF,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,6CAA6C,CAAC;AAElF,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,uCAAuC,CAAC;AAO3E,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACd,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AAC9D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAK9D,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,oCAAoC,CAAC;AAO5C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,OAAO,EACZ,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,wCAAwC,CAAC;AACxE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,sCAAsC,CAAC;AAGpE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AAGjE,OAAO,EACL,iBAAiB,EAGlB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,KAAK,UAAU,EAAiB,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAC,KAAK,YAAY,EAAgC,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAClE,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AAYjE,OAAO,EACL,KAAK,UAAU,EACf,KAAK,QAAQ,EAGd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAC,KAAK,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,2BAA2B,CAAC;AAatE,OAAO,KAAK,EAAqB,WAAW,EAAC,MAAM,cAAc,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAgBhD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAIhD,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACvC,cAAc,EAAE,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC1C,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;IAC3C,aAAa,EAAE,MAAM,aAAa,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,sBAAsB,eAAW,CAAC;AAC/C,eAAO,MAAM,sBAAsB,eAAW,CAAC;AAkB/C,eAAO,MAAM,oBAAoB,OAAQ,CAAC;AAE1C;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,eAAe,OAAQ,CAAC;AAErC,eAAO,MAAM,kCAAkC,OAAQ,CAAC;AAExD;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,QAAiB,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAC;AA+CzC,MAAM,WAAW,qBAAqB;IACpC,cAAc,IAAI,MAAM,CAAC;CAC1B;AAID,wBAAgB,mCAAmC,CACjD,CAAC,EAAE,MAAM,GACR,cAAc,CAAC,WAAW,CAAC,CAG7B;AAMD,qBAAa,IAAI,CACf,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,aAAa,EACtC,EAAE,SAAS,iBAAiB,GAAG,SAAS,GAAG,SAAS,EACpD,CAAC,GAAG,cAAc;;IAElB,QAAQ,CAAC,OAAO,SAAW;IAI3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAyD5B;;;;;;;;OAQG;IACH,aAAa,EAAE,MAAM,CAAC;IAoCtB;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAU/B;;OAEG;gBAES,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IA2Z1C;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CACL,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACzC,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAElC,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,cAAc;;;;IAQ1B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,GAAG,CACD,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACzC,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,EAEP,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAClE,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAOlC,IAAI,OAAO,IAAI,CAAC,CAEf;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,WAAW,CACT,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACzC,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,EAEP,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAClE,OAAO,CAAC,EAAE,kBAAkB,GAC3B,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACpC,WAAW,CACT,CAAC,EACD,MAAM,SAAS,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,EACzC,MAAM,SAAS,iBAAiB,GAAG,SAAS,EAC5C,OAAO,SAAS,iBAAiB,GAAG,SAAS,EAC7C,OAAO,EAEP,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAClE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAC3C,OAAO,CAAC,EAAE,kBAAkB,GAC3B,CAAC;IAyBJ;;OAEG;IACH,IAAI,MAAM,IAAI,UAAU,GAAG,IAAI,CAE9B;IAED;;;OAGG;IACH,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED;;;OAGG;IACH,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,MAAM,IAAI,CAAC,CAEd;IAED;;;OAGG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAED,IAAI,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC,CAE1C;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAG/C,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,aAAa,CAAC,CAAC;IAEzD;;;;;;;;;;;;;;;;;;OAkBG;IACH,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IAEtC;;;;;;;;;;;;;;;OAeG;IACH,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED;;;;;OAKG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAygC5B;;;;;OAKG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;;;;OASG;IACH,QAAQ,GAAI,UAAU,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,KAAG,CAAC,MAAM,IAAI,CAAC,CACpB;IAsG1C;;;OAGG;IACH,IAAI,SAAS,IAAI,SAAS,CAiBzB;CAcF;AAED,qBAAa,aAAc,SAAQ,YAAY,CAAC,OAAO,CAAC;;IAGtD,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAQhC,IAAI,MAAM,IAAI,OAAO,CAEpB;CACF;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,EAAE,QAAQ,EACtB,UAAU,EAAE,eAAe,EAC3B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,OAAO,EAClB,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAC3D,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EACjE,eAAe,SAAW,GACzB,OAAO,CACR;IACE,SAAS;IACT,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS;IACzC,iBAAiB,GAAG,SAAS;CAC9B,CACF,CA+EA"}

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

@@ -29,6 +29,7 @@ import { clientToServer } from "../../../zero-schema/src/name-mapper.js";
 import { iterateMutators, isMutatorRegistry } from "../../../zql/src/mutate/mutator-registry.js";
 import { createRunnableBuilder } from "../../../zql/src/query/create-builder.js";
 import { isClientMetric } from "../../../zql/src/query/metrics-delegate.js";
+import { addContextToQuery } from "../../../zql/src/query/query-registry.js";
 import "../../../zero-protocol/src/ast.js";
 import { nanoid } from "../util/nanoid.js";
 import { send } from "../util/socket.js";
@@ -525,7 +526,10 @@ class Zero {
    * ```
    */
   preload(query, options) {
-    return this.#zeroContext.preload(query.toQuery(this.context), options);
+    return this.#zeroContext.preload(
+      addContextToQuery(query, this.context),
+      options
+    );
   }
   /**
    * Executes a query once and returns the results.
@@ -548,13 +552,16 @@ class Zero {
    * ```
    */
   run(query, runOptions) {
-    return this.#zeroContext.run(query.toQuery(this.context), runOptions);
+    return this.#zeroContext.run(
+      addContextToQuery(query, this.context),
+      runOptions
+    );
   }
   get context() {
     return this.#options.context;
   }
   materialize(query, factoryOrOptions, maybeOptions) {
-    const q = query.toQuery(this.context);
+    const q = addContextToQuery(query, this.context);
     let factory;
     let options;
     if (typeof factoryOrOptions === "function") {