@rocicorp/zero 0.0.202410041744 → 0.2.2024101100

package/out/zero.js

@@ -609,6 +609,20 @@ var WriteImplBase = class {
   }
 };
 
+// ../shared/src/browser-env.ts
+function getBrowserGlobal(name) {
+  return globalThis[name];
+}
+function mustGetBrowserGlobal(name) {
+  const r = getBrowserGlobal(name);
+  if (r === void 0) {
+    throw new Error(
+      `Unsupported JavaScript environment: Could not find ${name}.`
+    );
+  }
+  return r;
+}
+
 // ../replicache/src/kv/idb-store.ts
 var RELAXED = { durability: "relaxed" };
 var OBJECT_STORE = "chunks";
@@ -663,7 +677,7 @@ var IDBStore = class {
           return fn(reopened);
         } else if (e.name === "NotFoundError") {
           this.#idbDeleted = true;
-          indexedDB.deleteDatabase(db.name);
+          mustGetBrowserGlobal("indexedDB").deleteDatabase(db.name);
           throw new IDBNotFoundError(
             `Replicache IndexedDB ${db.name} missing object store. Deleting db.`
           );
@@ -744,8 +758,9 @@ function objectStore(tx) {
   return tx.objectStore(OBJECT_STORE);
 }
 function openDatabase(name) {
+  const idb = mustGetBrowserGlobal("indexedDB");
   return new Promise((resolve, reject) => {
-    const req = indexedDB.open(name);
+    const req = idb.open(name);
     req.onupgradeneeded = () => {
       req.result.createObjectStore(OBJECT_STORE);
     };
@@ -1571,14 +1586,6 @@ function dropIDBStore(name) {
 import { consoleLogSink as consoleLogSink2 } from "@rocicorp/logger";
 import { resolver as resolver6 } from "@rocicorp/resolver";
 
-// ../shared/src/browser-env.ts
-function getDocument() {
-  return typeof document !== "undefined" ? document : void 0;
-}
-function getLocation() {
-  return typeof location !== "undefined" ? location : void 0;
-}
-
 // ../shared/src/document-visible.ts
 import { resolver as resolver3 } from "@rocicorp/resolver";
 function getDocumentVisibilityWatcher(doc, hiddenIntervalMS, signal) {
@@ -7712,9 +7719,11 @@ var SubscriptionsManagerImpl = class {
   #queryInternal;
   #lc;
   hasPendingSubscriptionRuns = false;
-  constructor(queryInternal, lc) {
+  #signal;
+  constructor(queryInternal, lc, signal) {
     this.#queryInternal = queryInternal;
     this.#lc = lc;
+    this.#signal = signal;
   }
   add(subscription) {
     this.#subscriptions.add(subscription);
@@ -7734,6 +7743,9 @@ var SubscriptionsManagerImpl = class {
     await this.#fireSubscriptions(subscriptions, Regular, diffs);
   }
   async #fireSubscriptions(subscriptions, kind, diffs) {
+    if (this.#signal.aborted) {
+      return;
+    }
     const subs = [...subscriptions];
     if (subs.length === 0) {
       return;
@@ -7947,7 +7959,7 @@ var ReplicacheImpl = class {
   auth;
   /** The name of the Replicache database. Populated by {@link ReplicacheOptions#name}. */
   name;
-  subscriptions;
+  #subscriptions;
   #mutationRecovery;
   /**
    * Client groups gets disabled when the server does not know about it.
@@ -8137,9 +8149,10 @@ var ReplicacheImpl = class {
       name,
       "replicache version": version
     });
-    this.subscriptions = new SubscriptionsManagerImpl(
+    this.#subscriptions = new SubscriptionsManagerImpl(
       this.#queryInternal,
-      this.#lc
+      this.#lc,
+      this.#closeAbortController.signal
     );
     const kvStoreProvider = getKVStoreProvider(this.#lc, options.kvStore);
     this.#kvStoreProvider = kvStoreProvider;
@@ -8157,7 +8170,7 @@ var ReplicacheImpl = class {
     const { minDelayMs = MIN_DELAY_MS, maxDelayMs = MAX_DELAY_MS } = requestOptions;
     this.#requestOptions = { maxDelayMs, minDelayMs };
     const visibilityWatcher = getDocumentVisibilityWatcher(
-      getDocument(),
+      getBrowserGlobal("document"),
       0,
       this.#closeAbortController.signal
     );
@@ -8272,7 +8285,7 @@ var ReplicacheImpl = class {
       signal
     );
     void this.recoverMutations(clients);
-    getDocument()?.addEventListener(
+    getBrowserGlobal("document")?.addEventListener(
       "visibilitychange",
       this.#onVisibilityChange
     );
@@ -8281,7 +8294,7 @@ var ReplicacheImpl = class {
     if (this.#closed) {
       return;
     }
-    if (getDocument()?.visibilityState !== "visible") {
+    if (getBrowserGlobal("document")?.visibilityState !== "visible") {
       return;
     }
     await this.#checkForClientStateNotFoundAndCallHandler();
@@ -8353,7 +8366,7 @@ var ReplicacheImpl = class {
     const { promise, resolve } = resolver6();
     closingInstances.set(this.name, promise);
     this.#closeAbortController.abort();
-    getDocument()?.removeEventListener(
+    getBrowserGlobal("document")?.removeEventListener(
       "visibilitychange",
       this.#onVisibilityChange
     );
@@ -8365,7 +8378,7 @@ var ReplicacheImpl = class {
     ];
     this.#pullConnectionLoop.close();
     this.#pushConnectionLoop.close();
-    this.subscriptions.clear();
+    this.#subscriptions.clear();
     await Promise.all(closingPromises);
     closingInstances.delete(this.name);
     resolve();
@@ -8383,16 +8396,16 @@ var ReplicacheImpl = class {
         lc,
         syncHead,
         clientID,
-        this.subscriptions,
+        this.#subscriptions,
         Latest
       );
       if (!replayMutations || replayMutations.length === 0) {
-        await this.subscriptions.fire(diffs);
+        await this.#subscriptions.fire(diffs);
         void this.#schedulePersist();
         return;
       }
       for (const mutation of replayMutations) {
-        if (this.subscriptions.hasPendingSubscriptionRuns) {
+        if (this.#subscriptions.hasPendingSubscriptionRuns) {
           await Promise.resolve();
         }
         const { meta } = mutation;
@@ -8753,7 +8766,7 @@ var ReplicacheImpl = class {
         this.perdag,
         clientID,
         this.#mutatorRegistry,
-        this.subscriptions,
+        this.#subscriptions,
         () => this.closed,
         Latest
       );
@@ -8767,7 +8780,7 @@ var ReplicacheImpl = class {
       }
     }
     if (diffs !== void 0) {
-      await this.subscriptions.fire(diffs);
+      await this.#subscriptions.fire(diffs);
     }
   }
   #fireOnClientStateNotFound() {
@@ -8877,12 +8890,12 @@ var ReplicacheImpl = class {
       options = { onData: options };
     }
     const { onData, onError, onDone, isEqual } = options;
-    return this.subscriptions.add(
+    return this.#subscriptions.add(
       new SubscriptionImpl(body, onData, onError, onDone, isEqual)
     );
   }
   experimentalWatch(callback, options) {
-    return this.subscriptions.add(
+    return this.#subscriptions.add(
       new WatchSubscription(callback, options)
     );
   }
@@ -8935,7 +8948,7 @@ var ReplicacheImpl = class {
   }
   async #mutate(name, mutatorImpl, args, timestamp) {
     const frozenArgs = deepFreeze(args ?? null);
-    if (this.subscriptions.hasPendingSubscriptionRuns) {
+    if (this.#subscriptions.hasPendingSubscriptionRuns) {
       await Promise.resolve();
     }
     await this.#ready;
@@ -8966,11 +8979,11 @@ var ReplicacheImpl = class {
         const lastMutationID = await dbWrite.getMutationID();
         const diffs = await dbWrite.commitWithDiffs(
           DEFAULT_HEAD_NAME,
-          this.subscriptions
+          this.#subscriptions
         );
         this.lastMutationID = lastMutationID;
         this.#pushConnectionLoop.send(false).catch(() => void 0);
-        await this.subscriptions.fire(diffs);
+        await this.#subscriptions.fire(diffs);
         void this.#schedulePersist();
         return result;
       } catch (ex) {
@@ -9211,6 +9224,9 @@ async function anyPendingMutationsInClientGroups(perdag) {
   return false;
 }
 
+// ../zql/src/zql/query/query-impl.ts
+import { resolver as resolver7 } from "@rocicorp/resolver";
+
 // ../shared/src/must.ts
 function must(v2, msg) {
   if (v2 == null) {
@@ -10884,10 +10900,16 @@ var QueryImpl = class extends AbstractQuery {
     return view;
   }
   preload() {
+    const { resolve, promise: complete } = resolver7();
     const ast = this._completeAst();
-    const unsub = this.#delegate.addServerQuery(ast);
+    const unsub = this.#delegate.addServerQuery(ast, (got) => {
+      if (got) {
+        resolve();
+      }
+    });
     return {
-      cleanup: unsub
+      cleanup: unsub,
+      complete
     };
   }
 };
@@ -10921,17 +10943,14 @@ function addPrimaryKeysToAst(schema, ast) {
 
 // ../zero-client/src/client/zero.ts
 import { LogContext as LogContext3 } from "@rocicorp/logger";
-import { resolver as resolver7 } from "@rocicorp/resolver";
+import { resolver as resolver8 } from "@rocicorp/resolver";
 
 // ../zero-protocol/src/ast.ts
-function readonly2(t2) {
-  return t2;
-}
 var selectorSchema = valita_exports.string();
-var orderingElementSchema = readonly2(
+var orderingElementSchema = readonly(
   valita_exports.tuple([selectorSchema, valita_exports.union(valita_exports.literal("asc"), valita_exports.literal("desc"))])
 );
-var orderingSchema = readonly2(valita_exports.array(orderingElementSchema));
+var orderingSchema = readonlyArray(orderingElementSchema);
 var primitiveSchema = valita_exports.union(
   valita_exports.string(),
   valita_exports.number(),
@@ -10966,7 +10985,7 @@ var simpleConditionSchema = valita_exports.object({
     valita_exports.string(),
     valita_exports.number(),
     valita_exports.boolean(),
-    readonly2(valita_exports.array(valita_exports.union(valita_exports.string(), valita_exports.number(), valita_exports.boolean()))),
+    readonlyArray(valita_exports.union(valita_exports.string(), valita_exports.number(), valita_exports.boolean())),
     valita_exports.object({
       type: valita_exports.literal("static"),
       anchor: valita_exports.union(valita_exports.literal("authData"), valita_exports.literal("preMutationRow")),
@@ -10990,8 +11009,8 @@ var astSchema = valita_exports.object({
   schema: valita_exports.string().optional(),
   table: valita_exports.string(),
   alias: valita_exports.string().optional(),
-  where: readonly2(valita_exports.array(conditionSchema)).optional(),
-  related: readonly2(valita_exports.array(correlatedSubquerySchema)).optional(),
+  where: readonlyArray(conditionSchema).optional(),
+  related: readonlyArray(correlatedSubquerySchema).optional(),
   limit: valita_exports.number().optional(),
   orderBy: orderingSchema.optional(),
   start: valita_exports.object({
@@ -11069,6 +11088,7 @@ var errorKindSchema = valita_exports.union(
   valita_exports.literal("InvalidConnectionRequestClientDeleted" /* InvalidConnectionRequestClientDeleted */),
   valita_exports.literal("InvalidMessage" /* InvalidMessage */),
   valita_exports.literal("InvalidPush" /* InvalidPush */),
+  valita_exports.literal("MutationRateLimited" /* MutationRateLimited */),
   valita_exports.literal("MutationFailed" /* MutationFailed */),
   valita_exports.literal("Unauthorized" /* Unauthorized */),
   valita_exports.literal("VersionNotSupported" /* VersionNotSupported */),
@@ -11085,27 +11105,35 @@ var errorMessageSchema = valita_exports.tuple([
 var versionSchema = valita_exports.string();
 var nullableVersionSchema = valita_exports.union(versionSchema, valita_exports.null());
 
-// ../zero-protocol/src/entity.ts
-var entityIDSchema = valita_exports.record(valita_exports.string());
+// ../zero-protocol/src/primary-key.ts
+var primaryKeySchema = valita_exports.array(valita_exports.string()).assert((arr) => arr.length > 0);
+var primaryKeyValueSchema = valita_exports.union(
+  valita_exports.string(),
+  valita_exports.number(),
+  valita_exports.boolean()
+);
+var primaryKeyValueRecordSchema = readonlyRecord(
+  primaryKeyValueSchema
+);
 
 // ../zero-protocol/src/entities-patch.ts
 var putOpSchema3 = valita_exports.object({
   op: valita_exports.literal("put"),
   entityType: valita_exports.string(),
-  entityID: entityIDSchema,
+  entityID: primaryKeyValueRecordSchema,
   value: jsonObjectSchema
 });
 var updateOpSchema = valita_exports.object({
   op: valita_exports.literal("update"),
   entityType: valita_exports.string(),
-  entityID: entityIDSchema,
+  entityID: primaryKeyValueRecordSchema,
   merge: jsonObjectSchema.optional(),
   constrain: valita_exports.array(valita_exports.string()).optional()
 });
 var delOpSchema3 = valita_exports.object({
   op: valita_exports.literal("del"),
   entityType: valita_exports.string(),
-  entityID: entityIDSchema
+  entityID: primaryKeyValueRecordSchema
 });
 var clearOpSchema3 = valita_exports.object({
   op: valita_exports.literal("clear")
@@ -11126,6 +11154,10 @@ var pokeStartBodySchema = valita_exports.object({
   // able to send a base cookie with value `null` to match that state.
   baseCookie: nullableVersionSchema,
   cookie: versionSchema,
+  schemaVersions: valita_exports.object({
+    minSupportedVersion: valita_exports.number(),
+    maxSupportedVersion: valita_exports.number()
+  }),
   timestamp: valita_exports.number().optional()
 });
 var pokePartBodySchema = valita_exports.object({
@@ -11206,25 +11238,25 @@ var CRUD_MUTATION_NAME = "_zero_crud";
 var createOpSchema = valita_exports.object({
   op: valita_exports.literal("create"),
   entityType: valita_exports.string(),
-  id: entityIDSchema,
+  id: primaryKeyValueRecordSchema,
   value: jsonObjectSchema
 });
 var setOpSchema = valita_exports.object({
   op: valita_exports.literal("set"),
   entityType: valita_exports.string(),
-  id: entityIDSchema,
+  id: primaryKeyValueRecordSchema,
   value: jsonObjectSchema
 });
 var updateOpSchema2 = valita_exports.object({
   op: valita_exports.literal("update"),
   entityType: valita_exports.string(),
-  id: entityIDSchema,
+  id: primaryKeyValueRecordSchema,
   partialValue: jsonObjectSchema
 });
 var deleteOpSchema = valita_exports.object({
   op: valita_exports.literal("delete"),
   entityType: valita_exports.string(),
-  id: entityIDSchema
+  id: primaryKeyValueRecordSchema
 });
 var crudOpSchema = valita_exports.union(
   createOpSchema,
@@ -13408,6 +13440,27 @@ var MemoryStorage = class {
   }
 };
 
+// ../shared/src/reverse-string.ts
+function reverseString(str) {
+  let reversed = "";
+  for (let i = str.length - 1; i >= 0; i--) {
+    reversed += str[i];
+  }
+  return reversed;
+}
+
+// ../shared/src/xxhash.ts
+import xxhash from "xxhash-wasm";
+var { create64, h32, h64 } = await xxhash();
+
+// ../shared/src/h64-with-reverse.ts
+function h64WithReverse(str) {
+  const forward = h64(str);
+  const backward = h64(reverseString(str));
+  const full = (forward << 64n) + backward;
+  return full.toString(36);
+}
+
 // ../zero-client/src/client/keys.ts
 var CLIENTS_KEY_PREFIX = "c/";
 var DESIRED_QUERIES_KEY_PREFIX = "d/";
@@ -13425,11 +13478,23 @@ function desiredQueriesPrefixForClient(clientID) {
 function toGotQueriesKey(hash2) {
   return GOT_QUERIES_KEY_PREFIX + hash2;
 }
-function toEntitiesKey(entityType, entityID) {
-  const idKeys = Object.keys(entityID);
-  assert(idKeys.length > 0);
-  const idSegment = idKeys.length === 1 ? entityID[idKeys[0]] : JSON.stringify(entityID, idKeys.sort());
-  return ENTITIES_KEY_PREFIX + entityType + "/" + idSegment;
+function maybeSort(arr) {
+  for (let i = 1; i < arr.length; i++) {
+    if (arr[i] < arr[i - 1]) {
+      return [...arr].sort();
+    }
+  }
+  return arr;
+}
+function toPrimaryKeyString(tableName, primaryKey, id) {
+  if (primaryKey.length === 1) {
+    return ENTITIES_KEY_PREFIX + tableName + "/" + id[primaryKey[0]];
+  }
+  const sorted = maybeSort(primaryKey);
+  const arr = sorted.map((k) => id[k]);
+  const str = JSON.stringify(arr);
+  const idSegment = h64WithReverse(str);
+  return ENTITIES_KEY_PREFIX + tableName + "/" + idSegment;
 }
 
 // ../zero-client/src/client/context.ts
@@ -13456,8 +13521,8 @@ var ZeroContext = class {
     this.#sources.set(name, source);
     return source;
   }
-  addServerQuery(ast) {
-    return this.#addQuery(ast);
+  addServerQuery(ast, gotCallback) {
+    return this.#addQuery(ast, gotCallback);
   }
   createStorage() {
     return new MemoryStorage();
@@ -13518,6 +13583,15 @@ var ZeroContext = class {
   }
 };
 
+// ../zero-client/src/client/make-id-from-primary-key.ts
+function makeIDFromPrimaryKey(primaryKey, value) {
+  const id = {};
+  for (const key of primaryKey) {
+    id[key] = parse(value[key], primaryKeyValueSchema);
+  }
+  return id;
+}
+
 // ../zero-client/src/client/crud.ts
 function makeCRUDMutate(schema, repMutate) {
   const { [CRUD_MUTATION_NAME]: zeroCRUD } = repMutate;
@@ -13531,7 +13605,7 @@ function makeCRUDMutate(schema, repMutate) {
       const ops = [];
       const m = {};
       for (const name of Object.keys(schema.tables)) {
-        m[name] = makeBatchCRUDMutate(name, ops);
+        m[name] = makeBatchCRUDMutate(name, schema, ops);
       }
       const rv = await body(m);
       await zeroCRUD({ ops });
@@ -13545,118 +13619,147 @@ function makeCRUDMutate(schema, repMutate) {
       throw new Error(`Cannot call mutate.${entityType}.${op} inside a batch`);
     }
   };
-  for (const name of Object.keys(schema.tables)) {
-    mutate[name] = makeEntityCRUDMutate(name, zeroCRUD, assertNotInBatch);
+  for (const [name, tableSchema] of Object.entries(schema.tables)) {
+    mutate[name] = makeEntityCRUDMutate(
+      name,
+      tableSchema.primaryKey,
+      zeroCRUD,
+      assertNotInBatch
+    );
   }
   return mutate;
 }
-function makeEntityCRUDMutate(entityType, zeroCRUD, assertNotInBatch) {
+function makeEntityCRUDMutate(entityType, primaryKey, zeroCRUD, assertNotInBatch) {
   return {
     create: (value) => {
       assertNotInBatch(entityType, "create");
-      const { id } = value;
       const op = {
         op: "create",
         entityType,
-        // TODO: Current crud mutators expect id to always exist
-        id: { id },
+        id: makeIDFromPrimaryKey(primaryKey, value),
         value
       };
       return zeroCRUD({ ops: [op] });
     },
     set: (value) => {
       assertNotInBatch(entityType, "set");
-      const { id } = value;
-      const op = { op: "set", entityType, id: { id }, value };
+      const op = {
+        op: "set",
+        entityType,
+        id: makeIDFromPrimaryKey(primaryKey, value),
+        value
+      };
       return zeroCRUD({ ops: [op] });
     },
     update: (value) => {
       assertNotInBatch(entityType, "update");
-      const { id } = value;
       const op = {
         op: "update",
         entityType,
-        id: { id },
+        id: makeIDFromPrimaryKey(primaryKey, value),
         partialValue: value
       };
       return zeroCRUD({ ops: [op] });
     },
     delete: (id) => {
       assertNotInBatch(entityType, "delete");
-      const op = { op: "delete", entityType, id };
+      const op = {
+        op: "delete",
+        entityType,
+        id: makeIDFromPrimaryKey(primaryKey, id)
+      };
       return zeroCRUD({ ops: [op] });
     }
   };
 }
-function makeBatchCRUDMutate(entityType, ops) {
+function makeBatchCRUDMutate(tableName, schema, ops) {
+  const { primaryKey } = schema.tables[tableName];
   return {
     create: (value) => {
-      const { id } = value;
       const op = {
         op: "create",
-        entityType,
-        id: { id },
+        entityType: tableName,
+        id: makeIDFromPrimaryKey(primaryKey, value),
         value
       };
       ops.push(op);
       return promiseVoid;
     },
     set: (value) => {
-      const { id } = value;
-      const op = { op: "set", entityType, id: { id }, value };
+      const op = {
+        op: "set",
+        entityType: tableName,
+        id: makeIDFromPrimaryKey(primaryKey, value),
+        value
+      };
       ops.push(op);
       return promiseVoid;
     },
     update: (value) => {
-      const { id } = value;
       const op = {
         op: "update",
-        entityType,
-        id: { id },
+        entityType: tableName,
+        id: makeIDFromPrimaryKey(primaryKey, value),
         partialValue: value
       };
       ops.push(op);
       return promiseVoid;
     },
     delete: (id) => {
-      const op = { op: "delete", entityType, id };
+      const op = {
+        op: "delete",
+        entityType: tableName,
+        id: makeIDFromPrimaryKey(primaryKey, id)
+      };
       ops.push(op);
       return promiseVoid;
     }
   };
 }
-function makeCRUDMutator(_schemas) {
+function makeCRUDMutator(schema) {
   return async function zeroCRUDMutator(tx, crudArg) {
     for (const op of crudArg.ops) {
       switch (op.op) {
         case "create":
-          await createImpl(tx, op);
+          await createImpl(tx, op, schema);
           break;
         case "set":
-          await setImpl(tx, op);
+          await setImpl(tx, op, schema);
           break;
         case "update":
-          await updateImpl(tx, op);
+          await updateImpl(tx, op, schema);
           break;
         case "delete":
-          await deleteImpl(tx, op);
+          await deleteImpl(tx, op, schema);
           break;
       }
     }
   };
 }
-async function createImpl(tx, arg) {
-  const key = toEntitiesKey(arg.entityType, arg.id);
+async function createImpl(tx, arg, schema) {
+  const key = toPrimaryKeyString(
+    arg.entityType,
+    schema.tables[arg.entityType].primaryKey,
+    arg.id
+  );
   if (!await tx.has(key)) {
     await tx.set(key, arg.value);
   }
 }
-async function setImpl(tx, arg) {
-  const key = toEntitiesKey(arg.entityType, arg.id);
+async function setImpl(tx, arg, schema) {
+  const key = toPrimaryKeyString(
+    arg.entityType,
+    schema.tables[arg.entityType].primaryKey,
+    arg.id
+  );
   await tx.set(key, arg.value);
 }
-async function updateImpl(tx, arg) {
-  const key = toEntitiesKey(arg.entityType, arg.id);
+async function updateImpl(tx, arg, schema) {
+  const key = toPrimaryKeyString(
+    arg.entityType,
+    schema.tables[arg.entityType].primaryKey,
+    arg.id
+  );
   const prev = await tx.get(key);
   if (prev === void 0) {
     return;
@@ -13665,8 +13768,12 @@ async function updateImpl(tx, arg) {
   const next = { ...prev, ...update };
   await tx.set(key, next);
 }
-async function deleteImpl(tx, arg) {
-  const key = toEntitiesKey(arg.entityType, arg.id);
+async function deleteImpl(tx, arg, schema) {
+  const key = toPrimaryKeyString(
+    arg.entityType,
+    schema.tables[arg.entityType].primaryKey,
+    arg.id
+  );
   await tx.del(key);
 }
 
@@ -14201,10 +14308,6 @@ var State = class {
   }
 };
 
-// ../shared/src/xxhash.ts
-import xxhash from "xxhash-wasm";
-var { create64, h32, h64 } = await xxhash();
-
 // ../zql/src/zql/ast/ast.ts
 import { compareUTF8 as compareUTF84 } from "compare-utf8";
 function normalizeAST(ast) {
@@ -14264,9 +14367,37 @@ var QueryManager = class {
   #clientID;
   #send;
   #queries = /* @__PURE__ */ new Map();
-  constructor(clientID, send2) {
+  #gotQueries = /* @__PURE__ */ new Set();
+  constructor(clientID, send2, experimentalWatch) {
     this.#clientID = clientID;
     this.#send = send2;
+    experimentalWatch(
+      (diff2) => {
+        for (const diffOp of diff2) {
+          const queryHash = diffOp.key.substring(GOT_QUERIES_KEY_PREFIX.length);
+          switch (diffOp.op) {
+            case "add":
+              this.#gotQueries.add(queryHash);
+              this.#fireGotCallbacks(queryHash, true);
+              break;
+            case "del":
+              this.#gotQueries.delete(queryHash);
+              this.#fireGotCallbacks(queryHash, false);
+              break;
+          }
+        }
+      },
+      {
+        prefix: GOT_QUERIES_KEY_PREFIX,
+        initialValuesInFirstDiff: true
+      }
+    );
+  }
+  #fireGotCallbacks(queryHash, got) {
+    const gotCallbacks = this.#queries.get(queryHash)?.gotCallbacks ?? [];
+    for (const gotCallback of gotCallbacks) {
+      gotCallback(got);
+    }
   }
   async getQueriesPatch(tx) {
     const existingQueryHashes = /* @__PURE__ */ new Set();
@@ -14287,12 +14418,16 @@ var QueryManager = class {
     }
     return patch;
   }
-  add(ast) {
+  add(ast, gotCallback) {
     const normalized = normalizeAST(ast);
     const astHash = hash(normalized);
     let entry = this.#queries.get(astHash);
     if (!entry) {
-      entry = { normalized, count: 1 };
+      entry = {
+        normalized,
+        count: 1,
+        gotCallbacks: gotCallback === void 0 ? [] : [gotCallback]
+      };
       this.#queries.set(astHash, entry);
       this.#send([
         "changeDesiredQueries",
@@ -14302,6 +14437,14 @@ var QueryManager = class {
       ]);
     } else {
       ++entry.count;
+      if (gotCallback) {
+        entry.gotCallbacks.push(gotCallback);
+      }
+    }
+    if (gotCallback) {
+      queueMicrotask(() => {
+        gotCallback(this.#gotQueries.has(astHash));
+      });
     }
     let removed = false;
     return () => {
@@ -14408,6 +14551,9 @@ function validateServerParam(paramName, server) {
 }
 function getServer(server) {
   if (server === void 0 || server === null) {
+    console.warn(
+      "Zero starting up with no server URL. This is supported for unit testing and prototyping, but no data will be synced."
+    );
     return null;
   }
   return validateServerParam("server", server);
@@ -14427,10 +14573,12 @@ var PokeHandler = class {
   // Serializes calls to this.#replicachePoke otherwise we can cause out of
   // order poke errors.
   #pokeLock = new Lock3();
-  constructor(replicachePoke, onPokeError, clientID, lc) {
+  #schema;
+  constructor(replicachePoke, onPokeError, clientID, schema, lc) {
     this.#replicachePoke = replicachePoke;
     this.#onPokeError = onPokeError;
     this.#clientID = clientID;
+    this.#schema = schema;
     this.#lc = lc.withContext("PokeHandler");
   }
   handlePokeStart(pokeStart) {
@@ -14504,7 +14652,7 @@ var PokeHandler = class {
       lc.debug?.("got poke lock at", now);
       lc.debug?.("merging", this.#pokeBuffer.length);
       try {
-        const merged = mergePokes(this.#pokeBuffer);
+        const merged = mergePokes(this.#pokeBuffer, this.#schema);
         this.#pokeBuffer.length = 0;
         if (merged === void 0) {
           lc.debug?.("frame is empty");
@@ -14533,7 +14681,7 @@ var PokeHandler = class {
     this.#pokeBuffer.length = 0;
   }
 };
-function mergePokes(pokeBuffer) {
+function mergePokes(pokeBuffer, schema) {
   if (pokeBuffer.length === 0) {
     return void 0;
   }
@@ -14587,7 +14735,9 @@ function mergePokes(pokeBuffer) {
       }
       if (pokePart.entitiesPatch) {
         mergedPatch.push(
-          ...pokePart.entitiesPatch.map(entitiesPatchOpToReplicachePatchOp)
+          ...pokePart.entitiesPatch.map(
+            (p) => entitiesPatchOpToReplicachePatchOp(p, schema)
+          )
         );
       }
     }
@@ -14637,25 +14787,37 @@ function queryPatchOpToReplicachePatchOp(op, toKey) {
       };
   }
 }
-function entitiesPatchOpToReplicachePatchOp(op) {
+function entitiesPatchOpToReplicachePatchOp(op, schema) {
   switch (op.op) {
     case "clear":
       return op;
     case "del":
       return {
         op: "del",
-        key: toEntitiesKey(op.entityType, op.entityID)
+        key: toPrimaryKeyString(
+          op.entityType,
+          schema.tables[op.entityType].primaryKey,
+          op.entityID
+        )
       };
     case "put":
       return {
         op: "put",
-        key: toEntitiesKey(op.entityType, op.entityID),
+        key: toPrimaryKeyString(
+          op.entityType,
+          schema.tables[op.entityType].primaryKey,
+          op.entityID
+        ),
         value: op.value
       };
     case "update":
       return {
         op: "update",
-        key: toEntitiesKey(op.entityType, op.entityID),
+        key: toPrimaryKeyString(
+          op.entityType,
+          schema.tables[op.entityType].primaryKey,
+          op.entityID
+        ),
         merge: op.merge,
         constrain: op.constrain
       };
@@ -14788,12 +14950,12 @@ var Zero = class {
     this.#onClientStateNotFound = value;
     this.#rep.onClientStateNotFound = value;
   }
-  #connectResolver = resolver7();
+  #connectResolver = resolver8();
   #pendingPullsByRequestID = /* @__PURE__ */ new Map();
   #lastMutationIDReceived = 0;
   #socket = void 0;
-  #socketResolver = resolver7();
-  #connectionStateChangeResolver = resolver7();
+  #socketResolver = resolver8();
+  #connectionStateChangeResolver = resolver8();
   /**
    * This resolver is only used for rejections. It is awaited in the connected
    * state (including when waiting for a pong). It is rejected when we get an
@@ -14810,7 +14972,7 @@ var Zero = class {
     }
     this.#connectionState = state;
     this.#connectionStateChangeResolver.resolve(state);
-    this.#connectionStateChangeResolver = resolver7();
+    this.#connectionStateChangeResolver = resolver8();
     if (false) {
       asTestZero(this)[onSetConnectionStateSymbol]?.(state);
     }
@@ -14830,7 +14992,7 @@ var Zero = class {
   #metrics;
   // Store as field to allow test subclass to override. Web API doesn't allow
   // overwriting location fields for security reasons.
-  #reload = () => getLocation()?.reload();
+  #reload = () => getBrowserGlobal("location")?.reload();
   /**
    * Constructs a new Zero client.
    */
@@ -14921,11 +15083,12 @@ var Zero = class {
     this.mutate = makeCRUDMutate(schema, rep.mutate);
     this.#queryManager = new QueryManager(
       rep.clientID,
-      (msg) => this.#sendChangeDesiredQueries(msg)
+      (msg) => this.#sendChangeDesiredQueries(msg),
+      rep.experimentalWatch.bind(rep)
     );
     this.#zeroContext = new ZeroContext(
       schema.tables,
-      (ast) => this.#queryManager.add(ast)
+      (ast, gotCallback) => this.#queryManager.add(ast, gotCallback)
     );
     rep.experimentalWatch(
       (diff2) => this.#zeroContext.processChanges(diff2),
@@ -14938,7 +15101,7 @@ var Zero = class {
     reportReloadReason(this.#lc);
     this.#metrics = new MetricManager({
       reportIntervalMs: REPORT_INTERVAL_MS,
-      host: getLocation()?.host ?? "",
+      host: getBrowserGlobal("location")?.host ?? "",
       source: "client",
       reporter: this.#enableAnalytics ? (allSeries) => this.#reportMetrics(allSeries) : () => Promise.resolve(),
       lc: this.#lc
@@ -14948,10 +15111,11 @@ var Zero = class {
       (poke) => this.#rep.poke(poke),
       () => this.#onPokeError(),
       rep.clientID,
+      schema,
       this.#lc
     );
     this.#visibilityWatcher = getDocumentVisibilityWatcher(
-      getDocument(),
+      getBrowserGlobal("document"),
       hiddenTabDisconnectDelay,
       this.#closeAbortController.signal
     );
@@ -15131,6 +15295,11 @@ var Zero = class {
   // An error on the connection is fatal for the connection.
   async #handleErrorMessage(lc, downMessage) {
     const [, kind, message] = downMessage;
+    if (kind === "MutationRateLimited" /* MutationRateLimited */) {
+      this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
+      lc.error?.("Mutation rate limited", { message });
+      return;
+    }
     lc.info?.(`${kind}: ${message}}`);
     const error = new ServerError(kind, message);
     this.#rejectMessageError?.reject(error);
@@ -15336,9 +15505,9 @@ var Zero = class {
         l.error?.("disconnect() called while disconnected");
         break;
     }
-    this.#socketResolver = resolver7();
+    this.#socketResolver = resolver8();
     l.debug?.("Creating new connect resolver");
-    this.#connectResolver = resolver7();
+    this.#connectResolver = resolver8();
     this.#setConnectionState(0 /* Disconnected */);
     this.#messageCount = 0;
     this.#connectStart = void 0;
@@ -15385,12 +15554,12 @@ var Zero = class {
     const body = pullResponseMessage[1];
     lc = lc.withContext("requestID", body.requestID);
     lc.debug?.("Handling pull response", body);
-    const resolver8 = this.#pendingPullsByRequestID.get(body.requestID);
-    if (!resolver8) {
+    const resolver9 = this.#pendingPullsByRequestID.get(body.requestID);
+    if (!resolver9) {
       lc.debug?.("No resolver found");
       return;
     }
-    resolver8.resolve(pullResponseMessage[1]);
+    resolver9.resolve(pullResponseMessage[1]);
   }
   async #pusher(req, requestID) {
     assert(req.pushVersion === 1);
@@ -15519,7 +15688,7 @@ var Zero = class {
               PING_INTERVAL_MS,
               controller.signal
             );
-            this.#rejectMessageError = resolver7();
+            this.#rejectMessageError = resolver8();
             let RaceCases;
             ((RaceCases2) => {
               RaceCases2[RaceCases2["Ping"] = 0] = "Ping";
@@ -15637,7 +15806,7 @@ var Zero = class {
       }
     ];
     send(socket, pullRequestMessage);
-    const pullResponseResolver = resolver7();
+    const pullResponseResolver = resolver8();
     this.#pendingPullsByRequestID.set(requestID, pullResponseResolver);
     try {
       let RaceCases;
@@ -15698,7 +15867,7 @@ var Zero = class {
    */
   async #ping(l, messageErrorRejectionPromise) {
     l.debug?.("pinging");
-    const { promise, resolve } = resolver7();
+    const { promise, resolve } = resolver8();
     this.#onPong = resolve;
     const pingMessage = ["ping", {}];
     const t0 = performance.now();
@@ -15758,7 +15927,8 @@ function createSocket(socketOrigin, baseCookie, clientID, clientGroupID, schemaV
     searchParams.set("debugPerf", true.toString());
   }
   lc.info?.("Connecting to", url.toString());
-  return new WebSocket(
+  const WS = mustGetBrowserGlobal("WebSocket");
+  return new WS(
     // toString() required for RN URL polyfill.
     url.toString(),
     auth === "" || auth === void 0 ? void 0 : encodeURIComponent(auth)