@needle-di/core 1.1.2 → 1.2.0

package/README.md

@@ -66,6 +66,15 @@ deno add jsr:@needle-di/core
 
 Check out our docs on [https://needle-di.io](https://needle-di.io/concepts/binding.html).
 
+## Using AI coding agents?
+
+Our documentation is available in an LLM-friendly format:
+
+- [https://needle-di.io/llms.txt](https://needle-di.io/llms.txt) - a compact index of all documentation pages
+- [https://needle-di.io/llms-full.txt](https://needle-di.io/llms-full.txt) - the full documentation as a single file
+
+See [AI agent instructions](https://needle-di.io/ai/agents.html) for guidance on using Needle DI with AI coding agents.
+
 ## License
 
 License under the MIT License (MIT)

package/dist/container.d.ts

@@ -1,5 +1,5 @@
 import { type Token } from "./tokens.ts";
-import type { Provider } from "./providers.ts";
+import type { Provider, ProviderList } from "./providers.ts";
 /**
  * A dependency injection (DI) container will keep track of all bindings
  * and hold the actual instances of your services.
@@ -7,24 +7,27 @@ import type { Provider } from "./providers.ts";
 export declare class Container {
     private readonly providers;
     private readonly singletons;
+    /**
+     * Async constructions that have been started but have not settled yet, keyed by token.
+     *
+     * Without this, two overlapping `getAsync()` calls for the same token would both see an
+     * empty `singletons` entry and construct it twice, breaking singleton semantics.
+     */
+    private readonly pending;
     private readonly parent?;
     private readonly factory;
     constructor(parent?: Container);
     /**
      * Binds multiple providers to this container.
      *
-     * {@link https://needle-di.io/concepts/binding.html#binding}
+     * Providers may be passed individually or as (nested) arrays. To define a list of providers
+     * upfront, outside of a container, use `defineProviders()`.
+     *
+     * @param providers one or more providers, optionally nested in arrays
+     *
+     * {@link https://needle-di.io/concepts/binding.html#binding-multiple-providers}
      */
-    bindAll<A>(p1: Provider<A>): this;
-    bindAll<A, B>(p1: Provider<A>, p2: Provider<B>): this;
-    bindAll<A, B, C>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>): this;
-    bindAll<A, B, C, D>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>): this;
-    bindAll<A, B, C, D, E>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>): this;
-    bindAll<A, B, C, D, E, F>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>, p6: Provider<F>): this;
-    bindAll<A, B, C, D, E, F, G>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>, p6: Provider<F>, p7: Provider<G>): this;
-    bindAll<A, B, C, D, E, F, G, H>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>, p6: Provider<F>, p7: Provider<G>, p8: Provider<H>): this;
-    bindAll<A, B, C, D, E, F, G, H, I>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>, p6: Provider<F>, p7: Provider<G>, p8: Provider<H>, p9: Provider<I>): this;
-    bindAll<A, B, C, D, E, F, G, H, I>(p1: Provider<A>, p2: Provider<B>, p3: Provider<C>, p4: Provider<D>, p5: Provider<E>, p6: Provider<F>, p7: Provider<G>, p8: Provider<H>, p9: Provider<I>, ...providers: Provider<any>[]): this;
+    bindAll<T extends readonly unknown[]>(...providers: ProviderList<T>): this;
     /**
      * Binds a provider to this container.
      *
@@ -32,11 +35,14 @@ export declare class Container {
      */
     bind<T>(provider: Provider<T>): this;
     /**
-     * Unbinds a provider.
+     * Unbinds a token.
      *
-     * {@link https://needle-di.io/concepts/binding.html#binding}
+     * This removes all providers for that token, including multi-providers,
+     * as well as any instances that were already constructed.
+     *
+     * {@link https://needle-di.io/concepts/binding.html#clear-binding}
      */
-    unbind<T>(provider: Provider<T>): this;
+    unbind<T>(token: Token<T>): this;
     /**
      * Unbinds all providers.
      *
@@ -127,6 +133,18 @@ export declare class Container {
         multi?: boolean;
         lazy?: boolean;
     }): Promise<T | T[] | undefined> | (() => Promise<T | T[] | undefined>);
+    /**
+     * Runs a function within an injection context backed by this container, so that it
+     * can use `inject()` and `injectAsync()` instead of `container.get()`. The return
+     * value of the function is passed through.
+     *
+     * The injection context is only active for as long as the function runs
+     * synchronously. When passing an async function, `inject()` and `injectAsync()`
+     * must therefore be called before its first `await`.
+     *
+     * {@link https://needle-di.io/concepts/injection.html#running-in-an-injection-context}
+     */
+    runInInjectionContext<T>(block: (container: Container) => T): T;
     /**
      * Creates a child container.
      *
@@ -137,6 +155,13 @@ export declare class Container {
      * Returns whether the container has one or more providers for this token.
      */
     has<T>(token: Token<T>): boolean;
