@figliolia/galena 2.2.4 → 2.2.6

package/dist/cjs/Galena/Galena.js

@@ -63,9 +63,9 @@ class Galena extends Guards_1.Guards {
     constructor(middleware = []) {
         super();
         this.state = {};
-        this.subscriptions = new Map();
         this.middleware = [];
         this.IDs = new event_emitter_1.AutoIncrementingID();
+        this.subscriptions = new Map();
         this.middleware = middleware;
     }
     /**
@@ -77,9 +77,10 @@ class Galena extends Guards_1.Guards {
      * state will automatically receive updates when your new unit of
      * state updates
      */
-    composeState(name, initialState, Model = (State_1.State)) {
+    composeState(name, initialState, Model) {
         this.guardDuplicateStates(name, this.state);
-        const state = new Model(name, initialState);
+        const StateModel = Model || (State_1.State);
+        const state = new StateModel(name, initialState);
         state.registerMiddleware(...this.middleware);
         this.mutable[name] = state;
         this.reIndexSubscriptions(name);
@@ -175,7 +176,7 @@ class Galena extends Guards_1.Guards {
             stateSubscriptions.push([
                 key,
                 this.state[key].subscribe(() => {
-                    callback(this.state);
+                    void callback(this.state);
                 }),
             ]);
         }
@@ -194,8 +195,8 @@ class Galena extends Guards_1.Guards {
         if (IDs) {
             for (const [state, ID] of IDs) {
                 this.state[state].unsubscribe(ID);
-                this.subscriptions.delete(ID);
             }
+            this.subscriptions.delete(ID);
         }
     }
     /**
@@ -207,21 +208,13 @@ class Galena extends Guards_1.Guards {
      * subscriptions
      */
     reIndexSubscriptions(name) {
-        var _a;
         for (const [ID, unitSubscriptions] of this.subscriptions) {
-            for (const [state, subscriptionID] of unitSubscriptions) {
-                const callback = (_a = this.state[state]["emitter"]
-                    .get(state)) === null || _a === void 0 ? void 0 : _a.get(subscriptionID);
-                if (callback) {
-                    unitSubscriptions.push([
-                        name,
-                        this.state[name].subscribe(() => {
-                            void callback(this.state);
-                        }),
-                    ]);
-                    this.subscriptions.set(ID, unitSubscriptions);
-                    break;
-                }
+            const [state, listenerID] = unitSubscriptions[0];
+            const subscriptions = this.state[state]["emitter"].get(state);
+            const listener = subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions.get(listenerID);
+            if (listener) {
+                unitSubscriptions.push([name, this.state[name].subscribe(listener)]);
+                this.subscriptions.set(ID, unitSubscriptions);
             }
         }
     }

package/dist/cjs/Galena/State.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.State = void 0;
 const types_1 = require("../Middleware/types");
 const event_emitter_1 = require("@figliolia/event-emitter");
-const types_2 = require("./types");
 const Scheduler_1 = require("./Scheduler");
+const types_2 = require("./types");
 /**
  * ### State
  *

package/dist/mjs/Galena/Galena.js

@@ -58,9 +58,9 @@ import { Guards } from "./Guards.js";
  */
 export class Galena extends Guards {
     state = {};
-    subscriptions = new Map();
     middleware = [];
     IDs = new AutoIncrementingID();
+    subscriptions = new Map();
     constructor(middleware = []) {
         super();
         this.middleware = middleware;
@@ -74,9 +74,10 @@ export class Galena extends Guards {
      * state will automatically receive updates when your new unit of
      * state updates
      */
-    composeState(name, initialState, Model = (State)) {
+    composeState(name, initialState, Model) {
         this.guardDuplicateStates(name, this.state);
-        const state = new Model(name, initialState);
+        const StateModel = Model || (State);
+        const state = new StateModel(name, initialState);
         state.registerMiddleware(...this.middleware);
         this.mutable[name] = state;
         this.reIndexSubscriptions(name);
@@ -172,7 +173,7 @@ export class Galena extends Guards {
             stateSubscriptions.push([
                 key,
                 this.state[key].subscribe(() => {
-                    callback(this.state);
+                    void callback(this.state);
                 }),
             ]);
         }
@@ -191,8 +192,8 @@ export class Galena extends Guards {
         if (IDs) {
             for (const [state, ID] of IDs) {
                 this.state[state].unsubscribe(ID);
-                this.subscriptions.delete(ID);
             }
+            this.subscriptions.delete(ID);
         }
     }
     /**
@@ -205,20 +206,12 @@ export class Galena extends Guards {
      */
     reIndexSubscriptions(name) {
         for (const [ID, unitSubscriptions] of this.subscriptions) {
-            for (const [state, subscriptionID] of unitSubscriptions) {
-                const callback = this.state[state]["emitter"]
-                    .get(state)
-                    ?.get(subscriptionID);
-                if (callback) {
-                    unitSubscriptions.push([
-                        name,
-                        this.state[name].subscribe(() => {
-                            void callback(this.state);
-                        }),
-                    ]);
-                    this.subscriptions.set(ID, unitSubscriptions);
-                    break;
-                }
+            const [state, listenerID] = unitSubscriptions[0];
+            const subscriptions = this.state[state]["emitter"].get(state);
+            const listener = subscriptions?.get(listenerID);
+            if (listener) {
+                unitSubscriptions.push([name, this.state[name].subscribe(listener)]);
+                this.subscriptions.set(ID, unitSubscriptions);
             }
         }
     }

package/dist/mjs/Galena/State.js

@@ -1,7 +1,7 @@
 import { MiddlewareEvents } from "../Middleware/types.js";
 import { EventEmitter } from "@figliolia/event-emitter";
-import { Priority } from "./types.js";
 import { Scheduler } from "./Scheduler.js";
+import { Priority } from "./types.js";
 /**
  * ### State
  *

package/dist/types/Galena/Galena.d.ts

@@ -1,6 +1,7 @@
 import type { Middleware } from "../Middleware/Middleware";
 import { State } from "./State";
 import { Guards } from "./Guards";
+import type { Subscription } from "./types";
 /**
  * ## Galena
  *
@@ -58,9 +59,9 @@ import { Guards } from "./Guards";
  */
 export declare class Galena<T extends Record<string, State<any>> = Record<string, State<any>>> extends Guards {
     readonly state: T;
-    private readonly subscriptions;
     private readonly middleware;
     private readonly IDs;
+    private readonly subscriptions;
     constructor(middleware?: Middleware[]);
     /**
      * Compose State
@@ -71,10 +72,7 @@ export declare class Galena<T extends Record<string, State<any>> = Record<string
      * state will automatically receive updates when your new unit of
      * state updates
      */
-    composeState<S extends any, M extends typeof State<S>>(name: string, initialState: S, Model?: {
-        new (name: string, initialState: S): State<S>;
-        clone<T_1>(state: T_1): T_1;
-    }): InstanceType<M>;
+    composeState<S extends Record<string, any>, M extends typeof State<S>>(name: string, initialState: S, Model?: M): InstanceType<M>;
     /**
      * Get State
      *
@@ -142,7 +140,7 @@ export declare class Galena<T extends Record<string, State<any>> = Record<string
      * subscription, call `Galena.unsubscribeAll()` with the ID
      * returned
      */
-    subscribeAll(callback: (nextState: T) => void): string;
+    subscribeAll(callback: Subscription<T>): string;
     /**
      * Unsubscribe
      *

package/dist/types/Galena/State.d.ts

@@ -1,6 +1,7 @@
 import type { Middleware } from "../Middleware/Middleware";
-import { Priority } from "./types";
 import { Scheduler } from "./Scheduler";
+import type { Subscription } from "./types";
+import { Priority } from "./types";
 /**
  * ### State
  *
@@ -200,7 +201,7 @@ export declare class State<T extends any = any> extends Scheduler {
      * callback you provide will execute each time state changes.
      * Returns a unique identifier for your subscription
      */
-    subscribe(callback: (nextState: T) => void): string;
+    subscribe(callback: Subscription<T>): string;
     /**
      * Unsubscribe
      *

package/dist/types/Galena/types.d.ts

@@ -8,3 +8,5 @@ export declare enum Priority {
     "BATCHED" = 3
 }
 export type Task = () => void;
+export type SubscriptionTuple = [state: string, ID: string];
+export type Subscription<T> = (nextState: T) => void | Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@figliolia/galena",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "A performant state management library supporting mutable state, batched updates, middleware and a rich development API",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",

package/src/Galena/Galena.ts

@@ -1,9 +1,8 @@
 import { AutoIncrementingID } from "@figliolia/event-emitter";
-
 import type { Middleware } from "Middleware/Middleware";
-
 import { State } from "Galena/State";
 import { Guards } from "./Guards";
+import type { Subscription, SubscriptionTuple } from "./types";
 
 /**
  * ## Galena
@@ -64,12 +63,9 @@ export class Galena<
   T extends Record<string, State<any>> = Record<string, State<any>>
 > extends Guards {
   public readonly state = {} as T;
-  private readonly subscriptions = new Map<
-    string,
-    [state: string, ID: string][]
-  >();
   private readonly middleware: Middleware[] = [];
   private readonly IDs = new AutoIncrementingID();
+  private readonly subscriptions = new Map<string, SubscriptionTuple[]>();
   constructor(middleware: Middleware[] = []) {
     super();
     this.middleware = middleware;
@@ -84,13 +80,14 @@ export class Galena<
    * state will automatically receive updates when your new unit of
    * state updates
    */
-  public composeState<S extends any, M extends typeof State<S>>(
+  public composeState<S extends Record<string, any>, M extends typeof State<S>>(
     name: string,
     initialState: S,
-    Model = State<S>
+    Model?: M
   ) {
     this.guardDuplicateStates(name, this.state);
-    const state = new Model(name, initialState);
+    const StateModel = Model || State<S>;
+    const state = new StateModel(name, initialState);
     state.registerMiddleware(...this.middleware);
     this.mutable[name] = state;
     this.reIndexSubscriptions(name);
@@ -201,13 +198,13 @@ export class Galena<
    * subscription, call `Galena.unsubscribeAll()` with the ID
    * returned
    */
-  public subscribeAll(callback: (nextState: T) => void) {
+  public subscribeAll(callback: Subscription<T>) {
     const stateSubscriptions: [state: string, ID: string][] = [];
     for (const key in this.state) {
       stateSubscriptions.push([
         key,
         this.state[key].subscribe(() => {
-          callback(this.state);
+          void callback(this.state);
         }),
       ]);
     }
@@ -227,8 +224,8 @@ export class Galena<
     if (IDs) {
       for (const [state, ID] of IDs) {
         this.state[state].unsubscribe(ID);
-        this.subscriptions.delete(ID);
       }
+      this.subscriptions.delete(ID);
     }
   }
 
@@ -242,20 +239,12 @@ export class Galena<
    */
   private reIndexSubscriptions(name: string) {
     for (const [ID, unitSubscriptions] of this.subscriptions) {
-      for (const [state, subscriptionID] of unitSubscriptions) {
-        const callback = this.state[state]["emitter"]
-          .get(state)
-          ?.get(subscriptionID);
-        if (callback) {
-          unitSubscriptions.push([
-            name,
-            this.state[name].subscribe(() => {
-              void callback(this.state);
-            }),
-          ]);
-          this.subscriptions.set(ID, unitSubscriptions);
-          break;
-        }
+      const [state, listenerID] = unitSubscriptions[0];
+      const subscriptions = this.state[state]["emitter"].get(state);
+      const listener = subscriptions?.get(listenerID);
+      if (listener) {
+        unitSubscriptions.push([name, this.state[name].subscribe(listener)]);
+        this.subscriptions.set(ID, unitSubscriptions);
       }
     }
   }

package/src/Galena/State.ts

@@ -1,8 +1,9 @@
 import { MiddlewareEvents } from "Middleware/types";
 import type { Middleware } from "Middleware/Middleware";
 import { EventEmitter } from "@figliolia/event-emitter";
-import { Priority, type MutationEvent } from "./types";
 import { Scheduler } from "./Scheduler";
+import type { Subscription } from "./types";
+import { Priority, type MutationEvent } from "./types";
 
 /**
  * ### State
@@ -260,7 +261,7 @@ export class State<T extends any = any> extends Scheduler {
    * callback you provide will execute each time state changes.
    * Returns a unique identifier for your subscription
    */
-  public subscribe(callback: (nextState: T) => void) {
+  public subscribe(callback: Subscription<T>) {
     return this.emitter.on(this.name, callback);
   }
 

package/src/Galena/types.ts

@@ -11,3 +11,7 @@ export enum Priority {
 }
 
 export type Task = () => void;
+
+export type SubscriptionTuple = [state: string, ID: string];
+
+export type Subscription<T> = (nextState: T) => void | Promise<void>;