@chromahq/store 1.0.4 → 1.0.6

package/dist/index.cjs.js

@@ -260,11 +260,15 @@ class BridgeStore {
   }
   setupStateSync() {
     if (this.bridge.on) {
-      this.bridge.on(`store:${this.storeName}:stateChanged`, (newState) => {
-        this.previousState = this.currentState;
-        this.currentState = newState;
-        this.notifyListeners();
+      this.bridge.on(`store:${this.storeName}:stateChanged`, () => {
+        this.bridge.send(`store:${this.storeName}:getState`).then((newState) => {
+          this.previousState = this.currentState;
+          this.currentState = newState;
+          this.notifyListeners();
+        });
       });
+    } else {
+      console.warn(`BridgeStore[${this.storeName}]: Bridge does not support event listening`);
     }
   }
   setState(partial, replace) {
@@ -310,7 +314,7 @@ function useStoreActions(store) {
         store.setState((state) => ({ ...state, ...partial }));
       },
       updateWith: (updater) => {
-        store.setState((state) => ({ ...state, ...updater(state) }));
+        store.setState((state) => updater(state));
       },
       replace: (newState) => {
         store.setState(newState, true);
@@ -397,6 +401,13 @@ class StoreBuilder {
     this.config.bridge = bridge;
     return this;
   }
+  /**
+   * Enable persistence with Chrome storage
+   */
+  withPersistence(options) {
+    this.config.persistence = options;
+    return this;
+  }
   /**
    * Create the store
    */
@@ -416,10 +427,13 @@ class StoreBuilder {
   createServiceWorkerStore() {
     let isReady = false;
     let initialState = null;
+    let runtimeBridge;
     const notifyReady = () => {
       isReady = true;
       readyCallbacks.forEach((callback) => callback());
+      this.onReadyCallbacks.forEach((callback) => callback());
       readyCallbacks.clear();
+      this.onReadyCallbacks.clear();
     };
     const creator = (set, get, store2) => {
       let state = {};
@@ -438,6 +452,11 @@ class StoreBuilder {
     };
     const persistedCreator = chromeStoragePersist(persistOptions)(creator);
     const store = vanilla.createStore(persistedCreator);
+    store.subscribe(() => {
+      if (runtimeBridge) {
+        runtimeBridge.broadcast(`store:${this.config.name}:stateChanged`, store.getState());
+      }
+    });
     const centralStore = Object.assign(store, {
       isReady: () => isReady,
       reset: () => {
@@ -447,6 +466,9 @@ class StoreBuilder {
           console.warn("ServiceWorkerStore: Cannot reset, initial state not available");
         }
       },
+      setBridge: (bridge) => {
+        runtimeBridge = bridge;
+      },
       onReady: (callback) => {
         if (isReady) {
           callback();
@@ -464,8 +486,19 @@ class StoreBuilder {
 function createStore(name) {
   return new StoreBuilder(name);
 }
+function createServiceWorkerStore(slices, name = "default", persistOptions) {
+  const sliceArray = Array.isArray(slices) ? slices : [slices];
+  let builder = createStore(name).withSlices(...sliceArray);
+  if (persistOptions) {
+    builder = builder.withPersistence(persistOptions);
+  }
+  return builder.create();
+}
+function createUIStore(bridge, initialState, name = "default") {
+  return createBridgeStore(bridge, initialState, name);
+}
 
-function autoRegisterStoreHandlers(store) {
+function autoRegisterStoreHandlers(store, storeName = "default") {
   if (!store) {
     throw new Error("autoRegisterStoreHandlers: store parameter is required");
   }
@@ -486,8 +519,8 @@ function autoRegisterStoreHandlers(store) {
       let replace = false;
       if (args.length === 1 && args[0] && typeof args[0] === "object") {
         const payload = args[0];
-        if ("partial" in payload && "replace" in payload) {
-          ({ partial, replace } = payload);
+        if ("partial" in payload) {
+          ({ partial, replace = false } = payload);
         } else {
           partial = payload;
           replace = false;
@@ -509,22 +542,13 @@ function autoRegisterStoreHandlers(store) {
       } else {
         store.setState(partial);
       }
-      return store.getState();
-    }
-  }
-  class AutoSubscribeToStoreMessage {
-    handle() {
-      if (!store) {
-        throw new Error("Store instance not available");
-      }
-      store.subscribe((state, prevState) => {
-      });
+      const updatedState = store.getState();
+      return updatedState;
     }
   }
   return {
     GetStoreStateMessage: AutoGetStoreStateMessage,
-    SetStoreStateMessage: AutoSetStoreStateMessage,
-    SubscribeToStoreMessage: AutoSubscribeToStoreMessage
+    SetStoreStateMessage: AutoSetStoreStateMessage
   };
 }
 
@@ -538,7 +562,7 @@ async function init(storeDefinition) {
     return {
       def: storeDefinition,
       store,
-      classes: autoRegisterStoreHandlers(store)
+      classes: autoRegisterStoreHandlers(store, storeDefinition.name)
     };
   } catch (error) {
     console.error(`Failed to initialize store "${storeDefinition.name}":`, error);
@@ -551,8 +575,10 @@ exports.StoreBuilder = StoreBuilder;
 exports.chromeStoragePersist = chromeStoragePersist;
 exports.createActionHookForStore = createActionHookForStore;
 exports.createBridgeStore = createBridgeStore;
+exports.createServiceWorkerStore = createServiceWorkerStore;
 exports.createStore = createStore;
 exports.createStoreHooks = createStoreHooks;
+exports.createUIStore = createUIStore;
 exports.init = init;
 exports.useCentralDispatch = useCentralDispatch;
 exports.useCentralStore = useCentralStore;

package/dist/index.d.ts

@@ -162,6 +162,10 @@ declare class StoreBuilder<T = any> {
      * Attach a bridge for cross-context communication
      */
     withBridge(bridge?: BridgeWithEvents): this;
+    /**
+     * Enable persistence with Chrome storage
+     */
+    withPersistence(options?: PersistOptions): this;
     /**
      * Create the store
      */
@@ -173,11 +177,21 @@ declare class StoreBuilder<T = any> {
  * Create a new store builder
  */
 declare function createStore<T = any>(name?: string): StoreBuilder<T>;
+/**
+ * Create a service worker store directly (convenience function)
+ * This creates a store optimized for service worker context with persistence
+ */
+declare function createServiceWorkerStore<T = any>(slices: StateCreator$1<T, [], [], T>[] | StateCreator$1<T, [], [], T>, name?: string, persistOptions?: PersistOptions): Promise<CentralStore<T>>;
+/**
+ * Create a bridge store directly (convenience function)
+ * This creates a store optimized for UI context that connects to service worker
+ */
+declare function createUIStore<T = any>(bridge: BridgeWithEvents, initialState?: T, name?: string): CentralStore<T>;
 
 /**
  * Initialize a store from a store definition
  */
 declare function init(storeDefinition: StoreDefinition): Promise<any>;
 
-export { BridgeStore, StoreBuilder, chromeStoragePersist, createActionHookForStore, createBridgeStore, createStore, createStoreHooks, init, useCentralDispatch, useCentralStore, useStoreReady, useStoreReset };
+export { BridgeStore, StoreBuilder, chromeStoragePersist, createActionHookForStore, createBridgeStore, createServiceWorkerStore, createStore, createStoreHooks, createUIStore, init, useCentralDispatch, useCentralStore, useStoreReady, useStoreReset };
 export type { Bridge, BridgeWithEvents, BridgeWithHandlers, CentralStore, ExtractSliceState, MergeSlices, PersistOptions, SliceCreator, StoreConfig, StoreDefinition };

package/dist/index.es.js

@@ -240,11 +240,15 @@ class BridgeStore {
   }
   setupStateSync() {
     if (this.bridge.on) {
-      this.bridge.on(`store:${this.storeName}:stateChanged`, (newState) => {
-        this.previousState = this.currentState;
-        this.currentState = newState;
-        this.notifyListeners();
+      this.bridge.on(`store:${this.storeName}:stateChanged`, () => {
+        this.bridge.send(`store:${this.storeName}:getState`).then((newState) => {
+          this.previousState = this.currentState;
+          this.currentState = newState;
+          this.notifyListeners();
+        });
       });
+    } else {
+      console.warn(`BridgeStore[${this.storeName}]: Bridge does not support event listening`);
     }
   }
   setState(partial, replace) {
@@ -290,7 +294,7 @@ function useStoreActions(store) {
         store.setState((state) => ({ ...state, ...partial }));
       },
       updateWith: (updater) => {
-        store.setState((state) => ({ ...state, ...updater(state) }));
+        store.setState((state) => updater(state));
       },
       replace: (newState) => {
         store.setState(newState, true);
@@ -377,6 +381,13 @@ class StoreBuilder {
     this.config.bridge = bridge;
     return this;
   }
+  /**
+   * Enable persistence with Chrome storage
+   */
+  withPersistence(options) {
+    this.config.persistence = options;
+    return this;
+  }
   /**
    * Create the store
    */
@@ -396,10 +407,13 @@ class StoreBuilder {
   createServiceWorkerStore() {
     let isReady = false;
     let initialState = null;
+    let runtimeBridge;
     const notifyReady = () => {
       isReady = true;
       readyCallbacks.forEach((callback) => callback());
+      this.onReadyCallbacks.forEach((callback) => callback());
       readyCallbacks.clear();
+      this.onReadyCallbacks.clear();
     };
     const creator = (set, get, store2) => {
       let state = {};
@@ -418,6 +432,11 @@ class StoreBuilder {
     };
     const persistedCreator = chromeStoragePersist(persistOptions)(creator);
     const store = createStore$1(persistedCreator);
+    store.subscribe(() => {
+      if (runtimeBridge) {
+        runtimeBridge.broadcast(`store:${this.config.name}:stateChanged`, store.getState());
+      }
+    });
     const centralStore = Object.assign(store, {
       isReady: () => isReady,
       reset: () => {
@@ -427,6 +446,9 @@ class StoreBuilder {
           console.warn("ServiceWorkerStore: Cannot reset, initial state not available");
         }
       },
+      setBridge: (bridge) => {
+        runtimeBridge = bridge;
+      },
       onReady: (callback) => {
         if (isReady) {
           callback();
@@ -444,8 +466,19 @@ class StoreBuilder {
 function createStore(name) {
   return new StoreBuilder(name);
 }
+function createServiceWorkerStore(slices, name = "default", persistOptions) {
+  const sliceArray = Array.isArray(slices) ? slices : [slices];
+  let builder = createStore(name).withSlices(...sliceArray);
+  if (persistOptions) {
+    builder = builder.withPersistence(persistOptions);
+  }
+  return builder.create();
+}
+function createUIStore(bridge, initialState, name = "default") {
+  return createBridgeStore(bridge, initialState, name);
+}
 
-function autoRegisterStoreHandlers(store) {
+function autoRegisterStoreHandlers(store, storeName = "default") {
   if (!store) {
     throw new Error("autoRegisterStoreHandlers: store parameter is required");
   }
@@ -466,8 +499,8 @@ function autoRegisterStoreHandlers(store) {
       let replace = false;
       if (args.length === 1 && args[0] && typeof args[0] === "object") {
         const payload = args[0];
-        if ("partial" in payload && "replace" in payload) {
-          ({ partial, replace } = payload);
+        if ("partial" in payload) {
+          ({ partial, replace = false } = payload);
         } else {
           partial = payload;
           replace = false;
@@ -489,22 +522,13 @@ function autoRegisterStoreHandlers(store) {
       } else {
         store.setState(partial);
       }
-      return store.getState();
-    }
-  }
-  class AutoSubscribeToStoreMessage {
-    handle() {
-      if (!store) {
-        throw new Error("Store instance not available");
-      }
-      store.subscribe((state, prevState) => {
-      });
+      const updatedState = store.getState();
+      return updatedState;
     }
   }
   return {
     GetStoreStateMessage: AutoGetStoreStateMessage,
-    SetStoreStateMessage: AutoSetStoreStateMessage,
-    SubscribeToStoreMessage: AutoSubscribeToStoreMessage
+    SetStoreStateMessage: AutoSetStoreStateMessage
   };
 }
 
@@ -518,7 +542,7 @@ async function init(storeDefinition) {
     return {
       def: storeDefinition,
       store,
-      classes: autoRegisterStoreHandlers(store)
+      classes: autoRegisterStoreHandlers(store, storeDefinition.name)
     };
   } catch (error) {
     console.error(`Failed to initialize store "${storeDefinition.name}":`, error);
@@ -526,4 +550,4 @@ async function init(storeDefinition) {
   }
 }
 
-export { BridgeStore, StoreBuilder, chromeStoragePersist, createActionHookForStore, createBridgeStore, createStore, createStoreHooks, init, useCentralDispatch, useCentralStore, useStoreReady, useStoreReset };
+export { BridgeStore, StoreBuilder, chromeStoragePersist, createActionHookForStore, createBridgeStore, createServiceWorkerStore, createStore, createStoreHooks, createUIStore, init, useCentralDispatch, useCentralStore, useStoreReady, useStoreReset };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chromahq/store",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Centralized, persistent store for Chrome extensions using zustand, accessible from service workers and React, with chrome.storage.local persistence.",
   "type": "module",
   "main": "dist/index.cjs.js",
@@ -50,10 +50,13 @@
   "devDependencies": {
     "@types/chrome": "^0.0.326",
     "@types/react": "^18.2.7",
-    "typescript": "^5.8.3"
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.4"
   },
   "scripts": {
     "build": "rollup -c rollup.config.mjs",
-    "dev": "rollup -c rollup.config.mjs --watch"
+    "dev": "rollup -c rollup.config.mjs --watch",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
 }