@rocicorp/zero 0.22.2025081301 → 0.23.2025081400

package/out/{chunk-N2EOVSVB.js → chunk-ZKRMVMWK.js}

@@ -1,3 +1,8 @@
+import {
+  promiseFalse,
+  promiseTrue,
+  promiseVoid
+} from "./chunk-MKB4RXL3.js";
 import {
   BTreeRead,
   Chunk,
@@ -10,11 +15,10 @@ import {
   GOT_QUERIES_KEY_PREFIX,
   Latest,
   MUTATIONS_KEY_PREFIX,
+  TDigest,
   V6,
   V7,
   addDiffsForIndexes,
-  assert,
-  assertArray,
   assertClientV6,
   assertCookie,
   assertHasClientState,
@@ -22,14 +26,10 @@ import {
   assertJSONObject,
   assertJSONValue,
   assertLocalMetaDD31,
-  assertNotNull,
-  assertNumber,
-  assertObject,
   assertOrderingIncludesPK,
   assertRefs,
   assertSnapshotCommitDD31,
   assertSnapshotMetaDD31,
-  assertString,
   astSchema,
   asyncIterableToArray,
   baseSnapshotFromCommit,
@@ -51,8 +51,6 @@ import {
   createPredicate,
   decodeIndexKey,
   deepEqual,
-  deepFreeze,
-  deepFreezeAllowUndefined,
   desiredQueriesPrefixForClient,
   diff,
   diff2,
@@ -70,13 +68,11 @@ import {
   getSizeOfValue,
   h64,
   hasClientState,
-  hasOwn,
   hashOfAST,
   hashOfNameAndArgs,
   initClientV6,
   inspectDownMessageSchema,
   isLocalMetaDD31,
-  isProd,
   joinIterables,
   jsonObjectSchema,
   jsonSchema,
@@ -87,6 +83,8 @@ import {
   makeClientID,
   makeComparator,
   mapAST,
+  mapAllEntries,
+  mapEntries,
   must,
   mustGetChunk,
   mustGetClient,
@@ -115,12 +113,12 @@ import {
   sourceNameFromKey,
   stringCompare,
   test,
+  throwOutput,
   toDesiredQueriesKey,
   toGotQueriesKey,
   toMutationResponseKey,
   toPrimaryKeyString,
   transformFilters,
-  unreachable,
   using,
   valita_exports,
   valuesEqual,
@@ -128,7 +126,20 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-LENWM5WE.js";
+} from "./chunk-O536GEIT.js";
+import {
+  assert,
+  assertArray,
+  assertNotNull,
+  assertNumber,
+  assertObject,
+  assertString,
+  deepFreeze,
+  deepFreezeAllowUndefined,
+  hasOwn,
+  isProd,
+  unreachable
+} from "./chunk-SGW2EIVJ.js";
 import {
   __export
 } from "./chunk-424PT5DM.js";
@@ -316,14 +327,6 @@ function mustGetBrowserGlobal(name) {
   return r;
 }
 
-// ../shared/src/resolved-promises.ts
-var promiseTrue = Promise.resolve(true);
-var promiseFalse = Promise.resolve(false);
-var promiseUndefined = Promise.resolve(void 0);
-var promiseVoid = Promise.resolve();
-var promiseNever = new Promise(() => {
-});
-
 // ../replicache/src/kv/write-impl-base.ts
 var deleteSentinel = Symbol();
 var WriteImplBase = class {
@@ -826,7 +829,7 @@ import { resolver as resolver4 } from "@rocicorp/resolver";
 // ../shared/src/sleep.ts
 import { resolver as resolver3 } from "@rocicorp/resolver";
 var promiseVoid2 = Promise.resolve();
-var promiseNever2 = new Promise(() => void 0);
+var promiseNever = new Promise(() => void 0);
 function sleep(ms, signal) {
   const newAbortError = () => new AbortError("Aborted");
   if (signal?.aborted) {
@@ -852,7 +855,7 @@ function sleep(ms, signal) {
 }
 function sleepWithAbort(ms, signal) {
   if (ms === 0) {
-    return [promiseVoid2, promiseNever2];
+    return [promiseVoid2, promiseNever];
   }
   const { promise: abortedPromise, resolve: abortedResolve } = resolver3();
   const sleepPromise = new Promise((resolve) => {
@@ -5711,23 +5714,6 @@ var ColumnBuilder = class _ColumnBuilder {
   }
 };
 
-// ../shared/src/objects.ts
-function mapEntries(input, mapper) {
-  const output = {};
-  for (const entry of Object.entries(input)) {
-    const mapped = mapper(entry[0], entry[1]);
-    output[mapped[0]] = mapped[1];
-  }
-  return output;
-}
-function mapAllEntries(input, mapper) {
-  const output = {};
-  for (const mapped of mapper(Object.entries(input))) {
-    output[mapped[0]] = mapped[1];
-  }
-  return output;
-}
-
 // ../zero-protocol/src/client-schema.ts
 var valueTypeSchema = literalUnion(
   "string",
@@ -5849,6 +5835,38 @@ var SchemaVersionNotSupported2 = "SchemaVersionNotSupported";
 import "@rocicorp/logger";
 import { resolver as resolver9 } from "@rocicorp/resolver";
 
+// ../shared/src/subscribable.ts
+var Subscribable = class {
+  _listeners = /* @__PURE__ */ new Set();
+  /**
+   * Subscribe to the subscribable.
+   *
+   * @param listener - The listener to subscribe to.
+   * @returns A function to unsubscribe from the subscribable.
+   */
+  subscribe = (listener) => {
+    this._listeners.add(listener);
+    return () => {
+      this._listeners.delete(listener);
+    };
+  };
+  /**
+   * Notify all listeners.
+   *
+   * @param update - The update to notify listeners with.
+   */
+  notify = (update) => {
+    this._listeners.forEach((listener) => listener(update));
+  };
+  hasListeners = () => this._listeners.size > 0;
+  /**
+   * Unsubscribe all listeners.
+   */
+  cleanup = () => {
+    this._listeners.clear();
+  };
+};
+
 // ../zero-protocol/src/delete-clients.ts
 var deleteClientsBodySchema = valita_exports.union(
   readonlyObject({
@@ -6289,7 +6307,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 25;
+var PROTOCOL_VERSION = 27;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -7813,6 +7831,44 @@ function applyDiffs(diffs, branch) {
   }
 }
 
+// ../zero-client/src/client/measure-push-operator.ts
+var MeasurePushOperator = class {
+  #input;
+  #queryID;
+  #metricsDelegate;
+  #output = throwOutput;
+  constructor(input, queryID, metricsDelegate) {
+    this.#input = input;
+    this.#queryID = queryID;
+    this.#metricsDelegate = metricsDelegate;
+    input.setOutput(this);
+  }
+  setOutput(output) {
+    this.#output = output;
+  }
+  fetch(req) {
+    return this.#input.fetch(req);
+  }
+  cleanup(req) {
+    return this.#input.cleanup(req);
+  }
+  getSchema() {
+    return this.#input.getSchema();
+  }
+  destroy() {
+    this.#input.destroy();
+  }
+  push(change) {
+    const startTime = performance.now();
+    this.#output.push(change);
+    this.#metricsDelegate.addMetric(
+      "query-update-client",
+      performance.now() - startTime,
+      this.#queryID
+    );
+  }
+};
+
 // ../zero-client/src/client/context.ts
 var ZeroContext = class {
   // It is a bummer to have to maintain separate MemorySources here and copy the
@@ -7820,14 +7876,13 @@ var ZeroContext = class {
   // pipelines *synchronously* and the core Replicache infra is all async. So
   // that needs to be fixed.
   #mainSources;
-  #addQuery;
-  #addCustomQuery;
-  #updateQuery;
-  #updateCustomQuery;
-  #flushQueryChanges;
+  addServerQuery;
+  addCustomQuery;
+  updateServerQuery;
+  updateCustomQuery;
+  flushQueryChanges;
   #batchViewUpdates;
   #commitListeners = /* @__PURE__ */ new Set();
-  #slowMaterializeThreshold;
   #lc;
   assertValidRunOptions;
   /**
@@ -7835,58 +7890,22 @@ var ZeroContext = class {
    * "complete" once the server has sent back the query result.
    */
   defaultQueryComplete = false;
-  constructor(lc, mainSources, addQuery, addCustomQuery, updateQuery, updateCustomQuery, flushQueryChanges, batchViewUpdates, slowMaterializeThreshold, assertValidRunOptions3) {
+  addMetric;
+  constructor(lc, mainSources, addQuery, addCustomQuery, updateQuery, updateCustomQuery, flushQueryChanges, batchViewUpdates, addMetric, assertValidRunOptions3) {
     this.#mainSources = mainSources;
-    this.#addQuery = addQuery;
-    this.#updateQuery = updateQuery;
-    this.#updateCustomQuery = updateCustomQuery;
+    this.addServerQuery = addQuery;
+    this.updateServerQuery = updateQuery;
+    this.updateCustomQuery = updateCustomQuery;
     this.#batchViewUpdates = batchViewUpdates;
     this.#lc = lc;
-    this.#slowMaterializeThreshold = slowMaterializeThreshold;
     this.assertValidRunOptions = assertValidRunOptions3;
-    this.#addCustomQuery = addCustomQuery;
-    this.#flushQueryChanges = flushQueryChanges;
+    this.addCustomQuery = addCustomQuery;
+    this.flushQueryChanges = flushQueryChanges;
+    this.addMetric = addMetric;
   }
   getSource(name) {
     return this.#mainSources.getSource(name);
   }
-  addCustomQuery(customQueryID, ttl, gotCallback) {
-    return this.#addCustomQuery(
-      customQueryID.name,
-      customQueryID.args,
-      ttl,
-      gotCallback
-    );
-  }
-  addServerQuery(ast, ttl, gotCallback) {
-    return this.#addQuery(ast, ttl, gotCallback);
-  }
-  updateServerQuery(ast, ttl) {
-    this.#updateQuery(ast, ttl);
-  }
-  updateCustomQuery(customQueryID, ttl) {
-    this.#updateCustomQuery(customQueryID.name, customQueryID.args, ttl);
-  }
-  flushQueryChanges() {
-    this.#flushQueryChanges();
-  }
-  onQueryMaterialized(hash, ast, duration) {
-    if (this.#slowMaterializeThreshold !== void 0 && duration > this.#slowMaterializeThreshold) {
-      this.#lc.warn?.(
-        "Slow query materialization (including server/network)",
-        hash,
-        ast,
-        duration
-      );
-    } else {
-      this.#lc.debug?.(
-        "Materialized query (including server/network)",
-        hash,
-        ast,
-        duration
-      );
-    }
-  }
   mapAst(ast) {
     return ast;
   }
@@ -7899,6 +7918,9 @@ var ZeroContext = class {
   decorateFilterInput(input) {
     return input;
   }
+  decorateSourceInput(input, queryID) {
+    return new MeasurePushOperator(input, queryID, this);
+  }
   onTransactionCommit(cb) {
     this.#commitListeners.add(cb);
     return () => {
@@ -8168,7 +8190,7 @@ var emptyObject = Object.freeze({});
 
 // ../zero-client/src/client/custom.ts
 var TransactionImpl = class {
-  constructor(lc, repTx, schema, slowMaterializeThreshold) {
+  constructor(lc, repTx, schema) {
     const castedRepTx = repTx;
     must(repTx.reason === "initial" || repTx.reason === "rebase");
     this.clientID = repTx.clientID;
@@ -8186,8 +8208,7 @@ var TransactionImpl = class {
     this.query = makeSchemaQuery(
       lc,
       schema,
-      txData.ivmSources,
-      slowMaterializeThreshold
+      txData.ivmSources
     );
     this.token = txData.token;
   }
@@ -8199,9 +8220,9 @@ var TransactionImpl = class {
   query;
   token;
 };
-function makeReplicacheMutator(lc, mutator, schema, slowMaterializeThreshold) {
+function makeReplicacheMutator(lc, mutator, schema) {
   return async (repTx, args) => {
-    const tx = new TransactionImpl(lc, repTx, schema, slowMaterializeThreshold);
+    const tx = new TransactionImpl(lc, repTx, schema);
     await mutator(tx, args);
   };
 }
@@ -8225,7 +8246,7 @@ function assertValidRunOptions(options) {
     "Cannot wait for complete results in custom mutations"
   );
 }
-function makeSchemaQuery(lc, schema, ivmBranch, slowMaterializeThreshold) {
+function makeSchemaQuery(lc, schema, ivmBranch) {
   const context = new ZeroContext(
     lc,
     ivmBranch,
@@ -8235,7 +8256,7 @@ function makeSchemaQuery(lc, schema, ivmBranch, slowMaterializeThreshold) {
     emptyFunction,
     emptyFunction,
     (applyViewUpdates) => applyViewUpdates(),
-    slowMaterializeThreshold,
+    emptyFunction,
     assertValidRunOptions
   );
   return new Proxy(
@@ -8581,7 +8602,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.22.2025081301";
+var version2 = "0.23.2025081400";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -9150,7 +9171,10 @@ var QueryManager = class {
   #pendingRemovals = [];
   #batchTimer;
   #lc;
-  constructor(lc, mutationTracker, clientID, tables, send2, experimentalWatch, recentQueriesMaxSize, queryChangeThrottleMs) {
+  #metrics = newMetrics();
+  #queryMetrics = /* @__PURE__ */ new Map();
+  #slowMaterializeThreshold;
+  constructor(lc, mutationTracker, clientID, tables, send2, experimentalWatch, recentQueriesMaxSize, queryChangeThrottleMs, slowMaterializeThreshold) {
     this.#lc = lc.withContext("QueryManager");
     this.#clientID = clientID;
     this.#clientToServer = clientToServer(tables);
@@ -9158,6 +9182,7 @@ var QueryManager = class {
     this.#send = send2;
     this.#mutationTracker = mutationTracker;
     this.#queryChangeThrottleMs = queryChangeThrottleMs;
+    this.#slowMaterializeThreshold = slowMaterializeThreshold;
     this.#mutationTracker.onAllMutationsApplied(() => {
       if (this.#pendingRemovals.length === 0) {
         return;
@@ -9253,7 +9278,7 @@ var QueryManager = class {
     }
     return patch;
   }
-  addCustom(name, args, ttl, gotCallback) {
+  addCustom({ name, args }, ttl, gotCallback) {
     const queryId = hashOfNameAndArgs(name, args);
     return this.#add(
       queryId,
@@ -9333,7 +9358,7 @@ var QueryManager = class {
       this.#remove(entry, queryId, gotCallback);
     };
   }
-  updateCustom(name, args, ttl) {
+  updateCustom({ name, args }, ttl) {
     const hash = hashOfNameAndArgs(name, args);
     const entry = must(this.#queries.get(hash));
     this.#updateEntry(entry, hash, ttl);
@@ -9394,15 +9419,61 @@ var QueryManager = class {
     if (entry.count === 0) {
       this.#recentQueries.add(astHash);
       if (this.#recentQueries.size > this.#recentQueriesMaxSize) {
-        const lruAstHash = this.#recentQueries.values().next().value;
-        assert(lruAstHash);
-        this.#queries.delete(lruAstHash);
-        this.#recentQueries.delete(lruAstHash);
-        this.#queueQueryChange({ op: "del", hash: lruAstHash });
+        const lruQueryID = this.#recentQueries.values().next().value;
+        assert(lruQueryID);
+        this.#queries.delete(lruQueryID);
+        this.#recentQueries.delete(lruQueryID);
+        this.#queryMetrics.delete(lruQueryID);
+        this.#queueQueryChange({ op: "del", hash: lruQueryID });
       }
     }
   }
+  /**
+   * Gets the aggregated metrics for all queries managed by this QueryManager.
+   */
+  get metrics() {
+    return this.#metrics;
+  }
+  addMetric(metric, value, ...args) {
+    metric;
+    this.#metrics[metric].add(value);
+    const queryID = args[0];
+    if (metric === "query-materialization-end-to-end") {
+      const ast = args[1];
+      if (this.#slowMaterializeThreshold !== void 0 && value > this.#slowMaterializeThreshold) {
+        this.#lc.warn?.(
+          "Slow query materialization (including server/network)",
+          queryID,
+          ast,
+          value
+        );
+      } else {
+        this.#lc.debug?.(
+          "Materialized query (including server/network)",
+          queryID,
+          ast,
+          value
+        );
+      }
+    }
+    let existing = this.#queryMetrics.get(queryID);
+    if (!existing) {
+      existing = newMetrics();
+      this.#queryMetrics.set(queryID, existing);
+    }
+    existing[metric].add(value);
+  }
+  getQueryMetrics(queryID) {
+    return this.#queryMetrics.get(queryID);
+  }
 };
+function newMetrics() {
+  return {
+    "query-materialization-client": new TDigest(),
+    "query-materialization-end-to-end": new TDigest(),
+    "query-update-client": new TDigest()
+  };
+}
 
 // ../zero-client/src/client/options.ts
 var updateNeededReasonTypeSchema = literalUnion(
@@ -9966,38 +10037,6 @@ var ZeroRep = class {
   }
 };
 
-// ../shared/src/subscribable.ts
-var Subscribable = class {
-  _listeners = /* @__PURE__ */ new Set();
-  /**
-   * Subscribe to the subscribable.
-   *
-   * @param listener - The listener to subscribe to.
-   * @returns A function to unsubscribe from the subscribable.
-   */
-  subscribe = (listener) => {
-    this._listeners.add(listener);
-    return () => {
-      this._listeners.delete(listener);
-    };
-  };
-  /**
-   * Notify all listeners.
-   *
-   * @param update - The update to notify listeners with.
-   */
-  notify = (update) => {
-    this._listeners.forEach((listener) => listener(update));
-  };
-  hasListeners = () => this._listeners.size > 0;
-  /**
-   * Unsubscribe all listeners.
-   */
-  cleanup = () => {
-    this._listeners.clear();
-  };
-};
-
 // ../zero-client/src/client/zero.ts
 var onSetConnectionStateSymbol = Symbol();
 var exposedToTestingSymbol = Symbol();
@@ -10228,8 +10267,7 @@ var Zero = class _Zero {
           replicacheMutators[key] = makeReplicacheMutator(
             lc,
             mutatorOrMutators,
-            schema,
-            slowMaterializeThreshold
+            schema
             // Replicache expects mutators to only be able to return JSON
             // but Zero wraps the return with: `{server?: Promise<MutationResult>, client?: T}`
           );
@@ -10245,8 +10283,7 @@ var Zero = class _Zero {
             replicacheMutators[key] = makeReplicacheMutator(
               lc,
               mutator,
-              schema,
-              slowMaterializeThreshold
+              schema
             );
           }
           continue;
@@ -10280,12 +10317,12 @@ var Zero = class _Zero {
       lc,
       this.#ivmMain,
       (ast, ttl, gotCallback) => this.#queryManager.addLegacy(ast, ttl, gotCallback),
-      (queryName, queryArgs, ttl, gotCallback) => this.#queryManager.addCustom(queryName, queryArgs, ttl, gotCallback),
+      (customQueryID, ttl, gotCallback) => this.#queryManager.addCustom(customQueryID, ttl, gotCallback),
       (ast, ttl) => this.#queryManager.updateLegacy(ast, ttl),
-      (name, args, ttl) => this.#queryManager.updateCustom(name, args, ttl),
+      (customQueryID, ttl) => this.#queryManager.updateCustom(customQueryID, ttl),
       () => this.#queryManager.flushBatch(),
       batchViewUpdates,
-      slowMaterializeThreshold,
+      this.#addMetric,
       assertValidRunOptions2
     );
     this.queryDelegate = this.#zeroContext;
@@ -10377,7 +10414,8 @@ var Zero = class _Zero {
       (msg) => this.#send(msg),
       rep.experimentalWatch.bind(rep),
       maxRecentQueries,
-      options.queryChangeThrottleMs ?? DEFAULT_QUERY_CHANGE_THROTTLE_MS
+      options.queryChangeThrottleMs ?? DEFAULT_QUERY_CHANGE_THROTTLE_MS,
+      slowMaterializeThreshold
     );
     this.#clientToServer = clientToServer(schema.tables);
     this.#deleteClientsManager = new DeleteClientsManager(
@@ -11316,13 +11354,32 @@ var Zero = class _Zero {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-AF3UI76B.js");
-      return m.newInspector(this.#rep, this.#schema, async () => {
-        await this.#connectResolver.promise;
-        return this.#socket;
-      });
+      const m = await import("./inspector-J5P4DOGH.js");
+      return m.newInspector(
+        this.#rep,
+        this.#queryManager,
+        this.#schema,
+        async () => {
+          await this.#connectResolver.promise;
+          return this.#socket;
+        }
+      );
     }
   }
+  #addMetric = (metric, value, ...args) => {
+    switch (metric) {
+      case "query-materialization-client":
+      case "query-materialization-end-to-end":
+      case "query-update-client":
+        this.#queryManager.addMetric(metric, value, ...args);
+        break;
+      case "query-materialization-server":
+        unreachable();
+      // eslint-disable-next-line no-fallthrough
+      default:
+        unreachable(metric);
+    }
+  };
 };
 var OnlineManager = class extends Subscribable {
   #online = false;
@@ -11457,7 +11514,6 @@ export {
   dropDatabase,
   dropAllDatabases,
   error_kind_enum_exports,
-  mapEntries,
   table,
   string3 as string,
   number2 as number,
@@ -11469,4 +11525,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-N2EOVSVB.js.map
+//# sourceMappingURL=chunk-ZKRMVMWK.js.map