@lppedd/di-wise-neo 0.11.1 → 0.11.2

package/dist/cjs/index.d.ts

@@ -431,9 +431,9 @@ interface Container {
      *
      * @see The documentation for `resolve(token: Token)`
      */
-    resolveAll<Value>(token: Token<Value>, optional?: false): NonNullable<Value>[];
-    resolveAll<Value>(token: Token<Value>, optional: true): NonNullable<Value>[];
-    resolveAll<Value>(token: Token<Value>, optional?: boolean): NonNullable<Value>[];
+    resolveAll<Value>(token: Token<Value>, optional?: false): Value[];
+    resolveAll<Value>(token: Token<Value>, optional: true): Value[];
+    resolveAll<Value>(token: Token<Value>, optional?: boolean): Value[];
     /**
      * Disposes this container and all its cached values.
      *
@@ -450,7 +450,7 @@ interface Container {
 declare function createContainer(options?: Partial<ContainerOptions>): Container;
 
 /**
- * Class decorator that enables auto-registration of an unregistered class,
+ * Class decorator that enables auto-registration of an unregistered class
  * when the class is first resolved from the container.
  *
  * @example
@@ -536,7 +536,7 @@ declare function Inject<Value>(token: Token<Value>): ParameterDecorator;
 declare function Inject<Value>(tokens: TokenRef<Value>): ParameterDecorator;
 
 /**
- * Class decorator that registers additional aliasing tokens for the decorated type,
+ * Class decorator that registers additional aliasing tokens for the decorated type
  * when the type is first registered in the container.
  *
  * The container uses {@link ExistingProvider} under the hood.
@@ -549,7 +549,7 @@ declare function Inject<Value>(tokens: TokenRef<Value>): ParameterDecorator;
  */
 declare function Injectable<This extends object, Value extends This>(...tokens: Tokens<Value>): ClassDecorator;
 /**
- * Class decorator that registers additional aliasing tokens for the decorated type,
+ * Class decorator that registers additional aliasing tokens for the decorated type
  * when the type is first registered in the container.
  *
  * The container uses {@link ExistingProvider} under the hood.
@@ -651,19 +651,19 @@ declare function Optional<Value>(tokens: TokenRef<Value>): ParameterDecorator;
 
 /**
  * Parameter decorator that injects all instances provided by the registrations
- * associated with the given class, or an empty array if the class is not registered
+ * associated with the given class or an empty array if the class is not registered
  * in the container.
  */
 declare function OptionalAll<Instance extends object>(Class: Constructor<Instance>): ParameterDecorator;
 /**
  * Parameter decorator that injects all values provided by the registrations
- * associated with the given token, or an empty array if the token is not registered
+ * associated with the given token or an empty array if the token is not registered
  * in the container.
  */
 declare function OptionalAll<Value>(token: Token<Value>): ParameterDecorator;
 /**
  * Parameter decorator that injects all values provided by the registrations
- * associated with the given token, or an empty array if the token is not registered
+ * associated with the given token or an empty array if the token is not registered
  * in the container.
  *
  * Allows referencing a token declared later in the file by using the
@@ -776,7 +776,7 @@ declare function injectAll<Instance extends object>(Class: Constructor<Instance>
  *
  * Throws an error if the token is not registered in the container.
  */
-declare function injectAll<Value>(token: Token<Value>): NonNullable<Value>[];
+declare function injectAll<Value>(token: Token<Value>): Value[];
 
 /**
  * Injector API.
@@ -805,7 +805,7 @@ interface Injector {
      *
      * Throws an error if the token is not registered in the container.
      */
-    injectAll<Value>(token: Token<Value>): NonNullable<Value>[];
+    injectAll<Value>(token: Token<Value>): Value[];
     /**
      * Injects the instance associated with the given class,
      * or `undefined` if the class is not registered in the container.
@@ -817,15 +817,15 @@ interface Injector {
      */
     optional<Value>(token: Token<Value>, name?: string): Value | undefined;
     /**
-     * Injects all instances provided by the registrations associated with the given class,
+     * Injects all instances provided by the registrations associated with the given class
      * or an empty array if the class is not registered in the container.
      */
     optionalAll<Instance extends object>(Class: Constructor<Instance>): Instance[];
     /**
-     * Injects all values provided by the registrations associated with the given token,
+     * Injects all values provided by the registrations associated with the given token
      * or an empty array if the token is not registered in the container.
      */
-    optionalAll<Value>(token: Token<Value>): NonNullable<Value>[];
+    optionalAll<Value>(token: Token<Value>): Value[];
     /**
      * Runs a function inside the injection context of this injector.
      *
@@ -909,7 +909,7 @@ interface Middleware {
 /**
  * Applies middleware functions to a container.
  *
- * Middlewares are applied in array order, but execute in reverse order.
+ * Middlewares are applied in array order but execute in reverse order.
  *
  * @example
  * ```ts
@@ -967,15 +967,15 @@ declare function optionalBy<Instance extends object>(thisArg: any, Class: Constr
 declare function optionalBy<Value>(thisArg: any, token: Token<Value>, name?: string): Value | undefined;
 
 /**
- * Injects all instances provided by the registrations associated with the given class,
+ * Injects all instances provided by the registrations associated with the given class
  * or an empty array if the class is not registered in the container.
  */
 declare function optionalAll<Instance extends object>(Class: Constructor<Instance>): Instance[];
 /**
- * Injects all values provided by the registrations associated with the given token,
+ * Injects all values provided by the registrations associated with the given token
  * or an empty array if the token is not registered in the container.
  */
-declare function optionalAll<Value>(token: Token<Value>): NonNullable<Value>[];
+declare function optionalAll<Value>(token: Token<Value>): Value[];
 
 export { AutoRegister, EagerInstantiate, Inject, InjectAll, Injectable, Injector, Named, Optional, OptionalAll, Scope, Scoped, applyMiddleware, build, createContainer, createType, forwardRef, inject, injectAll, injectBy, optional, optionalAll, optionalBy, setClassIdentityMapping };
 export type { ClassProvider, Constructor, Container, ContainerOptions, ExistingProvider, FactoryProvider, Middleware, MiddlewareComposer, Provider, RegistrationOptions, Token, TokenRef, Tokens, TokensRef, Type, ValueProvider };

package/dist/cjs/index.js

@@ -662,7 +662,7 @@ function isDisposable(value) {
         if (!registration && isConstructor(token)) {
             registration = this.autoRegisterClass(token, localName);
         }
-        return this.resolveRegistration(token, registration, localOptional, localName);
+        return this.resolveRegistration(token, registration, localOptional, localName)?.value;
     }
     resolveAll(token, optional) {
         this.checkDisposed();
@@ -680,8 +680,7 @@ function isDisposable(value) {
                 token
             ]);
         }
