floppy-disk 3.7.0 → 3.7.1

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

@@ -1,4 +1,4 @@
-import { type InitStoreOptions, type StoreApi } from "../vanilla.mjs";
+import { type InitStoreOptions, type SetStateInput } from "../vanilla.mjs";
 import type { StoreKey } from "./create-stores.mjs";
 type StreamDataState<TData, TError> = {
     state: "INITIAL";
@@ -43,8 +43,8 @@ export type StreamState<TData, TError> = ({
 }>) | ({
     connectionState: "CONNECTING";
     connectingAt: number;
-    connectedAt: number | undefined;
-    disconnectedAt: number | undefined;
+    connectedAt: undefined;
+    disconnectedAt: undefined;
 } & StreamDataState<TData, TError>) | ({
     connectionState: "CONNECTED";
     connectingAt: number;
@@ -68,6 +68,7 @@ type AdditionalStoreApi<TConnection> = {
     data: {
         reset: () => void;
     };
+    delete: () => boolean;
 };
 export type StreamOptions<TConnection, TData, TError = Error> = InitStoreOptions<StreamState<TData, TError>, AdditionalStoreApi<TConnection>> & {
     connection?: {
@@ -84,5 +85,20 @@ export declare const experimental_createStream: <TConnection, TData, TVariable e
     error: (error: TError) => void;
 }) => TConnection, disconnect: (connection: TConnection) => void, options?: StreamOptions<TConnection, TData, TError>) => (variable?: TVariable) => ((options?: {
     initialData?: TData;
-}) => StreamState<TData, TError>) & StoreApi<StreamState<TData, TError>> & AdditionalStoreApi<TConnection>;
+}) => StreamState<TData, TError>) & {
+    setState: (value: SetStateInput<StreamState<TData, TError>>) => void;
+    getState: () => StreamState<TData, TError>;
+    subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<StreamState<TData, TError>>) => () => void;
+    getSubscriberCount: () => number;
+    variableHash: string;
+    connection: {
+        get: () => Readonly<TConnection> | undefined;
+        reconnect: () => void;
+        disconnect: () => void;
+    };
+    data: {
+        reset: () => void;
+    };
+    delete: () => boolean;
+};
 export {};

package/esm/react.mjs

@@ -785,7 +785,20 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
   const connections = /* @__PURE__ */ new WeakMap();
   const disconnectFns = /* @__PURE__ */ new WeakMap();
   const disconnectTimeoutIds = /* @__PURE__ */ new WeakMap();
