injectus 0.2.0 → 0.2.1

package/dist/errors.d.ts

@@ -8,7 +8,7 @@ export declare abstract class DependencyPathError extends Error {
     constructor(leaf: Token);
     /** Full dependency path, root-to-leaf. */
     get path(): readonly Token[];
-    /** Prepend `token` to `error`'s path as the exception unwinds one frame. */
+    /** @internal Prepend `token` to `error`'s path as the exception unwinds one frame. */
     static prepend(error: DependencyPathError, token: Token): void;
 }
 /** Thrown when a cycle is detected in the dependency graph. The message renders the full path root-to-leaf. */

package/dist/errors.js

@@ -13,7 +13,7 @@ export class DependencyPathError extends Error {
     get path() {
         return this.#path;
     }
-    /** Prepend `token` to `error`'s path as the exception unwinds one frame. */
+    /** @internal Prepend `token` to `error`'s path as the exception unwinds one frame. */
     static prepend(error, token) {
         error.#path.unshift(token);
     }

package/dist/injector.js

@@ -60,17 +60,21 @@ export class Injector {
             throw new TokenNotFoundError(token, this.name);
         }
         const { binding, injector } = found;
-        const prev = getInjectionContext();
+        const prevLifetime = getInjectionContext()?.effectiveLifetime;
+        if (prevLifetime === Lifetime.Singleton &&
+            binding.lifetime === Lifetime.Scoped) {
+            throw new CaptiveDependencyError(token);
+        }
+        const isNotSelf = injector !== this;
+        const owner = 
         // Singleton caches on owner; factory must run under owner's chain or child shadow poisons parent cache
-        const owner = binding.lifetime === Lifetime.Singleton && injector !== this
-            ? injector
-            : this;
+        isNotSelf && binding.lifetime === Lifetime.Singleton ? injector : this;
         const prevInjectContext = setInjectionContext({
             injector: owner,
-            effectiveLifetime: minLifetime(binding.lifetime, prev?.effectiveLifetime),
+            effectiveLifetime: minLifetime(binding.lifetime, prevLifetime),
         });
         try {
-            if (binding.lifetime === Lifetime.Scoped && injector !== this) {
+            if (isNotSelf && binding.lifetime === Lifetime.Scoped) {
                 const scopedBinding = makeBinding(binding.factory, EMPTY, Lifetime.Scoped);
                 this.#bindings.set(token, scopedBinding);
                 return this.hydrate(token, scopedBinding, options);
@@ -100,12 +104,6 @@ export class Injector {
         if (binding.value !== EMPTY) {
             return binding.value;
         }
-        const lifetime = binding.lifetime;
-        const ctx = getInjectionContext();
-        if (lifetime === Lifetime.Scoped &&
-            ctx.effectiveLifetime === Lifetime.Singleton) {
-            throw new CaptiveDependencyError(token);
-        }
         binding.value = CIRCULAR;
         let instance;
         try {
@@ -118,7 +116,7 @@ export class Injector {
             }
             throw e;
         }
-        if (lifetime === Lifetime.Transient) {
+        if (binding.lifetime === Lifetime.Transient) {
             binding.value = EMPTY;
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "injectus",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "High-performance, decorator-free IoC container for Node.js — sync inject(), explicit lifetimes, TC39-native disposal.",
   "main": "./dist/index.js",