+    /**
+     * Constructs the providers for a token asynchronously, ensuring that concurrent
+     * requests for the same token share a single construction and therefore a single
+     * instance. Callers that join an already running construction inherit its result,
+     * not its chain: their own chain has already been checked for cycles by the caller.
+     */
+    private constructOnce;
     private autoBindIfNeeded;
     private existingProviderAlreadyProvided;
 }

package/dist/container.js

@@ -1,9 +1,9 @@
 import { isClassToken, toString, isInjectionToken, getToken } from "./tokens.js";
 import * as Guards from "./providers.js";
 import { getInjectableTargets, isInjectable } from "./decorators.js";
-import { assertPresent, assertSingle, getParentClasses, promiseTry, windowedSlice } from "./utils.js";
-import { Factory } from "./factory.js";
-import { injectionContext } from "./context.js";
+import { assertPresent, assertSingle, flattenDeep, getParentClasses, promiseTry, windowedSlice } from "./utils.js";
+import { assertNoCycle, Factory } from "./factory.js";
+import { currentResolutionChain, injectionContext } from "./context.js";
 /**
  * A dependency injection (DI) container will keep track of all bindings
  * and hold the actual instances of your services.
@@ -11,6 +11,13 @@ import { injectionContext } from "./context.js";
 export class Container {
     providers = new Map();
     singletons = new Map();
+    /**
+     * Async constructions that have been started but have not settled yet, keyed by token.
+     *
+     * Without this, two overlapping `getAsync()` calls for the same token would both see an
+     * empty `singletons` entry and construct it twice, breaking singleton semantics.
+     */
+    pending = new Map();
     parent;
     factory;
     constructor(parent) {
@@ -21,9 +28,18 @@ export class Container {
             useValue: this,
         });
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    /**
+     * Binds multiple providers to this container.
+     *
+     * Providers may be passed individually or as (nested) arrays. To define a list of providers
+     * upfront, outside of a container, use `defineProviders()`.
+     *
+     * @param providers one or more providers, optionally nested in arrays
+     *
+     * {@link https://needle-di.io/concepts/binding.html#binding-multiple-providers}
+     */
     bindAll(...providers) {
-        providers.forEach((it) => this.bind(it));
+        flattenDeep(providers).forEach((it) => this.bind(it));
         return this;
     }
     /**
@@ -76,14 +92,17 @@ export class Container {
         return this;
     }
     /**
-     * Unbinds a provider.
+     * Unbinds a token.
      *
-     * {@link https://needle-di.io/concepts/binding.html#binding}
+     * This removes all providers for that token, including multi-providers,
+     * as well as any instances that were already constructed.
+     *
+     * {@link https://needle-di.io/concepts/binding.html#clear-binding}
      */
