@rocicorp/zero 0.0.2024100502 → 0.0.2024100800

package/out/zero.js

@@ -7712,9 +7712,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 +7736,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;
@@ -8139,7 +8144,8 @@ var ReplicacheImpl = class {
     });
     this.subscriptions = new SubscriptionsManagerImpl(
       this.#queryInternal,
-      this.#lc
+      this.#lc,
+      this.#closeAbortController.signal
     );
     const kvStoreProvider = getKVStoreProvider(this.#lc, options.kvStore);
     this.#kvStoreProvider = kvStoreProvider;
@@ -9211,6 +9217,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 +10893,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,7 +10936,7 @@ 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) {
@@ -11127,6 +11142,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({
@@ -14265,9 +14284,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();
@@ -14288,12 +14335,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",
@@ -14303,6 +14354,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 () => {
@@ -14409,6 +14468,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);
@@ -14789,12 +14851,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
@@ -14811,7 +14873,7 @@ var Zero = class {
     }
     this.#connectionState = state;
     this.#connectionStateChangeResolver.resolve(state);
-    this.#connectionStateChangeResolver = resolver7();
+    this.#connectionStateChangeResolver = resolver8();
     if (false) {
       asTestZero(this)[onSetConnectionStateSymbol]?.(state);
     }
@@ -14844,6 +14906,11 @@ var Zero = class {
       kvStore = "idb",
       schema
     } = options;
+    if (typeof WebSocket === "undefined") {
+      throw new Error(
+        "Cannot find WebSocket global. Are you running in Node? Zero is only currently supported in browsers."
+      );
+    }
     if (!userID) {
       throw new Error("ZeroOptions.userID must not be empty.");
     }
@@ -14922,7 +14989,8 @@ 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,
@@ -15342,9 +15410,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;
@@ -15391,12 +15459,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);
@@ -15525,7 +15593,7 @@ var Zero = class {
               PING_INTERVAL_MS,
               controller.signal
             );
-            this.#rejectMessageError = resolver7();
+            this.#rejectMessageError = resolver8();
             let RaceCases;
             ((RaceCases2) => {
               RaceCases2[RaceCases2["Ping"] = 0] = "Ping";
@@ -15643,7 +15711,7 @@ var Zero = class {
       }
     ];
     send(socket, pullRequestMessage);
-    const pullResponseResolver = resolver7();
+    const pullResponseResolver = resolver8();
     this.#pendingPullsByRequestID.set(requestID, pullResponseResolver);
     try {
       let RaceCases;
@@ -15704,7 +15772,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();