@blac/core 2.0.0-rc-8 → 2.0.0-rc-11

package/dist/index.es.js

@@ -1,385 +1,7 @@
-var I = Object.defineProperty;
-var y = (d, e, t) => e in d ? I(d, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[e] = t;
-var i = (d, e, t) => y(d, typeof e != "symbol" ? e + "" : e, t);
-const u = class u {
-  getInstance() {
-    return u._instance || (u._instance = new l({
-      __unsafe_ignore_singleton: !0
-    })), u._instance;
-  }
-  setInstance(e) {
-    u._instance = e;
-  }
-  resetInstance() {
-    const e = u._instance;
-    if (u._instance = new l({
-      __unsafe_ignore_singleton: !0
-    }), e)
-      for (const t of e.keepAliveBlocs)
-        u._instance.keepAliveBlocs.add(t), u._instance.uidRegistry.set(t.uid, t);
-  }
-};
-i(u, "_instance");
-let B = u, g = new B();
-function A(d) {
-  g = d;
-}
-const r = class r {
-  /**
-   * Creates a new Blac instance.
-   * @param options - Configuration options including singleton control
-   */
-  constructor(e = {}) {
-    /** Timestamp when the instance was created */
-    i(this, "createdAt", Date.now());
-    /** Map storing all registered bloc instances by their class name and ID */
-    i(this, "blocInstanceMap", /* @__PURE__ */ new Map());
-    /** Map storing isolated bloc instances grouped by their constructor */
-    // TODO: BlocConstructor<any> is required here for type inference to work correctly.
-    // Using BlocConstructor<BlocBase<unknown>> would break type inference when storing
-    // different bloc types in the same map. The 'any' allows proper polymorphic storage
-    // while maintaining type safety at usage sites through the BlocConstructor constraint.
-    i(this, "isolatedBlocMap", /* @__PURE__ */ new Map());
-    /** Map for O(1) lookup of isolated blocs by UID */
-    i(this, "isolatedBlocIndex", /* @__PURE__ */ new Map());
-    /** Map tracking UIDs to prevent memory leaks */
-    i(this, "uidRegistry", /* @__PURE__ */ new Map());
-    /** Set of keep-alive blocs for controlled cleanup */
-    i(this, "keepAliveBlocs", /* @__PURE__ */ new Set());
-    /** Flag to control whether changes should be posted to document */
-    i(this, "postChangesToDocument", !1);
-    /**
-     * Logs messages to console when logging is enabled
-     * @param args - Arguments to log
-     */
-    i(this, "log", (...e) => {
-      r.enableLog && r.logLevel === "warn" && console.warn(`☢️ [Blac ${this.createdAt.toString()}]`, ...e), r.enableLog && r.logLevel === "log" && console.log(`☢️ [Blac ${this.createdAt.toString()}]`, ...e);
-    });
-    /**
-     * Logs a warning message
-     * @param message - Warning message
-     * @param args - Additional arguments
-     */
-    i(this, "warn", (e, ...t) => {
-      r.enableLog && console.warn(
-        `🚨 [Blac ${String(r.instance.createdAt)}]`,
-        e,
-        ...t
-      );
-    });
-    /**
-     * Logs an error message
-     * @param message - Error message
-     * @param args - Additional arguments
-     */
-    i(this, "error", (e, ...t) => {
-      r.enableLog && console.error(
-        `🚨 [Blac ${String(r.instance.createdAt)}]`,
-        e,
-        ...t
-      );
-    });
-    /**
-     * Resets the Blac instance to a new one, disposing non-keepAlive blocs
-     * from the old instance.
-     */
-    i(this, "resetInstance", () => {
-      this.log("Reset Blac instance");
-      const e = new Map(this.blocInstanceMap), t = new Map(this.isolatedBlocMap);
-      e.forEach((s) => {
-        !s._keepAlive && s._disposalState === "active" && this.disposeBloc(s);
-      }), t.forEach((s) => {
-        s.forEach((n) => {
-          !n._keepAlive && n._disposalState === "active" && this.disposeBloc(n);
-        });
-      }), this.blocInstanceMap.clear(), this.isolatedBlocMap.clear(), this.isolatedBlocIndex.clear(), g.resetInstance();
-    });
-    /**
-     * Disposes of a bloc instance by removing it from the appropriate registry
-     * @param bloc - The bloc instance to dispose
-     */
-    i(this, "disposeBloc", (e) => {
-      if (e._disposalState !== "active") {
-        this.log(
-          `[${e._name}:${String(e._id)}] disposeBloc called on already disposed bloc`
-        );
-        return;
-      }
-      const t = e.constructor, s = this.createBlocInstanceMapKey(e._name, e._id);
-      this.log(
-        `[${e._name}:${String(e._id)}] disposeBloc called. Isolated: ${String(t.isolated)}`
-      ), e._dispose(), t.isolated ? (this.unregisterIsolatedBlocInstance(e), this.blocInstanceMap.delete(s)) : this.unregisterBlocInstance(e), this.log("dispatched bloc", e);
-    });
-    i(this, "activateBloc", (e) => {
-      if (e._disposalState !== "active") {
-        this.log(
-          `[${e._name}:${String(e._id)}] activateBloc called on disposed bloc. Ignoring.`
-        );
-        return;
-      }
-      const t = e.constructor;
-      (e.isIsolated ? this.findIsolatedBlocInstance(t, e._id) : this.findRegisteredBlocInstance(t, e._id)) || (this.log(
-        `[${e._name}:${String(e._id)}] activateBloc called. Isolated: ${String(e.isIsolated)}`
-      ), e.isIsolated ? this.registerIsolatedBlocInstance(e) : this.registerBlocInstance(e));
-    });
-    /**
-     * Gets or creates a bloc instance based on the provided class and options.
-     * If a bloc with the given ID exists, it will be returned. Otherwise, a new instance will be created.
-     *
-     * @param blocClass - The bloc class to get or create
-     * @param options - Options including:
-     *   - id: The instance ID (defaults to class name if not provided)
-     *   - props: Properties to pass to the bloc constructor
-     *   - instanceRef: Optional reference string for the instance
-     * @returns The bloc instance
-     */
-    i(this, "getBloc", (e, t = {}) => {
-      const { id: s } = t, n = e, o = s ?? e.name;
-      if (n.isolated) {
-        const c = this.findIsolatedBlocInstance(e, o);
-        if (c)
-          return c;
-        if (t.throwIfNotFound)
-          throw new Error(`Isolated bloc ${e.name} not found`);
-      } else {
-        const c = this.findRegisteredBlocInstance(e, o);
-        if (c)
-          return c;
-        if (t.throwIfNotFound)
-          throw new Error(`Registered bloc ${e.name} not found`);
-      }
-      const a = this.createNewBlocInstance(e, o, t);
-      if (this.log(
-        `[${e.name}:${String(o)}] (getBloc) No existing instance found. Creating new one.`,
-        t,
-        a
-      ), !a)
-        throw new Error(
-          `[getBloc] Failed to create bloc instance for ${e.name}. This should never happen.`
-        );
-      return a;
-    });
-    /**
-     * Gets a bloc instance or throws an error if it doesn't exist
-     * @param blocClass - The bloc class to get
-     * @param options - Options including:
-     *   - id: The instance ID (defaults to class name if not provided)
-     *   - props: Properties to pass to the bloc constructor
-     *   - instanceRef: Optional reference string for the instance
-     */
-    i(this, "getBlocOrThrow", (e, t = {}) => {
-      const s = e.isolated, n = t.id || e.name, o = s ? this.findIsolatedBlocInstance(e, n) : this.findRegisteredBlocInstance(e, n);
-      if (o)
-        return o;
-      throw new Error(`Bloc ${e.name} not found`);
-    });
-    /**
-     * Gets all instances of a specific bloc class
-     * @param blocClass - The bloc class to search for
-     * @param options - Options including:
-     *   - searchIsolated: Whether to search in isolated blocs (defaults to bloc's isolated property)
-     * @returns Array of matching bloc instances
-     */
-    i(this, "getAllBlocs", (e, t = {}) => {
-      const s = [];
-      if (this.blocInstanceMap.forEach((n) => {
-        n.constructor === e && s.push(n);
-      }), t.searchIsolated !== !1) {
-        const n = this.isolatedBlocMap.get(e);
-        n && s.push(...n.map((o) => o));
-      }
-      return s;
-    });
-    /**
-     * Disposes all keep-alive blocs of a specific type
-     * @param blocClass - The bloc class to dispose
-     */
-    i(this, "disposeKeepAliveBlocs", (e) => {
-      const t = [];
-      for (const s of this.keepAliveBlocs)
-        (!e || s.constructor === e) && t.push(s);
-      t.forEach((s) => s._dispose());
-    });
-    /**
-     * Disposes all blocs matching a pattern
-     * @param predicate - Function to test each bloc for disposal
-     */
-    i(this, "disposeBlocs", (e) => {
-      const t = [];
-      for (const s of this.blocInstanceMap.values())
-        e(s) && t.push(s);
-      for (const s of this.isolatedBlocMap.values())
-        for (const n of s)
-          e(n) && t.push(n);
-      t.forEach((s) => s._dispose());
-    });
-    /**
-     * Gets memory usage statistics for debugging
-     */
-    i(this, "getMemoryStats", () => ({
-      totalBlocs: this.uidRegistry.size,
-      registeredBlocs: this.blocInstanceMap.size,
-      isolatedBlocs: Array.from(this.isolatedBlocMap.values()).reduce(
-        (e, t) => e + t.length,
-        0
-      ),
-      keepAliveBlocs: this.keepAliveBlocs.size,
-      isolatedBlocTypes: this.isolatedBlocMap.size
-    }));
-    /**
-     * Validates consumer references and cleans up orphaned consumers
-     */
-    i(this, "validateConsumers", () => {
-      for (const e of this.uidRegistry.values())
-        e._validateConsumers(), e._consumers.size === 0 && !e._keepAlive && e._disposalState === "active" && setTimeout(() => {
-          e._consumers.size === 0 && !e._keepAlive && e._disposalState === "active" && this.disposeBloc(e);
-        }, 1e3);
-    });
-    const { __unsafe_ignore_singleton: t = !1 } = e;
-    if (!t)
-      return r.instance;
-    g.setInstance(this);
-  }
-  /** @deprecated Use getInstance() instead */
-  static get instance() {
-    return g.getInstance();
-  }
-  static get getAllBlocs() {
-    return r.instance.getAllBlocs;
-  }
-  static get log() {
-    return r.instance.log;
-  }
-  /**
-   * Gets the current Blac instance
-   * @returns The Blac instance
-   */
-  static getInstance() {
-    return g.getInstance();
-  }
-  static get warn() {
-    return r.instance.warn;
-  }
-  static get error() {
-    return r.instance.error;
-  }
-  static get disposeBloc() {
-    return r.instance.disposeBloc;
-  }
-  /**
-   * Creates a unique key for a bloc instance in the map based on the bloc class name and instance ID
-   * @param blocClassName - The name of the bloc class
-   * @param id - The instance ID
-   * @returns A unique key string in the format "className:id"
-   */
-  createBlocInstanceMapKey(e, t) {
-    return `${e}:${String(t)}`;
-  }
-  /**
-   * Unregister a bloc instance from the main registry
-   * @param bloc - The bloc instance to unregister
-   */
-  unregisterBlocInstance(e) {
-    const t = this.createBlocInstanceMapKey(e._name, e._id);
-    this.blocInstanceMap.delete(t), this.uidRegistry.delete(e.uid), this.keepAliveBlocs.delete(e);
-  }
-  /**
-   * Registers a bloc instance in the main registry
-   * @param bloc - The bloc instance to register
-   */
-  registerBlocInstance(e) {
-    const t = this.createBlocInstanceMapKey(e._name, e._id);
-    this.blocInstanceMap.set(t, e), this.uidRegistry.set(e.uid, e), e._keepAlive && this.keepAliveBlocs.add(e);
-  }
-  /**
-   * Finds a registered bloc instance by its class and ID
-   * @param blocClass - The bloc class to search for
-   * @param id - The instance ID
-   * @returns The found bloc instance or undefined if not found
-   */
-  findRegisteredBlocInstance(e, t) {
-    if (e.isolated) return;
-    const n = this.createBlocInstanceMapKey(e.name, t);
-    return this.blocInstanceMap.get(n);
-  }
-  /**
-   * Registers an isolated bloc instance in the isolated registry
-   * @param bloc - The isolated bloc instance to register
-   */
-  registerIsolatedBlocInstance(e) {
-    const t = e.constructor, s = this.isolatedBlocMap.get(t);
-    s ? s.push(e) : this.isolatedBlocMap.set(t, [e]), this.isolatedBlocIndex.set(e.uid, e), this.uidRegistry.set(e.uid, e), e._keepAlive && this.keepAliveBlocs.add(e);
-  }
-  /**
-   * Unregister an isolated bloc instance from the isolated registry
-   * @param bloc - The isolated bloc instance to unregister
-   */
-  unregisterIsolatedBlocInstance(e) {
-    const t = e.constructor, s = this.isolatedBlocMap.get(t);
-    let n = !1;
-    if (s) {
-      const a = s.findIndex((c) => c.uid === e.uid);
-      a !== -1 && (s.splice(a, 1), n = !0), s.length === 0 && this.isolatedBlocMap.delete(t);
-    }
-    const o = this.isolatedBlocIndex.delete(e.uid);
-    this.uidRegistry.delete(e.uid), this.keepAliveBlocs.delete(e), n !== o && this.warn(
-      `[Blac] Inconsistent state detected during isolated bloc cleanup for ${e._name}:${e.uid}. Map removal: ${n}, Index removal: ${o}`
-    );
-  }
-  /**
-   * Finds an isolated bloc instance by its class and ID (O(n) lookup)
-   */
-  findIsolatedBlocInstance(e, t) {
-    if (!e.isolated) return;
-    const n = this.isolatedBlocMap.get(e);
-    return n ? n.find((a) => a._id === t) : void 0;
-  }
-  /**
-   * Finds an isolated bloc instance by UID (O(1) lookup)
-   */
-  findIsolatedBlocInstanceByUid(e) {
-    return this.isolatedBlocIndex.get(e);
-  }
-  /**
-   * Creates a new bloc instance and registers it in the appropriate registry
-   * @param blocClass - The bloc class to instantiate
-   * @param id - The instance ID
-   * @param props - Properties to pass to the bloc constructor
-   * @param instanceRef - Optional reference string for the instance
-   * @returns The newly created bloc instance
-   */
-  createNewBlocInstance(e, t, s = {}) {
-    const { props: n, instanceRef: o } = s, a = new e(n);
-    return a._instanceRef = o, a.props = n || null, a._updateId(t), a._setDisposalHandler((c) => this.disposeBloc(c)), a.isIsolated ? (this.registerIsolatedBlocInstance(a), a) : (this.registerBlocInstance(a), a);
-  }
-  static get activateBloc() {
-    return r.instance.activateBloc;
-  }
-  static get getBloc() {
-    return r.instance.getBloc;
-  }
-  static get getBlocOrThrow() {
-    return r.instance.getBlocOrThrow;
-  }
-  static get disposeKeepAliveBlocs() {
-    return r.instance.disposeKeepAliveBlocs;
-  }
-  static get disposeBlocs() {
-    return r.instance.disposeBlocs;
-  }
-  static get getMemoryStats() {
-    return r.instance.getMemoryStats;
-  }
-  static get validateConsumers() {
-    return r.instance.validateConsumers;
-  }
-};
-/** Flag to enable/disable logging */
-i(r, "enableLog", !1), i(r, "logLevel", "warn"), i(r, "resetInstance", () => {
-  g.resetInstance();
-});
-let l = r;
-class w {
+var E = Object.defineProperty;
+var O = (c, e, t) => e in c ? E(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
+var i = (c, e, t) => O(c, typeof e != "symbol" ? e + "" : e, t);
+class V {
   /**
    * Creates a new BlacObservable instance
    * @param bloc - The Bloc instance to observe
@@ -410,16 +32,38 @@ class w {
    * @returns A function that can be called to unsubscribe the observer
    */
   subscribe(e) {
-    return l.log("BlacObservable.subscribe: Subscribing observer.", this.bloc, e), this._observers.add(e), () => {
-      l.log("BlacObservable.subscribe: Unsubscribing observer.", this.bloc, e), this.unsubscribe(e);
-    };
+    const t = this.bloc._disposalState;
+    return t === _.DISPOSED || t === _.DISPOSING ? (d.log(
+      "BlacObservable.subscribe: Cannot subscribe to disposed/disposing bloc.",
+      this.bloc,
+      e
+    ), () => {
+    }) : (d.log(
+      "BlacObservable.subscribe: Subscribing observer.",
+      this.bloc,
+      e
+    ), this._observers.add(e), t === _.DISPOSAL_REQUESTED && (d.log(
+      "BlacObservable.subscribe: Cancelling disposal due to new subscription.",
+      this.bloc
+    ), this.bloc._atomicStateTransition(
+      _.DISPOSAL_REQUESTED,
+      _.ACTIVE
+    )), () => {
+      d.log(
+        "BlacObservable.subscribe: Unsubscribing observer.",
+        this.bloc,
+        e
+      ), this.unsubscribe(e);
+    });
   }
   /**
    * Unsubscribes an observer from state changes
    * @param observer - The observer to unsubscribe
    */
   unsubscribe(e) {
-    this._observers.delete(e), this.size === 0 && (l.log("BlacObservable.unsubscribe: No observers left.", this.bloc), this.bloc._consumers.size === 0 && !this.bloc._keepAlive && this.bloc._disposalState === "active" && (l.log(`[${this.bloc._name}:${this.bloc._id}] No observers or consumers left. Scheduling disposal.`), this.bloc._scheduleDisposal()));
+    this._observers.delete(e), this.size === 0 && (d.log("BlacObservable.unsubscribe: No observers left.", this.bloc), this.bloc._consumers.size === 0 && !this.bloc._keepAlive && this.bloc._disposalState === _.ACTIVE && (d.log(
+      `[${this.bloc._name}:${this.bloc._id}] No observers or consumers left. Scheduling disposal.`
+    ), this.bloc._scheduleDisposal()));
   }
   /**
    * Notifies all observers of a state change
@@ -429,31 +73,27 @@ class w {
    */
   notify(e, t, s) {
     this._observers.forEach((n) => {
-      let o = !1;
+      let r = !1;
       if (n.dependencyArray) {
-        const a = n.lastState, c = n.dependencyArray(e, t);
-        if (!a)
-          o = !0;
-        else if (a.length !== c.length)
-          o = !0;
+        const o = n.lastState, a = n.dependencyArray(
+          e,
+          t,
+          this.bloc
+        );
+        if (!o)
+          r = !0;
+        else if (o.length !== a.length)
+          r = !0;
         else
-          for (let h = 0; h < c.length; h++) {
-            const _ = a[h] || [], p = c[h] || [];
-            if (_.length !== p.length) {
-              o = !0;
+          for (let u = 0; u < a.length; u++)
+            if (!Object.is(o[u], a[u])) {
+              r = !0;
               break;
             }
-            for (let f = 0; f < p.length; f++)
-              if (!Object.is(_[f], p[f])) {
-                o = !0;
-                break;
-              }
-            if (o) break;
-          }
-        n.lastState = c;
+        n.lastState = a;
       } else
-        o = !0;
-      o && n.fn(e, t, s);
+        r = !0;
+      r && n.fn(e, t, s);
     });
   }
   /**
@@ -463,21 +103,22 @@ class w {
     this._observers.clear();
   }
 }
-function b() {
-  return typeof crypto < "u" && crypto.randomUUID ? crypto.randomUUID() : "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(d) {
+function $() {
+  return typeof crypto < "u" && crypto.randomUUID ? crypto.randomUUID() : "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const e = Math.random() * 16 | 0;
-    return (d === "x" ? e : e & 3 | 8).toString(16);
+    return (c === "x" ? e : e & 3 | 8).toString(16);
   });
 }
-class v {
+var _ = /* @__PURE__ */ ((c) => (c.ACTIVE = "active", c.DISPOSAL_REQUESTED = "disposal_requested", c.DISPOSING = "disposing", c.DISPOSED = "disposed", c))(_ || {});
+class x {
   /**
    * Creates a new BlocBase instance with the given initial state.
    * Sets up the observer, registers with the Blac manager, and initializes addons.
-   * 
+   *
    * @param initialState The initial state value for this Bloc
    */
   constructor(e) {
-    i(this, "uid", b());
+    i(this, "uid", $());
     /**
      * Defines how dependencies are selected from the state for efficient updates.
      * When provided, observers will only be notified when selected dependencies change.
@@ -515,9 +156,14 @@ class v {
     i(this, "_createdAt", Date.now());
     /**
      * @internal
-     * Disposal state to prevent race conditions
+     * Atomic disposal state to prevent race conditions
      */
     i(this, "_disposalState", "active");
+    /**
+     * @internal
+     * Timestamp when disposal was requested (for React Strict Mode grace period)
+     */
+    i(this, "_disposalRequestTime", 0);
     /**
      * @internal
      * The current state of the Bloc.
@@ -565,7 +211,7 @@ class v {
      * @internal
      * Updates the Bloc instance's ID to a new value.
      * Only updates if the new ID is defined and different from the current one.
-     * 
+     *
      * @param id The new ID to assign to this Bloc instance
      */
     i(this, "_updateId", (e) => {
@@ -586,24 +232,30 @@ class v {
      * @internal
      * Registers a new consumer to this Bloc instance.
      * Notifies the Blac manager that a consumer has been added.
-     * 
+     *
      * @param consumerId The unique ID of the consumer being added
      * @param consumerRef Optional reference to the consumer object for cleanup validation
      */
     i(this, "_addConsumer", (e, t) => {
       var s;
-      this._disposalState === "active" && (this._consumers.has(e) || (this._consumers.add(e), t && this._consumerRefs.set(e, new WeakRef(t)), (s = globalThis.Blac) == null || s.log(`[${this._name}:${this._id}] Consumer added. Total consumers: ${this._consumers.size}`)));
+      return this._disposalState !== "active" ? !1 : (this._consumers.has(e) || (this._consumers.add(e), t && this._consumerRefs.set(e, new WeakRef(t)), (s = globalThis.Blac) == null || s.log(
+        `[${this._name}:${this._id}] Consumer added. Total consumers: ${this._consumers.size}`
+      )), !0);
     });
     /**
      * @internal
      * Unregisters a consumer from this Bloc instance.
      * Notifies the Blac manager that a consumer has been removed.
-     * 
+     *
      * @param consumerId The unique ID of the consumer being removed
      */
     i(this, "_removeConsumer", (e) => {
       var t, s;
-      this._consumers.has(e) && (this._consumers.delete(e), this._consumerRefs.delete(e), (t = globalThis.Blac) == null || t.log(`[${this._name}:${this._id}] Consumer removed. Remaining consumers: ${this._consumers.size}, keepAlive: ${this._keepAlive}`), this._consumers.size === 0 && !this._keepAlive && this._disposalState === "active" && ((s = globalThis.Blac) == null || s.log(`[${this._name}:${this._id}] No consumers left and not keep-alive. Scheduling disposal.`), this._scheduleDisposal()));
+      this._consumers.has(e) && (this._consumers.delete(e), this._consumerRefs.delete(e), (t = globalThis.Blac) == null || t.log(
+        `[${this._name}:${this._id}] Consumer removed. Remaining consumers: ${this._consumers.size}, keepAlive: ${this._keepAlive}`
+      ), this._consumers.size === 0 && !this._keepAlive && this._disposalState === "active" && ((s = globalThis.Blac) == null || s.log(
+        `[${this._name}:${this._id}] No consumers left and not keep-alive. Scheduling disposal.`
+      ), this._scheduleDisposal()));
     });
     /**
      * @internal
@@ -619,110 +271,585 @@ class v {
     /**
      * @internal
      * Updates the state and notifies all observers of the change.
-     * 
+     *
      * @param newState The new state to be set
      * @param oldState The previous state for comparison
      * @param action Optional metadata about what caused the state change
      */
     i(this, "_pushState", (e, t, s) => {
-      if (e === void 0) {
-        console.warn("BlocBase._pushState: newState is undefined", this);
-        return;
+      if (e !== void 0 && !(s !== void 0 && typeof s != "object" && typeof s != "function")) {
+        if (this._batchingEnabled) {
+          this._pendingUpdates.push({ newState: e, oldState: t, action: s }), this._oldState = t, this._state = e;
+          return;
+        }
+        this._oldState = t, this._state = e, this._observer.notify(e, t, s), this.lastUpdate = Date.now();
+      }
+    });
+    /**
+     * Enables batching for multiple state updates
+     * @param batchFn Function to execute with batching enabled
+     */
+    i(this, "batch", (e) => {
+      if (this._batchingLock)
+        return e();
+      this._batchingLock = !0, this._batchingEnabled = !0, this._pendingUpdates = [];
+      try {
+        const t = e();
+        if (this._pendingUpdates.length > 0) {
+          const s = this._pendingUpdates[this._pendingUpdates.length - 1];
+          this._observer.notify(
+            s.newState,
+            s.oldState,
+            s.action
+          ), this.lastUpdate = Date.now();
+        }
+        return t;
+      } finally {
+        this._batchingEnabled = !1, this._batchingLock = !1, this._pendingUpdates = [];
       }
-      if (s !== void 0 && typeof s != "object" && typeof s != "function") {
-        console.warn("BlocBase._pushState: Invalid action type", this, s);
+    });
+    this._state = e, this._observer = new V(this), this._id = this.constructor.name;
+    const t = this.constructor;
+    this._keepAlive = typeof t.keepAlive == "boolean" ? t.keepAlive : !1, this._isolated = typeof t.isolated == "boolean" ? t.isolated : !1;
+  }
+  get isIsolated() {
+    return this._isolated;
+  }
+  get isKeepAlive() {
+    return this._keepAlive;
+  }
+  /**
+   * Returns the current state of the Bloc.
+   * Use this getter to access the state in a read-only manner.
+   * Returns the state even during transitional lifecycle states for React compatibility.
+   */
+  get state() {
+    return this._disposalState === "disposed" ? this._state : this._state;
+  }
+  /**
+   * Returns whether this Bloc instance has been disposed.
+   * @returns true if the bloc is in DISPOSED state
+   */
+  get isDisposed() {
+    return this._disposalState === "disposed";
+  }
+  /**
+   * @internal
+   * Returns the name of the Bloc class for identification and debugging.
+   */
+  get _name() {
+    return this.constructor.name;
+  }
+  /**
+   * @internal
+   * Performs atomic state transition using compare-and-swap semantics
+   * @param expectedState The expected current state
+   * @param newState The desired new state
+   * @returns Result indicating success/failure and state information
+   */
+  _atomicStateTransition(e, t) {
+    var s, n, r, o;
+    if (this._disposalState === e) {
+      const a = this._disposalState;
+      return this._disposalState = t, (s = globalThis.Blac) != null && s.enableLog && ((n = globalThis.Blac) == null || n.log(
+        `[${this._name}:${this._id}] State transition: ${a} -> ${t} (SUCCESS)`
+      )), {
+        success: !0,
+        currentState: t,
+        previousState: a
+      };
+    }
+    return (r = globalThis.Blac) != null && r.enableLog && ((o = globalThis.Blac) == null || o.log(
+      `[${this._name}:${this._id}] State transition failed: expected ${e}, current ${this._disposalState}`
+    )), {
+      success: !1,
+      currentState: this._disposalState,
+      previousState: e
+    };
+  }
+  /**
+   * @internal
+   * Cleans up resources and removes this Bloc from the system.
+   * Notifies the Blac manager and clears all observers.
+   */
+  _dispose() {
+    var t;
+    let e = this._atomicStateTransition(
+      "active",
+      "disposing"
+      /* DISPOSING */
+    );
+    if (e.success || (e = this._atomicStateTransition(
+      "disposal_requested",
+      "disposing"
+      /* DISPOSING */
+    )), !e.success)
+      return !1;
+    try {
+      return this._consumers.clear(), this._consumerRefs.clear(), this._observer.clear(), (t = this.onDispose) == null || t.call(this), this._atomicStateTransition(
+        "disposing",
+        "disposed"
+        /* DISPOSED */
+      ).success;
+    } catch (s) {
+      throw this._disposalState = "active", s;
+    }
+  }
+  /**
+   * @internal
+   * Sets the disposal handler for this bloc
+   */
+  _setDisposalHandler(e) {
+    this._disposalHandler = e;
+  }
+  /**
+   * @internal
+   * Schedules disposal of this bloc instance if it has no consumers
+   * Uses atomic state transitions to prevent race conditions
+   */
+  _scheduleDisposal() {
+    if (!this._atomicStateTransition(
+      "active",
+      "disposal_requested"
+      /* DISPOSAL_REQUESTED */
+    ).success)
+      return;
+    if (!(this._consumers.size === 0 && !this._keepAlive)) {
+      this._atomicStateTransition(
+        "disposal_requested",
+        "active"
+        /* ACTIVE */
+      );
+      return;
+    }
+    this._disposalRequestTime = Date.now(), queueMicrotask(() => {
+      this._consumers.size === 0 && !this._keepAlive && this._observer.size === 0 && this._disposalState === "disposal_requested" ? this._disposalHandler ? this._disposalHandler(this) : this._dispose() : this._atomicStateTransition(
+        "disposal_requested",
+        "active"
+        /* ACTIVE */
+      );
+    });
+  }
+}
+/**
+ * When true, every consumer will receive its own unique instance of this Bloc.
+ * Use this when state should not be shared between components.
+ * @default false
+ */
+i(x, "isolated", !1), /**
+ * When true, the Bloc instance persists even when there are no active consumers.
+ * Useful for maintaining state between component unmount/remount cycles.
+ * @default false
+ */
+i(x, "keepAlive", !1);
+const y = class y {
+  getInstance() {
+    return y._instance || (y._instance = new d({
+      __unsafe_ignore_singleton: !0
+    })), y._instance;
+  }
+  setInstance(e) {
+    y._instance = e;
+  }
+  resetInstance() {
+    const e = y._instance;
+    if (y._instance = new d({
+      __unsafe_ignore_singleton: !0
+    }), e)
+      for (const t of e.keepAliveBlocs)
+        y._instance.keepAliveBlocs.add(t), y._instance.uidRegistry.set(t.uid, t);
+  }
+};
+i(y, "_instance");
+let C = y, S = new C();
+function q(c) {
+  S = c;
+}
+const l = class l {
+  /**
+   * Creates a new Blac instance.
+   * @param options - Configuration options including singleton control
+   */
+  constructor(e = {}) {
+    /** Timestamp when the instance was created */
+    i(this, "createdAt", Date.now());
+    /** Map storing all registered bloc instances by their class name and ID */
+    i(this, "blocInstanceMap", /* @__PURE__ */ new Map());
+    /** Map storing isolated bloc instances grouped by their constructor */
+    // Using BlocConstructor<BlocBase<unknown>> would break type inference when storing
+    // different bloc types in the same map. The 'any' allows proper polymorphic storage
+    // while maintaining type safety at usage sites through the BlocConstructor constraint.
+    i(this, "isolatedBlocMap", /* @__PURE__ */ new Map());
+    /** Map for O(1) lookup of isolated blocs by UID */
+    i(this, "isolatedBlocIndex", /* @__PURE__ */ new Map());
+    /** Map tracking UIDs to prevent memory leaks */
+    i(this, "uidRegistry", /* @__PURE__ */ new Map());
+    /** Set of keep-alive blocs for controlled cleanup */
+    i(this, "keepAliveBlocs", /* @__PURE__ */ new Set());
+    /** Flag to control whether changes should be posted to document */
+    i(this, "postChangesToDocument", !1);
+    /**
+     * Logs messages to console when logging is enabled
+     * @param args - Arguments to log
+     */
+    i(this, "log", (...e) => {
+      l.logSpy && l.logSpy(e), l.enableLog && l.logLevel, l.enableLog && l.logLevel;
+    });
+    /**
+     * Logs a warning message
+     * @param message - Warning message
+     * @param args - Additional arguments
+     */
+    i(this, "warn", (e, ...t) => {
+      l.enableLog;
+    });
+    /**
+     * Logs an error message
+     * @param message - Error message
+     * @param args - Additional arguments
+     */
+    i(this, "error", (e, ...t) => {
+      l.enableLog;
+    });
+    /**
+     * Resets the Blac instance to a new one, disposing non-keepAlive blocs
+     * from the old instance.
+     */
+    i(this, "resetInstance", () => {
+      this.log("Reset Blac instance");
+      const e = new Map(this.blocInstanceMap), t = new Map(this.isolatedBlocMap);
+      e.forEach((s) => {
+        !s._keepAlive && s._disposalState === _.ACTIVE && this.disposeBloc(s);
+      }), t.forEach((s) => {
+        s.forEach((n) => {
+          !n._keepAlive && n._disposalState === _.ACTIVE && this.disposeBloc(n);
+        });
+      }), this.blocInstanceMap.clear(), this.isolatedBlocMap.clear(), this.isolatedBlocIndex.clear(), S.resetInstance();
+    });
+    /**
+     * Disposes of a bloc instance by removing it from the appropriate registry
+     * @param bloc - The bloc instance to dispose
+     */
+    i(this, "disposeBloc", (e) => {
+      const t = e._disposalState;
+      if (![
+        _.ACTIVE,
+        _.DISPOSAL_REQUESTED
+      ].includes(t)) {
+        this.log(
+          `[${e._name}:${String(e._id)}] disposeBloc called on bloc in invalid state: ${t}`
+        );
         return;
       }
-      if (this._batchingEnabled) {
-        this._pendingUpdates.push({ newState: e, oldState: t, action: s }), this._oldState = t, this._state = e;
+      const n = e.constructor, r = this.createBlocInstanceMapKey(e._name, e._id);
+      this.log(
+        `[${e._name}:${String(e._id)}] disposeBloc called. Isolated: ${String(n.isolated)}`
+      ), e._dispose(), n.isolated ? (this.unregisterIsolatedBlocInstance(e), this.blocInstanceMap.delete(r)) : this.unregisterBlocInstance(e), this.log("dispatched bloc", e);
+    });
+    i(this, "activateBloc", (e) => {
+      if (e._disposalState !== _.ACTIVE) {
+        this.log(
+          `[${e._name}:${String(e._id)}] activateBloc called on disposed bloc. Ignoring.`
+        );
         return;
       }
-      this._oldState = t, this._state = e, this._observer.notify(e, t, s), this.lastUpdate = Date.now();
+      const t = e.constructor;
+      (e.isIsolated ? this.findIsolatedBlocInstance(t, e._id) : this.findRegisteredBlocInstance(t, e._id)) || (this.log(
+        `[${e._name}:${String(e._id)}] activateBloc called. Isolated: ${String(e.isIsolated)}`
+      ), e.isIsolated ? this.registerIsolatedBlocInstance(e) : this.registerBlocInstance(e));
+    });
+    /**
+     * Gets or creates a bloc instance based on the provided class and options.
+     * If a bloc with the given ID exists, it will be returned. Otherwise, a new instance will be created.
+     *
+     * @param blocClass - The bloc class to get or create
+     * @param options - Options including:
+     *   - id: The instance ID (defaults to class name if not provided)
+     *   - props: Properties to pass to the bloc constructor
+     *   - instanceRef: Optional reference string for the instance
+     * @returns The bloc instance
+     */
+    i(this, "getBloc", (e, t = {}) => {
+      const { id: s, forceNewInstance: n } = t, r = e, o = s ?? e.name;
+      if (this.log(`[${e.name}:${String(o)}] (getBloc) Called:`, {
+        options: t,
+        base: r
+      }), !n)
+        if (r.isolated) {
+          const u = this.findIsolatedBlocInstance(
+            e,
+            t.instanceRef ?? o
+          );
+          if (u)
+            return u;
+          if (t.throwIfNotFound)
+            throw new Error(`Isolated bloc ${e.name} not found`);
+        } else {
+          const u = this.findRegisteredBlocInstance(
+            e,
+            o
+          );
+          if (u)
+            return u;
+          if (t.throwIfNotFound)
+            throw new Error(`Registered bloc ${e.name} not found`);
+        }
+      const a = this.createNewBlocInstance(e, o, t);
+      if (this.log(
+        `[${e.name}:${String(o)}] (getBloc) No existing instance found. Creating new one.`,
+        t,
+        a
+      ), !a)
+        throw new Error(
+          `[getBloc] Failed to create bloc instance for ${e.name}. This should never happen.`
+        );
+      return a;
+    });
+    /**
+     * Gets a bloc instance or throws an error if it doesn't exist
+     * @param blocClass - The bloc class to get
+     * @param options - Options including:
+     *   - id: The instance ID (defaults to class name if not provided)
+     *   - props: Properties to pass to the bloc constructor
+     *   - instanceRef: Optional reference string for the instance
+     */
+    i(this, "getBlocOrThrow", (e, t = {}) => {
+      const s = e.isolated, n = t.id || e.name, r = s ? this.findIsolatedBlocInstance(e, n) : this.findRegisteredBlocInstance(e, n);
+      if (r)
+        return r;
+      throw new Error(`Bloc ${e.name} not found`);
+    });
+    /**
+     * Gets all instances of a specific bloc class
+     * @param blocClass - The bloc class to search for
+     * @param options - Options including:
+     *   - searchIsolated: Whether to search in isolated blocs (defaults to bloc's isolated property)
+     * @returns Array of matching bloc instances
+     */
+    i(this, "getAllBlocs", (e, t = {}) => {
+      const s = [];
+      if (this.blocInstanceMap.forEach((n) => {
+        n.constructor === e && s.push(n);
+      }), t.searchIsolated !== !1) {
+        const n = this.isolatedBlocMap.get(e);
+        n && s.push(...n.map((r) => r));
+      }
+      return s;
+    });
+    /**
+     * Disposes all keep-alive blocs of a specific type
+     * @param blocClass - The bloc class to dispose
+     */
+    i(this, "disposeKeepAliveBlocs", (e) => {
+      const t = [];
+      for (const s of this.keepAliveBlocs)
+        (!e || s.constructor === e) && t.push(s);
+      t.forEach((s) => s._dispose());
+    });
+    /**
+     * Disposes all blocs matching a pattern
+     * @param predicate - Function to test each bloc for disposal
+     */
+    i(this, "disposeBlocs", (e) => {
+      const t = [];
+      for (const s of this.blocInstanceMap.values())
+        e(s) && t.push(s);
+      for (const s of this.isolatedBlocMap.values())
+        for (const n of s)
+          e(n) && t.push(n);
+      t.forEach((s) => s._dispose());
     });
     /**
-     * Enables batching for multiple state updates
-     * @param batchFn Function to execute with batching enabled
+     * Gets memory usage statistics for debugging
      */
-    i(this, "batch", (e) => {
-      if (this._batchingLock)
-        return e();
-      this._batchingLock = !0, this._batchingEnabled = !0, this._pendingUpdates = [];
-      try {
-        const t = e();
-        if (this._pendingUpdates.length > 0) {
-          const s = this._pendingUpdates[this._pendingUpdates.length - 1];
-          this._observer.notify(s.newState, s.oldState, s.action), this.lastUpdate = Date.now();
-        }
-        return t;
-      } finally {
-        this._batchingEnabled = !1, this._batchingLock = !1, this._pendingUpdates = [];
-      }
+    i(this, "getMemoryStats", () => ({
+      totalBlocs: this.uidRegistry.size,
+      registeredBlocs: this.blocInstanceMap.size,
+      isolatedBlocs: Array.from(this.isolatedBlocMap.values()).reduce(
+        (e, t) => e + t.length,
+        0
+      ),
+      keepAliveBlocs: this.keepAliveBlocs.size,
+      isolatedBlocTypes: this.isolatedBlocMap.size
+    }));
+    /**
+     * Validates consumer references and cleans up orphaned consumers
+     */
+    i(this, "validateConsumers", () => {
+      for (const e of this.uidRegistry.values())
+        e._validateConsumers(), e._consumers.size === 0 && !e._keepAlive && e._disposalState === _.ACTIVE && setTimeout(() => {
+          e._consumers.size === 0 && !e._keepAlive && e._disposalState === _.ACTIVE && this.disposeBloc(e);
+        }, 1e3);
     });
-    this._state = e, this._observer = new w(this), this._id = this.constructor.name;
-    const t = this.constructor;
-    this._keepAlive = typeof t.keepAlive == "boolean" ? t.keepAlive : !1, this._isolated = typeof t.isolated == "boolean" ? t.isolated : !1;
+    const { __unsafe_ignore_singleton: t = !1 } = e;
+    if (!t)
+      return l.instance;
+    S.setInstance(this);
   }
-  get isIsolated() {
-    return this._isolated;
+  static get instance() {
+    return S.getInstance();
   }
-  get isKeepAlive() {
-    return this._keepAlive;
+  static get getAllBlocs() {
+    return l.instance.getAllBlocs;
+  }
+  /** Get current configuration */
+  static get config() {
+    return { ...this._config };
   }
   /**
-   * Returns the current state of the Bloc.
-   * Use this getter to access the state in a read-only manner.
+   * Set or update Blac configuration
+   * @param config - Partial configuration to merge with existing config
+   * @throws Error if configuration is invalid
    */
-  get state() {
-    return this._state;
+  static setConfig(e) {
+    if (e.proxyDependencyTracking !== void 0 && typeof e.proxyDependencyTracking != "boolean")
+      throw new Error("BlacConfig.proxyDependencyTracking must be a boolean");
+    if (e.exposeBlacInstance !== void 0 && typeof e.exposeBlacInstance != "boolean")
+      throw new Error("BlacConfig.exposeBlacInstance must be a boolean");
+    this._config = {
+      ...this._config,
+      ...e
+    }, this.enableLog && this.instance.log("Blac config updated:", this._config);
+  }
+  static get log() {
+    return l.instance.log;
   }
   /**
-   * @internal
-   * Returns the name of the Bloc class for identification and debugging.
+   * Gets the current Blac instance
+   * @returns The Blac instance
    */
-  get _name() {
-    return this.constructor.name;
+  static getInstance() {
+    return S.getInstance();
+  }
+  static get warn() {
+    return l.instance.warn;
+  }
+  static get error() {
+    return l.instance.error;
+  }
+  static get disposeBloc() {
+    return l.instance.disposeBloc;
   }
   /**
-   * @internal
-   * Cleans up resources and removes this Bloc from the system.
-   * Notifies the Blac manager and clears all observers.
+   * Creates a unique key for a bloc instance in the map based on the bloc class name and instance ID
+   * @param blocClassName - The name of the bloc class
+   * @param id - The instance ID
+   * @returns A unique key string in the format "className:id"
    */
-  _dispose() {
-    var e;
-    this._disposalState === "active" && (this._disposalState = "disposing", this._consumers.clear(), this._consumerRefs.clear(), this._observer.clear(), (e = this.onDispose) == null || e.call(this), this._disposalState = "disposed");
+  createBlocInstanceMapKey(e, t) {
+    return `${e}:${String(t)}`;
   }
   /**
-   * @internal
-   * Sets the disposal handler for this bloc
+   * Unregister a bloc instance from the main registry
+   * @param bloc - The bloc instance to unregister
    */
-  _setDisposalHandler(e) {
-    this._disposalHandler = e;
+  unregisterBlocInstance(e) {
+    const t = this.createBlocInstanceMapKey(e._name, e._id);
+    this.blocInstanceMap.delete(t), this.uidRegistry.delete(e.uid), this.keepAliveBlocs.delete(e);
   }
   /**
-   * @internal
-   * Schedules disposal of this bloc instance if it has no consumers
+   * Registers a bloc instance in the main registry
+   * @param bloc - The bloc instance to register
    */
-  _scheduleDisposal() {
-    this._disposalState === "active" && this._consumers.size === 0 && !this._keepAlive && (this._disposalHandler ? this._disposalHandler(this) : this._dispose());
+  registerBlocInstance(e) {
+    const t = this.createBlocInstanceMapKey(e._name, e._id);
+    this.blocInstanceMap.set(t, e), this.uidRegistry.set(e.uid, e), e._keepAlive && this.keepAliveBlocs.add(e);
   }
-}
-/**
- * When true, every consumer will receive its own unique instance of this Bloc.
- * Use this when state should not be shared between components.
- * @default false
- */
-i(v, "isolated", !1), /**
- * When true, the Bloc instance persists even when there are no active consumers.
- * Useful for maintaining state between component unmount/remount cycles.
- * @default false
- */
-i(v, "keepAlive", !1);
-class S extends v {
+  /**
+   * Finds a registered bloc instance by its class and ID
+   * @param blocClass - The bloc class to search for
+   * @param id - The instance ID
+   * @returns The found bloc instance or undefined if not found
+   */
+  findRegisteredBlocInstance(e, t) {
+    if (e.isolated) return;
+    const n = this.createBlocInstanceMapKey(e.name, t);
+    return this.blocInstanceMap.get(n);
+  }
+  /**
+   * Registers an isolated bloc instance in the isolated registry
+   * @param bloc - The isolated bloc instance to register
+   */
+  registerIsolatedBlocInstance(e) {
+    const t = e.constructor, s = this.isolatedBlocMap.get(t);
+    s ? s.push(e) : this.isolatedBlocMap.set(t, [e]), this.isolatedBlocIndex.set(e.uid, e), this.uidRegistry.set(e.uid, e), e._keepAlive && this.keepAliveBlocs.add(e);
+  }
+  /**
+   * Unregister an isolated bloc instance from the isolated registry
+   * @param bloc - The isolated bloc instance to unregister
+   */
+  unregisterIsolatedBlocInstance(e) {
+    const t = e.constructor, s = this.isolatedBlocMap.get(t);
+    let n = !1;
+    if (s) {
+      const o = s.findIndex((a) => a.uid === e.uid);
+      o !== -1 && (s.splice(o, 1), n = !0), s.length === 0 && this.isolatedBlocMap.delete(t);
+    }
+    const r = this.isolatedBlocIndex.delete(e.uid);
+    this.uidRegistry.delete(e.uid), this.keepAliveBlocs.delete(e), n !== r && this.warn(
+      `[Blac] Inconsistent state detected during isolated bloc cleanup for ${e._name}:${e.uid}. Map removal: ${n}, Index removal: ${r}`
+    );
+  }
+  /**
+   * Finds an isolated bloc instance by its class and ID (O(n) lookup)
+   */
+  findIsolatedBlocInstance(e, t) {
+    if (!e.isolated) return;
+    const n = this.isolatedBlocMap.get(e);
+    return n ? n.find((o) => o._id === t) : void 0;
+  }
+  /**
+   * Finds an isolated bloc instance by UID (O(1) lookup)
+   */
+  findIsolatedBlocInstanceByUid(e) {
+    return this.isolatedBlocIndex.get(e);
+  }
+  /**
+   * Creates a new bloc instance and registers it in the appropriate registry
+   * @param blocClass - The bloc class to instantiate
+   * @param id - The instance ID
+   * @param props - Properties to pass to the bloc constructor
+   * @param instanceRef - Optional reference string for the instance
+   * @returns The newly created bloc instance
+   */
+  createNewBlocInstance(e, t, s = {}) {
+    const { props: n, instanceRef: r } = s, o = new e(n);
+    return o._instanceRef = r, o.props = n || null, o._updateId(t), o._setDisposalHandler((a) => this.disposeBloc(a)), o.isIsolated ? (this.registerIsolatedBlocInstance(o), o) : (this.registerBlocInstance(o), o);
+  }
+  static get activateBloc() {
+    return l.instance.activateBloc;
+  }
+  static get getBloc() {
+    return l.instance.getBloc;
+  }
+  static get getBlocOrThrow() {
+    return l.instance.getBlocOrThrow;
+  }
+  static get disposeKeepAliveBlocs() {
+    return l.instance.disposeKeepAliveBlocs;
+  }
+  static get disposeBlocs() {
+    return l.instance.disposeBlocs;
+  }
+  static get getMemoryStats() {
+    return l.instance.getMemoryStats;
+  }
+  static get validateConsumers() {
+    return l.instance.validateConsumers;
+  }
+};
+/** Private static configuration */
+i(l, "_config", {
+  exposeBlacInstance: !1,
+  proxyDependencyTracking: !0
+}), /** Flag to enable/disable logging */
+i(l, "enableLog", !1), i(l, "logLevel", "warn"), i(l, "logSpy", null), i(l, "resetInstance", () => {
+  S.resetInstance();
+});
+let d = l;
+class U extends x {
   constructor() {
     super(...arguments);
-    // Stores handlers: Map<EventConstructor (subtype of A), HandlerFunction>
-    // The handler's event parameter will be correctly typed to the specific EventConstructor
-    // by the 'on' method's signature.
     i(this, "eventHandlers", /* @__PURE__ */ new Map());
     /**
      * @internal
@@ -751,7 +878,7 @@ class S extends v {
    *                The 'event' parameter in the handler will be typed to the specific eventConstructor.
    */
   on(t, s) {
-    this.eventHandlers.has(t) && l.warn(
+    this.eventHandlers.has(t) && d.warn(
       `[Bloc ${this._name}:${String(this._id)}] Handler for event '${t.name}' already registered. It will be overwritten.`
     ), this.eventHandlers.set(
       t,
@@ -782,42 +909,51 @@ class S extends v {
   async _processEvent(t) {
     const s = t.constructor, n = this.eventHandlers.get(s);
     if (n) {
-      const o = (a) => {
-        const c = this.state;
-        this._pushState(a, c, t);
+      const r = (o) => {
+        const a = this.state;
+        this._pushState(o, a, t);
       };
       try {
-        await n(t, o);
-      } catch (a) {
-        const c = t.constructor.name || "UnnamedConstructor", h = {
+        await n(t, r);
+      } catch (o) {
+        const a = t.constructor.name || "UnnamedConstructor", u = {
           blocName: this._name,
           blocId: String(this._id),
-          eventType: c,
+          eventType: a,
           currentState: this.state,
           action: t,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         };
-        if (l.error(
-          `[Bloc ${this._name}:${String(this._id)}] Error in event handler for '${c}':`,
-          a,
+        if (d.error(
+          `[Bloc ${this._name}:${String(this._id)}] Error in event handler for '${a}':`,
+          o,
           "Context:",
-          h
-        ), a instanceof Error && a.name === "CriticalError")
-          throw a;
+          u
+        ), o instanceof Error && o.name === "CriticalError")
+          throw o;
       }
     } else {
-      const o = t.constructor.name || "UnnamedConstructor";
-      l.warn(
-        `[Bloc ${this._name}:${String(this._id)}] No handler registered for action type: '${o}'.`,
+      const r = t.constructor.name || "UnnamedConstructor";
+      d.warn(
+        `[Bloc ${this._name}:${String(this._id)}] No handler registered for action type: '${r}'.`,
         "Registered handlers:",
-        Array.from(this.eventHandlers.keys()).map((a) => a.name),
+        Array.from(this.eventHandlers.keys()).map((o) => o.name),
         "Action was:",
         t
       );
     }
   }
 }
-class k extends v {
+class H extends x {
+  /**
+   * @internal
+   * Protected method for useBloc to call
+   */
+  _updateProps(e) {
+    var s;
+    const t = this.props;
+    this.props = e, (s = this.onPropsChanged) == null || s.call(this, t, e);
+  }
   /**
    * Updates the current state and notifies all observers of the change.
    * If the new state is identical to the current state (using Object.is),
@@ -833,14 +969,14 @@ class k extends v {
   /**
    * Partially updates the current state by merging it with the provided state patch.
    * This method is only applicable when the state is an object type.
-   * 
+   *
    * @param statePatch - A partial state object containing only the properties to update
    * @param ignoreChangeCheck - If true, skips checking if the state has actually changed
    * @throws {TypeError} If the state is not an object type
    */
   patch(e, t = !1) {
     if (typeof this.state != "object" || this.state === null) {
-      l.warn(
+      d.warn(
         "Cubit.patch: was called on a cubit where the state is not an object. This is a no-op."
       );
       return;
@@ -851,8 +987,8 @@ class k extends v {
     else
       for (const n in e)
         if (Object.prototype.hasOwnProperty.call(e, n)) {
-          const a = this.state[n];
-          if (!Object.is(e[n], a)) {
+          const o = this.state[n];
+          if (!Object.is(e[n], o)) {
             s = !0;
             break;
           }
@@ -863,40 +999,64 @@ class k extends v {
     });
   }
 }
-class $ {
+class N {
+  constructor(e) {
+    this.props = e;
+  }
+}
+function j(c, e) {
+  if (Object.is(c, e))
+    return !0;
+  if (typeof c != "object" || c === null || typeof e != "object" || e === null)
+    return !1;
+  const t = Object.keys(c), s = Object.keys(e);
+  if (t.length !== s.length)
+    return !1;
+  for (let n = 0; n < t.length; n++) {
+    const r = t[n];
+    if (!Object.prototype.hasOwnProperty.call(e, r) || !Object.is(c[r], e[r]))
+      return !1;
+  }
+  return !0;
+}
+class L {
   /**
    * Sets up a clean test environment
    */
   static setUp() {
-    this.originalInstance = l.instance, l.resetInstance(), l.enableLog = !1;
+    this.originalInstance = d.instance, d.resetInstance(), d.enableLog = !1;
   }
   /**
    * Tears down the test environment and restores original state
    */
   static tearDown() {
-    l.resetInstance();
+    d.resetInstance();
   }
   /**
    * Creates a test bloc with automatic cleanup
    */
   static createBloc(e, ...t) {
     const s = new e(...t);
-    return l.activateBloc(s), s;
+    return d.activateBloc(s), s;
   }
   /**
    * Waits for a bloc to emit a specific state
    */
   static async waitForState(e, t, s = 5e3) {
-    return new Promise((n, o) => {
-      const a = setTimeout(() => {
-        o(new Error(`Timeout waiting for state matching predicate after ${s}ms`));
-      }, s), c = e._observer.subscribe({
-        id: `test-waiter-${crypto.randomUUID()}`,
-        fn: (h) => {
-          t(h) && (clearTimeout(a), c(), n(h));
+    return new Promise((n, r) => {
+      const o = setTimeout(() => {
+        r(
+          new Error(
+            `Timeout waiting for state matching predicate after ${s}ms`
+          )
+        );
+      }, s), a = e._observer.subscribe({
+        id: `test-waiter-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+        fn: (u) => {
+          t(u) && (clearTimeout(o), a(), n(u));
         }
       });
-      t(e.state) && (clearTimeout(a), c(), n(e.state));
+      t(e.state) && (clearTimeout(o), a(), n(e.state));
     });
   }
   /**
@@ -904,34 +1064,38 @@ class $ {
    */
   static async expectStates(e, t, s = 5e3) {
     const n = [];
-    return new Promise((o, a) => {
-      const c = setTimeout(() => {
-        a(new Error(
-          `Timeout waiting for states. Expected: ${JSON.stringify(t)}, Received: ${JSON.stringify(n)}`
-        ));
-      }, s), h = e._observer.subscribe({
+    return new Promise((r, o) => {
+      const a = setTimeout(() => {
+        o(
+          new Error(
+            `Timeout waiting for states. Expected: ${JSON.stringify(t)}, Received: ${JSON.stringify(n)}`
+          )
+        );
+      }, s), u = e._observer.subscribe({
         id: `test-expecter-${crypto.randomUUID()}`,
-        fn: (_) => {
-          if (n.push(_), n.length === t.length) {
-            clearTimeout(c), h();
-            for (let p = 0; p < t.length; p++) {
-              const f = t[p], m = n[p];
-              if (JSON.stringify(f) !== JSON.stringify(m)) {
-                a(new Error(
-                  `State mismatch at index ${p}. Expected: ${JSON.stringify(f)}, Received: ${JSON.stringify(m)}`
-                ));
+        fn: (p) => {
+          if (n.push(p), n.length === t.length) {
+            clearTimeout(a), u();
+            for (let h = 0; h < t.length; h++) {
+              const m = t[h], I = n[h];
+              if (JSON.stringify(m) !== JSON.stringify(I)) {
+                o(
+                  new Error(
+                    `State mismatch at index ${h}. Expected: ${JSON.stringify(m)}, Received: ${JSON.stringify(I)}`
+                  )
+                );
                 return;
               }
             }
-            o();
+            r();
           }
         }
       });
     });
   }
 }
-i($, "originalInstance");
-class M extends S {
+i(L, "originalInstance");
+class Q extends U {
   constructor(t) {
     super(t);
     i(this, "mockHandlers", /* @__PURE__ */ new Map());
@@ -955,7 +1119,7 @@ class M extends S {
     return this.eventHandlers.has(t);
   }
 }
-class E extends k {
+class W extends H {
   constructor(t) {
     super(t);
     i(this, "stateHistory", []);
@@ -980,16 +1144,16 @@ class E extends k {
     this.stateHistory = [this.state];
   }
 }
-class R {
+class F {
   constructor() {
     i(this, "initialStats");
-    this.initialStats = l.getMemoryStats();
+    this.initialStats = d.getMemoryStats();
   }
   /**
    * Check for memory leaks and return a report
    */
   checkForLeaks() {
-    const e = l.getMemoryStats(), t = e.registeredBlocs > this.initialStats.registeredBlocs || e.isolatedBlocs > this.initialStats.isolatedBlocs || e.keepAliveBlocs > this.initialStats.keepAliveBlocs, s = `
+    const e = d.getMemoryStats(), t = e.registeredBlocs > this.initialStats.registeredBlocs || e.isolatedBlocs > this.initialStats.isolatedBlocs || e.keepAliveBlocs > this.initialStats.keepAliveBlocs, s = `
 Memory Leak Detection Report:
 - Initial registered blocs: ${this.initialStats.registeredBlocs}
 - Current registered blocs: ${e.registeredBlocs}
@@ -1006,17 +1170,419 @@ Memory Leak Detection Report:
     };
   }
 }
+class z {
+  constructor() {
+    i(this, "consumers", /* @__PURE__ */ new WeakMap());
+    i(this, "registrationCount", 0);
+    i(this, "activeConsumers", 0);
+  }
+  register(e, t) {
+    this.registrationCount++, this.consumers.get(e) || this.activeConsumers++, this.consumers.set(e, {
+      id: t,
+      lastNotified: Date.now(),
+      hasRendered: !1,
+      stateAccesses: /* @__PURE__ */ new Set(),
+      classAccesses: /* @__PURE__ */ new Set(),
+      stateValues: /* @__PURE__ */ new Map(),
+      classValues: /* @__PURE__ */ new Map(),
+      accessCount: 0,
+      lastAccessTime: 0,
+      firstAccessTime: 0
+    });
+  }
+  unregister(e) {
+    e && this.consumers.get(e) && (this.consumers.delete(e), this.activeConsumers = Math.max(0, this.activeConsumers - 1));
+  }
+  trackAccess(e, t, s, n) {
+    const r = this.consumers.get(e);
+    if (!r) return;
+    const o = Date.now();
+    r.firstAccessTime || (r.firstAccessTime = o), r.accessCount++, r.lastAccessTime = o, t === "state" ? (r.stateAccesses.add(s), n !== void 0 && r.stateValues.set(s, { value: n, lastAccessTime: o })) : (r.classAccesses.add(s), n !== void 0 && r.classValues.set(s, { value: n, lastAccessTime: o }));
+  }
+  resetTracking(e) {
+    const t = this.consumers.get(e);
+    t && (t.stateAccesses.clear(), t.classAccesses.clear(), t.stateValues.clear(), t.classValues.clear(), t.accessCount = 0, t.firstAccessTime = 0);
+  }
+  getDependencies(e) {
+    const t = this.consumers.get(e);
+    return t ? {
+      statePaths: Array.from(t.stateAccesses),
+      classPaths: Array.from(t.classAccesses)
+    } : null;
+  }
+  hasValuesChanged(e, t, s) {
+    const n = this.consumers.get(e);
+    if (!n) return !0;
+    let r = !1;
+    const o = Date.now();
+    if (n.stateValues.size === 0 && n.classValues.size === 0 && (n.stateAccesses.size > 0 || n.classAccesses.size > 0))
+      return !0;
+    for (const [a, u] of n.stateValues)
+      try {
+        const p = this.getValueAtPath(t, a);
+        p !== u.value && (n.stateValues.set(a, {
+          value: p,
+          lastAccessTime: o
+        }), r = !0);
+      } catch {
+        r = !0;
+      }
+    for (const [a, u] of n.classValues)
+      try {
+        const p = this.getValueAtPath(s, a);
+        p !== u.value && (n.classValues.set(a, {
+          value: p,
+          lastAccessTime: o
+        }), r = !0);
+      } catch {
+        r = !0;
+      }
+    return r;
+  }
+  shouldNotifyConsumer(e, t) {
+    const s = this.consumers.get(e);
+    if (!s) return !1;
+    for (const n of t) {
+      if (s.stateAccesses.has(n) || s.classAccesses.has(n)) return !0;
+      for (const r of s.stateAccesses)
+        if (n.startsWith(r + ".") || r.startsWith(n + "."))
+          return !0;
+    }
+    return !1;
+  }
+  updateLastNotified(e) {
+    const t = this.consumers.get(e);
+    t && (t.lastNotified = Date.now());
+  }
+  getConsumerInfo(e) {
+    return this.consumers.get(e);
+  }
+  setHasRendered(e, t) {
+    const s = this.consumers.get(e);
+    s && (s.hasRendered = t);
+  }
+  hasConsumer(e) {
+    return this.consumers.has(e);
+  }
+  getStats() {
+    return {
+      totalRegistrations: this.registrationCount,
+      activeConsumers: this.activeConsumers
+    };
+  }
+  getValueAtPath(e, t) {
+    const s = t.split(".");
+    let n = e;
+    for (const r of s) {
+      if (n == null) return;
+      n = n[r];
+    }
+    return n;
+  }
+}
+const k = /* @__PURE__ */ new WeakMap();
+let f = {
+  stateProxiesCreated: 0,
+  classProxiesCreated: 0,
+  cacheHits: 0,
+  cacheMisses: 0,
+  propertyAccesses: 0,
+  nestedProxiesCreated: 0,
+  totalProxiesCreated: 0,
+  createdAt: Date.now()
+};
+class b {
+  static createStateProxy(e) {
+    const { target: t, consumerRef: s, consumerTracker: n, path: r = "" } = e;
+    if (!s || !n || typeof t != "object" || t === null)
+      return t;
+    let o = k.get(t);
+    o || (o = /* @__PURE__ */ new WeakMap(), k.set(t, o));
+    const a = o.get(s);
+    if (a)
+      return f.cacheHits++, a;
+    f.cacheMisses++;
+    const u = {
+      get(h, m) {
+        if (typeof m == "symbol" || m === "constructor")
+          return Reflect.get(h, m);
+        const I = r ? `${r}.${m}` : m;
+        f.propertyAccesses++;
+        const g = Reflect.get(h, m), w = g && typeof g === "object" && g !== null ? void 0 : g;
+        if (n.trackAccess(s, "state", I, w), g && typeof g == "object" && g !== null) {
+          const B = Object.getPrototypeOf(g) === Object.prototype, P = Array.isArray(g);
+          if (B || P)
+            return f.nestedProxiesCreated++, b.createStateProxy({
+              target: g,
+              consumerRef: s,
+              consumerTracker: n,
+              path: I
+            });
+        }
+        return g;
+      },
+      has(h, m) {
+        return m in h;
+      },
+      ownKeys(h) {
+        return Reflect.ownKeys(h);
+      },
+      getOwnPropertyDescriptor(h, m) {
+        return Reflect.getOwnPropertyDescriptor(h, m);
+      },
+      set() {
+        return !1;
+      },
+      deleteProperty() {
+        return !1;
+      }
+    }, p = new Proxy(t, u);
+    return o.set(s, p), f.stateProxiesCreated++, f.totalProxiesCreated++, p;
+  }
+  static createClassProxy(e) {
+    const { target: t, consumerRef: s, consumerTracker: n } = e;
+    if (!s || !n)
+      return t;
+    let r = k.get(t);
+    r || (r = /* @__PURE__ */ new WeakMap(), k.set(t, r));
+    const o = r.get(s);
+    if (o)
+      return f.cacheHits++, o;
+    f.cacheMisses++;
+    const a = {
+      get(p, h) {
+        const m = Reflect.get(p, h);
+        let I = !1, g = p;
+        const A = /* @__PURE__ */ new WeakSet(), D = 10;
+        let w = 0;
+        for (; g && !I && w < D && !A.has(g); ) {
+          A.add(g);
+          try {
+            const T = Object.getOwnPropertyDescriptor(
+              g,
+              h
+            );
+            if (T && T.get) {
+              I = !0;
+              break;
+            }
+            g = Object.getPrototypeOf(g), w++;
+          } catch {
+            break;
+          }
+        }
+        if (!I)
+          return m;
+        f.propertyAccesses++;
+        const B = m, M = B !== null && typeof B != "object" ? B : void 0;
+        return n.trackAccess(
+          s,
+          "class",
+          String(h),
+          M
+        ), m;
+      },
+      has(p, h) {
+        return h in p;
+      },
+      ownKeys(p) {
+        return Reflect.ownKeys(p);
+      },
+      getOwnPropertyDescriptor(p, h) {
+        return Reflect.getOwnPropertyDescriptor(p, h);
+      }
+    }, u = new Proxy(t, a);
+    return r.set(s, u), f.classProxiesCreated++, f.totalProxiesCreated++, u;
+  }
+  static getProxyState(e) {
+    return b.createStateProxy({
+      target: e.state,
+      consumerRef: e.consumerRef,
+      consumerTracker: e.consumerTracker
+    });
+  }
+  static getProxyBlocInstance(e) {
+    return b.createClassProxy({
+      target: e.blocInstance,
+      consumerRef: e.consumerRef,
+      consumerTracker: e.consumerTracker
+    });
+  }
+  static getStats() {
+    const e = Date.now() - f.createdAt;
+    return {
+      ...f,
+      totalProxies: f.stateProxiesCreated + f.classProxiesCreated,
+      cacheEfficiency: f.cacheHits + f.cacheMisses > 0 ? `${(f.cacheHits / (f.cacheHits + f.cacheMisses) * 100).toFixed(1)}%` : "N/A",
+      lifetime: `${e}ms`,
+      proxiesPerSecond: e > 0 ? (f.totalProxiesCreated / (e / 1e3)).toFixed(2) : "N/A"
+    };
+  }
+  static resetStats() {
+    f = {
+      stateProxiesCreated: 0,
+      classProxiesCreated: 0,
+      cacheHits: 0,
+      cacheMisses: 0,
+      propertyAccesses: 0,
+      nestedProxiesCreated: 0,
+      totalProxiesCreated: 0,
+      createdAt: Date.now()
+    };
+  }
+}
+const v = class v {
+  constructor(e, t) {
+    i(this, "id", `consumer-${$()}`);
+    i(this, "blocConstructor");
+    i(this, "componentRef", { current: {} });
+    i(this, "blocInstance");
+    // Core components
+    i(this, "consumerTracker");
+    i(this, "lastProps");
+    i(this, "unmountTime", 0);
+    i(this, "mountTime", 0);
+    // Dependency tracking
+    i(this, "dependencyValues");
+    i(this, "isUsingDependencies", !1);
+    // Lifecycle state
+    i(this, "hasMounted", !1);
+    i(this, "mountCount", 0);
+    i(this, "options");
+    i(this, "createStateProxy", (e) => b.createStateProxy({
+      target: e.target,
+      consumerRef: this.componentRef.current,
+      consumerTracker: this
+    }));
+    i(this, "createClassProxy", (e) => b.createClassProxy({
+      target: e.target,
+      consumerRef: this.componentRef.current,
+      consumerTracker: this
+    }));
+    i(this, "createSubscription", (e) => this.blocInstance._observer.subscribe({
+      id: this.id,
+      fn: (s, n) => {
+        var r;
+        if (this.isUsingDependencies && ((r = this.options) != null && r.dependencies)) {
+          const o = this.options.dependencies(this.blocInstance);
+          if (!this.hasDependencyValuesChanged(
+            this.dependencyValues,
+            o
+          ))
+            return;
+          this.dependencyValues = o;
+        } else if (d.config.proxyDependencyTracking) {
+          const o = this.consumerTracker.getConsumerInfo(
+            this.componentRef.current
+          );
+          if (o && o.hasRendered && !this.consumerTracker.hasValuesChanged(
+            this.componentRef.current,
+            s,
+            this.blocInstance
+          ))
+            return;
+        } else {
+          e.onChange();
+          return;
+        }
+        e.onChange();
+      }
+    }));
+    i(this, "mount", () => {
+      var e, t;
+      if (this.isUsingDependencies && ((e = this.options) != null && e.dependencies) && (this.dependencyValues = this.options.dependencies(this.blocInstance)), this.mountCount++, this.blocInstance._addConsumer(this.id, this.componentRef.current), !this.hasMounted && (this.hasMounted = !0, this.mountTime = Date.now(), (t = this.options) != null && t.onMount))
+        try {
+          this.options.onMount(this.blocInstance);
+        } catch (s) {
+          throw s;
+        }
+    });
+    i(this, "unmount", () => {
+      var e;
+      if (this.unmountTime = Date.now(), this.consumerTracker.unregister(this.componentRef.current), this.blocInstance._removeConsumer(this.id), v.propsOwners.get(this.blocInstance) === this.id && v.propsOwners.delete(this.blocInstance), (e = this.options) != null && e.onUnmount)
+        try {
+          this.options.onUnmount(this.blocInstance);
+        } catch {
+        }
+    });
+    i(this, "getProxyState", (e) => this.isUsingDependencies || !d.config.proxyDependencyTracking ? e : b.getProxyState({
+      state: e,
+      consumerRef: this.componentRef.current,
+      consumerTracker: this
+    }));
+    i(this, "getProxyBlocInstance", () => this.isUsingDependencies || !d.config.proxyDependencyTracking ? this.blocInstance : b.getProxyBlocInstance({
+      blocInstance: this.blocInstance,
+      consumerRef: this.componentRef.current,
+      consumerTracker: this
+    }));
+    this.options = t, this.blocConstructor = e.blocConstructor, this.componentRef = e.componentRef, this.isUsingDependencies = !!(t != null && t.dependencies), this.consumerTracker = new z(), this.blocInstance = this.updateBlocInstance(), this.consumerTracker.register(e.componentRef.current, this.id), this.isUsingDependencies && (t != null && t.dependencies) && (this.dependencyValues = t.dependencies(this.blocInstance)), (t == null ? void 0 : t.props) !== void 0 && this.updateProps(t.props);
+  }
+  trackAccess(e, t, s, n) {
+    this.consumerTracker.trackAccess(e, t, s, n);
+  }
+  getConsumerDependencies(e) {
+    return this.consumerTracker.getDependencies(e);
+  }
+  shouldNotifyConsumer(e, t) {
+    const s = this.consumerTracker.getConsumerInfo(e);
+    return !s || !s.hasRendered ? !0 : this.consumerTracker.shouldNotifyConsumer(e, t);
+  }
+  updateLastNotified(e) {
+    this.consumerTracker.updateLastNotified(e), this.consumerTracker.setHasRendered(e, !0);
+  }
+  resetConsumerTracking() {
+    this.consumerTracker.resetTracking(this.componentRef.current);
+  }
+  updateBlocInstance() {
+    var e, t;
+    return this.blocInstance = d.instance.getBloc(this.blocConstructor, {
+      props: (e = this.options) == null ? void 0 : e.props,
+      id: (t = this.options) == null ? void 0 : t.id,
+      instanceRef: this.id
+    }), this.blocInstance;
+  }
+  // Expose calledOnMount for backward compatibility
+  get calledOnMount() {
+    return this.hasMounted;
+  }
+  updateProps(e) {
+    const t = this.blocInstance;
+    if (v.propsOwners.has(t) || v.propsOwners.set(t, this.id), v.propsOwners.get(t) !== this.id) {
+      d.warn(
+        `[BlacAdapter] Attempted to set props on ${t.constructor.name} from non-owner adapter`
+      );
+      return;
+    }
+    t._disposalState === _.DISPOSED || t._disposalState === _.DISPOSING || j(this.lastProps, e) || ("add" in t && typeof t.add == "function" ? t.add(new N(e)) : "_updateProps" in t && typeof t._updateProps == "function" && t._updateProps(e), this.lastProps = e);
+  }
+  hasDependencyValuesChanged(e, t) {
+    if (!e || e.length !== t.length) return !0;
+    for (let s = 0; s < e.length; s++)
+      if (!Object.is(e[s], t[s]))
+        return !0;
+    return !1;
+  }
+};
+// Props ownership tracking
+i(v, "propsOwners", /* @__PURE__ */ new WeakMap());
+let R = v;
 export {
-  l as Blac,
-  w as BlacObservable,
-  S as Bloc,
-  v as BlocBase,
-  $ as BlocTest,
-  k as Cubit,
-  R as MemoryLeakDetector,
-  M as MockBloc,
-  E as MockCubit,
-  b as generateUUID,
-  A as setBlacInstanceManager
+  d as Blac,
+  R as BlacAdapter,
+  V as BlacObservable,
+  U as Bloc,
+  x as BlocBase,
+  _ as BlocLifecycleState,
+  L as BlocTest,
+  z as ConsumerTracker,
+  H as Cubit,
+  F as MemoryLeakDetector,
+  Q as MockBloc,
+  W as MockCubit,
+  N as PropsUpdated,
+  b as ProxyFactory,
+  $ as generateUUID,
+  q as setBlacInstanceManager,
+  j as shallowEqual
 };
 //# sourceMappingURL=index.es.js.map