-    unbind(provider) {
-        const token = getToken(provider);
+    unbind(token) {
         this.providers.delete(token);
         this.singletons.delete(token);
+        this.pending.delete(token);
         return this;
     }
     /**
@@ -94,17 +113,25 @@ export class Container {
     unbindAll() {
         this.providers.clear();
         this.singletons.clear();
+        this.pending.clear();
         return this;
     }
     get(token, options) {
         const lazy = options?.lazy ?? false;
         if (lazy) {
+            // Lazy injection deliberately starts a new resolution when the getter is invoked,
+            // which is exactly what makes it usable to break a cycle.
             return () => this.get(token, { ...options, lazy: false });
         }
+        // The resolution we are part of, if any. Read from the active injection context
+        // rather than passed as an argument, so that the public API stays unchanged.
+        const chain = currentResolutionChain();
         this.autoBindIfNeeded(token);
         const optional = options?.optional ?? false;
         if (!this.providers.has(token)) {
             if (this.parent) {
+                // Delegation happens synchronously, so the context this chain was read from is
+                // still active and the parent observes the very same chain.
                 return this.parent.get(token, { ...options, lazy: false });
             }
             if (optional) {
@@ -114,10 +141,8 @@ export class Container {
         }
         const providers = assertPresent(this.providers.get(token));
         if (!this.singletons.has(token)) {
-            injectionContext(this).run(() => {
-                const values = providers.flatMap((provider) => this.factory.construct(provider, token));
-                this.singletons.set(token, values);
-            });
+            const values = providers.flatMap((provider) => this.factory.construct(provider, token, chain));
+            this.singletons.set(token, values);
         }
         const singletons = assertPresent(this.singletons.get(token));
         const multi = options?.multi ?? false;
@@ -132,13 +157,20 @@ export class Container {
     getAsync(token, options) {
         const lazy = options?.lazy ?? false;
         if (lazy) {
+            // Lazy injection deliberately starts a new resolution when the getter is invoked,
+            // which is exactly what makes it usable to break a cycle.
             return () => this.getAsync(token, { ...options, lazy: false });
         }
+        // Must be read here, before the first `await`: the injection context we inherit this
+        // from is restored as soon as our caller's synchronous block returns.
+        const chain = currentResolutionChain();
         return promiseTry(async () => {
             this.autoBindIfNeeded(token);
             const optional = options?.optional ?? false;
             if (!this.providers.has(token)) {
                 if (this.parent) {
+                    // Still part of the synchronous prefix, so the context is active and the parent
+                    // observes the very same chain.
                     return this.parent.getAsync(token, { ...options, lazy: false });
                 }
                 if (optional) {
@@ -147,13 +179,17 @@ export class Container {
                 throw Error(`No provider(s) found for ${toString(token)}`);
             }
             const providers = assertPresent(this.providers.get(token));
-            if (!this.singletons.has(token)) {
-                await injectionContext(this).runAsync(async () => {
-                    const values = await Promise.all(providers.map((it) => this.factory.constructAsync(it)));
-                    this.singletons.set(token, values.flat());
-                });
+            let singletons = this.singletons.get(token);
+            if (!singletons) {
+                // Cycle detection has to happen before we join an in-flight construction below:
+                // a genuine cycle would otherwise await the pending promise of a token that is
+                // waiting on us, and hang instead of reporting itself.
+                providers.forEach((provider) => assertNoCycle(chain, provider));
+                // We use the values the construction produced instead of reading `singletons`
+                // back, so that a token that was unbound while we were suspended still resolves
+                // to the result of the construction we started.
+                singletons = await this.constructOnce(token, providers, chain);
             }
-            const singletons = assertPresent(this.singletons.get(token));
             const multi = options?.multi ?? false;
             if (multi) {
                 return singletons;
@@ -164,6 +200,27 @@ export class Container {
             }
         });
     }
+    /**
+     * Runs a function within an injection context backed by this container, so that it
+     * can use `inject()` and `injectAsync()` instead of `container.get()`. The return
+     * value of the function is passed through.
+     *
+     * The injection context is only active for as long as the function runs
+     * synchronously. When passing an async function, `inject()` and `injectAsync()`
+     * must therefore be called before its first `await`.
+     *
+     * {@link https://needle-di.io/concepts/injection.html#running-in-an-injection-context}
+     */
+    runInInjectionContext(block) {
+        // A fresh context per call, never one cached per container: contexts are scoped to
+        // a single resolution, and sharing one would interleave concurrent resolutions.
+        //
+        // The chain is inherited rather than reset. Called from user code it is empty
+        // anyway, but called from within a construction the block is part of that
+        // resolution, so continuing its chain is what keeps circular dependencies
+        // detectable instead of recursing until the stack overflows.
+        return injectionContext(this, currentResolutionChain()).run(block);
+    }
     /**
      * Creates a child container.
      *
@@ -178,6 +235,39 @@ export class Container {
     has(token) {
         return this.providers.has(token) || (this.parent?.has(token) ?? false);
     }
+    /**
+     * Constructs the providers for a token asynchronously, ensuring that concurrent
+     * requests for the same token share a single construction and therefore a single
+     * instance. Callers that join an already running construction inherit its result,
+     * not its chain: their own chain has already been checked for cycles by the caller.
+     */
+    constructOnce(token, providers, chain) {
+        const existing = this.pending.get(token);
+        if (existing) {
+            return existing;
+        }
+        const pending = promiseTry(async () => {
+            const values = await Promise.all(providers.map((it) => this.factory.constructAsync(it, chain)));
+            return values.flat();
+        });
+        this.pending.set(token, pending);
+        // A construction may only write back if it is still the current one for this token.
+        // If it was unbound or superseded while in flight, the container has moved on and
+        // storing the result would resurrect a token that is no longer bound.
+        const isCurrent = () => this.pending.get(token) === pending;
+        pending.then((values) => {
+            if (isCurrent()) {
+                this.pending.delete(token);
+                this.singletons.set(token, values);
+            }
+        }, () => {
+            // A failed construction must not be cached, so a later attempt can retry.
+            if (isCurrent()) {
+                this.pending.delete(token);
+            }
+        });
+        return pending;
+    }
     autoBindIfNeeded(token) {
         if (this.singletons.has(token)) {
             return;

package/dist/container.js.map

@@ -1 +1 @@
-{"version":3,"file":"container.js","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"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"}

package/dist/context.d.ts

@@ -1,4 +1,5 @@
 import { Container } from "./container.ts";
+import type { ResolutionChain } from "./factory.ts";
 import type { Token } from "./tokens.ts";
 /**
  * Injects a service within the current injection context, using the token provided.
@@ -63,9 +64,14 @@ export declare function injectAsync<T>(token: Token<T>, options: {
 /**
  * A context has a specific container associated to it and allows you to run sync or async code.
  *
+ * It also carries the {@link ResolutionChain} of the resolution it belongs to, so that
+ * `inject()` and `injectAsync()` calls made by user code continue that chain instead of
+ * starting a new one.
+ *
  * @internal
  */
-interface Context {
+export interface Context {
+    readonly chain: ResolutionChain;
     run<T>(block: (container: Container) => T): T;
     runAsync<T>(block: (container: Container) => Promise<T>): Promise<T>;
 }
@@ -74,5 +80,15 @@ interface Context {
  *
  * @internal
  */
-export declare function injectionContext(container: Container): Context;
-export {};
+export declare function injectionContext(container: Container, chain?: ResolutionChain): Context;
+/**
+ * Returns the resolution chain of the injection context that is currently active, or an
+ * empty chain when there is none (i.e., when a resolution is started from user code).
+ *
+ * Like `inject()` and `injectAsync()`, this must be read synchronously while the context
+ * is still active: the context is restored as soon as the current synchronous block
+ * returns, so it cannot be read after an `await`.
+ *
+ * @internal
+ */
+export declare function currentResolutionChain(): ResolutionChain;

package/dist/context.js

@@ -1,4 +1,5 @@
 import { Container } from "./container.js";
+import { promiseTry } from "./utils.js";
 export function inject(token, options) {
     try {
         return _currentContext.run((container) => container.get(token, options));
@@ -24,12 +25,17 @@ export function injectAsync(token, options) {
         return Promise.reject(error);
     }
 }
+/**
+ * The chain of a resolution that has no parent, i.e., one started from user code.
+ */
+const EMPTY_RESOLUTION_CHAIN = Object.freeze([]);
 /**
  * The global context does not allow dependency injection.
  *
  * @internal
  */
 class GlobalContext {
+    chain = EMPTY_RESOLUTION_CHAIN;
     run() {
         throw new NeedsInjectionContextError();
     }
@@ -44,8 +50,10 @@ class GlobalContext {
  */
 class InjectionContext {
     container;
-    constructor(container) {
+    chain;
+    constructor(container, chain) {
         this.container = container;
+        this.chain = chain;
     }
     run(block) {
         const originalContext = _currentContext;
@@ -58,14 +66,18 @@ class InjectionContext {
             _currentContext = originalContext;
         }
     }
-    async runAsync(block) {
+    runAsync(block) {
         const originalContext = _currentContext;
         try {
             // eslint-disable-next-line @typescript-eslint/no-this-alias
             _currentContext = this;
-            return await block(this.container);
+            return promiseTry(() => block(this.container));
         }
         finally {
+            // The context must be restored synchronously, as soon as the block's synchronous
+            // prefix has returned its promise. Holding it across the `await` (i.e. until the
+            // promise settles) leaks this context to unrelated code that runs while the block
+            // is suspended, making `inject()`/`injectAsync()` resolve from the wrong container.
             _currentContext = originalContext;
         }
     }
@@ -76,8 +88,21 @@ let _currentContext = new GlobalContext();
  *
  * @internal
  */
-export function injectionContext(container) {
-    return new InjectionContext(container);
+export function injectionContext(container, chain = EMPTY_RESOLUTION_CHAIN) {
+    return new InjectionContext(container, chain);
+}
+/**
+ * Returns the resolution chain of the injection context that is currently active, or an
+ * empty chain when there is none (i.e., when a resolution is started from user code).
+ *
+ * Like `inject()` and `injectAsync()`, this must be read synchronously while the context
+ * is still active: the context is restored as soon as the current synchronous block
+ * returns, so it cannot be read after an `await`.
+ *
+ * @internal
+ */
+export function currentResolutionChain() {
+    return _currentContext.chain;
 }
 /**
  * An error that occurs when `inject()` or `injectAsync()` is used outside an injection context.
@@ -86,7 +111,10 @@ export function injectionContext(container) {
  */
 class NeedsInjectionContextError extends Error {
     constructor() {
-        super(`You can only invoke inject() or injectAsync() within an injection context`);
+        super(`You can only invoke inject() or injectAsync() within an injection context. ` +
+            `If you entered one using container.runInInjectionContext(), note that it is no longer ` +
+            `active after its first await. ` +
+            `See https://needle-di.io/concepts/injection.html#running-in-an-injection-context`);
     }
 }
 //# sourceMappingURL=context.js.map

package/dist/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAc3C,MAAM,UAAU,MAAM,CACpB,KAAe,EACf,OAAiE;IAEjE,IAAI,CAAC;QACH,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,0BAA0B,IAAI,OAAO,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC9E,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAgBD,MAAM,UAAU,WAAW,CACzB,KAAe,EACf,OAIC;IAED,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;YAClB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACnG,CAAC;QACD,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACzG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,0BAA0B,IAAI,OAAO,EAAE,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC9E,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAYD;;;;GAIG;AACH,MAAM,aAAa;IACjB,GAAG;QACD,MAAM,IAAI,0BAA0B,EAAE,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,MAAM,IAAI,0BAA0B,EAAE,CAAC;IACzC,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,gBAAgB;IACS;IAA7B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,GAAG,CAAI,KAAkC;QACvC,MAAM,eAAe,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC;YACH,4DAA4D;YAC5D,eAAe,GAAG,IAAI,CAAC;YACvB,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YACT,eAAe,GAAG,eAAe,CAAC;QACpC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAI,KAA+C;QAC/D,MAAM,eAAe,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC;YACH,4DAA4D;YAC5D,eAAe,GAAG,IAAI,CAAC;YACvB,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;gBAAS,CAAC;YACT,eAAe,GAAG,eAAe,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AAED,IAAI,eAAe,GAAqC,IAAI,aAAa,EAAE,CAAC;AAE5E;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAoB;IACnD,OAAO,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC;AAED;;;;GAIG;AACH,MAAM,0BAA2B,SAAQ,KAAK;IAC5C;QACE,KAAK,CAAC,2EAA2E,CAAC,CAAC;IACrF,CAAC;CACF"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}

package/dist/factory.d.ts

@@ -1,14 +1,34 @@
 import { type Provider } from "./providers.ts";
 import { type Token } from "./tokens.ts";
 import { Container } from "./container.ts";
+/**
+ * The providers that are currently being constructed, ordered from the root of a
+ * resolution down to the provider that is being constructed right now.
+ *
+ * A chain belongs to a single resolution and is treated as immutable: every nested
+ * injection receives its own extended copy. This is what keeps concurrent resolutions
+ * isolated. A single mutable stack shared by the whole container would interleave
+ * them, and any provider two overlapping resolutions have in common would be reported
+ * as a circular dependency.
+ *
+ * @internal
+ */
+export type ResolutionChain = readonly Provider<unknown>[];
+/**
+ * Asserts that constructing `provider` as the next step of `chain` does not close a
+ * cycle, i.e., that the provider does not (transitively) depend on itself.
+ *
+ * @internal
+ */
+export declare function assertNoCycle(chain: ResolutionChain, provider: Provider<unknown>): void;
 /**
  * @internal
  */
 export declare class Factory {
     private readonly container;
-    private readonly underConstruction;
     constructor(container: Container);
-    construct<T>(provider: Provider<T>, token: Token<T>): T[];
-    constructAsync<T>(provider: Provider<T>): Promise<T[]>;
+    construct<T>(provider: Provider<T>, token: Token<T>, chain: ResolutionChain): T[];
+    constructAsync<T>(provider: Provider<T>, chain: ResolutionChain): Promise<T[]>;
     private doConstruct;
+    private enter;
 }

package/dist/factory.js

@@ -3,79 +3,94 @@ import { getToken, toString } from "./tokens.js";
 import * as Guards from "./providers.js";
 import { assertNever, retryOn } from "./utils.js";
 import { Container } from "./container.js";
+import { injectionContext } from "./context.js";
+/**
+ * Asserts that constructing `provider` as the next step of `chain` does not close a
+ * cycle, i.e., that the provider does not (transitively) depend on itself.
+ *
+ * @internal
+ */
+export function assertNoCycle(chain, provider) {
+    if (chain.includes(provider)) {
+        throw new CircularDependencyError([...chain, provider].map(getToken).map(toString));
+    }
+}
+/**
+ * Returns the chain that the dependencies of `provider` should be resolved with.
+ * Throws a {@link CircularDependencyError} if `provider` is already part of `chain`.
+ */
+function extend(chain, provider) {
+    assertNoCycle(chain, provider);
+    return [...chain, provider];
+}
 /**
  * @internal
  */
 export class Factory {
     container;
-    underConstruction = [];
     constructor(container) {
         this.container = container;
     }
-    construct(provider, token) {
+    construct(provider, token, chain) {
         if (Guards.isAsyncProvider(provider)) {
             throw new AsyncProvidersInSyncInjectionContextError(token);
         }
-        try {
-            if (this.underConstruction.includes(provider)) {
-                const dependencyGraph = [...this.underConstruction, provider].map(getToken).map(toString);
-                throw new CircularDependencyError(dependencyGraph);
-            }
-            this.underConstruction.push(provider);
-            return this.doConstruct(provider);
+        return this.doConstruct(provider, extend(chain, provider));
+    }
+    async constructAsync(provider, chain) {
+        // The chain that this provider's own dependencies are resolved with. Since it is a
+        // fresh array rather than a shared stack, there is nothing to unwind afterwards:
+        // it simply goes out of scope, no matter when (or whether) this construction settles.
+        const nested = extend(chain, provider);
+        if (Guards.isAsyncProvider(provider)) {
+            return [await this.enter(nested).runAsync(() => provider.useFactory(this.container))];
+        }
+        // in class and constructor providers, we allow stuff to be synchronously injected,
+        // by just retrying when we encounter an async dependency down the road.
+        // todo: this feels like an ugly workaround, so let's create something nice for this.
+        if (Guards.isClassProvider(provider) || Guards.isConstructorProvider(provider)) {
+            const create = Guards.isConstructorProvider(provider) ? () => [new provider()] : () => [new provider.useClass()];
+            return retryOn(AsyncProvidersInSyncInjectionContextError, 
+            // retries run in a later tick, when the original injection context is no longer
+            // active, so each attempt must explicitly (re-)enter the injection context for
+            // the field initializers' inject() calls to work.
+            async () => this.enter(nested).run(() => create()), async (error) => {
+                // Resolving the async dependency is part of this construction, so it has to
+                // continue this chain. Entering the context again is what carries it across
+                // the tick boundary introduced by the retry.
+                await this.enter(nested).runAsync(() => this.container.getAsync(error.token, { multi: true, optional: true }));
+            });
         }
-        finally {
-            this.underConstruction.pop();
+        if (Guards.isExistingProvider(provider)) {
+            return await this.enter(nested).runAsync(() => this.container.getAsync(provider.useExisting, { multi: true }));
         }
+        // all other types of providers are constructed synchronously anyway.
+        return this.doConstruct(provider, nested);
     }
-    async constructAsync(provider) {
-        try {
-            if (this.underConstruction.includes(provider)) {
-                const dependencyGraph = [...this.underConstruction, provider].map(getToken).map(toString);
-                throw new CircularDependencyError(dependencyGraph);
+    doConstruct(provider, chain) {
+        // User code runs inside the injection context, so that the inject() calls it makes
+        // resolve from the right container and continue this resolution's chain.
+        return this.enter(chain).run(() => {
+            if (Guards.isConstructorProvider(provider)) {
+                return [new provider()];
             }
-            this.underConstruction.push(provider);
-            if (Guards.isAsyncProvider(provider)) {
-                return [await provider.useFactory(this.container)];
+            else if (Guards.isClassProvider(provider)) {
+                return [new provider.useClass()];
             }
-            // in class and constructor providers, we allow stuff to be synchronously injected,
-            // by just retrying when we encounter an async dependency down the road.
-            // todo: this feels like an ugly workaround, so let's create something nice for this.
-            if (Guards.isClassProvider(provider) || Guards.isConstructorProvider(provider)) {
-                const create = Guards.isConstructorProvider(provider)
-                    ? () => [new provider()]
-                    : () => [new provider.useClass()];
-                return retryOn(AsyncProvidersInSyncInjectionContextError, async () => create(), async (error) => {
-                    await this.container.getAsync(error.token, { multi: true, optional: true });
-                });
+            else if (Guards.isValueProvider(provider)) {
+                return [provider.useValue];
             }
-            if (Guards.isExistingProvider(provider)) {
-                return await this.container.getAsync(provider.useExisting, { multi: true });
+            else if (Guards.isFactoryProvider(provider)) {
+                return [provider.useFactory(this.container)];
             }
-            // all other types of providers are constructed synchronously anyway.
-            return this.doConstruct(provider);
-        }
-        finally {
-            this.underConstruction.pop();
-        }
+            else if (Guards.isExistingProvider(provider)) {
+                return this.container.get(provider.useExisting, { multi: true });
+            }
+            return assertNever(provider);
+        });
     }
-    doConstruct(provider) {
-        if (Guards.isConstructorProvider(provider)) {
-            return [new provider()];
-        }
-        else if (Guards.isClassProvider(provider)) {
-            return [new provider.useClass()];
-        }
-        else if (Guards.isValueProvider(provider)) {
-            return [provider.useValue];
-        }
-        else if (Guards.isFactoryProvider(provider)) {
-            return [provider.useFactory(this.container)];
-        }
-        else if (Guards.isExistingProvider(provider)) {
-            return this.container.get(provider.useExisting, { multi: true });
-        }
-        return assertNever(provider);
+    enter(chain) {
+        return injectionContext(this.container, chain);
     }
 }
 /**

package/dist/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { Container, bootstrap, bootstrapAsync } from "./container.ts";
 export { inject, injectAsync } from "./context.ts";
 export { injectable } from "./decorators.ts";
-export type { Provider, SyncProvider, AsyncProvider, ExistingProvider, ConstructorProvider, ClassProvider, ValueProvider, FactoryProvider, AsyncFactoryProvider, SyncFactoryProvider, } from "./providers.ts";
+export type { Provider, SyncProvider, AsyncProvider, ExistingProvider, ConstructorProvider, ClassProvider, ValueProvider, FactoryProvider, AsyncFactoryProvider, SyncFactoryProvider, ProviderList, } from "./providers.ts";
+export { defineProviders } from "./providers.ts";
 export { InjectionToken } from "./tokens.ts";
 export type { Token } from "./tokens.ts";

package/dist/index.js

@@ -1,5 +1,6 @@
 export { Container, bootstrap, bootstrapAsync } from "./container.js";
 export { inject, injectAsync } from "./context.js";
 export { injectable } from "./decorators.js";
+export { defineProviders } from "./providers.js";
 export { InjectionToken } from "./tokens.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAa7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAc7C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC"}

package/dist/providers.d.ts

@@ -72,3 +72,69 @@ export declare function isFactoryProvider<T>(provider: Provider<T>): provider is
 export declare function isAsyncProvider<T>(provider: Provider<T>): provider is AsyncProvider<T>;
 export declare function isExistingProvider<T>(provider: Provider<T>): provider is ExistingProvider<T>;
 export declare function isMultiProvider<T>(provider: Provider<T>): boolean;
+/**
+ * A single provider, or an arbitrarily nested array of providers.
+ */
+type ProviderNode = Provider<unknown> | readonly ProviderNode[];
+/**
+ * Recursively unwraps nested arrays, yielding the union of all leaf types.
+ */
+type ExtractProviders<T> = T extends readonly unknown[] ? ExtractProviders<T[number]> : T;
+/**
+ * Every provider variant that is an object literal, i.e. all of them except
+ * {@link ConstructorProvider}, which is a class reference.
+ */
+type ObjectProvider<T> = ClassProvider<T> | ValueProvider<T> | SyncFactoryProvider<T> | AsyncFactoryProvider<T> | ExistingProvider<T>;
+/**
+ * `keyof` distributed over the members of a union, rather than the keys they have in common.
+ */
+type KeysOfUnion<T> = T extends unknown ? keyof T : never;
+/**
+ * Every property name that may appear on an object-based provider.
+ */
+type ProviderKey = KeysOfUnion<ObjectProvider<unknown>>;
+/**
+ * Rejects properties that do not exist on any provider, by requiring them to be `never`.
+ *
+ * TypeScript only applies its built-in excess property check to *fresh* object literals.
+ * Since {@link ProviderList} first captures the arguments in an inferred type parameter,
+ * that freshness is lost, so the check is reproduced here explicitly.
+ */
+type NoExcessProperties<T> = Record<Exclude<keyof T, ProviderKey>, never>;
+/**
+ * Type-checks a single element: either a nested array, or a provider whose value type
+ * is correlated with the token it is provided for.
+ */
+type CheckProviderNode<T> = T extends readonly unknown[] ? CheckedProviderList<T> : T extends {
+    provide: Token<infer U>;
+} ? Exclude<keyof T, ProviderKey> extends never ? Provider<U> : Provider<U> & NoExcessProperties<T> : Provider<unknown>;
+/**
+ * Type-checks every element of an (arbitrarily nested) list of providers.
+ */
+type CheckedProviderList<T extends readonly unknown[]> = {
+    [K in keyof T]: CheckProviderNode<T[K]>;
+};
+/**
+ * The list of arguments accepted by {@link Container.bindAll} and {@link defineProviders}:
+ * one or more providers, optionally nested in arrays, preserving the correlation between each
+ * token and the value it provides.
+ *
+ * When the given arguments already satisfy this, they are accepted as-is. Otherwise this type
+ * resolves to the expected shape, so that TypeScript reports the mismatch on the offending
+ * element rather than on the call as a whole.
+ */
+export type ProviderList<T extends readonly unknown[]> = T extends readonly [] ? readonly [ProviderNode] : T extends CheckedProviderList<T> ? T : CheckedProviderList<T>;
+/**
+ * Defines a list of providers upfront, outside of a container.
+ *
+ * Providers may be passed individually or as (nested) arrays, and are returned as a single
+ * flattened array. Unlike annotating a variable as `Provider<unknown>[]`, this preserves the
+ * correlation between each token and the value it provides.
+ *
+ * @param providers one or more providers, optionally nested in arrays
+ * @returns a flat array containing every given provider
+ *
+ * {@link https://needle-di.io/concepts/binding.html#defining-providers-upfront}
+ */
+export declare function defineProviders<T extends readonly unknown[]>(...providers: ProviderList<T>): ExtractProviders<T>[];
+export {};

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { isClassLike } from "./utils.js";
+import { flattenDeep, isClassLike } from "./utils.js";
 export function isConstructorProvider(provider) {
     return isClassLike(provider);
 }
@@ -20,4 +20,19 @@ export function isExistingProvider(provider) {
 export function isMultiProvider(provider) {
     return "provide" in provider && "multi" in provider && provider.multi === true;
 }
+/**
+ * Defines a list of providers upfront, outside of a container.
+ *
+ * Providers may be passed individually or as (nested) arrays, and are returned as a single
+ * flattened array. Unlike annotating a variable as `Provider<unknown>[]`, this preserves the
+ * correlation between each token and the value it provides.
+ *
+ * @param providers one or more providers, optionally nested in arrays
+ * @returns a flat array containing every given provider
+ *
+ * {@link https://needle-di.io/concepts/binding.html#defining-providers-upfront}
+ */
+export function defineProviders(...providers) {
+    return flattenDeep(providers);
+}
 //# sourceMappingURL=providers.js.map

package/dist/providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"providers.js","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,YAAY,CAAC;AAkFrD,MAAM,UAAU,qBAAqB,CAAI,QAAqB;IAC5D,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAI,QAAqB;IACxD,OAAO,SAAS,IAAI,QAAQ,IAAI,YAAY,IAAI,QAAQ,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAI,QAAqB;IACzD,OAAO,SAAS,IAAI,QAAQ,IAAI,aAAa,IAAI,QAAQ,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC;AACjF,CAAC"}
+{"version":3,"file":"providers.js","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAkFlE,MAAM,UAAU,qBAAqB,CAAI,QAAqB;IAC5D,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,UAAU,IAAI,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAI,QAAqB;IACxD,OAAO,SAAS,IAAI,QAAQ,IAAI,YAAY,IAAI,QAAQ,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,iBAAiB,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAI,QAAqB;IACzD,OAAO,SAAS,IAAI,QAAQ,IAAI,aAAa,IAAI,QAAQ,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,QAAqB;IACtD,OAAO,SAAS,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,CAAC;AACjF,CAAC;AA6ED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAA+B,GAAG,SAA0B;IACzF,OAAO,WAAW,CAAC,SAA+B,CAAC,CAAC;AACtD,CAAC"}

package/dist/utils.d.ts

@@ -15,6 +15,12 @@ export declare function isClassLike(target: unknown): target is Class<unknown> |
  * @internal
  */
 export declare function getParentClasses(target: Class<unknown>): Class<unknown>[];
+/**
+ * Recursively flattens an arbitrarily nested array into a flat array.
+ *
+ * @internal
+ */
+export declare function flattenDeep<T>(values: readonly unknown[]): T[];
 /**
  * Ensures a given value is not null or undefined.
  *
@@ -55,9 +61,3 @@ export declare function assertNever(_: never): never;
  * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/try
  */
 export declare function promiseTry<T>(block: () => T | PromiseLike<T>): Promise<Awaited<T>>;
-/**
- * Simple function that returns a Promise with a certain delay.
- *
- * @internal
- */
-export declare function delay(delayInMs: number): Promise<void>;

package/dist/utils.js

@@ -21,6 +21,14 @@ export function getParentClasses(target) {
     }
     return parentClasses;
 }
+/**
+ * Recursively flattens an arbitrarily nested array into a flat array.
+ *
+ * @internal
+ */
+export function flattenDeep(values) {
+    return values.flat(Infinity);
+}
 /**
  * Ensures a given value is not null or undefined.
  *
@@ -94,12 +102,4 @@ export function assertNever(_) {
 export async function promiseTry(block) {
     return await new Promise((resolve) => resolve(block()));
 }
-/**
- * Simple function that returns a Promise with a certain delay.
- *
- * @internal
- */
-export function delay(delayInMs) {
-    return new Promise((resolve) => setTimeout(resolve, delayInMs));
-}
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,MAAe;IACzC,OAAO,OAAO,MAAM,KAAK,UAAU,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAsB;IACrD,MAAM,aAAa,GAAqB,EAAE,CAAC;IAC3C,IAAI,YAAY,GAAG,MAAM,CAAC;IAC1B,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,WAAW,GAAmB,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,YAAY,GAAG,WAAW,CAAC;IAC7B,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAI,KAA2B;IAC1D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AASD,MAAM,UAAU,aAAa,CAAI,KAAU,EAAE,IAAI,GAAG,CAAC;IACnD,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,UAAyB,EACzB,KAA6B,EAC7B,OAAyC;IAEzC,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAI,KAAU,EAAE,aAA4B;IACtE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,UAAU,WAAW,CAAC,CAAQ;IAClC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAI,KAA+B;IACjE,OAAO,MAAM,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK,CAAC,SAAiB;IACrC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,MAAe;IACzC,OAAO,OAAO,MAAM,KAAK,UAAU,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAsB;IACrD,MAAM,aAAa,GAAqB,EAAE,CAAC;IAC3C,IAAI,YAAY,GAAG,MAAM,CAAC;IAC1B,OAAO,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,WAAW,GAAmB,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACxE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,YAAY,GAAG,WAAW,CAAC;IAC7B,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAI,MAA0B;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAQ,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAI,KAA2B;IAC1D,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AASD,MAAM,UAAU,aAAa,CAAI,KAAU,EAAE,IAAI,GAAG,CAAC;IACnD,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,UAAyB,EACzB,KAA6B,EAC7B,OAAyC;IAEzC,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAI,KAAU,EAAE,aAA4B;IACtE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,UAAU,WAAW,CAAC,CAAQ;IAClC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAI,KAA+B;IACjE,OAAO,MAAM,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAC7D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-di/core",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "A simple TypeScript library for dependency injection",
   "license": "MIT",
   "keywords": [