-  const clearDataTimeoutIds = /* @__PURE__ */ new WeakMap();
+  const clearAllTimeouts = (store) => {
+    const gcTimeoutId = gcTimeoutIds.get(store);
+    if (gcTimeoutId) {
+      clearTimeout(gcTimeoutId);
+      gcTimeoutIds.delete(store);
+    }
+    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
+    if (disconnectTimeoutIds_) {
+      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
+      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
+      clearTimeout(disconnectTimeoutIds_.offline);
+    }
+  };
+  const gcTimeoutIds = /* @__PURE__ */ new WeakMap();
   const configureStoreEvents = () => ({
     ...options,
     onFirstSubscribe: (state, store) => {
@@ -827,12 +840,7 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
     if (store.getSubscriberCount() && showLog) {
       console.log("Stream disconnected while there is subscriber");
     }
-    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
-    if (disconnectTimeoutIds_) {
-      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
-      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
-      clearTimeout(disconnectTimeoutIds_.offline);
-    }
+    clearAllTimeouts(store);
     (_a = disconnectFns.get(store)) == null ? void 0 : _a();
     if (store.getState().connectionState !== "INITIAL") {
       store.setState({
@@ -842,10 +850,10 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
     }
     connections.delete(store);
     disconnectFns.delete(store);
-    clearDataTimeoutIds.set(
+    gcTimeoutIds.set(
       store,
       setTimeout(() => {
-        store.data.reset();
+        if (store.getSubscriberCount() === 0) store.delete();
       }, gcTime)
     );
   };
@@ -866,12 +874,15 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
       store.connection.get = () => connections.get(store);
       store.connection.reconnect = () => {
         var _a;
+        clearAllTimeouts(store);
         const { connectionState } = store.getState();
         if (connectionState === "CONNECTING") return;
         (_a = disconnectFns.get(store)) == null ? void 0 : _a();
         store.setState({
           connectionState: "CONNECTING",
-          connectingAt: Date.now()
+          connectingAt: Date.now(),
+          connectedAt: void 0,
+          disconnectedAt: void 0
         });
         const connection = connect(variable, {
           connected: () => {
@@ -922,20 +933,31 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
           errorUpdatedAt: void 0
         });
       };
+      store.delete = () => {
+        if (store.getSubscriberCount() > 0) {
+          console.warn(
+            "Cannot delete store while it still has active subscribers. Unsubscribe all listeners before deleting the store."
+          );
+          return false;
+        }
+        clearAllTimeouts(store);
+        store.setState(initialState);
+        return stores.delete(variableHash);
+      };
     }
     const useStore = (options2) => useStoreState(store, {
       initialState: { data: options2 == null ? void 0 : options2.initialData }
     });
-    return Object.assign(useStore, store);
+    return Object.assign(useStore, {
+      ...store,
+      setState: (value) => {
+        console.debug("Manual setState (not via provided actions) on stream store");
+        store.setState(value);
+      }
+    });
   };
   const triggerReconnect = (store, trigger) => {
-    clearTimeout(clearDataTimeoutIds.get(store));
-    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
-    if (disconnectTimeoutIds_) {
-      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
-      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
-      clearTimeout(disconnectTimeoutIds_.offline);
-    }
+    clearAllTimeouts(store);
     const { connectionState } = store.getState();
     if (connectionState === "INITIAL" || connectionState === "DISCONNECTED") {
       return store.connection.reconnect();

package/package.json

@@ -2,7 +2,7 @@
   "name": "floppy-disk",
   "description": "Lightweight unified state management for sync and async data.",
   "private": false,
-  "version": "3.7.0",
+  "version": "3.7.1",
   "keywords": [
     "utilities",
     "store",

package/react/create-stream.d.ts

@@ -1,4 +1,4 @@
-import { type InitStoreOptions, type StoreApi } from "../vanilla.ts";
+import { type InitStoreOptions, type SetStateInput } from "../vanilla.ts";
 import type { StoreKey } from "./create-stores.ts";
 type StreamDataState<TData, TError> = {
     state: "INITIAL";
@@ -43,8 +43,8 @@ export type StreamState<TData, TError> = ({
 }>) | ({
     connectionState: "CONNECTING";
     connectingAt: number;
-    connectedAt: number | undefined;
-    disconnectedAt: number | undefined;
+    connectedAt: undefined;
+    disconnectedAt: undefined;
 } & StreamDataState<TData, TError>) | ({
     connectionState: "CONNECTED";
     connectingAt: number;
@@ -68,6 +68,7 @@ type AdditionalStoreApi<TConnection> = {
     data: {
         reset: () => void;
     };
+    delete: () => boolean;
 };
 export type StreamOptions<TConnection, TData, TError = Error> = InitStoreOptions<StreamState<TData, TError>, AdditionalStoreApi<TConnection>> & {
     connection?: {
@@ -84,5 +85,20 @@ export declare const experimental_createStream: <TConnection, TData, TVariable e
     error: (error: TError) => void;
 }) => TConnection, disconnect: (connection: TConnection) => void, options?: StreamOptions<TConnection, TData, TError>) => (variable?: TVariable) => ((options?: {
     initialData?: TData;
-}) => StreamState<TData, TError>) & StoreApi<StreamState<TData, TError>> & AdditionalStoreApi<TConnection>;
+}) => StreamState<TData, TError>) & {
+    setState: (value: SetStateInput<StreamState<TData, TError>>) => void;
+    getState: () => StreamState<TData, TError>;
+    subscribe: (subscriber: import("../vanilla.ts").Subscriber<StreamState<TData, TError>>) => () => void;
+    getSubscriberCount: () => number;
+    variableHash: string;
+    connection: {
+        get: () => Readonly<TConnection> | undefined;
+        reconnect: () => void;
+        disconnect: () => void;
+    };
+    data: {
+        reset: () => void;
+    };
+    delete: () => boolean;
+};
 export {};

package/react.js

@@ -787,7 +787,20 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
   const connections = /* @__PURE__ */ new WeakMap();
   const disconnectFns = /* @__PURE__ */ new WeakMap();
   const disconnectTimeoutIds = /* @__PURE__ */ new WeakMap();
-  const clearDataTimeoutIds = /* @__PURE__ */ new WeakMap();
+  const clearAllTimeouts = (store) => {
+    const gcTimeoutId = gcTimeoutIds.get(store);
+    if (gcTimeoutId) {
+      clearTimeout(gcTimeoutId);
+      gcTimeoutIds.delete(store);
+    }
+    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
+    if (disconnectTimeoutIds_) {
+      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
+      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
+      clearTimeout(disconnectTimeoutIds_.offline);
+    }
+  };
+  const gcTimeoutIds = /* @__PURE__ */ new WeakMap();
   const configureStoreEvents = () => ({
     ...options,
     onFirstSubscribe: (state, store) => {
@@ -829,12 +842,7 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
     if (store.getSubscriberCount() && showLog) {
       console.log("Stream disconnected while there is subscriber");
     }
-    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
-    if (disconnectTimeoutIds_) {
-      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
-      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
-      clearTimeout(disconnectTimeoutIds_.offline);
-    }
+    clearAllTimeouts(store);
     (_a = disconnectFns.get(store)) == null ? void 0 : _a();
     if (store.getState().connectionState !== "INITIAL") {
       store.setState({
@@ -844,10 +852,10 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
     }
     connections.delete(store);
     disconnectFns.delete(store);
-    clearDataTimeoutIds.set(
+    gcTimeoutIds.set(
       store,
       setTimeout(() => {
-        store.data.reset();
+        if (store.getSubscriberCount() === 0) store.delete();
       }, gcTime)
     );
   };
@@ -868,12 +876,15 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
       store.connection.get = () => connections.get(store);
       store.connection.reconnect = () => {
         var _a;
+        clearAllTimeouts(store);
         const { connectionState } = store.getState();
         if (connectionState === "CONNECTING") return;
         (_a = disconnectFns.get(store)) == null ? void 0 : _a();
         store.setState({
           connectionState: "CONNECTING",
-          connectingAt: Date.now()
+          connectingAt: Date.now(),
+          connectedAt: void 0,
+          disconnectedAt: void 0
         });
         const connection = connect(variable, {
           connected: () => {
@@ -924,20 +935,31 @@ const experimental_createStream = (connect, disconnect, options = {}) => {
           errorUpdatedAt: void 0
         });
       };
+      store.delete = () => {
+        if (store.getSubscriberCount() > 0) {
+          console.warn(
+            "Cannot delete store while it still has active subscribers. Unsubscribe all listeners before deleting the store."
+          );
+          return false;
+        }
+        clearAllTimeouts(store);
+        store.setState(initialState);
+        return stores.delete(variableHash);
+      };
     }
     const useStore = (options2) => useStoreState(store, {
       initialState: { data: options2 == null ? void 0 : options2.initialData }
     });
-    return Object.assign(useStore, store);
+    return Object.assign(useStore, {
+      ...store,
+      setState: (value) => {
+        console.debug("Manual setState (not via provided actions) on stream store");
+        store.setState(value);
+      }
+    });
   };
   const triggerReconnect = (store, trigger) => {
-    clearTimeout(clearDataTimeoutIds.get(store));
-    const disconnectTimeoutIds_ = disconnectTimeoutIds.get(store);
-    if (disconnectTimeoutIds_) {
-      clearTimeout(disconnectTimeoutIds_["last-unsubscribe"]);
-      clearTimeout(disconnectTimeoutIds_["document-hidden"]);
-      clearTimeout(disconnectTimeoutIds_.offline);
-    }
+    clearAllTimeouts(store);
     const { connectionState } = store.getState();
     if (connectionState === "INITIAL" || connectionState === "DISCONNECTED") {
       return store.connection.reconnect();