@rocicorp/zero 1.5.0-canary.3 → 1.6.0-canary.0

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -136,6 +136,7 @@ var ViewSyncerService = class {
 			}
 			if (await this.#checkForShutdownConditionsInLock()) {
 				this.#lc.info?.(`closing clientGroupID=${this.id}`);
+				this.#initialized.reject("shut down before initialization completed");
 				this.#stateChanges.cancel();
 				return;
 			}
@@ -621,6 +622,7 @@ var ViewSyncerService = class {
 			this.#hydrations.add(1);
 			this.#hydrationTime.recordMs(elapsed);
 			this.#addQueryMaterializationServerMetric(transformationHash, elapsed);
+			this.#inspectorDelegate.addQuery(transformationHash, transformedAst);
 			lc.debug?.(`hydrated ${count} rows for ${queryID} (${elapsed} ms)`);
 			const storedSigHex = cvr.queries[queryID]?.rowSetSignature;
 			if (storedSigHex !== void 0 && storedSigHex !== null) {
@@ -813,14 +815,10 @@ var ViewSyncerService = class {
 			lc = lc.withContext("stateVersion", stateVersion);
 			lc.info?.(`hydrating ${addQueries.length} queries`);
 			const updater = new CVRQueryDrivenUpdater(this.#cvrStore, cvr, stateVersion, this.#pipelines.replicaVersion, (queryID) => this.#pipelines.rowSetSignature(queryID));
-			const { queryPatches } = updater.trackQueries(lc, addQueries, removeQueries);
 			if (addQueries.some((q) => driftedQueryIDs.has(q.id))) updater.ensureNewVersion();
-			const newVersion = updater.updatedVersion();
+			const { queryPatches, newVersion } = updater.trackQueries(lc, addQueries, removeQueries);
 			const pokers = startPoke(this.#getClients(), newVersion);
-			for (const patch of queryPatches) await pokers.addPatch({
-				...patch,
-				toVersion: newVersion
-			});
+			for (const patch of queryPatches) await pokers.addPatch(patch);
 			for (const q of removeQueries) {
 				this.#pipelines.removeQuery(q.id);
 				this.#inspectorDelegate.removeQuery(q.id);
@@ -841,6 +839,7 @@ var ViewSyncerService = class {
 					const elapsed = timer.stop();
 					totalProcessTime += elapsed;
 					self.#addQueryMaterializationServerMetric(q.id, elapsed);
+					self.#inspectorDelegate.addQuery(q.id, q.ast);
 					if (elapsed > slowHydrateThreshold) lc.warn?.("Slow query materialization", elapsed, q.ast);
 					manualSpan(tracer, "vs.addAndConsumeQuery", elapsed, {
 						hash: q.id,