@push.rocks/smartstate 2.0.23 → 2.0.25

package/dist_bundle/bundle.js

@@ -17727,9 +17727,9 @@ var StatePart2 = class {
       this.webStore = new dist_ts_exports11.WebStore(this.webStoreOptions);
       await this.webStore.init();
       const storedState = await this.webStore.get(String(this.name));
-      if (storedState) {
+      if (storedState && this.validateState(storedState)) {
         this.stateStore = storedState;
-        this.notifyChange();
+        await this.notifyChange();
       }
     }
   }
@@ -17744,24 +17744,38 @@ var StatePart2 = class {
    * @param newStateArg
    */
   async setState(newStateArg) {
+    if (!this.validateState(newStateArg)) {
+      throw new Error(`Invalid state structure for state part '${this.name}'`);
+    }
     this.stateStore = newStateArg;
-    this.notifyChange();
+    await this.notifyChange();
     if (this.webStore) {
       await this.webStore.set(String(this.name), newStateArg);
     }
     return this.stateStore;
   }
+  /**
+   * Validates state structure - can be overridden for custom validation
+   * @param stateArg
+   */
+  validateState(stateArg) {
+    return stateArg !== null && stateArg !== void 0;
+  }
   /**
    * notifies of a change on the state
    */
-  notifyChange() {
-    const createStateHash = (stateArg) => {
-      return dist_ts_web_exports.sha256FromString(dist_ts_exports4.stringify(stateArg));
+  async notifyChange() {
+    if (!this.stateStore) {
+      return;
+    }
+    const createStateHash = async (stateArg) => {
+      return await dist_ts_web_exports.sha256FromString(dist_ts_exports4.stringify(stateArg));
     };
-    if (this.stateStore && this.lastStateNotificationPayloadHash && createStateHash(this.stateStore) === this.lastStateNotificationPayloadHash) {
+    const currentHash = await createStateHash(this.stateStore);
+    if (this.lastStateNotificationPayloadHash && currentHash === this.lastStateNotificationPayloadHash) {
       return;
     } else {
-      this.lastStateNotificationPayloadHash = this.stateStore;
+      this.lastStateNotificationPayloadHash = currentHash;
     }
     this.state.next(this.stateStore);
   }
@@ -17769,7 +17783,11 @@ var StatePart2 = class {
    * creates a cumulative notification by adding a change notification at the end of the call stack;
    */
   notifyChangeCumulative() {
-    setTimeout(() => this.state.next(this.stateStore), 0);
+    setTimeout(async () => {
+      if (this.stateStore) {
+        await this.notifyChange();
+      }
+    }, 0);
   }
   /**
    * selects a state or a substate
@@ -17780,6 +17798,7 @@ var StatePart2 = class {
     }
     const mapped = this.state.pipe(
       dist_ts_exports5.rxjs.ops.startWith(this.getState()),
+      dist_ts_exports5.rxjs.ops.filter((stateArg) => stateArg !== void 0),
       dist_ts_exports5.rxjs.ops.map((stateArg) => {
         try {
           return selectorFn(stateArg);
@@ -17837,25 +17856,33 @@ var Smartstate = class {
   }
   /**
    * Allows getting and initializing a new statepart
-   * initMode === 'soft' it will allow existing stateparts
-   * initMode === 'mandatory' will fail if there is an existing statepart
-   * initMode === 'force' will overwrite any existing statepart
+   * initMode === 'soft' (default) - returns existing statepart if exists, creates new if not
+   * initMode === 'mandatory' - requires statepart to not exist, fails if it does
+   * initMode === 'force' - always creates new statepart, overwriting any existing
+   * initMode === 'persistent' - like 'soft' but with webstore persistence
    * @param statePartNameArg
    * @param initialArg
    * @param initMode
    */
-  async getStatePart(statePartNameArg, initialArg, initMode) {
-    if (this.statePartMap[statePartNameArg]) {
-      if (initialArg && (!initMode || initMode !== "soft")) {
-        throw new Error(
-          `${statePartNameArg} already exists, yet you try to set an initial state again`
-        );
+  async getStatePart(statePartNameArg, initialArg, initMode = "soft") {
+    const existingStatePart = this.statePartMap[statePartNameArg];
+    if (existingStatePart) {
+      switch (initMode) {
+        case "mandatory":
+          throw new Error(
+            `State part '${statePartNameArg}' already exists, but initMode is 'mandatory'`
+          );
+        case "force":
+          return this.createStatePart(statePartNameArg, initialArg, initMode);
+        case "soft":
+        case "persistent":
+        default:
+          return existingStatePart;
       }
-      return this.statePartMap[statePartNameArg];
     } else {
       if (!initialArg) {
         throw new Error(
-          `${statePartNameArg} does not yet exist, yet you don't provide an initial state`
+          `State part '${statePartNameArg}' does not exist and no initial state provided`
         );
       }
       return this.createStatePart(statePartNameArg, initialArg, initMode);
@@ -17865,8 +17892,9 @@ var Smartstate = class {
    * Creates a statepart
    * @param statePartName
    * @param initialPayloadArg
+   * @param initMode
    */
-  async createStatePart(statePartName, initialPayloadArg, initMode) {
+  async createStatePart(statePartName, initialPayloadArg, initMode = "soft") {
     const newState = new StatePart2(
       statePartName,
       initMode === "persistent" ? {
@@ -17877,8 +17905,8 @@ var Smartstate = class {
     await newState.init();
     const currentState = newState.getState();
     await newState.setState({
-      ...initialPayloadArg,
-      ...currentState
+      ...currentState,
+      ...initialPayloadArg
     });
     this.statePartMap[statePartName] = newState;
     return newState;