@rocicorp/zero 0.18.2025032800 → 0.18.2025040200

package/out/{chunk-3S3SDA44.js → chunk-CT4LRQ5P.js}

@@ -34,7 +34,6 @@ import {
   clientGroupHasPendingMutations,
   clientGroupIDSchema,
   clientIDSchema,
-  clientToServer,
   commitFromHash,
   commitFromHead,
   commitIsLocalDD31,
@@ -95,7 +94,6 @@ import {
   readonlyArray,
   readonlyObject,
   rowSchema,
-  serverToClient,
   setClient,
   setClientGroup,
   setClientGroups,
@@ -116,7 +114,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-NBZURO2P.js";
+} from "./chunk-R7QLNPBS.js";
 import {
   compareTTL,
   hasOwn,
@@ -299,11 +297,15 @@ function assertPullerResultV1(v) {
 import { resolver } from "@rocicorp/resolver";
 
 // ../shared/src/browser-env.ts
+var overrides = /* @__PURE__ */ new Map();
 function getBrowserGlobal(name) {
+  if (overrides.has(name)) {
+    return overrides.get(name);
+  }
   return globalThis[name];
 }
 function getBrowserGlobalMethod(name) {
-  return globalThis[name]?.bind(globalThis);
+  return getBrowserGlobal(name)?.bind(globalThis);
 }
 function mustGetBrowserGlobal(name) {
   const r = getBrowserGlobal(name);
@@ -5174,7 +5176,20 @@ var ReplicacheImpl = class {
   };
   #register(name, mutatorImpl) {
     this.#mutatorRegistry[name] = mutatorImpl;
-    return (args) => this.#mutate(name, mutatorImpl, args, performance.now());
+    return (args) => {
+      const trackingData = name === "_zero_crud" ? void 0 : this.#zero?.trackMutation();
+      const result = this.#mutate(
+        trackingData,
+        name,
+        mutatorImpl,
+        args,
+        performance.now()
+      );
+      if (trackingData) {
+        result.server = trackingData.serverPromise;
+      }
+      return result;
+    };
   }
   #registerMutators(regs) {
     const rv = /* @__PURE__ */ Object.create(null);
@@ -5183,7 +5198,7 @@ var ReplicacheImpl = class {
     }
     return rv;
   }
-  async #mutate(name, mutatorImpl, args, timestamp) {
+  async #mutate(trackingData, name, mutatorImpl, args, timestamp) {
     const frozenArgs = deepFreeze(args ?? null);
     if (this.#subscriptions.hasPendingSubscriptionRuns) {
       await Promise.resolve();
@@ -5192,36 +5207,54 @@ var ReplicacheImpl = class {
     const { clientID } = this;
     return withWriteNoImplicitCommit(this.memdag, async (dagWrite) => {
       try {
-        const headHash = await mustGetHeadHash(DEFAULT_HEAD_NAME, dagWrite);
-        const originalHash = null;
-        const dbWrite = await newWriteLocal(
-          headHash,
-          name,
-          frozenArgs,
-          originalHash,
-          dagWrite,
-          timestamp,
-          clientID,
-          Latest
-        );
-        const tx = new WriteTransactionImpl(
-          clientID,
-          await dbWrite.getMutationID(),
-          "initial",
-          await this.#zero?.getTxData(headHash, {
-            openLazyRead: dagWrite
-          }),
-          dbWrite,
-          this.#lc
-        );
-        const result = await mutatorImpl(tx, args);
-        throwIfClosed(dbWrite);
-        const lastMutationID = await dbWrite.getMutationID();
-        const [newHead, diffs] = await dbWrite.commitWithDiffs(
-          DEFAULT_HEAD_NAME,
-          this.#subscriptions
-        );
-        this.lastMutationID = lastMutationID;
+        let result;
+        let newHead;
+        let diffs;
+        let headHash;
+        try {
+          headHash = await mustGetHeadHash(DEFAULT_HEAD_NAME, dagWrite);
+          const originalHash = null;
+          const dbWrite = await newWriteLocal(
+            headHash,
+            name,
+            frozenArgs,
+            originalHash,
+            dagWrite,
+            timestamp,
+            clientID,
+            Latest
+          );
+          const mutationID = await dbWrite.getMutationID();
+          const tx = new WriteTransactionImpl(
+            clientID,
+            mutationID,
+            "initial",
+            await this.#zero?.getTxData(headHash, {
+              openLazyRead: dagWrite
+            }),
+            dbWrite,
+            this.#lc
+          );
+          if (trackingData) {
+            this.#zero?.mutationIDAssigned(
+              trackingData.ephemeralID,
+              mutationID
+            );
+          }
+          result = await mutatorImpl(tx, args);
+          throwIfClosed(dbWrite);
+          const lastMutationID = await dbWrite.getMutationID();
+          [newHead, diffs] = await dbWrite.commitWithDiffs(
+            DEFAULT_HEAD_NAME,
+            this.#subscriptions
+          );
+          this.lastMutationID = lastMutationID;
+        } catch (e) {
+          if (trackingData) {
+            this.#zero?.rejectMutation(trackingData.ephemeralID, e);
+          }
+          throw e;
+        }
         this.#zero?.advance(headHash, newHead, diffs.get("") ?? []);
         this.#pushConnectionLoop.send(false).catch(() => void 0);
         await this.#subscriptions.fire(diffs);
@@ -5551,9 +5584,7 @@ var valueTypeSchema = valita_exports.union(
   valita_exports.literal("number"),
   valita_exports.literal("boolean"),
   valita_exports.literal("null"),
-  valita_exports.literal("json"),
-  valita_exports.literal("date"),
-  valita_exports.literal("timestamp")
+  valita_exports.literal("json")
 );
 var columnSchemaSchema = valita_exports.object({
   type: valueTypeSchema
@@ -5791,6 +5822,87 @@ var StaticQuery = class _StaticQuery extends AbstractQuery {
   }
 };
 
+// ../zero-schema/src/name-mapper.ts
+function clientToServer(tables) {
+  return createMapperFrom("client", tables);
+}
+function serverToClient(tables) {
+  return createMapperFrom("server", tables);
+}
+function createMapperFrom(src, tables) {
+  const mapping = new Map(
+    Object.entries(tables).map(
+      ([tableName, { serverName: serverTableName, columns }]) => {
+        let allColumnsSame = true;
+        const names = {};
+        for (const [name, { serverName }] of Object.entries(columns)) {
+          if (serverName && serverName !== name) {
+            allColumnsSame = false;
+          }
+          if (src === "client") {
+            names[name] = serverName ?? name;
+          } else {
+            names[serverName ?? name] = name;
+          }
+        }
+        return [
+          src === "client" ? tableName : serverTableName ?? tableName,
+          {
+            tableName: src === "client" ? serverTableName ?? tableName : tableName,
+            columns: names,
+            allColumnsSame
+          }
+        ];
+      }
+    )
+  );
+  return new NameMapper(mapping);
+}
+var NameMapper = class {
+  #tables = /* @__PURE__ */ new Map();
+  constructor(tables) {
+    this.#tables = tables;
+  }
+  #getTable(src, ctx) {
+    const table2 = this.#tables.get(src);
+    if (!table2) {
+      throw new Error(
+        `unknown table "${src}" ${!ctx ? "" : `in ${JSON.stringify(ctx)}`}`
+      );
+    }
+    return table2;
+  }
+  tableName(src, context) {
+    return this.#getTable(src, context).tableName;
+  }
+  columnName(table2, src, ctx) {
+    const dst = this.#getTable(table2, ctx).columns[src];
+    if (!dst) {
+      throw new Error(
+        `unknown column "${src}" of "${table2}" table ${!ctx ? "" : `in ${JSON.stringify(ctx)}`}`
+      );
+    }
+    return dst;
+  }
+  row(table2, row) {
+    const dest = this.#getTable(table2);
+    const { allColumnsSame, columns } = dest;
+    if (allColumnsSame) {
+      return row;
+    }
+    const clientRow = {};
+    for (const col in row) {
+      clientRow[columns[col] ?? col] = row[col];
+    }
+    return clientRow;
+  }
+  columns(table2, cols) {
+    const dest = this.#getTable(table2);
+    const { allColumnsSame, columns } = dest;
+    return cols === void 0 || allColumnsSame ? cols : cols.map((col) => columns[col] ?? col);
+  }
+};
+
 // ../zero-schema/src/permissions.ts
 var ANYONE_CAN = [
   (_, eb) => eb.and()
@@ -6290,7 +6402,7 @@ var appErrorSchema = valita_exports.object({
   details: jsonSchema.optional()
 });
 var zeroErrorSchema = valita_exports.object({
-  error: valita_exports.literal("ooo-mutation"),
+  error: valita_exports.literal("oooMutation"),
   details: jsonSchema.optional()
 });
 var mutationOkSchema = valita_exports.object({
@@ -6307,14 +6419,14 @@ var pushOkSchema = valita_exports.object({
   mutations: valita_exports.array(mutationResponseSchema)
 });
 var unsupportedPushVersionSchema = valita_exports.object({
-  error: valita_exports.literal("unsupported-push-version"),
+  error: valita_exports.literal("unsupportedPushVersion"),
   // optional for backwards compatibility
   // This field is included so the client knows which mutations
   // were not processed by the server.
   mutationIDs: valita_exports.array(mutationIDSchema).optional()
 });
 var unsupportedSchemaVersionSchema = valita_exports.object({
-  error: valita_exports.literal("unsupported-schema-version"),
+  error: valita_exports.literal("unsupportedSchemaVersion"),
   // optional for backwards compatibility
   // This field is included so the client knows which mutations
   // were not processed by the server.
@@ -6327,7 +6439,7 @@ var httpErrorSchema = valita_exports.object({
   mutationIDs: valita_exports.array(mutationIDSchema).optional()
 });
 var zeroPusherErrorSchema = valita_exports.object({
-  error: valita_exports.literal("zero-pusher"),
+  error: valita_exports.literal("zeroPusher"),
   details: valita_exports.string(),
   mutationIDs: valita_exports.array(mutationIDSchema).optional()
 });
@@ -6339,9 +6451,13 @@ var pushErrorSchema = valita_exports.union(
 );
 var pushResponseSchema = valita_exports.union(pushOkSchema, pushErrorSchema);
 var pushResponseMessageSchema = valita_exports.tuple([
-  valita_exports.literal("push-response"),
+  valita_exports.literal("pushResponse"),
   pushResponseSchema
 ]);
+var pushParamsSchema = valita_exports.object({
+  schema: valita_exports.string(),
+  appID: valita_exports.string()
+});
 function mapCRUD(arg, map) {
   return {
     ops: arg.ops.map(
@@ -6372,7 +6488,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 12;
+var PROTOCOL_VERSION = 14;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -7925,17 +8041,10 @@ var TransactionImpl = class {
   query;
   token;
 };
-function makeReplicacheMutator(lc, mutationTracker, mutator, schema, slowMaterializeThreshold) {
+function makeReplicacheMutator(lc, mutator, schema, slowMaterializeThreshold) {
   return async (repTx, args) => {
     const tx = new TransactionImpl(lc, repTx, schema, slowMaterializeThreshold);
     await mutator(tx, args);
-    if (repTx.reason === "initial") {
-      const serverPromise = mutationTracker.trackMutation(repTx.mutationID);
-      return {
-        server: serverPromise
-      };
-    }
-    return {};
   };
 }
 function makeSchemaCRUD(schema, tx, ivmBranch) {
@@ -8305,7 +8414,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.18.2025032800";
+var version2 = "0.18.2025040200";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -8602,34 +8711,62 @@ var State = class {
 // ../zero-client/src/client/mutation-tracker.ts
 import { resolver as resolver7 } from "@rocicorp/resolver";
 var transientPushErrorTypes = [
-  "zero-pusher",
+  "zeroPusher",
   "http",
   // These should never actually be received as they cause the websocket
   // connection to be closed.
-  "unsupported-push-version",
-  "unsupported-schema-version"
+  "unsupportedPushVersion",
+  "unsupportedSchemaVersion"
 ];
+var currentEphemeralID = 0;
+function nextEphemeralID() {
+  return ++currentEphemeralID;
+}
 var MutationTracker = class {
   #outstandingMutations;
+  #ephemeralIDsByMutationID;
   #allMutationsConfirmedListeners;
+  #lc;
   #clientID;
-  constructor() {
+  constructor(lc) {
+    this.#lc = lc.withContext("MutationTracker");
     this.#outstandingMutations = /* @__PURE__ */ new Map();
+    this.#ephemeralIDsByMutationID = /* @__PURE__ */ new Map();
     this.#allMutationsConfirmedListeners = /* @__PURE__ */ new Set();
   }
   set clientID(clientID) {
     this.#clientID = clientID;
   }
-  trackMutation(id) {
-    assert(!this.#outstandingMutations.has(id));
+  trackMutation() {
+    const id = nextEphemeralID();
     const mutationResolver = resolver7();
     this.#outstandingMutations.set(id, {
       resolver: mutationResolver
     });
-    return mutationResolver.promise;
+    return { ephemeralID: id, serverPromise: mutationResolver.promise };
+  }
+  mutationIDAssigned(id, mutationID) {
+    const entry = this.#outstandingMutations.get(id);
+    if (entry) {
+      entry.mutationID = mutationID;
+      this.#ephemeralIDsByMutationID.set(mutationID, id);
+    }
+  }
+  rejectMutation(id, e) {
+    const entry = this.#outstandingMutations.get(id);
+    if (entry) {
+      this.#settleMutation(id, entry, "reject", {
+        error: "app",
+        details: e instanceof Error ? e.message : String(e)
+      });
+    }
   }
   processPushResponse(response) {
     if ("error" in response) {
+      this.#lc.error?.(
+        "Received an error response when pushing mutations",
+        response
+      );
       this.#processPushError(response);
     } else {
       this.#processPushOk(response);
@@ -8658,7 +8795,10 @@ var MutationTracker = class {
    */
   onConnected(lastMutationID) {
     for (const [id, entry] of this.#outstandingMutations) {
-      if (id <= lastMutationID) {
+      if (!entry.mutationID) {
+        continue;
+      }
+      if (entry.mutationID <= lastMutationID) {
         this.#settleMutation(id, entry, "resolve", emptyObject);
       } else {
         break;
@@ -8694,20 +8834,31 @@ var MutationTracker = class {
       mid.clientID === this.#clientID,
       "received mutation for the wrong client"
     );
-    const entry = this.#outstandingMutations.get(mid.id);
-    assert(entry);
-    this.#settleMutation(mid.id, entry, "reject", error);
+    this.#lc.error?.(`Mutation ${mid.id} returned an error`, error);
+    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid.id);
+    assert(
+      ephemeralID,
+      () => "invalid state. An ephemeral id was never assigned to mutation " + mid.id
+    );
+    const entry = this.#outstandingMutations.get(ephemeralID);
+    assert(entry && entry.mutationID === mid.id);
+    this.#settleMutation(ephemeralID, entry, "reject", error);
   }
   #processMutationOk(result, mid) {
     assert(
       mid.clientID === this.#clientID,
       "received mutation for the wrong client"
     );
-    const entry = this.#outstandingMutations.get(mid.id);
-    assert(entry);
-    this.#settleMutation(mid.id, entry, "resolve", result);
+    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid.id);
+    assert(
+      ephemeralID,
+      () => "invalid state. An ephemeral id was never assigned to mutation " + mid.id
+    );
+    const entry = this.#outstandingMutations.get(ephemeralID);
+    assert(entry && entry.mutationID === mid.id);
+    this.#settleMutation(ephemeralID, entry, "resolve", result);
   }
-  #settleMutation(mutationID, entry, type, result) {
+  #settleMutation(ephemeralID, entry, type, result) {
     switch (type) {
       case "resolve":
         assert(!("error" in result));
@@ -8718,7 +8869,10 @@ var MutationTracker = class {
         entry.resolver.reject(result);
         break;
     }
-    const removed = this.#outstandingMutations.delete(mutationID);
+    const removed = this.#outstandingMutations.delete(ephemeralID);
+    if (entry.mutationID) {
+      this.#ephemeralIDsByMutationID.delete(entry.mutationID);
+    }
     if (removed && this.#outstandingMutations.size === 0) {
       this.#notifyAllMutationsConfirmedListeners();
     }
@@ -9386,12 +9540,14 @@ var ZeroRep = class {
   #context;
   #ivmMain;
   #customMutatorsEnabled;
+  #mutationTracker;
   #store;
   #auth;
-  constructor(context, ivmMain, customMutatorsEnabled) {
+  constructor(context, ivmMain, customMutatorsEnabled, mutationTracker) {
     this.#context = context;
     this.#ivmMain = ivmMain;
     this.#customMutatorsEnabled = customMutatorsEnabled;
+    this.#mutationTracker = mutationTracker;
   }
   set auth(auth) {
     if (auth === "") {
@@ -9430,6 +9586,15 @@ var ZeroRep = class {
   advance = (expectedHash, newHash, diffs) => {
     this.#context.processChanges(expectedHash, newHash, diffs);
   };
+  trackMutation() {
+    return this.#mutationTracker.trackMutation();
+  }
+  mutationIDAssigned(ephemeralID, mutationID) {
+    this.#mutationTracker.mutationIDAssigned(ephemeralID, mutationID);
+  }
+  rejectMutation(ephemeralID, ex) {
+    this.#mutationTracker.rejectMutation(ephemeralID, ex);
+  }
 };
 
 // ../zero-client/src/client/zero.ts
@@ -9631,7 +9796,7 @@ var Zero = class {
       );
     }
     const lc = new LogContext4(logOptions.logLevel, {}, logOptions.logSink);
-    this.#mutationTracker = new MutationTracker();
+    this.#mutationTracker = new MutationTracker(lc);
     if (options.mutators) {
       for (const [namespaceOrKey, mutatorOrMutators] of Object.entries(
         options.mutators
@@ -9641,7 +9806,6 @@ var Zero = class {
           assertUnique(key);
           replicacheMutators[key] = makeReplicacheMutator(
             lc,
-            this.#mutationTracker,
             mutatorOrMutators,
             schema,
             slowMaterializeThreshold
@@ -9659,7 +9823,6 @@ var Zero = class {
             assertUnique(key);
             replicacheMutators[key] = makeReplicacheMutator(
               lc,
-              this.#mutationTracker,
               mutator,
               schema,
               slowMaterializeThreshold
@@ -9709,7 +9872,8 @@ var Zero = class {
       zero: new ZeroRep(
         this.#zeroContext,
         this.#ivmMain,
-        options.mutators !== void 0
+        options.mutators !== void 0,
+        this.#mutationTracker
       )
     };
     const rep = new ReplicacheImpl(replicacheOptions, replicacheImplOptions);
@@ -9994,7 +10158,7 @@ var Zero = class {
         return this.#deleteClientsManager.clientsDeletedOnServer(
           downMessage[1]
         );
-      case "push-response":
+      case "pushResponse":
         return this.#mutationTracker.processPushResponse(downMessage[1]);
       case "inspect":
         break;
@@ -10679,7 +10843,7 @@ var Zero = class {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-SH2ZK7O3.js");
+      const m = await import("./inspector-RYBBQ63M.js");
       return m.newInspector(this.#rep, this.#schema, () => this.#socket);
     }
   }
@@ -10798,4 +10962,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-3S3SDA44.js.map
+//# sourceMappingURL=chunk-CT4LRQ5P.js.map