@spooky-sync/core 0.0.1-canary.325 → 0.0.1-canary.326

package/dist/index.js

@@ -2188,8 +2188,8 @@ function trimHistory(history, cap) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.325";
-const WASM_VERSION = "0.0.1-canary.325";
+const CORE_VERSION = "0.0.1-canary.326";
+const WASM_VERSION = "0.0.1-canary.326";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class DevToolsService {
 	version = CORE_VERSION;
@@ -3548,6 +3548,22 @@ const compose = (...reducers) => (s) => reducers.reduce((acc, r) => r(acc), s);
 //#endregion
 //#region src/state/selectors.ts
 const activeHashes = (s) => [...s.queries.keys()];
+/**
+* The status subscribers see. `fetching` while a fetch cycle is in flight,
+* and also while a live query is not yet `settled`: the server's membership
+* is in but its rows are still downloading or not yet shown. Registration
+* ends its cycle as soon as membership is applied and the body fetch starts
+* its own a moment later, so the fetch count alone read `idle` in between,
+* and a binding that settles on "membership known and idle" told the app a
+* row did not exist while it was on its way (a by-id screen showed "not
+* found" for a moment, or for as long as the bodies took).
+*/
+const queryStatus = (s, hash) => {
+	const e = s.queries.get(hash);
+	if (!e) return void 0;
+	if (deriveStatus(e.lifecycle) === "fetching") return "fetching";
+	return e.lifecycle.phase === "live" && !settled(s, hash) ? "fetching" : "idle";
+};
 /** The optimistic overlay, derived from the outbox (pending AND acked items). */
 function overlay(s) {
 	const writes = /* @__PURE__ */ new Set();
@@ -7396,9 +7412,8 @@ var Runtime = class {
 			});
 		}
 		for (const [hash, subs] of this.statusSubs) {
-			const entry = next.queries.get(hash);
-			if (!entry) continue;
-			const status = deriveStatus(entry.lifecycle);
+			if (!next.queries.get(hash)) continue;
+			const status = queryStatus(next, hash) ?? "idle";
 			if (this.lastStatus.get(hash) === status) continue;
 			this.lastStatus.set(hash, status);
 			for (const cb of subs) this.safely(() => cb(status));
@@ -7502,9 +7517,8 @@ var Runtime = class {
 		const set = this.statusSubs.get(hash) ?? /* @__PURE__ */ new Set();
 		set.add(cb);
 		this.statusSubs.set(hash, set);
-		const entry = this.stateValue.queries.get(hash);
-		if (entry) {
-			const status = deriveStatus(entry.lifecycle);
+		if (this.stateValue.queries.get(hash)) {
+			const status = queryStatus(this.stateValue, hash) ?? "idle";
 			this.lastStatus.set(hash, status);
 			if (options.immediate) this.safely(() => cb(status));
 		}
@@ -15261,7 +15275,7 @@ function createTabsCoordinator(config, s, host) {
 	return new TabsCoordinator({
 		tabId: s.tabId,
 		fingerprint: computeTabsFingerprint({
-			coreVersion: "0.0.1-canary.325",
+			coreVersion: "0.0.1-canary.326",
 			schemaHash: hash53(config.schemaSurql),
 			endpoint: config.database.endpoint ?? "",
 			namespace: config.database.namespace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.325",
+  "version": "0.0.1-canary.326",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -75,8 +75,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.325",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.325",
+    "@spooky-sync/query-builder": "0.0.1-canary.326",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.326",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "blurhash": "^2.0.5",

package/src/client/runtime.ts

@@ -7,9 +7,9 @@ import type { Lane, Saga } from '../kernel/saga';
 import { runSaga } from '../kernel/saga';
 import type { ClientState } from '../state/client-state';
 import { emptyState } from '../state/client-state';
-import { deriveStatus, isAuthoritative } from '../state/lifecycle';
+import { isAuthoritative } from '../state/lifecycle';
 import * as R from '../state/reducers';
-import { fetchingQueryCount, pendingMutationCount } from '../state/selectors';
+import { fetchingQueryCount, pendingMutationCount, queryStatus } from '../state/selectors';
 import type { SagaEnv } from '../query/env';
 import { route } from './router';
 
@@ -152,7 +152,7 @@ export class Runtime {
     for (const [hash, subs] of this.statusSubs) {
       const entry = next.queries.get(hash);
       if (!entry) continue;
-      const status = deriveStatus(entry.lifecycle);
+      const status = queryStatus(next, hash) ?? 'idle';
       if (this.lastStatus.get(hash) === status) continue;
       this.lastStatus.set(hash, status);
       for (const cb of subs) this.safely(() => cb(status));
@@ -255,7 +255,7 @@ export class Runtime {
     this.statusSubs.set(hash, set);
     const entry = this.stateValue.queries.get(hash);
     if (entry) {
-      const status = deriveStatus(entry.lifecycle);
+      const status = queryStatus(this.stateValue, hash) ?? 'idle';
       this.lastStatus.set(hash, status);
       if (options.immediate) this.safely(() => cb(status));
     }

package/src/state/selectors.test.ts

@@ -77,6 +77,19 @@ describe('needed / planFetch / settled', () => {
     expect(S.settleFailed(s, 'a')).toBe(false);
     expect(S.settleFailed(R.applyLifecycle('a', { type: 'remote-failed' })(s), 'a')).toBe(true);
   });
+  it('queryStatus stays fetching until a live query is settled', () => {
+    const base = e('a', { lifecycle: { ...live, notified: true }, remoteArray: [['thing:1', 1]] });
+    const s = { ...buildState([base], R.setVersions([['thing:1', 1]])), dirty: new Set<string>() };
+    expect(S.queryStatus(s, 'a')).toBe('idle');
+    // Membership in, body still downloading (registration already ended its cycle).
+    expect(S.queryStatus(R.setVersions([['thing:1', 0]])(s), 'a')).toBe('fetching');
+    // Body landed, not yet shown to subscribers.
+    expect(S.queryStatus(R.markDirty(['a'])(s), 'a')).toBe('fetching');
+    // A cold query with no fetch in flight has nothing to wait for.
+    expect(S.queryStatus(buildState([e('c', { lifecycle: { phase: 'cold' } })]), 'c')).toBe('idle');
+    expect(S.queryStatus(R.applyLifecycle('a', { type: 'fetch-begin' })(s), 'a')).toBe('fetching');
+    expect(S.queryStatus(s, 'missing')).toBeUndefined();
+  });
   it('fetchingQueryCount counts entries with fetch depth', () => {
     const s = buildState([e('a', { lifecycle: { fetchDepth: 2 } }), e('b')]);
     expect(S.fetchingQueryCount(s)).toBe(1);

package/src/state/selectors.ts

@@ -12,9 +12,21 @@ export const activeHashes = (s: ClientState): QueryHash[] => [...s.queries.keys(
 export const hashesForTable = (s: ClientState, table: string): QueryHash[] =>
   [...s.queries].filter(([, e]) => e.def.tableName === table).map(([h]) => h);
 
+/**
+ * The status subscribers see. `fetching` while a fetch cycle is in flight,
+ * and also while a live query is not yet `settled`: the server's membership
+ * is in but its rows are still downloading or not yet shown. Registration
+ * ends its cycle as soon as membership is applied and the body fetch starts
+ * its own a moment later, so the fetch count alone read `idle` in between,
+ * and a binding that settles on "membership known and idle" told the app a
+ * row did not exist while it was on its way (a by-id screen showed "not
+ * found" for a moment, or for as long as the bodies took).
+ */
 export const queryStatus = (s: ClientState, hash: QueryHash): QueryStatus | undefined => {
   const e = s.queries.get(hash);
-  return e ? deriveStatus(e.lifecycle) : undefined;
+  if (!e) return undefined;
+  if (deriveStatus(e.lifecycle) === 'fetching') return 'fetching';
+  return e.lifecycle.phase === 'live' && !settled(s, hash) ? 'fetching' : 'idle';
 };
 
 export interface Overlay {