@playfast/reform-query-browser 1.0.2 → 1.2.0

package/README.md

@@ -29,8 +29,8 @@ import { BrowserQueryDefaults, localStorageQueryStore } from '@playfast/reform-q
 // In your app layer, alongside Engine:
 const base = Layer.mergeAll(
   Engine,
-  BrowserQueryDefaults,    // refetch on focus + reconnect
-  localStorageQueryStore,  // enables `persist`
+  BrowserQueryDefaults, // refetch on focus + reconnect
+  localStorageQueryStore, // enables `persist`
   /* your state + calc layers */
 )
 
@@ -39,7 +39,7 @@ AsyncCalc.live(Todos, { query, persist: { key: 'todos' } })
 
 // Imperative control anywhere you can run an Effect:
 runtime.runFork(AsyncCalc.invalidate(Todos)) // mark stale (refetches if active)
-runtime.runFork(AsyncCalc.refetch(Todos))    // force a run now
+runtime.runFork(AsyncCalc.refetch(Todos)) // force a run now
 ```
 
 All of `QueryEvents`/`QueryStore` are optional: a calc that uses `persist` with no

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export { QueryEventsBrowser } from './queryEvents.browser.js';
+export { localStorageQueryStore } from './localStorage.store.js';
+export { BrowserQueryDefaults, RefetchOnFocus, RefetchOnReconnect } from './refetchManagers.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/index.js

@@ -0,0 +1,4 @@
+export { QueryEventsBrowser } from './queryEvents.browser.js';
+export { localStorageQueryStore } from './localStorage.store.js';
+export { BrowserQueryDefaults, RefetchOnFocus, RefetchOnReconnect } from './refetchManagers.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/localStorage.store.d.ts

@@ -0,0 +1,5 @@
+import { QueryStore } from '@playfast/reform/internal';
+import { Layer } from 'effect';
+export declare const makeLocalStorageQueryStore: (storage: Storage) => Layer.Layer<QueryStore>;
+export declare const localStorageQueryStore: Layer.Layer<QueryStore>;
+//# sourceMappingURL=localStorage.store.d.ts.map

package/dist/localStorage.store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"localStorage.store.d.ts","sourceRoot":"","sources":["../src/localStorage.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsC,MAAM,2BAA2B,CAAA;AAC1F,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAA;AA2BtD,eAAO,MAAM,0BAA0B,GAAI,SAAS,OAAO,KAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CACvC,CAAA;AAS7C,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAmC,CAAA"}

package/dist/localStorage.store.js

@@ -0,0 +1,30 @@
+import { QueryStore, noopQueryStore } from '@playfast/reform/internal';
+import { Effect, Layer, Option, Schema } from 'effect';
+const PREFIX = 'reform-query:';
+const JsonValue = Schema.parseJson(Schema.Unknown);
+// Corrupt/version-skewed entry → None (cache miss); fetch fresh.
+const decodeJson = Schema.decodeUnknownOption(JsonValue);
+const encodeJson = Schema.encodeSync(JsonValue);
+const makeApi = (storage) => {
+    return {
+        get: (key) => Effect.sync(() => {
+            const raw = storage.getItem(PREFIX + key);
+            return raw === null ? Option.none() : decodeJson(raw);
+        }),
+        set: (key, payload) => Effect.sync(() => {
+            storage.setItem(PREFIX + key, encodeJson(payload));
+        }),
+        remove: (key) => Effect.sync(() => {
+            storage.removeItem(PREFIX + key);
+        }),
+    };
+};
+export const makeLocalStorageQueryStore = (storage) => Layer.succeed(QueryStore, makeApi(storage));
+const makeDefaultStore = () => {
+    if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
+        return Layer.succeed(QueryStore, noopQueryStore);
+    }
+    return makeLocalStorageQueryStore(window.localStorage);
+};
+export const localStorageQueryStore = Layer.suspend(makeDefaultStore);
+//# sourceMappingURL=localStorage.store.js.map

package/dist/localStorage.store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"localStorage.store.js","sourceRoot":"","sources":["../src/localStorage.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1F,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEtD,MAAM,MAAM,GAAG,eAAe,CAAA;AAE9B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAClD,iEAAiE;AACjE,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAA;AACxD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AAE/C,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAiB,EAAE;IAClD,OAAO;QACL,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CACX,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAA;YACzC,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvD,CAAC,CAAC;QACJ,GAAG,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACpB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC;QACJ,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,CAAA;QAClC,CAAC,CAAC;KACL,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,OAAgB,EAA2B,EAAE,CACtF,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAE7C,MAAM,gBAAgB,GAAG,GAA4B,EAAE;IACrD,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,WAAW,EAAE,CAAC;QAChF,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IAClD,CAAC;IACD,OAAO,0BAA0B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;AACxD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAA4B,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA"}

package/dist/queryEvents.browser.d.ts

@@ -0,0 +1,4 @@
+import { QueryEvents } from '@playfast/reform/internal';
+import { Layer } from 'effect';
+export declare const QueryEventsBrowser: Layer.Layer<QueryEvents>;
+//# sourceMappingURL=queryEvents.browser.d.ts.map

package/dist/queryEvents.browser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryEvents.browser.d.ts","sourceRoot":"","sources":["../src/queryEvents.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwC,MAAM,2BAA2B,CAAA;AAC7F,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEtC,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CA6CvD,CAAA"}

package/dist/queryEvents.browser.js

@@ -0,0 +1,39 @@
+import { QueryEvents, noopQueryEvents } from '@playfast/reform/internal';
+import { Effect, Layer } from 'effect';
+export const QueryEventsBrowser = Layer.scoped(QueryEvents, Effect.gen(function* () {
+    if (typeof window === 'undefined') {
+        return noopQueryEvents;
+    }
+    const focusListeners = new Set();
+    const onlineListeners = new Set();
+    const fire = (listeners) => {
+        listeners.forEach((listener) => listener());
+    };
+    // Focus + tab-visible both fire; ignore hide visibilitychange.
+    const onFocus = () => {
+        if (document.visibilityState === 'visible') {
+            fire(focusListeners);
+        }
+    };
+    const onOnline = () => fire(onlineListeners);
+    document.addEventListener('visibilitychange', onFocus);
+    window.addEventListener('focus', onFocus);
+    window.addEventListener('online', onOnline);
+    yield* Effect.addFinalizer(() => Effect.sync(() => {
+        document.removeEventListener('visibilitychange', onFocus);
+        window.removeEventListener('focus', onFocus);
+        window.removeEventListener('online', onOnline);
+    }));
+    const subscribeTo = (listeners) => (listener) => {
+        listeners.add(listener);
+        return () => {
+            listeners.delete(listener);
+        };
+    };
+    const api = {
+        subscribeFocus: subscribeTo(focusListeners),
+        subscribeOnline: subscribeTo(onlineListeners),
+    };
+    return api;
+}));
+//# sourceMappingURL=queryEvents.browser.js.map

package/dist/queryEvents.browser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryEvents.browser.js","sourceRoot":"","sources":["../src/queryEvents.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC7F,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEtC,MAAM,CAAC,MAAM,kBAAkB,GAA6B,KAAK,CAAC,MAAM,CACtE,WAAW,EACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,GAAG,EAAc,CAAA;IAC5C,MAAM,eAAe,GAAG,IAAI,GAAG,EAAc,CAAA;IAC7C,MAAM,IAAI,GAAG,CAAC,SAAkC,EAAE,EAAE;QAClD,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC7C,CAAC,CAAA;IACD,+DAA+D;IAC/D,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,QAAQ,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,cAAc,CAAC,CAAA;QACtB,CAAC;IACH,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAE5C,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;IACtD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC3C,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;QACzD,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC5C,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC,CAAC,CACH,CAAA;IAED,MAAM,WAAW,GACf,CAAC,SAA0B,EAAE,EAAE,CAC/B,CAAC,QAAoB,EAAgB,EAAE;QACrC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACvB,OAAO,GAAG,EAAE;YACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC5B,CAAC,CAAA;IACH,CAAC,CAAA;IACH,MAAM,GAAG,GAAmB;QAC1B,cAAc,EAAE,WAAW,CAAC,cAAc,CAAC;QAC3C,eAAe,EAAE,WAAW,CAAC,eAAe,CAAC;KAC9C,CAAA;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAC,CACH,CAAA"}

package/dist/refetchManagers.d.ts

@@ -0,0 +1,6 @@
+import { QueryEvents, Queries } from '@playfast/reform/internal';
+import { Layer } from 'effect';
+export declare const RefetchOnFocus: Layer.Layer<never, never, QueryEvents | Queries>;
+export declare const RefetchOnReconnect: Layer.Layer<never, never, QueryEvents | Queries>;
+export declare const BrowserQueryDefaults: Layer.Layer<never, never, Queries>;
+//# sourceMappingURL=refetchManagers.d.ts.map

package/dist/refetchManagers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refetchManagers.d.ts","sourceRoot":"","sources":["../src/refetchManagers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACrF,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAA;AAkBtC,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAE3E,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAE/E,CAAA;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAG3B,CAAA"}

package/dist/refetchManagers.js

@@ -0,0 +1,16 @@
+import { QueryEvents, Queries } from '@playfast/reform/internal';
+import { Effect, Layer } from 'effect';
+import { QueryEventsBrowser } from './queryEvents.browser.js';
+const onSignal = (pick) => Layer.scopedDiscard(Effect.gen(function* () {
+    const events = yield* QueryEvents;
+    const queries = yield* Queries;
+    const invalidateAll = () => {
+        queries.byName.forEach((handle) => handle.invalidate());
+    };
+    const unsubscribe = pick(events)(invalidateAll);
+    yield* Effect.addFinalizer(() => Effect.sync(unsubscribe));
+}));
+export const RefetchOnFocus = onSignal((events) => events.subscribeFocus);
+export const RefetchOnReconnect = onSignal((events) => events.subscribeOnline);
+export const BrowserQueryDefaults = Layer.mergeAll(RefetchOnFocus, RefetchOnReconnect).pipe(Layer.provide(QueryEventsBrowser));
+//# sourceMappingURL=refetchManagers.js.map

package/dist/refetchManagers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refetchManagers.js","sourceRoot":"","sources":["../src/refetchManagers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACrF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE1D,MAAM,QAAQ,GAAG,CACf,IAAsE,EACpB,EAAE,CACpD,KAAK,CAAC,aAAa,CACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAA;IACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;IAC9B,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;IACzD,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAA;IAC/C,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAA;AAC5D,CAAC,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,cAAc,GAAqD,QAAQ,CACtF,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAClC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAqD,QAAQ,CAC1F,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CACnC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAuC,KAAK,CAAC,QAAQ,CACpF,cAAc,EACd,kBAAkB,CACnB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,51 +1,63 @@
 {
   "name": "@playfast/reform-query-browser",
-  "playbook": "./playbook",
-  "version": "1.0.2",
-  "type": "module",
+  "version": "1.2.0",
   "description": "Browser host layers for Reform's AsyncCalc — window focus/online auto-invalidation and localStorage persistence. Keeps reform core DOM-free: implements the optional QueryEvents and QueryStore seams.",
   "keywords": [
-    "reform",
     "effect",
-    "react-query",
+    "layer",
     "persistence",
+    "react-query",
     "refetch-on-focus",
-    "layer"
+    "reform"
   ],
+  "bugs": {
+    "url": "https://github.com/playfast/reform/issues"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/playfast/reform.git",
     "directory": "packages/reform-query-browser"
   },
-  "bugs": {
-    "url": "https://github.com/playfast/reform/issues"
-  },
-  "sideEffects": false,
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./src/index.ts",
-    "./*": "./src/*.ts"
-  },
   "files": [
+    "dist",
     "src",
     "README.md"
   ],
+  "type": "module",
+  "sideEffects": false,
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "playfast-src": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": {
+      "playfast-src": "./src/*.ts",
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "clean": "rm -rf dist .tsbuildinfo",
     "check": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json",
+    "build": "rm -rf dist .tsbuildinfo && tsc -p tsconfig.build.json && bun ../../scripts/fix-esm-extensions.ts dist",
     "test": "vitest run",
     "test:watch": "vitest",
     "coverage": "vitest run --coverage",
     "lint": "oxlint src",
-    "lint:fix": "oxlint --fix src"
+    "lint:fix": "oxlint --fix src",
+    "prepack": "bun run build"
   },
   "peerDependencies": {
-    "effect": "*",
-    "@playfast/reform": "*"
+    "@playfast/reform": "*",
+    "effect": "*"
   },
-  "publishConfig": {
-    "access": "public"
-  }
+  "playbook": "./playbook"
 }

package/src/localStorage.store.ts

@@ -1,4 +1,4 @@
-import { QueryStore, type QueryStoreApi, noopQueryStore } from '@playfast/reform'
+import { QueryStore, type QueryStoreApi, noopQueryStore } from '@playfast/reform/internal'
 import { Effect, Layer, Option, Schema } from 'effect'
 
 const PREFIX = 'reform-query:'
@@ -8,25 +8,32 @@ const JsonValue = Schema.parseJson(Schema.Unknown)
 const decodeJson = Schema.decodeUnknownOption(JsonValue)
 const encodeJson = Schema.encodeSync(JsonValue)
 
-const makeApi = (): QueryStoreApi => {
-  if (typeof window === 'undefined' || typeof localStorage === 'undefined') {
-    return noopQueryStore
-  }
+const makeApi = (storage: Storage): QueryStoreApi => {
   return {
     get: (key) =>
       Effect.sync(() => {
-        const raw = localStorage.getItem(PREFIX + key)
+        const raw = storage.getItem(PREFIX + key)
         return raw === null ? Option.none() : decodeJson(raw)
       }),
     set: (key, payload) =>
       Effect.sync(() => {
-        localStorage.setItem(PREFIX + key, encodeJson(payload))
+        storage.setItem(PREFIX + key, encodeJson(payload))
       }),
     remove: (key) =>
       Effect.sync(() => {
-        localStorage.removeItem(PREFIX + key)
+        storage.removeItem(PREFIX + key)
       }),
   }
 }
 
-export const localStorageQueryStore: Layer.Layer<QueryStore> = Layer.succeed(QueryStore, makeApi())
+export const makeLocalStorageQueryStore = (storage: Storage): Layer.Layer<QueryStore> =>
+  Layer.succeed(QueryStore, makeApi(storage))
+
+const makeDefaultStore = (): Layer.Layer<QueryStore> => {
+  if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
+    return Layer.succeed(QueryStore, noopQueryStore)
+  }
+  return makeLocalStorageQueryStore(window.localStorage)
+}
+
+export const localStorageQueryStore: Layer.Layer<QueryStore> = Layer.suspend(makeDefaultStore)

package/src/queryEvents.browser.ts

@@ -1,4 +1,4 @@
-import { QueryEvents, type QueryEventsApi, noopQueryEvents } from '@playfast/reform'
+import { QueryEvents, type QueryEventsApi, noopQueryEvents } from '@playfast/reform/internal'
 import { Effect, Layer } from 'effect'
 
 export const QueryEventsBrowser: Layer.Layer<QueryEvents> = Layer.scoped(

package/src/refetchManagers.ts

@@ -1,4 +1,4 @@
-import { QueryEvents, type QueryEventsApi, Queries } from '@playfast/reform'
+import { QueryEvents, type QueryEventsApi, Queries } from '@playfast/reform/internal'
 import { Effect, Layer } from 'effect'
 import { QueryEventsBrowser } from './queryEvents.browser'
 

package/src/reform-query-browser.test.ts

@@ -4,7 +4,8 @@
 import { expect, it } from '@effect/vitest'
 import { AsyncCalc, Engine, State, StateGroup } from '@playfast/reform'
 import { Duration, Effect, Layer, Schema as S } from 'effect'
-import { localStorageQueryStore } from './localStorage.store'
+import { Window } from 'happy-dom'
+import { makeLocalStorageQueryStore } from './localStorage.store'
 import { QueryEventsBrowser } from './queryEvents.browser'
 import { RefetchOnFocus } from './refetchManagers'
 
@@ -49,7 +50,9 @@ it.live('window focus invalidates a live query, so an active reader refetches',
 })
 
 it.live('persist hydrates from localStorage (stale) then writes the settled value through', () => {
-  localStorage.setItem('reform-query:P', '99') // a previously-persisted value
+  const storageWindow = new Window({ url: 'https://reform-query.test/' })
+  const storage = storageWindow.localStorage
+  storage.setItem('reform-query:P', '99') // a previously-persisted value
   class Count extends State.make('count', S.Number) {}
   class Inputs extends StateGroup.make(Count) {}
   class Q extends AsyncCalc.make('Q', {
@@ -63,7 +66,7 @@ it.live('persist hydrates from localStorage (stale) then writes the settled valu
   })
   const App = QLive.pipe(
     Layer.provideMerge(StateGroup.live(Inputs, { count: 5 })),
-    Layer.provideMerge(localStorageQueryStore),
+    Layer.provideMerge(makeLocalStorageQueryStore(storage)),
     Layer.provideMerge(Engine),
   )
 
@@ -71,8 +74,8 @@ it.live('persist hydrates from localStorage (stale) then writes the settled valu
     const view = yield* Q.store
     expect(view.get()).toMatchObject({ _tag: 'Success', value: 99, refetching: true })
 
-    yield* waitUntil(() => localStorage.getItem('reform-query:P') === '10')
+    yield* waitUntil(() => storage.getItem('reform-query:P') === '10')
     expect(view.get()).toMatchObject({ _tag: 'Success', value: 10, refetching: false })
-    expect(localStorage.getItem('reform-query:P')).toBe('10')
-  }).pipe(Effect.provide(App))
+    expect(storage.getItem('reform-query:P')).toBe('10')
+  }).pipe(Effect.provide(App), Effect.ensuring(Effect.sync(() => storageWindow.close())))
 })