@rocicorp/zero 0.18.2025032401 → 0.18.2025032900

package/out/advanced.js

@@ -1,4 +1,3 @@
-import "./chunk-ULOTOBTC.js";
 import {
   applyChange
 } from "./chunk-2NCGIK6G.js";

package/out/{chunk-5WXONOGR.js → chunk-I7LQ2GI3.js}

@@ -46,6 +46,7 @@ import {
   deepEqual,
   deepFreeze,
   deepFreezeAllowUndefined,
+  defaultFormat,
   desiredQueriesPrefixForClient,
   diff,
   diff2,
@@ -59,11 +60,13 @@ import {
   getClientGroupIDForClient,
   getClientGroups,
   getClients,
+  getNonCryptoRandomValues,
   getSizeOfValue,
   h64,
   hasClientState,
   hashOfAST,
   initClientV6,
+  inspectDownMessageSchema,
   isLocalMetaDD31,
   isProd,
   joinIterables,
@@ -78,6 +81,7 @@ import {
   mustGetChunk,
   mustGetClient,
   mustGetHeadHash,
+  nanoid,
   newQuery,
   newRandomHash,
   newWriteLocal,
@@ -112,12 +116,12 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-DSUPSGE4.js";
+} from "./chunk-NBZURO2P.js";
 import {
   compareTTL,
   hasOwn,
   parseTTL
-} from "./chunk-2B2QE5AT.js";
+} from "./chunk-MB3DEFRC.js";
 import {
   assert,
   assertArray,
@@ -4124,17 +4128,6 @@ function diffBinarySearch(diff3, prefix, compareKey) {
   );
 }
 
-// ../shared/src/random-values.ts
-function getNonCryptoRandomValues(array5) {
-  if (array5 === null) {
-    throw new TypeError("array cannot be null");
-  }
-  for (let i = 0; i < array5.length; i++) {
-    array5[i] = Math.floor(Math.random() * 256);
-  }
-  return array5;
-}
-
 // ../replicache/src/sync/request-id.ts
 var sessionID = "";
 function getSessionID() {
@@ -5190,7 +5183,7 @@ var ReplicacheImpl = class {
     }
     return rv;
   }
-  async #mutate(name, mutatorImpl, args, timestamp) {
+  async #mutate(name, mutatorImpl, args, timestamp2) {
     const frozenArgs = deepFreeze(args ?? null);
     if (this.#subscriptions.hasPendingSubscriptionRuns) {
       await Promise.resolve();
@@ -5207,7 +5200,7 @@ var ReplicacheImpl = class {
           frozenArgs,
           originalHash,
           dagWrite,
-          timestamp,
+          timestamp2,
           clientID,
           Latest
         );
@@ -5558,7 +5551,9 @@ var valueTypeSchema = valita_exports.union(
   valita_exports.literal("number"),
   valita_exports.literal("boolean"),
   valita_exports.literal("null"),
-  valita_exports.literal("json")
+  valita_exports.literal("json"),
+  valita_exports.literal("date"),
+  valita_exports.literal("timestamp")
 );
 var columnSchemaSchema = valita_exports.object({
   type: valueTypeSchema
@@ -5618,6 +5613,20 @@ function json() {
     customType: null
   });
 }
+function date() {
+  return new ColumnBuilder({
+    type: "date",
+    optional: false,
+    customType: null
+  });
+}
+function timestamp() {
+  return new ColumnBuilder({
+    type: "timestamp",
+    optional: false,
+    customType: null
+  });
+}
 function enumeration() {
   return new ColumnBuilder({
     type: "string",
@@ -5817,7 +5826,9 @@ async function definePermissions(schema, definer) {
   for (const name of Object.keys(schema.tables)) {
     expressionBuilders[name] = new StaticQuery(
       schema,
-      name
+      name,
+      { table: name },
+      defaultFormat
     ).expressionBuilder();
   }
   const config = await definer();
@@ -6288,13 +6299,18 @@ var mutationIDSchema = valita_exports.object({
   clientID: valita_exports.string()
 });
 var appErrorSchema = valita_exports.object({
-  error: valita_exports.literal("app")
-  // the user can add any additional fields in their API server
+  error: valita_exports.literal("app"),
+  // The user can return any additional data here
+  details: jsonSchema.optional()
 });
 var zeroErrorSchema = valita_exports.object({
-  error: valita_exports.literal("ooo-mutation")
+  error: valita_exports.literal("ooo-mutation"),
+  details: jsonSchema.optional()
+});
+var mutationOkSchema = valita_exports.object({
+  // The user can return any additional data here
+  data: jsonSchema.optional()
 });
-var mutationOkSchema = valita_exports.object({});
 var mutationErrorSchema = valita_exports.union(appErrorSchema, zeroErrorSchema);
 var mutationResultSchema = valita_exports.union(mutationOkSchema, mutationErrorSchema);
 var mutationResponseSchema = valita_exports.object({
@@ -6340,6 +6356,10 @@ var pushResponseMessageSchema = valita_exports.tuple([
   valita_exports.literal("push-response"),
   pushResponseSchema
 ]);
+var pushParamsSchema = valita_exports.object({
+  schema: valita_exports.string(),
+  appID: valita_exports.string()
+});
 function mapCRUD(arg, map) {
   return {
     ops: arg.ops.map(
@@ -6355,16 +6375,9 @@ function mapCRUD(arg, map) {
   };
 }
 
-// ../zero-protocol/src/warm.ts
-var warmBodySchema = valita_exports.object({
-  payload: valita_exports.string()
-});
-var warmMessageSchema = valita_exports.tuple([valita_exports.literal("warm"), warmBodySchema]);
-
 // ../zero-protocol/src/down.ts
 var downstreamSchema = valita_exports.union(
   connectedMessageSchema,
-  warmMessageSchema,
   errorMessageSchema,
   pongMessageSchema,
   pokeStartMessageSchema,
@@ -6372,11 +6385,12 @@ var downstreamSchema = valita_exports.union(
   pokeEndMessageSchema,
   pullResponseMessageSchema,
   deleteClientsMessageSchema,
-  pushResponseMessageSchema
+  pushResponseMessageSchema,
+  inspectDownMessageSchema
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 9;
+var PROTOCOL_VERSION = 12;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -6387,24 +6401,6 @@ function customMutatorKey(namespace, name) {
   return `${namespace}|${name}`;
 }
 
-// ../zero-client/src/util/nanoid.ts
-function nanoid(size = 21) {
-  const randomBytes = getNonCryptoRandomValues(new Uint8Array(size));
-  return randomBytes.reduce((id, byte) => {
-    byte &= 63;
-    if (byte < 36) {
-      id += byte.toString(36);
-    } else if (byte < 62) {
-      id += (byte - 26).toString(36).toUpperCase();
-    } else if (byte > 62) {
-      id += "-";
-    } else {
-      id += "_";
-    }
-    return id;
-  }, "");
-}
-
 // ../zero-client/src/util/socket.ts
 function send(ws, data) {
   ws.send(JSON.stringify(data));
@@ -7909,6 +7905,11 @@ async function deleteImpl(tx, arg, schema, ivmBranch) {
   }
 }
 
+// ../shared/src/sentinels.ts
+function emptyFunction() {
+}
+var emptyObject = Object.freeze({});
+
 // ../zero-client/src/client/custom.ts
 var TransactionImpl = class {
   constructor(lc, repTx, schema, slowMaterializeThreshold) {
@@ -7943,14 +7944,16 @@ var TransactionImpl = class {
   token;
 };
 function makeReplicacheMutator(lc, mutationTracker, mutator, schema, slowMaterializeThreshold) {
-  return (repTx, args) => {
+  return async (repTx, args) => {
     const tx = new TransactionImpl(lc, repTx, schema, slowMaterializeThreshold);
-    const clientPromise = mutator(tx, args);
+    await mutator(tx, args);
     if (repTx.reason === "initial") {
       const serverPromise = mutationTracker.trackMutation(repTx.mutationID);
-      clientPromise.server = serverPromise;
+      return {
+        server: serverPromise
+      };
     }
-    return clientPromise;
+    return {};
   };
 }
 function makeSchemaCRUD(schema, tx, ivmBranch) {
@@ -7971,8 +7974,7 @@ function makeSchemaQuery(lc, schema, ivmBranch, slowMaterializeThreshold) {
   const context = new ZeroContext(
     lc,
     ivmBranch,
-    () => () => {
-    },
+    () => emptyFunction,
     () => {
     },
     (applyViewUpdates) => applyViewUpdates(),
@@ -8321,7 +8323,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.18.2025032401";
+var version2 = "0.18.2025032900";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -8615,6 +8617,140 @@ var State = class {
   }
 };
 
+// ../zero-client/src/client/mutation-tracker.ts
+import { resolver as resolver7 } from "@rocicorp/resolver";
+var transientPushErrorTypes = [
+  "zero-pusher",
+  "http",
+  // These should never actually be received as they cause the websocket
+  // connection to be closed.
+  "unsupported-push-version",
+  "unsupported-schema-version"
+];
+var MutationTracker = class {
+  #outstandingMutations;
+  #allMutationsConfirmedListeners;
+  #clientID;
+  constructor() {
+    this.#outstandingMutations = /* @__PURE__ */ new Map();
+    this.#allMutationsConfirmedListeners = /* @__PURE__ */ new Set();
+  }
+  set clientID(clientID) {
+    this.#clientID = clientID;
+  }
+  trackMutation(id) {
+    assert(!this.#outstandingMutations.has(id));
+    const mutationResolver = resolver7();
+    this.#outstandingMutations.set(id, {
+      resolver: mutationResolver
+    });
+    return mutationResolver.promise;
+  }
+  processPushResponse(response) {
+    if ("error" in response) {
+      this.#processPushError(response);
+    } else {
+      this.#processPushOk(response);
+    }
+  }
+  /**
+   * When we reconnect to zero-cache, we resolve all outstanding mutations
+   * whose ID is less than or equal to the lastMutationID.
+   *
+   * The reason is that any responses the API server sent
+   * to those mutations have been lost.
+   *
+   * An example case: the API server responds while the connection
+   * is down. Those responses are dropped.
+   *
+   * Mutations whose LMID is > the lastMutationID are not resolved
+   * since they will be retried by the client, giving us another chance
+   * at getting a response.
+   *
+   * The only way to ensure that all API server responses are
+   * received would be to have the API server write them
+   * to the DB while writing the LMID.
+   *
+   * This would have the downside of not being able to provide responses to a
+   * mutation with data gathered after the transaction.
+   */
+  onConnected(lastMutationID) {
+    for (const [id, entry] of this.#outstandingMutations) {
+      if (id <= lastMutationID) {
+        this.#settleMutation(id, entry, "resolve", emptyObject);
+      } else {
+        break;
+      }
+    }
+  }
+  get size() {
+    return this.#outstandingMutations.size;
+  }
+  #processPushError(error) {
+    if (transientPushErrorTypes.includes(error.error)) {
+      return;
+    }
+    const mids = error.mutationIDs;
+    if (!mids) {
+      return;
+    }
+    for (const mid of mids) {
+      this.#processMutationError(mid, error);
+    }
+  }
+  #processPushOk(ok) {
+    for (const mutation of ok.mutations) {
+      if ("error" in mutation.result) {
+        this.#processMutationError(mutation.id, mutation.result);
+      } else {
+        this.#processMutationOk(mutation.result, mutation.id);
+      }
+    }
+  }
+  #processMutationError(mid, error) {
+    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, "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);
+  }
+  #settleMutation(mutationID, entry, type, result) {
+    switch (type) {
+      case "resolve":
+        assert(!("error" in result));
+        entry.resolver.resolve(result);
+        break;
+      case "reject":
+        assert("error" in result);
+        entry.resolver.reject(result);
+        break;
+    }
+    const removed = this.#outstandingMutations.delete(mutationID);
+    if (removed && this.#outstandingMutations.size === 0) {
+      this.#notifyAllMutationsConfirmedListeners();
+    }
+  }
+  onAllMutationsConfirmed(listener) {
+    this.#allMutationsConfirmedListeners.add(listener);
+  }
+  #notifyAllMutationsConfirmedListeners() {
+    for (const listener of this.#allMutationsConfirmedListeners) {
+      listener();
+    }
+  }
+};
+
 // ../zero-client/src/client/ping-result-enum.ts
 var TimedOut = 0;
 var Success = 1;
@@ -8628,11 +8764,24 @@ var QueryManager = class {
   #recentQueriesMaxSize;
   #recentQueries = /* @__PURE__ */ new Set();
   #gotQueries = /* @__PURE__ */ new Set();
-  constructor(clientID, tables, send2, experimentalWatch, recentQueriesMaxSize) {
+  #mutationTracker;
+  #pendingRemovals = [];
+  constructor(mutationTracker, clientID, tables, send2, experimentalWatch, recentQueriesMaxSize) {
     this.#clientID = clientID;
     this.#clientToServer = clientToServer(tables);
     this.#recentQueriesMaxSize = recentQueriesMaxSize;
     this.#send = send2;
+    this.#mutationTracker = mutationTracker;
+    this.#mutationTracker.onAllMutationsConfirmed(() => {
+      if (this.#pendingRemovals.length === 0) {
+        return;
+      }
+      const pendingRemovals = this.#pendingRemovals;
+      this.#pendingRemovals = [];
+      for (const removal of pendingRemovals) {
+        removal();
+      }
+    });
     experimentalWatch(
       (diff3) => {
         for (const diffOp of diff3) {
@@ -8746,6 +8895,12 @@ var QueryManager = class {
         return;
       }
       removed = true;
+      if (this.#mutationTracker.size > 0) {
+        this.#pendingRemovals.push(
+          () => this.#remove(entry, astHash, gotCallback)
+        );
+        return;
+      }
       this.#remove(entry, astHash, gotCallback);
     };
   }
@@ -9295,84 +9450,6 @@ var ZeroRep = class {
   };
 };
 
-// ../zero-client/src/client/mutation-tracker.ts
-import { resolver as resolver7 } from "@rocicorp/resolver";
-var MutationTracker = class {
-  #outstandingMutations;
-  #clientID;
-  constructor() {
-    this.#outstandingMutations = /* @__PURE__ */ new Map();
-  }
-  set clientID(clientID) {
-    this.#clientID = clientID;
-  }
-  trackMutation(id) {
-    assert(!this.#outstandingMutations.has(id));
-    const mutationResolver = resolver7();
-    this.#outstandingMutations.set(id, mutationResolver);
-    return mutationResolver.promise;
-  }
-  /**
-   * Called if the mutation is never able to be sent to the server
-   * and abandoned before persisted.
-   * In that case, we have no `pushResponse` to process.
-   */
-  rejectMutation(id, e) {
-    const resolver9 = this.#outstandingMutations.get(id);
-    assert(resolver9);
-    resolver9.reject(e);
-    this.#outstandingMutations.delete(id);
-  }
-  processPushResponse(response) {
-    if ("error" in response) {
-      this.#processPushError(response);
-    } else {
-      this.#processPushOk(response);
-    }
-  }
-  get size() {
-    return this.#outstandingMutations.size;
-  }
-  #processPushError(error) {
-    const mids = error.mutationIDs;
-    if (!mids) {
-      return;
-    }
-    for (const mid of mids) {
-      this.#processMutationError(mid, error);
-    }
-  }
-  #processPushOk(ok) {
-    for (const mutation of ok.mutations) {
-      if ("error" in mutation.result) {
-        this.#processMutationError(mutation.id, mutation.result);
-      } else {
-        this.#processMutationOk(mutation.result, mutation.id);
-      }
-    }
-  }
-  #processMutationError(mid, error) {
-    assert(
-      mid.clientID === this.#clientID,
-      "received mutation for the wrong client"
-    );
-    const resolver9 = this.#outstandingMutations.get(mid.id);
-    assert(resolver9);
-    resolver9.reject(error);
-    this.#outstandingMutations.delete(mid.id);
-  }
-  #processMutationOk(result, mid) {
-    assert(
-      mid.clientID === this.#clientID,
-      "received mutation for the wrong client"
-    );
-    const resolver9 = this.#outstandingMutations.get(mid.id);
-    assert(resolver9);
-    resolver9.resolve(result);
-    this.#outstandingMutations.delete(mid.id);
-  }
-};
-
 // ../zero-client/src/client/zero.ts
 var onSetConnectionStateSymbol = Symbol();
 var exposedToTestingSymbol = Symbol();
@@ -9586,6 +9663,8 @@ var Zero = class {
             mutatorOrMutators,
             schema,
             slowMaterializeThreshold
+            // Replicache expects mutators to only be able to return JSON
+            // but Zero wraps the return with: `{server?: Promise<MutationResult>, client?: T}`
           );
           continue;
         }
@@ -9642,6 +9721,8 @@ var Zero = class {
     const replicacheImplOptions = {
       enableClientGroupForking: false,
       enableMutationRecovery: false,
+      enablePullAndPushInOpen: false,
+      // Zero calls push in its connection management code
       onClientsDeleted: (clientIDs, clientGroupIDs) => this.#deleteClientsManager.onClientsDeleted(clientIDs, clientGroupIDs),
       zero: new ZeroRep(
         this.#zeroContext,
@@ -9678,10 +9759,8 @@ var Zero = class {
     });
     this.#onClientStateNotFound = onClientStateNotFoundCallback;
     this.#rep.onClientStateNotFound = onClientStateNotFoundCallback;
-    let { mutate, mutateBatch } = makeCRUDMutate(schema, rep.mutate);
+    const { mutate, mutateBatch } = makeCRUDMutate(schema, rep.mutate);
     if (options.mutators) {
-      mutate = {};
-      mutateBatch = void 0;
       for (const [namespaceOrKey, mutatorsOrMutator] of Object.entries(
         options.mutators
       )) {
@@ -9704,6 +9783,7 @@ var Zero = class {
     this.mutate = mutate;
     this.mutateBatch = mutateBatch;
     this.#queryManager = new QueryManager(
+      this.#mutationTracker,
       rep.clientID,
       schema.tables,
       (msg) => this.#sendChangeDesiredQueries(msg),
@@ -9928,14 +10008,14 @@ var Zero = class {
         return this.#handlePokeEnd(lc, downMessage);
       case "pull":
         return this.#handlePullResponse(lc, downMessage);
-      case "warm":
-        break;
       case "deleteClients":
         return this.#deleteClientsManager.clientsDeletedOnServer(
           downMessage[1]
         );
       case "push-response":
         return this.#mutationTracker.processPushResponse(downMessage[1]);
+      case "inspect":
+        break;
       default:
         msgType;
         rejectInvalidMessage();
@@ -10161,6 +10241,9 @@ var Zero = class {
     try {
       l.debug?.("Waiting for connection to be acknowledged");
       await this.#connectResolver.promise;
+      this.#mutationTracker.onConnected(this.#lastMutationIDReceived);
+      this.#rep.push().catch(() => {
+      });
     } finally {
       clearTimeout(timeoutID);
       this.#closeAbortController.signal.removeEventListener(
@@ -10294,17 +10377,17 @@ var Zero = class {
     const now = Date.now();
     for (let i = start; i < req.mutations.length; i++) {
       const m = req.mutations[i];
-      const timestamp = now - Math.round(performance.now() - m.timestamp);
+      const timestamp2 = now - Math.round(performance.now() - m.timestamp);
       const zeroM = m.name === CRUD_MUTATION_NAME ? {
         type: CRUD,
-        timestamp,
+        timestamp: timestamp2,
         id: m.id,
         clientID: m.clientID,
         name: m.name,
         args: [mapCRUD(m.args, this.#clientToServer)]
       } : {
         type: Custom,
-        timestamp,
+        timestamp: timestamp2,
         id: m.id,
         clientID: m.clientID,
         name: m.name,
@@ -10614,8 +10697,8 @@ var Zero = class {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-ROITQB3J.js");
-      return m.newInspector(this.#rep, this.#schema);
+      const m = await import("./inspector-SH2ZK7O3.js");
+      return m.newInspector(this.#rep, this.#schema, () => this.#socket);
     }
   }
 };
@@ -10724,6 +10807,8 @@ export {
   number2 as number,
   boolean,
   json,
+  date,
+  timestamp,
   enumeration,
   createSchema,
   ANYONE_CAN,
@@ -10733,4 +10818,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-5WXONOGR.js.map
+//# sourceMappingURL=chunk-I7LQ2GI3.js.map