-        return registrations //
-        .map((registration)=>this.resolveRegistration(token, registration, optional)).filter((value)=>value != null);
+        return registrations.map((registration)=>this.resolveRegistration(token, registration, optional)).filter((result)=>result !== undefined).map((result)=>result.value);
     }
     dispose() {
         if (this.myDisposed) {
@@ -741,7 +740,9 @@ function isDisposable(value) {
             ]);
         }
         try {
-            return this.resolveProviderValue(token, registration);
+            return {
+                value: this.resolveProviderValue(token, registration)
+            };
         } catch (e) {
             throwResolutionError([
                 token,
@@ -937,7 +938,7 @@ function isDisposable(value) {
 }
 
 /**
- * Class decorator that enables auto-registration of an unregistered class,
+ * Class decorator that enables auto-registration of an unregistered class
  * when the class is first resolved from the container.
  *
  * @example
@@ -1245,14 +1246,14 @@ function OptionalAll(token) {
         injectAll: (token)=>runInContext(()=>injectAll(token)),
         optional: (token, name)=>runInContext(()=>optional(token, name)),
         optionalAll: (token)=>runInContext(()=>optionalAll(token)),
-        runInContext
+        runInContext: runInContext
     };
 }, "Injector");
 
 /**
  * Applies middleware functions to a container.
  *
- * Middlewares are applied in array order, but execute in reverse order.
+ * Middlewares are applied in array order but execute in reverse order.
  *
  * @example
  * ```ts