floppy-disk 3.1.1 → 3.2.0-beta.1

package/esm/react/create-query.d.mts

@@ -22,6 +22,7 @@ import { type InitStoreOptions, type SetState } from "../vanilla.ts";
 export type QueryState<TData, TError> = {
     isPending: boolean;
     isRevalidating: boolean;
+    willRetryAt: undefined | number;
     isRetrying: boolean;
     retryCount: number;
 } & ({
@@ -30,6 +31,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: undefined;
     dataUpdatedAt: undefined;
+    dataStaleAt: undefined;
     error: undefined;
     errorUpdatedAt: undefined;
 } | {
@@ -38,6 +40,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: TData;
     dataUpdatedAt: number;
+    dataStaleAt: undefined | number;
     error: undefined;
     errorUpdatedAt: undefined;
 } | {
@@ -46,6 +49,7 @@ export type QueryState<TData, TError> = {
     isError: true;
     data: undefined;
     dataUpdatedAt: undefined;
+    dataStaleAt: undefined;
     error: TError;
     errorUpdatedAt: number;
 } | {
@@ -54,6 +58,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: TData;
     dataUpdatedAt: number;
+    dataStaleAt: undefined | number;
     error: TError;
     errorUpdatedAt: number;
 });
@@ -209,6 +214,9 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
     initialData?: never;
     initialDataIsStale?: never;
 })) => QueryState<TData, TError>) & {
+    /**
+     * Internal data, do not mutate!
+     */
     metadata: {
         isInvalidated?: boolean;
         promise?: Promise<QueryState<TData, TError>> | undefined;

package/esm/react/create-stores.d.mts

@@ -43,4 +43,6 @@ export declare const createStores: <TState extends Record<string, any>, TKey ext
     getState: () => TState;
     subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<TState>) => () => void;
     getSubscribers: () => Set<import("../vanilla.d.mts").Subscriber<TState>>;
+    key: TKey;
+    keyHash: string;
 };

package/esm/react.mjs

@@ -95,6 +95,8 @@ const createStores = (initialState, options) => {
       store = stores.get(keyHash);
     } else {
       store = initStore(initialState, options);
+      store.key = key;
+      store.keyHash = keyHash;
       stores.set(keyHash, store);
     }
     const useStore = (options2) => useStoreState(store, options2);
