storion 0.3.0 → 0.5.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,YAAY,EAEjB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EAEf,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,KAAK,eAAe,GACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EACL,EAAE,EACF,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,OAAO,EACP,OAAO,EACP,QAAQ,EACR,cAAc,EACd,iBAAiB,GAClB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EACL,cAAc,EACd,IAAI,EACJ,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EACL,MAAM,EACN,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,GACvB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,KAAK,WAAW,GACjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,YAAY,EACZ,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,YAAY,EAEjB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,UAAU,EAEf,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,KAAK,eAAe,GACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EACL,EAAE,EACF,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,OAAO,EACP,OAAO,EACP,QAAQ,EACR,cAAc,EACd,iBAAiB,GAClB,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EACL,cAAc,EACd,IAAI,EACJ,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EACL,MAAM,EACN,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,GACvB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EACT,KAAK,WAAW,GACjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAGzD,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/react/index.js

@@ -3,9 +3,9 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { memo, useMemo, createElement, createContext, useContext, useReducer, useRef, useEffect, useLayoutEffect, useState, forwardRef } from "react";
 import { container } from "../storion.js";
-import { applyExcept, applyFor, compose, createLoggingMiddleware, createResolver, createValidationMiddleware, effect, pick, trigger, when } from "../storion.js";
-import { w as withHooks, i as isSpec, S as STORION_TYPE, r as resolveEquality, s as store } from "../store-XP2pujaJ.js";
-import { m, p, n, g, a, j, d, h, l, f, k, b, x, o, q, u, v, t } from "../store-XP2pujaJ.js";
+import { applyExcept, applyFor, compose, createLoggingMiddleware, createResolver, createValidationMiddleware, effect, forStores, pick, trigger, when } from "../storion.js";
+import { w as withHooks, i as isSpec, S as STORION_TYPE, r as resolveEquality, s as store } from "../store-CwA4YTVb.js";
+import { m, p, n, g, a, j, d, h, l, f, k, b, x, o, q, u, v, t } from "../store-CwA4YTVb.js";
 import { jsx } from "react/jsx-runtime";
 const StoreContext = createContext(null);
 const StoreProvider = memo(
@@ -161,7 +161,7 @@ class LocalStoreController {
       if (depsCount > 0) {
         this.dispose();
         throw new Error(
-          `Local store must not have dependencies, but "${this.spec.name}" has ${depsCount} dependencies. Use useStore() with a global container for stores with dependencies.`
+          `Local store must not have dependencies, but "${this.spec.displayName}" has ${depsCount} dependencies. Use useStore() with a global container for stores with dependencies.`
         );
       }
       if (shouldScheduleDispose) {
@@ -392,6 +392,7 @@ export {
   p as deepEqual,
   effect,
   n as equality,
+  forStores,
   g as getKind,
   a as is,
   j as isAction,

package/dist/{store-XP2pujaJ.js → store-CwA4YTVb.js}

@@ -1898,6 +1898,9 @@ function createStoreContext(options) {
     reset() {
       reset();
     },
+    onDispose(callback) {
+      onDispose == null ? void 0 : onDispose(callback);
+    },
     mixin(mixin, ...args) {
       if (!isSetupPhase()) {
         throw new Error(
@@ -2210,13 +2213,17 @@ function collection(createItem, initialItems) {
   };
 }
 function store(options) {
-  const name = options.name ?? generateSpecName();
+  const displayName = options.name ?? generateSpecName();
   const spec = function(resolver) {
-    return createStoreInstance(spec, resolver, {});
+    return createStoreInstance(
+      spec,
+      resolver,
+      {}
+    );
   };
   Object.defineProperties(spec, {
     [STORION_TYPE]: { value: "store.spec", enumerable: false },
-    name: { value: name, enumerable: true, writable: false },
+    displayName: { value: displayName, enumerable: true, writable: false },
     options: { value: options, enumerable: true, writable: false }
   });
   return spec;
@@ -2224,7 +2231,7 @@ function store(options) {
 function createStoreInstance(spec, resolver, instanceOptions = {}) {
   var _a;
   const options = spec.options;
-  const storeId = generateStoreId(spec.name);
+  const storeId = generateStoreId(spec.displayName);
   let disposed = false;
   let currentState = { ...options.state };
   let initialState = currentState;

package/dist/storion.js

@@ -1,5 +1,146 @@
-import { e as emitter, i as isSpec, S as STORION_TYPE, u as untrack, y as getHooks, w as withHooks, r as resolveEquality, z as scheduleNotification, v as unwrapFn, o as shallowEqual } from "./store-XP2pujaJ.js";
-import { m, p, n, g, a, j, d, h, l, f, k, b, x, s, q, t } from "./store-XP2pujaJ.js";
+import { i as isSpec, e as emitter, u as untrack, S as STORION_TYPE, y as getHooks, w as withHooks, r as resolveEquality, z as scheduleNotification, v as unwrapFn, o as shallowEqual } from "./store-CwA4YTVb.js";
+import { m, p, n, g, a, j, d, h, l, f, k, b, x, s, q, t } from "./store-CwA4YTVb.js";
+function extractDisplayName(factory) {
+  if (isSpec(factory)) {
+    return factory.displayName;
+  }
+  if (typeof factory.displayName === "string" && factory.displayName) {
+    return factory.displayName;
+  }
+  if (factory.name && factory.name !== "") {
+    return factory.name;
+  }
+  return void 0;
+}
+function createResolver(options = {}) {
+  const {
+    middleware = [],
+    parent,
+    invokeResolver: invokeResolverOption
+  } = options;
+  const cache2 = /* @__PURE__ */ new Map();
+  const overrides = /* @__PURE__ */ new Map();
+  const resolve = (factory) => overrides.get(factory) ?? factory;
+  const invoke = (factory, resolverForCtx) => {
+    const isStoreSpec = isSpec(factory);
+    const displayName = extractDisplayName(factory);
+    const chain = middleware.reduceRight(
+      (next, mw) => () => {
+        if (isStoreSpec) {
+          const ctx = {
+            type: "store",
+            factory,
+            resolver: resolverForCtx,
+            next,
+            displayName,
+            spec: factory
+          };
+          return mw(ctx);
+        } else {
+          const ctx = {
+            type: "factory",
+            factory,
+            resolver: resolverForCtx,
+            next,
+            displayName
+          };
+          return mw(ctx);
+        }
+      },
+      () => factory(resolverForCtx)
+    );
+    return chain();
+  };
+  const resolver = {
+    get(factory) {
+      if (cache2.has(factory)) {
+        return cache2.get(factory);
+      }
+      if (parent && overrides.size === 0 && parent.has(factory)) {
+        return parent.get(factory);
+      }
+      const instance = invoke(
+        resolve(factory),
+        invokeResolverOption ?? resolver
+      );
+      cache2.set(factory, instance);
+      return instance;
+    },
+    create(factory) {
+      return invoke(resolve(factory), invokeResolverOption ?? resolver);
+    },
+    set(factory, override) {
+      overrides.set(factory, override);
+      cache2.delete(factory);
+    },
+    has(factory) {
+      const inParent = parent && overrides.size === 0 && parent.has(factory);
+      return cache2.has(factory) || (inParent ?? false);
+    },
+    tryGet(factory) {
+      if (cache2.has(factory)) {
+        return cache2.get(factory);
+      }
+      if (parent && overrides.size === 0) {
+        return parent.tryGet(factory);
+      }
+      return void 0;
+    },
+    delete(factory) {
+      const instance = cache2.get(factory);
+      if (instance) {
+        if (instance && typeof instance === "object" && "dispose" in instance && typeof instance.dispose === "function") {
+          instance.dispose();
+        }
+        cache2.delete(factory);
+        return true;
+      }
+      return false;
+    },
+    clear() {
+      for (const instance of cache2.values()) {
+        if (instance && typeof instance === "object" && "dispose" in instance && typeof instance.dispose === "function") {
+          instance.dispose();
+        }
+      }
+      cache2.clear();
+    },
+    scope(scopeOptions = {}) {
+      return createResolver({
+        middleware: scopeOptions.middleware ?? middleware,
+        parent: resolver,
+        ...scopeOptions
+      });
+    }
+  };
+  return resolver;
+}
+function when(predicate, middleware) {
+  return (ctx) => {
+    if (predicate(ctx.factory)) {
+      return middleware(ctx);
+    }
+    return ctx.next();
+  };
+}
+function createLoggingMiddleware(prefix = "Resolver") {
+  return (ctx) => {
+    const name = ctx.factory.name || "anonymous";
+    console.log(`[${prefix}] Creating: ${name}`);
+    const start = performance.now();
+    const result = ctx.next();
+    const duration = (performance.now() - start).toFixed(2);
+    console.log(`[${prefix}] Created: ${name} (${duration}ms)`);
+    return result;
+  };
+}
+function createValidationMiddleware(validate) {
+  return (ctx) => {
+    const result = ctx.next();
+    validate(result, ctx.factory);
+    return result;
+  };
+}
 let defaultMiddlewareConfig = {};
 const container = function(options = {}) {
   const middleware = [
@@ -7,156 +148,93 @@ const container = function(options = {}) {
     ...options.middleware ?? [],
     ...defaultMiddlewareConfig.post ?? []
   ];
-  const cache2 = /* @__PURE__ */ new Map();
-  const factoryCache = /* @__PURE__ */ new Map();
   const instancesById = /* @__PURE__ */ new Map();
-  const overrides = /* @__PURE__ */ new Map();
-  const factoryOverrides = /* @__PURE__ */ new Map();
   const creationOrder = [];
   const createEmitter = emitter();
   const disposeEmitter = emitter();
-  const creating = /* @__PURE__ */ new Set();
-  const creatingFactories = /* @__PURE__ */ new Set();
   const parent = options._parent;
-  const resolve = (spec) => overrides.get(spec) ?? spec;
-  function buildMiddlewareChain() {
-    let chain = (spec, next) => next(spec);
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const currentMiddleware = middleware[i];
-      const nextInChain = chain;
-      chain = (spec, next) => currentMiddleware(spec, (s2) => nextInChain(s2, next));
+  let containerApi;
+  const internalResolver = createResolver({
+    middleware,
+    parent,
+    get invokeResolver() {
+      return containerApi;
     }
-    return (spec) => chain(spec, (s2) => s2(containerApi));
-  }
-  const createWithMiddleware = buildMiddlewareChain();
-  function createInstance(spec) {
-    const instance = untrack(() => createWithMiddleware(spec));
+  });
+  function trackStore(spec, instance) {
+    instancesById.set(instance.id, instance);
+    creationOrder.push(spec);
     if (typeof instance.onDispose === "function") {
       instance.onDispose(() => {
         disposeEmitter.emit(instance);
-        cache2.delete(spec);
         instancesById.delete(instance.id);
+        internalResolver.delete(spec);
         const index = creationOrder.indexOf(spec);
         if (index !== -1) {
           creationOrder.splice(index, 1);
         }
       });
     }
-    return instance;
+    createEmitter.emit(instance);
   }
-  const containerApi = {
+  containerApi = {
     [STORION_TYPE]: "container",
-    // ========================================================================
-    // Resolver Methods
-    // ========================================================================
-    // Implementation handles multiple overloads
+    // Get by ID or factory/spec
     get(specOrIdOrFactory) {
       if (typeof specOrIdOrFactory === "string") {
         return instancesById.get(specOrIdOrFactory);
       }
-      if (!isSpec(specOrIdOrFactory)) {
-        const factory = specOrIdOrFactory;
-        if (factoryCache.has(factory)) {
-          return factoryCache.get(factory);
-        }
-        if (parent && factoryOverrides.size === 0 && "tryGet" in parent && typeof parent.tryGet === "function") {
-          const parentInstance = parent.tryGet(factory);
-          if (parentInstance !== void 0) {
-            return parentInstance;
-          }
-        }
-        if (creatingFactories.has(factory)) {
-          const name = factory.name || "anonymous";
-          throw new Error(
-            `Circular dependency detected: factory "${name}" is being created while already in creation stack.`
-          );
-        }
-        creatingFactories.add(factory);
-        try {
-          const mapped = factoryOverrides.get(factory) ?? factory;
-          const instance = mapped(containerApi);
-          factoryCache.set(factory, instance);
-          return instance;
-        } finally {
-          creatingFactories.delete(factory);
-        }
-      }
-      const spec = specOrIdOrFactory;
-      if (cache2.has(spec)) {
-        return cache2.get(spec);
-      }
-      if (parent && overrides.size === 0 && parent.has(spec)) {
-        return parent.get(spec);
-      }
-      if (creating.has(spec)) {
-        const name = spec.name ?? "unknown";
-        throw new Error(
-          `Circular dependency detected: "${name}" is being created while already in creation stack.`
-        );
-      }
-      creating.add(spec);
-      try {
-        const mapped = resolve(spec);
-        const instance = createInstance(mapped);
-        cache2.set(spec, instance);
-        instancesById.set(instance.id, instance);
-        creationOrder.push(spec);
-        createEmitter.emit(instance);
-        return instance;
-      } finally {
-        creating.delete(spec);
+      const wasCached = internalResolver.has(specOrIdOrFactory);
+      const instance = untrack(() => internalResolver.get(specOrIdOrFactory));
+      if (!wasCached && isSpec(specOrIdOrFactory)) {
+        trackStore(specOrIdOrFactory, instance);
       }
+      return instance;
     },
-    // Implementation handles both StoreSpec and Factory overloads
     create(specOrFactory) {
-      if (!isSpec(specOrFactory)) {
-        const factory = specOrFactory;
-        const mapped2 = factoryOverrides.get(factory) ?? factory;
-        return mapped2(containerApi);
+      const instance = untrack(() => internalResolver.create(specOrFactory));
+      if (isSpec(specOrFactory)) {
+        const storeInstance = instance;
+        instancesById.set(storeInstance.id, storeInstance);
+        if (typeof storeInstance.onDispose === "function") {
+          storeInstance.onDispose(() => {
+            disposeEmitter.emit(storeInstance);
+            instancesById.delete(storeInstance.id);
+          });
+        }
       }
-      const mapped = resolve(specOrFactory);
-      return createInstance(mapped);
+      return instance;
     },
     set(spec, override) {
-      overrides.set(spec, override);
-      const existing = cache2.get(spec);
+      const existing = internalResolver.tryGet(spec);
       if (existing) {
         existing.dispose();
       }
+      internalResolver.set(spec, override);
     },
     has(spec) {
-      const inParent = parent && overrides.size === 0 && parent.has(spec);
-      return cache2.has(spec) || (inParent ?? false);
+      return internalResolver.has(spec);
     },
     tryGet(spec) {
-      if (cache2.has(spec)) {
-        return cache2.get(spec);
-      }
-      if (parent && overrides.size === 0) {
-        return parent.tryGet(spec);
-      }
-      return void 0;
+      return internalResolver.tryGet(spec);
     },
     delete(spec) {
-      const instance = cache2.get(spec);
+      const instance = internalResolver.tryGet(spec);
       if (instance) {
         instance.dispose();
         return true;
       }
       return false;
     },
-    // ========================================================================
-    // Container-Specific Methods
-    // ========================================================================
     clear() {
       const specs = [...creationOrder].reverse();
       for (const spec of specs) {
-        const instance = cache2.get(spec);
+        const instance = internalResolver.tryGet(spec);
         if (instance) {
           instance.dispose();
         }
       }
-      cache2.clear();
+      internalResolver.clear();
       instancesById.clear();
       creationOrder.length = 0;
     },
@@ -184,96 +262,6 @@ defaultsFn.clear = () => {
   defaultMiddlewareConfig = {};
 };
 container.defaults = defaultsFn;
-function createResolver(options = {}) {
-  const { middleware = [], parent } = options;
-  const cache2 = /* @__PURE__ */ new Map();
-  const overrides = /* @__PURE__ */ new Map();
-  const resolve = (factory) => overrides.get(factory) ?? factory;
-  const invoke = (factory, resolver2) => {
-    const chain = middleware.reduceRight(
-      (next, mw) => () => mw({
-        factory,
-        resolver: resolver2,
-        next
-      }),
-      () => factory(resolver2)
-    );
-    return chain();
-  };
-  const resolver = {
-    get(factory) {
-      if (cache2.has(factory)) {
-        return cache2.get(factory);
-      }
-      if (parent && overrides.size === 0 && parent.has(factory)) {
-        return parent.get(factory);
-      }
-      const instance = invoke(resolve(factory), resolver);
-      cache2.set(factory, instance);
-      return instance;
-    },
-    create(factory) {
-      return invoke(resolve(factory), resolver);
-    },
-    set(factory, override) {
-      overrides.set(factory, override);
-      cache2.delete(factory);
-    },
-    has(factory) {
-      const inParent = parent && overrides.size === 0 && parent.has(factory);
-      return cache2.has(factory) || (inParent ?? false);
-    },
-    tryGet(factory) {
-      if (cache2.has(factory)) {
-        return cache2.get(factory);
-      }
-      if (parent && overrides.size === 0) {
-        return parent.tryGet(factory);
-      }
-      return void 0;
-    },
-    delete(factory) {
-      return cache2.delete(factory);
-    },
-    clear() {
-      cache2.clear();
-    },
-    scope(scopeOptions = {}) {
-      return createResolver({
-        middleware: scopeOptions.middleware ?? middleware,
-        parent: resolver,
-        ...scopeOptions
-      });
-    }
-  };
-  return resolver;
-}
-function when(predicate, middleware) {
-  return (ctx) => {
-    if (predicate(ctx.factory)) {
-      return middleware(ctx);
-    }
-    return ctx.next();
-  };
-}
-function createLoggingMiddleware(prefix = "Resolver") {
-  return (ctx) => {
-    const name = ctx.factory.name || "anonymous";
-    console.log(`[${prefix}] Creating: ${name}`);
-    const start = performance.now();
-    const result = ctx.next();
-    const duration = (performance.now() - start).toFixed(2);
-    console.log(`[${prefix}] Created: ${name} (${duration}ms)`);
-    return result;
-  };
-}
-function createValidationMiddleware(validate) {
-  return (ctx) => {
-    const result = ctx.next();
-    validate(result, ctx.factory);
-    return result;
-  };
-}
 let pickIdCounter = 0;
 function pick(selector, equality) {
   var _a;
@@ -337,10 +325,16 @@ function pick(selector, equality) {
   });
   return currentValue;
 }
-function createEffectContext(nth, isStale) {
+function isPromiseLike(value) {
+  return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
+}
+function createEffectContext(nth) {
   let cleanupEmitter = null;
   let abortController = null;
+  let isStale = false;
   const runCleanups = () => {
+    if (isStale) return;
+    isStale = true;
     if (abortController) {
       abortController.abort();
       abortController = null;
@@ -349,6 +343,22 @@ function createEffectContext(nth, isStale) {
       cleanupEmitter.emitAndClearLifo();
     }
   };
+  function wrapPromise(promise) {
+    return new Promise((resolve, reject) => {
+      promise.then(
+        (value) => {
+          if (!isStale) {
+            resolve(value);
+          }
+        },
+        (error) => {
+          if (!isStale) {
+            reject(error);
+          }
+        }
+      );
+    });
+  }
   const context = {
     nth,
     get signal() {
@@ -365,24 +375,17 @@ function createEffectContext(nth, isStale) {
     },
     safe(promiseOrCallback) {
       if (promiseOrCallback instanceof Promise) {
-        return new Promise((resolve, reject) => {
-          promiseOrCallback.then(
-            (value) => {
-              if (!isStale()) {
-                resolve(value);
-              }
-            },
-            (error) => {
-              if (!isStale()) {
-                reject(error);
-              }
-            }
-          );
-        });
+        return wrapPromise(promiseOrCallback);
       }
       return (...args) => {
-        if (!isStale()) {
-          return promiseOrCallback(...args);
+        if (!isStale) {
+          const result = promiseOrCallback(
+            ...args
+          );
+          if (isPromiseLike(result)) {
+            return wrapPromise(result);
+          }
+          return result;
         }
         return void 0;
       };
@@ -525,11 +528,10 @@ function effect(fn, options) {
       }
       newTrackedDeps = /* @__PURE__ */ new Map();
       writtenProps.clear();
-      const isStale = () => isDisposed || runGeneration !== currentGeneration;
       let lazyContext = null;
       const getOrCreateContext = () => {
         if (!lazyContext) {
-          lazyContext = createEffectContext(currentGeneration, isStale);
+          lazyContext = createEffectContext(currentGeneration);
         }
         return lazyContext;
       };
@@ -619,43 +621,55 @@ function patternToPredicate(pattern) {
 function patternsToPredicate(patterns) {
   if (Array.isArray(patterns)) {
     const predicates = patterns.map(patternToPredicate);
-    return (spec) => predicates.some((p2) => p2(spec.name));
+    return (ctx) => ctx.displayName !== void 0 && predicates.some((p2) => p2(ctx.displayName));
   }
   const predicate = patternToPredicate(patterns);
-  return (spec) => predicate(spec.name);
+  return (ctx) => ctx.displayName !== void 0 && predicate(ctx.displayName);
 }
 function compose(...middlewares) {
   if (middlewares.length === 0) {
-    return (spec, next) => next(spec);
+    return (ctx) => ctx.next();
   }
   if (middlewares.length === 1) {
     return middlewares[0];
   }
-  return (spec, next) => {
-    let chain = next;
-    for (let i = middlewares.length - 1; i >= 0; i--) {
-      const middleware = middlewares[i];
-      const prevChain = chain;
-      chain = (s2) => middleware(s2, prevChain);
-    }
-    return chain(spec);
+  return (ctx) => {
+    let index = 0;
+    const executeNext = () => {
+      if (index >= middlewares.length) {
+        return ctx.next();
+      }
+      const currentMiddleware = middlewares[index];
+      index++;
+      const wrappedCtx = ctx.type === "store" ? { ...ctx, next: executeNext } : { ...ctx, next: executeNext };
+      return currentMiddleware(wrappedCtx);
+    };
+    return executeNext();
   };
 }
 function applyFor(predicateOrPatterns, middleware) {
   const predicate = typeof predicateOrPatterns === "function" ? predicateOrPatterns : patternsToPredicate(predicateOrPatterns);
   const composedMiddleware = Array.isArray(middleware) ? compose(...middleware) : middleware;
-  return (spec, next) => {
-    if (predicate(spec)) {
-      return composedMiddleware(spec, next);
+  return (ctx) => {
+    if (predicate(ctx)) {
+      return composedMiddleware(ctx);
     }
-    return next(spec);
+    return ctx.next();
   };
 }
 function applyExcept(predicateOrPatterns, middleware) {
   const matchPredicate = typeof predicateOrPatterns === "function" ? predicateOrPatterns : patternsToPredicate(predicateOrPatterns);
-  const invertedPredicate = (spec) => !matchPredicate(spec);
+  const invertedPredicate = (ctx) => !matchPredicate(ctx);
   return applyFor(invertedPredicate, middleware);
 }
+function forStores(storeMiddleware) {
+  return (ctx) => {
+    if (ctx.type === "store") {
+      return storeMiddleware(ctx);
+    }
+    return ctx.next();
+  };
+}
 const DEFAULT_KEY = {};
 const cache = /* @__PURE__ */ new Map();
 function getKeyCache(key) {
@@ -720,6 +734,7 @@ export {
   p as deepEqual,
   effect,
   n as equality,
+  forStores,
   g as getKind,
   a as is,
   j as isAction,