@fluojs/di 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/container.d.ts

@@ -9,15 +9,17 @@ export declare class Container {
     private readonly registrations;
     private readonly multiRegistrations;
     private readonly multiOverriddenTokens;
-    private readonly requestCache;
-    private readonly multiRequestCache;
+    private requestCache;
+    private multiRequestCache;
     private readonly multiSingletonCache;
     private readonly staleDisposalTasks;
     private readonly staleDisposalErrors;
     private readonly singletonCache;
-    private readonly childScopes;
+    private readonly forwardRefTokenCache;
+    private childScopes;
     private disposePromise;
     private disposed;
+    private trackedByRoot;
     constructor(parent?: Container | undefined, requestScopeEnabled?: boolean, singletonCache?: Map<Token, Promise<unknown>>);
     /**
      * Registers providers in the current container scope.
@@ -78,6 +80,7 @@ export declare class Container {
      */
     dispose(): Promise<void>;
     private disposeAll;
+    private isDisposedInHierarchy;
     private hasMulti;
     private assertNoRegistrationConflict;
     private hasAncestorSingleRegistration;
@@ -94,11 +97,15 @@ export declare class Container {
     private resolveMultiProviderInstance;
     private resolveExistingProviderTarget;
     private resolveScopedOrSingletonInstance;
+    private getCachedScopedOrSingletonInstance;
     private shouldResolveFromRoot;
     private shouldResolveMultiProviderFromRoot;
     private resolveDepToken;
     private withTokenInChain;
     private root;
+    private ensureTrackedRequestScope;
+    private requestCacheForWrite;
+    private multiRequestCacheForWrite;
     private lookupProvider;
     /**
      * Resolve the cache map that should hold the instance for `provider`.
@@ -127,6 +134,7 @@ export declare class Container {
     private assertSingletonDependencyScopes;
     private resolveEffectiveProvider;
     private resolveProviderDependencyToken;
+    private resolveForwardRefToken;
     private resolveProviderDeps;
     private invalidateCachedEntry;
 }

package/dist/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAW3E,OAAO,KAAK,EASV,QAAQ,EAET,MAAM,YAAY,CAAC;AAuIpB;;GAEG;AACH,qBAAa,SAAS;IAelB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAftC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA0C;IAC7E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoB;IAC1D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmD;IACrF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAmD;IACvF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAC/D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+B;IAC9D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;IACpD,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAS;gBAGN,MAAM,CAAC,EAAE,SAAS,YAAA,EAClB,mBAAmB,UAAQ,EAC5C,cAAc,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAK/C;;;;;;;;;OASG;IACH,QAAQ,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI;IAyCxC;;;;;;;;;;;;;OAaG;IACH,QAAQ,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI;IA6BxC;;;;;OAKG;IACH,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAI1B;;;;;OAKG;IACH,kBAAkB,IAAI,SAAS;IAa/B;;;;;;;;;OASG;IACG,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAW7C;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAiBhB,UAAU;IAgBxB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,4BAA4B;IAsBpC,OAAO,CAAC,6BAA6B;IAIrC,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,qBAAqB;YAgBf,gBAAgB;YAehB,8BAA8B;IA+B5C,OAAO,CAAC,eAAe;YAgBT,kBAAkB;IAMhC,OAAO,CAAC,mCAAmC;YAoB7B,6BAA6B;YAc7B,4BAA4B;IA4B1C,OAAO,CAAC,6BAA6B;YAQvB,gCAAgC;IAuB9C,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kCAAkC;YAI5B,eAAe;YAwBf,gBAAgB;IAiB9B,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,cAAc;IAUtB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,oBAAoB;YAkBd,YAAY;YAaZ,0BAA0B;YA0B1B,8BAA8B;IAc5C,OAAO,CAAC,mBAAmB;YAWb,yBAAyB;IAMvC,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,YAAY;YAIN,WAAW;IA+BzB,OAAO,CAAC,+BAA+B;IAsBvC,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,8BAA8B;YAYxB,mBAAmB;IAUjC,OAAO,CAAC,qBAAqB;CA6C9B"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"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"}

package/dist/container.js

@@ -119,15 +119,17 @@ export class Container {
   registrations = new Map();
   multiRegistrations = new Map();
   multiOverriddenTokens = new Set();
-  requestCache = new Map();
-  multiRequestCache = new Map();
+  requestCache;
+  multiRequestCache;
   multiSingletonCache = new Map();
   staleDisposalTasks = new Set();
   staleDisposalErrors = [];
   singletonCache;
-  childScopes = new Set();
+  forwardRefTokenCache = new WeakMap();
+  childScopes;
   disposePromise;
   disposed = false;
+  trackedByRoot = false;
   constructor(parent, requestScopeEnabled = false, singletonCache) {
     this.parent = parent;
     this.requestScopeEnabled = requestScopeEnabled;
@@ -145,7 +147,7 @@ export class Container {
    * @throws {InvalidProviderError} When a provider definition is structurally invalid.
    */
   register(...providers) {
-    if (this.disposed) {
+    if (this.isDisposedInHierarchy()) {
       throw new ContainerResolutionError('Container has been disposed and can no longer register providers.', {
         hint: 'Ensure providers are registered before calling container.dispose().'
       });
@@ -189,7 +191,7 @@ export class Container {
    * @throws {InvalidProviderError} When a provider definition is structurally invalid.
    */
   override(...providers) {
-    if (this.disposed) {
+    if (this.isDisposedInHierarchy()) {
       throw new ContainerResolutionError('Container has been disposed and can no longer override providers.', {
         hint: 'Ensure overrides are applied before calling container.dispose().'
       });
@@ -228,14 +230,12 @@ export class Container {
    * @throws {ContainerResolutionError} When called after the container was disposed.
    */
   createRequestScope() {
-    if (this.disposed) {
+    if (this.isDisposedInHierarchy()) {
       throw new ContainerResolutionError('Container has been disposed and can no longer create request scopes.', {
         hint: 'Create request scopes before calling container.dispose().'
       });
     }
-    const child = new Container(this, true, this.root().singletonCache);
-    this.root().childScopes.add(child);
-    return child;
+    return new Container(this, true, this.root().singletonCache);
   }
 
   /**
@@ -249,7 +249,7 @@ export class Container {
    * @throws {CircularDependencyError} When provider dependency resolution detects a cycle.
    */
   async resolve(token) {
-    if (this.disposed) {
+    if (this.isDisposedInHierarchy()) {
       throw new ContainerResolutionError('Container has been disposed and can no longer resolve providers.', {
         token,
         hint: 'Ensure all resolves complete before calling container.dispose().'
@@ -281,17 +281,24 @@ export class Container {
   async disposeAll() {
     try {
       // Dispose all live request-scope children first (root only)
-      if (!this.parent && this.childScopes.size > 0) {
+      if (!this.parent && this.childScopes && this.childScopes.size > 0) {
         await Promise.all(Array.from(this.childScopes).map(child => child.dispose()));
         this.childScopes.clear();
       }
       await this.disposeCache(this.disposalCacheEntries());
     } finally {
-      if (this.parent) {
-        this.root().childScopes.delete(this);
+      if (this.parent && this.trackedByRoot) {
+        this.root().childScopes?.delete(this);
+        this.trackedByRoot = false;
       }
     }
   }
+  isDisposedInHierarchy() {
+    if (this.disposed) {
+      return true;
+    }
+    return this.parent?.isDisposedInHierarchy() ?? false;
+  }
   hasMulti(token) {
     if (this.multiRegistrations.has(token)) return true;
     return this.parent?.hasMulti(token) ?? false;
@@ -362,6 +369,10 @@ export class Container {
     if (provider.scope === 'transient') {
       return await this.withTokenInChain(token, chain, activeTokens, async (c, at) => this.instantiate(provider, c, at));
     }
+    const cachedInstance = this.getCachedScopedOrSingletonInstance(provider);
+    if (cachedInstance) {
+      return await cachedInstance;
+    }
     return await this.withTokenInChain(token, chain, activeTokens, async (c, at) => this.resolveScopedOrSingletonInstance(provider, c, at));
   }
   requireProvider(token) {
@@ -431,6 +442,15 @@ export class Container {
     }
     return cache.get(provider.provide);
   }
+  getCachedScopedOrSingletonInstance(provider) {
+    if (provider.scope !== Scope.DEFAULT) {
+      return undefined;
+    }
+    if (this.shouldResolveFromRoot(provider)) {
+      return this.root().getCachedScopedOrSingletonInstance(provider);
+    }
+    return this.cacheFor(provider).get(provider.provide);
+  }
   shouldResolveFromRoot(provider) {
     return provider.scope === Scope.DEFAULT && this.requestScopeEnabled && !this.registrations.has(provider.provide);
   }
@@ -446,7 +466,7 @@ export class Container {
       return this.resolveWithChain(innerToken, chain, activeTokens);
     }
     if (isForwardRef(depEntry)) {
-      const resolvedToken = depEntry.forwardRef();
+      const resolvedToken = this.resolveForwardRefToken(depEntry);
       return this.resolveWithChain(resolvedToken, chain, activeTokens, /* allowForwardRef */true);
     }
     return this.resolveWithChain(depEntry, chain, activeTokens);
@@ -464,6 +484,25 @@ export class Container {
   root() {
     return this.parent ? this.parent.root() : this;
   }
+  ensureTrackedRequestScope() {
+    if (!this.requestScopeEnabled || !this.parent || this.trackedByRoot) {
+      return;
+    }
+    const root = this.root();
+    root.childScopes ??= new Set();
+    root.childScopes.add(this);
+    this.trackedByRoot = true;
+  }
+  requestCacheForWrite() {
+    this.ensureTrackedRequestScope();
+    this.requestCache ??= new Map();
+    return this.requestCache;
+  }
+  multiRequestCacheForWrite() {
+    this.ensureTrackedRequestScope();
+    this.multiRequestCache ??= new Map();
+    return this.multiRequestCache;
+  }
   lookupProvider(token) {
     const local = this.registrations.get(token);
     if (local) {
@@ -486,7 +525,7 @@ export class Container {
   cacheFor(provider) {
     if (provider.scope === Scope.DEFAULT) {
       if (this.requestScopeEnabled && this.registrations.has(provider.provide)) {
-        return this.requestCache;
+        return this.requestCacheForWrite();
       }
       return this.root().singletonCache;
     }
@@ -497,12 +536,12 @@ export class Container {
         hint: 'Wrap the resolve call inside a request-scoped child container created via container.createRequestScope().'
       });
     }
-    return this.requestCache;
+    return this.requestCacheForWrite();
   }
   multiCacheFor(provider) {
     if (provider.scope === Scope.DEFAULT) {
       if (this.requestScopeEnabled && this.hasLocalMultiProvider(provider)) {
-        return this.multiRequestCache;
+        return this.multiRequestCacheForWrite();
       }
       return this.root().multiSingletonCache;
     }
@@ -513,15 +552,15 @@ export class Container {
         hint: 'Wrap the resolve call inside a request-scoped child container created via container.createRequestScope().'
       });
     }
-    return this.multiRequestCache;
+    return this.multiRequestCacheForWrite();
   }
   hasLocalMultiProvider(provider) {
     return this.multiRegistrations.get(provider.provide)?.includes(provider) ?? false;
   }
   disposalCacheEntries() {
     if (this.parent) {
-      const entries = Array.from(this.requestCache.entries());
-      for (const [provider, promise] of this.multiRequestCache.entries()) {
+      const entries = Array.from(this.requestCache?.entries() ?? []);
+      for (const [provider, promise] of this.multiRequestCache?.entries() ?? []) {
         entries.push([provider, promise]);
       }
       return entries;
@@ -577,8 +616,8 @@ export class Container {
   }
   clearDisposalCaches() {
     if (this.parent) {
-      this.requestCache.clear();
-      this.multiRequestCache.clear();
+      this.requestCache?.clear();
+      this.multiRequestCache?.clear();
       return;
     }
     this.singletonCache.clear();
@@ -679,13 +718,21 @@ export class Container {
   }
   resolveProviderDependencyToken(depEntry) {
     if (isForwardRef(depEntry)) {
-      return depEntry.forwardRef();
+      return this.resolveForwardRefToken(depEntry);
     }
     if (isOptionalToken(depEntry)) {
       return depEntry.token;
     }
     return depEntry;
   }
+  resolveForwardRefToken(forwardRefEntry) {
+    if (this.forwardRefTokenCache.has(forwardRefEntry)) {
+      return this.forwardRefTokenCache.get(forwardRefEntry);
+    }
+    const resolvedToken = forwardRefEntry.forwardRef();
+    this.forwardRefTokenCache.set(forwardRefEntry, resolvedToken);
+    return resolvedToken;
+  }
   async resolveProviderDeps(provider, chain, activeTokens) {
     const deps = new Array(provider.inject.length);
     for (const [index, entry] of provider.inject.entries()) {
@@ -694,7 +741,7 @@ export class Container {
     return deps;
   }
   invalidateCachedEntry(token, scope) {
-    if (this.requestCache.has(token)) {
+    if (this.requestCache?.has(token)) {
       const cached = this.requestCache.get(token);
       if (cached) {
         this.scheduleStaleDisposal(cached);
@@ -720,12 +767,16 @@ export class Container {
         this.multiSingletonCache.delete(provider);
       }
     }
-    for (const [provider, cached] of this.multiRequestCache.entries()) {
+    const multiRequestCache = this.multiRequestCache;
+    if (!multiRequestCache) {
+      return;
+    }
+    for (const [provider, cached] of multiRequestCache.entries()) {
       if (provider.provide !== token) {
         continue;
       }
       this.scheduleStaleDisposal(cached);
-      this.multiRequestCache.delete(provider);
+      multiRequestCache.delete(provider);
     }
   }
 }

package/package.json

@@ -9,7 +9,7 @@
     "container",
     "provider"
   ],
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -36,7 +36,7 @@
     "dist"
   ],
   "dependencies": {
-    "@fluojs/core": "^1.0.0-beta.1"
+    "@fluojs/core": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "vitest": "^3.2.4"