@@ -118,6 +120,7 @@ const createStores = (initialState, options) => {
 const INITIAL_STATE$1 = {
   isPending: false,
   isRevalidating: false,
+  willRetryAt: void 0,
   isRetrying: false,
   retryCount: 0,
   state: "INITIAL",
@@ -125,6 +128,7 @@ const INITIAL_STATE$1 = {
   isError: false,
   data: void 0,
   dataUpdatedAt: void 0,
+  dataStaleAt: void 0,
   error: void 0,
   errorUpdatedAt: void 0
 };
@@ -143,7 +147,7 @@ const createQuery = (queryFn, options = {}) => {
   } = options;
   const initialState = { ...INITIAL_STATE$1 };
   const stores = /* @__PURE__ */ new Map();
-  const configureStoreEvents = () => ({
+  const configureStoreEvents = (variableHash) => ({
     ...options,
     onFirstSubscribe: (state, store) => {
       var _a;
@@ -168,14 +172,21 @@ const createQuery = (queryFn, options = {}) => {
       }
     },
     onLastUnsubscribe: (state, store) => {
-      var _a, _b;
+      var _a;
       (_a = options.onLastUnsubscribe) == null ? void 0 : _a.call(options, state, store);
       const { metadata, revalidate: revalidate2 } = internals.get(store);
       clearTimeout(metadata.retryTimeoutId);
-      (_b = metadata.retryResolver) == null ? void 0 : _b.call(metadata, state);
-      metadata.retryResolver = void 0;
+      if (metadata.retryResolver) {
+        store.setState({ willRetryAt: void 0 });
+        metadata.retryResolver(store.getState());
+        metadata.retryResolver = void 0;
+      }
       metadata.garbageCollectionTimeoutId = setTimeout(() => {
-        store.setState(initialState);
+        if (metadata.promiseResolver || metadata.retryResolver) {
+          store.setState(initialState);
+        } else {
+          stores.delete(variableHash);
+        }
       }, gcTime);
       if (isClient) {
         if (revalidateOnFocus) {
@@ -277,6 +288,7 @@ const createQuery = (queryFn, options = {}) => {
         store.setState({
           isPending: true,
           isRevalidating: stateBeforeExecute.state === "SUCCESS",
+          willRetryAt: void 0,
           isRetrying: !!metadata.retryResolver,
           retryCount: metadata.retryResolver ? stateBeforeExecute.retryCount + 1 : 0
         });
@@ -289,6 +301,7 @@ const createQuery = (queryFn, options = {}) => {
           }
           if (!metadata.promiseResolver) return;
           if (promise !== metadata.promise) return resolve(metadata.promise);
+          const now = Date.now();
           store.setState({
             isPending: false,
             isRevalidating: false,
@@ -298,7 +311,8 @@ const createQuery = (queryFn, options = {}) => {
             isSuccess: true,
             isError: false,
             data,
-            dataUpdatedAt: Date.now(),
+            dataUpdatedAt: now,
+            dataStaleAt: now + staleTime,
             error: void 0,
             errorUpdatedAt: void 0
           });
@@ -313,16 +327,23 @@ const createQuery = (queryFn, options = {}) => {
           var _a;
           if (!metadata.promiseResolver && !metadata.retryResolver) return;
           if (promise !== metadata.promise) return resolve(metadata.promise);
-          store.setState({
+          const nextState = {
+            ...store.getState(),
             isPending: false,
             isRevalidating: false,
             isRetrying: false
-          });
-          const [shouldRetry, retryDelay] = shouldRetryFn(error, store.getState());
+          };
+          const [shouldRetry, retryDelay] = shouldRetryFn(error, nextState);
           const hasSubscriber = store.getSubscribers().size > 0;
           if (shouldRetry && hasSubscriber) {
             metadata.retryResolver = resolve;
             metadata.retryTimeoutId = setTimeout(createPromise, retryDelay);
+            store.setState({
+              isPending: false,
+              isRevalidating: false,
+              isRetrying: false,
+              willRetryAt: Date.now() + retryDelay
+            });
           } else {
             store.setState({
               isPending: false,
@@ -375,7 +396,7 @@ const createQuery = (queryFn, options = {}) => {
     if (stores.has(variableHash)) {
       store = stores.get(variableHash);
     } else {
-      store = initStore(initialState, configureStoreEvents());
+      store = initStore(initialState, configureStoreEvents(variableHash));
       stores.set(variableHash, store);
       internals.set(store, configureInternals(store, variable, variableHash));
     }

package/package.json

@@ -2,7 +2,10 @@
   "name": "floppy-disk",
   "description": "Lightweight unified state management for sync and async data.",
   "private": false,
-  "version": "3.1.1",
+  "version": "3.2.0-beta.1",
+  "publishConfig": {
+    "tag": "beta"
+  },
   "keywords": [
     "utilities",
     "store",
@@ -68,7 +71,6 @@
       }
     }
   },
-  "packageManager": "pnpm@10.32.1",
   "peerDependencies": {
     "@types/react": ">=17.0",
     "react": ">=17.0"
@@ -81,4 +83,4 @@
       "optional": true
     }
   }
-}
+}

package/react/create-query.d.ts

@@ -22,6 +22,7 @@ import { type InitStoreOptions, type SetState } from "../vanilla.ts";
 export type QueryState<TData, TError> = {
     isPending: boolean;
     isRevalidating: boolean;
+    willRetryAt: undefined | number;
     isRetrying: boolean;
     retryCount: number;
 } & ({
@@ -30,6 +31,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: undefined;
     dataUpdatedAt: undefined;
+    dataStaleAt: undefined;
     error: undefined;
     errorUpdatedAt: undefined;
 } | {
@@ -38,6 +40,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: TData;
     dataUpdatedAt: number;
+    dataStaleAt: undefined | number;
     error: undefined;
     errorUpdatedAt: undefined;
 } | {
@@ -46,6 +49,7 @@ export type QueryState<TData, TError> = {
     isError: true;
     data: undefined;
     dataUpdatedAt: undefined;
+    dataStaleAt: undefined;
     error: TError;
     errorUpdatedAt: number;
 } | {
@@ -54,6 +58,7 @@ export type QueryState<TData, TError> = {
     isError: false;
     data: TData;
     dataUpdatedAt: number;
+    dataStaleAt: undefined | number;
     error: TError;
     errorUpdatedAt: number;
 });
@@ -209,6 +214,9 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
     initialData?: never;
     initialDataIsStale?: never;
 })) => QueryState<TData, TError>) & {
+    /**
+     * Internal data, do not mutate!
+     */
     metadata: {
         isInvalidated?: boolean;
         promise?: Promise<QueryState<TData, TError>> | undefined;

package/react/create-stores.d.ts

@@ -43,4 +43,6 @@ export declare const createStores: <TState extends Record<string, any>, TKey ext
     getState: () => TState;
     subscribe: (subscriber: import("../vanilla.ts").Subscriber<TState>) => () => void;
     getSubscribers: () => Set<import("../vanilla.ts").Subscriber<TState>>;
+    key: TKey;
+    keyHash: string;
 };

package/react.js

@@ -97,6 +97,8 @@ const createStores = (initialState, options) => {
       store = stores.get(keyHash);
     } else {
       store = vanilla.initStore(initialState, options);
+      store.key = key;
+      store.keyHash = keyHash;
       stores.set(keyHash, store);
     }
     const useStore = (options2) => useStoreState(store, options2);
@@ -120,6 +122,7 @@ const createStores = (initialState, options) => {
 const INITIAL_STATE$1 = {
   isPending: false,
   isRevalidating: false,
+  willRetryAt: void 0,
   isRetrying: false,
   retryCount: 0,
   state: "INITIAL",
@@ -127,6 +130,7 @@ const INITIAL_STATE$1 = {
   isError: false,
   data: void 0,
   dataUpdatedAt: void 0,
+  dataStaleAt: void 0,
   error: void 0,
   errorUpdatedAt: void 0
 };
@@ -145,7 +149,7 @@ const createQuery = (queryFn, options = {}) => {
   } = options;
   const initialState = { ...INITIAL_STATE$1 };
   const stores = /* @__PURE__ */ new Map();
-  const configureStoreEvents = () => ({
+  const configureStoreEvents = (variableHash) => ({
     ...options,
     onFirstSubscribe: (state, store) => {
       var _a;
@@ -170,14 +174,21 @@ const createQuery = (queryFn, options = {}) => {
       }
     },
     onLastUnsubscribe: (state, store) => {
-      var _a, _b;
+      var _a;
       (_a = options.onLastUnsubscribe) == null ? void 0 : _a.call(options, state, store);
       const { metadata, revalidate: revalidate2 } = internals.get(store);
       clearTimeout(metadata.retryTimeoutId);
-      (_b = metadata.retryResolver) == null ? void 0 : _b.call(metadata, state);
-      metadata.retryResolver = void 0;
+      if (metadata.retryResolver) {
+        store.setState({ willRetryAt: void 0 });
+        metadata.retryResolver(store.getState());
+        metadata.retryResolver = void 0;
+      }
       metadata.garbageCollectionTimeoutId = setTimeout(() => {
-        store.setState(initialState);
+        if (metadata.promiseResolver || metadata.retryResolver) {
+          store.setState(initialState);
+        } else {
+          stores.delete(variableHash);
+        }
       }, gcTime);
       if (vanilla.isClient) {
         if (revalidateOnFocus) {
@@ -279,6 +290,7 @@ const createQuery = (queryFn, options = {}) => {
         store.setState({
           isPending: true,
           isRevalidating: stateBeforeExecute.state === "SUCCESS",
+          willRetryAt: void 0,
           isRetrying: !!metadata.retryResolver,
           retryCount: metadata.retryResolver ? stateBeforeExecute.retryCount + 1 : 0
         });
@@ -291,6 +303,7 @@ const createQuery = (queryFn, options = {}) => {
           }
           if (!metadata.promiseResolver) return;
           if (promise !== metadata.promise) return resolve(metadata.promise);
+          const now = Date.now();
           store.setState({
             isPending: false,
             isRevalidating: false,
@@ -300,7 +313,8 @@ const createQuery = (queryFn, options = {}) => {
             isSuccess: true,
             isError: false,
             data,
-            dataUpdatedAt: Date.now(),
+            dataUpdatedAt: now,
+            dataStaleAt: now + staleTime,
             error: void 0,
             errorUpdatedAt: void 0
           });
@@ -315,16 +329,23 @@ const createQuery = (queryFn, options = {}) => {
           var _a;
           if (!metadata.promiseResolver && !metadata.retryResolver) return;
           if (promise !== metadata.promise) return resolve(metadata.promise);
-          store.setState({
+          const nextState = {
+            ...store.getState(),
             isPending: false,
             isRevalidating: false,
             isRetrying: false
-          });
-          const [shouldRetry, retryDelay] = shouldRetryFn(error, store.getState());
+          };
+          const [shouldRetry, retryDelay] = shouldRetryFn(error, nextState);
           const hasSubscriber = store.getSubscribers().size > 0;
           if (shouldRetry && hasSubscriber) {
             metadata.retryResolver = resolve;
             metadata.retryTimeoutId = setTimeout(createPromise, retryDelay);
+            store.setState({
+              isPending: false,
+              isRevalidating: false,
+              isRetrying: false,
+              willRetryAt: Date.now() + retryDelay
+            });
           } else {
             store.setState({
               isPending: false,
@@ -377,7 +398,7 @@ const createQuery = (queryFn, options = {}) => {
     if (stores.has(variableHash)) {
       store = stores.get(variableHash);
     } else {
-      store = vanilla.initStore(initialState, configureStoreEvents());
+      store = vanilla.initStore(initialState, configureStoreEvents(variableHash));
       stores.set(variableHash, store);
       internals.set(store, configureInternals(store, variable, variableHash));
     }