@lppedd/di-wise-neo 0.7.0 → 0.7.2

package/dist/cjs/index.d.ts

@@ -772,13 +772,13 @@ interface Injector {
      *
      * Throws an error if the class is not registered in the container.
      */
-    inject<Instance extends object>(Class: Constructor<Instance>): Instance;
+    inject<Instance extends object>(Class: Constructor<Instance>, name?: string): Instance;
     /**
      * Injects the value associated with the given token.
      *
      * Throws an error if the token is not registered in the container.
      */
-    inject<Value>(token: Token<Value>): Value;
+    inject<Value>(token: Token<Value>, name?: string): Value;
     /**
      * Injects all instances provided by the registrations associated with the given class.
      *
@@ -795,12 +795,12 @@ interface Injector {
      * Injects the instance associated with the given class,
      * or `undefined` if the class is not registered in the container.
      */
-    optional<Instance extends object>(Class: Constructor<Instance>): Instance | undefined;
+    optional<Instance extends object>(Class: Constructor<Instance>, name?: string): Instance | undefined;
     /**
      * Injects the value associated with the given token,
      * or `undefined` if the token is not registered in the container.
      */
-    optional<Value>(token: Token<Value>): Value | undefined;
+    optional<Value>(token: Token<Value>, name?: string): Value | undefined;
     /**
      * 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.
@@ -905,5 +905,51 @@ interface Middleware {
  */
 declare function applyMiddleware(container: Container, middlewares: Middleware[]): Container;
 
-export { AutoRegister, EagerInstantiate, Inject, InjectAll, Injectable, Injector, Named, Optional, OptionalAll, Scope, Scoped, applyMiddleware, build, createContainer, createType, forwardRef, inject, injectAll, injectBy, setClassIdentityMapping };
+/**
+ * Injects the instance associated with the given class,
+ * or `undefined` if the class is not registered in the container.
+ */
+declare function optional<Instance extends object>(Class: Constructor<Instance>, name?: string): Instance | undefined;
+/**
+ * Injects the value associated with the given token,
+ * or `undefined` if the token is not registered in the container.
+ */
+declare function optional<Value>(token: Token<Value>, name?: string): Value | undefined;
+/**
+ * Injects the instance associated with the given class,
+ * or `undefined` if the class is not registered in the container.
+ *
+ * Compared to {@link optional}, `optionalBy` accepts a `thisArg` argument
+ * (the containing class) which is used to resolve circular dependencies.
+ *
+ * @param thisArg - The containing instance, used to help resolve circular dependencies.
+ * @param Class - The class to resolve.
+ * @param name - The name qualifier of the class to resolve.
+ */
+declare function optionalBy<Instance extends object>(thisArg: any, Class: Constructor<Instance>, name?: string): Instance | undefined;
+/**
+ * Injects the value associated with the given token,
+ * or `undefined` if the token is not registered in the container.
+ *
+ * Compared to {@link optional}, `optionalBy` accepts a `thisArg` argument
+ * (the containing class) which is used to resolve circular dependencies.
+ *
+ * @param thisArg - The containing instance, used to help resolve circular dependencies.
+ * @param token - The token to resolve.
+ * @param name - The name qualifier of the token to resolve.
+ */
+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,
+ * 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,
+ * or an empty array if the token is not registered in the container.
+ */
+declare function optionalAll<Value>(token: Token<Value>): NonNullable<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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 // @internal
 function assert(condition, message) {
     if (!condition) {
-        const resolvedMessage = typeof message === "string" ? message : message();
-        throw new Error(tag(resolvedMessage));
+        throw new Error(tag(typeof message === "string" ? message : message()));
     }
 }
 // @internal
@@ -18,11 +17,7 @@ function throwUnregisteredError(token) {
 // @internal
 function throwExistingUnregisteredError(sourceToken, targetTokenOrError) {
     let message = tag(`token resolution error encountered while resolving ${sourceToken.name}`);
-    if (isError(targetTokenOrError)) {
-        message += `\n  [cause] ${untag(targetTokenOrError.message)}`;
-    } else {
-        message += `\n  [cause] the aliased token ${targetTokenOrError.name} is not registered`;
-    }
+    message += isError(targetTokenOrError) ? `\n  [cause] ${untag(targetTokenOrError.message)}` : `\n  [cause] the aliased token ${targetTokenOrError.name} is not registered`;
     throw new Error(message);
 }
 function isError(value) {
@@ -33,8 +28,7 @@ function tag(message) {
     return `[di-wise-neo] ${message}`;
 }
 function untag(message) {
-    return message.startsWith("[di-wise-neo]") //
-     ? message.substring(13).trimStart() : message;
+    return message.startsWith("[di-wise-neo]") ? message.substring(13).trimStart() : message;
 }
 
 // @internal
@@ -583,6 +577,9 @@ function isDisposable(value) {
             }
         } else {
             const [token, provider, options] = args;
+            const existingProvider = isExistingProvider(provider);
+            const name = existingProvider ? undefined : provider.name;
+            assert(name === undefined || name.trim(), "the provider name qualifier cannot be empty or blank");
             if (isClassProvider(provider)) {
                 const metadata = getMetadata(provider.useClass);
                 const registration = {
@@ -602,12 +599,11 @@ function isDisposable(value) {
                     this.resolveProviderValue(registration, registration.provider);
                 }
             } else {
-                const existingProvider = isExistingProvider(provider);
                 if (existingProvider) {
                     assert(token !== provider.useExisting, `the useExisting token ${token.name} cannot be the same as the token being registered`);
                 }
                 this.myTokenRegistry.set(token, {
-                    name: existingProvider ? undefined : provider.name,
+                    name: name,
                     provider: provider,
                     options: options
                 });
@@ -1183,9 +1179,9 @@ function OptionalAll(token) {
         }
     }
     return {
-        inject: (token)=>withCurrentContext(()=>inject(token)),
+        inject: (token, name)=>withCurrentContext(()=>inject(token, name)),
         injectAll: (token)=>withCurrentContext(()=>injectAll(token)),
-        optional: (token)=>withCurrentContext(()=>optional(token)),
+        optional: (token, name)=>withCurrentContext(()=>optional(token, name)),
         optionalAll: (token)=>withCurrentContext(()=>optionalAll(token))
     };
 });
@@ -1253,5 +1249,8 @@ exports.forwardRef = forwardRef;
 exports.inject = inject;
 exports.injectAll = injectAll;
 exports.injectBy = injectBy;
+exports.optional = optional;
+exports.optionalAll = optionalAll;
+exports.optionalBy = optionalBy;
 exports.setClassIdentityMapping = setClassIdentityMapping;
 //# sourceMappingURL=index.js.map