@adimm/x-injection 0.3.2 → 0.5.0

package/dist/index.js

@@ -1,47 +1,55 @@
 var e = Object.defineProperty, i = (i, t) => e(i, "name", {
     value: t,
     configurable: !0
-}), t = "GlobalAppModule", n = "AnonymousModule";
+}), t = "GlobalAppModule";
 
-import { injectable as o } from "inversify";
+import { injectable as n } from "inversify";
 
-var r, s, d = function(e) {
+var r, o, s = function(e) {
     return e[e.Singleton = 0] = "Singleton", e[e.Transient = 1] = "Transient", e[e.Request = 2] = "Request", 
     e;
 }({});
 
-function c(e) {
+function d(e) {
     switch (e) {
-      case d.Singleton:
+      case s.Singleton:
         return "Singleton";
 
-      case d.Transient:
+      case s.Transient:
         return "Transient";
 
-      case d.Request:
+      case s.Request:
         return "Request";
     }
 }
 
-function a(e) {
+function c(e) {
     switch (e) {
       case "Singleton":
-        return d.Singleton;
+        return s.Singleton;
 
       case "Transient":
-        return d.Transient;
+        return s.Transient;
 
       case "Request":
-        return d.Request;
+        return s.Request;
     }
 }
 
-i(c, "injectionScopeToBindingScope"), i(a, "bindingScopeToInjectionScope");
+i(d, "injectionScopeToBindingScope"), i(c, "bindingScopeToInjectionScope");
 
-import { getClassMetadata as u } from "@inversifyjs/core";
+import { getClassMetadata as a } from "@inversifyjs/core";
+
+function u(e) {
+    return "function" == typeof e && Function.prototype.toString.call(e).startsWith("class ");
+}
 
 function h(e) {
-    return "function" == typeof e && /^class\s/.test(Function.prototype.toString.call(e));
+    return "function" == typeof e;
+}
+
+function p(e) {
+    return "function" == typeof e && !Function.prototype.toString.call(e).startsWith("class ");
 }
 
 function f(e) {
@@ -56,59 +64,70 @@ function l(e) {
     return !1 !== f(t) && !1 !== t.hasOwnProperty("isPrototypeOf");
 }
 
-function p(e) {
-    return "function" == typeof e;
+function v(e) {
+    return void 0 === e ? n() : n(d(e));
 }
 
-function g(e) {
-    return void 0 === e ? o() : o(c(e));
-}
-
-i(h, "isClass"), i(f, "isObject"), i(l, "isPlainObject"), function(e) {
+i(u, "isClass"), i(h, "isClassOrFunction"), i(p, "isFunction"), i(f, "isObject"), 
+i(l, "isPlainObject"), function(e) {
     function t(e) {
-        return v(e) && "useClass" in e;
+        return y(e) && "useClass" in e;
     }
     function n(e) {
-        return v(e) && "useValue" in e;
-    }
-    function o(e) {
-        return v(e) && "useFactory" in e;
+        return y(e) && "useValue" in e;
     }
     function r(e) {
-        return "string" == typeof e || "symbol" == typeof e || h(e) || "function" == typeof e;
+        return y(e) && "useFactory" in e;
+    }
+    function o(e) {
+        return "string" == typeof e || "symbol" == typeof e || h(e);
     }
     function s(e) {
-        return r(e) ? e : e.provide;
+        return o(e) ? e : e.provide;
     }
     function d(e) {
         return e.map((e => s(e)));
     }
-    function c(e, i) {
-        return p(e) ?? g(e) ?? i;
+    function f(e, i) {
+        return u(e) ? {
+            ...i,
+            provide: i?.provide ?? e,
+            useClass: i?.useClass ?? e
+        } : p(e) ? {
+            ...i,
+            provide: i?.provide ?? e,
+            useFactory: i?.useFactory ?? e
+        } : {
+            ...e,
+            ...i
+        };
+    }
+    function v(e, i) {
+        return m(e) ?? S(e) ?? i;
     }
-    function f(e) {
-        if (v(e)) return e;
+    function g(e) {
+        if (y(e)) return e;
     }
-    function p(e) {
-        const i = f(e);
+    function m(e) {
+        const i = g(e);
         if (i) return i.scope;
     }
-    function g(e) {
+    function S(e) {
         const i = s(e);
-        if (!h(i)) return;
-        const t = u(i)?.scope;
-        return t ? a(t) : void 0;
+        if (!u(i)) return;
+        const t = a(i)?.scope;
+        return t ? c(t) : void 0;
     }
-    function v(e) {
+    function y(e) {
         return l(e) && "object" == typeof e && "provide" in e;
     }
     i(t, "isClassToken"), e.isClassToken = t, i(n, "isValueToken"), e.isValueToken = n, 
-    i(o, "isFactoryToken"), e.isFactoryToken = o, i(r, "isProviderIdentifier"), e.isProviderIdentifier = r, 
+    i(r, "isFactoryToken"), e.isFactoryToken = r, i(o, "isProviderIdentifier"), e.isProviderIdentifier = o, 
     i(s, "toServiceIdentifier"), e.toServiceIdentifier = s, i(d, "toServiceIdentifiers"), 
-    e.toServiceIdentifiers = d, i(c, "getInjectionScopeByPriority"), e.getInjectionScopeByPriority = c, 
-    i(f, "tryGetProviderOptions"), e.tryGetProviderOptions = f, i(p, "tryGetScopeFromProvider"), 
-    e.tryGetScopeFromProvider = p, i(g, "tryGetDecoratorScopeFromClass"), e.tryGetDecoratorScopeFromClass = g, 
-    i(v, "hasProvideProperty");
+    e.toServiceIdentifiers = d, i(f, "toDependencyProviderWithOptions"), e.toDependencyProviderWithOptions = f, 
+    i(v, "getInjectionScopeByPriority"), e.getInjectionScopeByPriority = v, i(g, "tryGetProviderOptions"), 
+    e.tryGetProviderOptions = g, i(m, "tryGetScopeFromProvider"), e.tryGetScopeFromProvider = m, 
+    i(S, "tryGetDecoratorScopeFromClass"), e.tryGetDecoratorScopeFromClass = S, i(y, "hasProvideProperty");
 }(r || (r = {})), function(e) {
     function t(e) {
         return e;
@@ -118,79 +137,79 @@ i(h, "isClass"), i(f, "isObject"), i(l, "isPlainObject"), function(e) {
     }
     i(t, "buildInternalConstructorParams"), e.buildInternalConstructorParams = t, i(n, "isDynamicExport"), 
     e.isDynamicExport = n;
-}(s || (s = {})), i(p, "isClassOrFunction"), i(g, "Injectable");
+}(o || (o = {})), i(v, "Injectable");
 
-import { inject as v } from "inversify";
+import { inject as g } from "inversify";
 
-function S(e) {
-    return v(r.toServiceIdentifier(e));
+function m(e) {
+    return g(r.toServiceIdentifier(e));
 }
 
-i(S, "Inject");
+i(m, "Inject");
 
-import { multiInject as y } from "inversify";
+import { multiInject as S } from "inversify";
 
-function m(e) {
-    return y(r.toServiceIdentifier(e));
+function y(e) {
+    return S(r.toServiceIdentifier(e));
 }
 
-i(m, "MultiInject");
+i(y, "MultiInject");
 
 import { injectFromBase as I } from "inversify";
 
-function b(e) {
+function E(e) {
     return I(e);
 }
 
-i(b, "InjectFromBase");
+i(E, "InjectFromBase");
 
-import { named as E } from "inversify";
+import { named as b } from "inversify";
 
 function T(e) {
-    return E(e);
+    return b(e);
 }
 
 i(T, "Named");
 
 import { optional as _ } from "inversify";
 
-function B() {
+function w() {
     return _();
 }
 
-i(B, "Optional");
+i(w, "Optional");
 
-import { postConstruct as w } from "inversify";
+import { postConstruct as B } from "inversify";
 
 function D() {
-    return w();
+    return B();
 }
 
 i(D, "PostConstruct");
 
-import { preDestroy as C } from "inversify";
+import { preDestroy as P } from "inversify";
 
-function k() {
-    return C();
+function M() {
+    return P();
 }
 
-i(k, "PreDestroy");
+i(M, "PreDestroy");
 
-import { tagged as M } from "inversify";
+import { tagged as C } from "inversify";
 
-function P(e, i) {
-    return M(e, i);
+function k(e, i) {
+    return C(e, i);
 }
 
-i(P, "Tagged");
+i(k, "Tagged");
 
-import { unmanaged as j } from "inversify";
+import { unmanaged as x } from "inversify";
 
-function x() {
-    return j();
+function j() {
+    return x();
 }
 
-i(x, "Unmanaged");
+i(j, "Unmanaged");
 
 var A = class e extends Error {
     static {
@@ -205,7 +224,7 @@ var A = class e extends Error {
     constructor(e, i) {
         super(`{ProviderModule.${e.toString()}} => ${i}`);
     }
-}, O = class e extends R {
+}, F = class e extends R {
     static {
         i(this, "XInjectionProviderModuleDisposedError");
     }
@@ -213,7 +232,7 @@ var A = class e extends Error {
     constructor(e) {
         super(e, "Has been disposed! You can re-initialize it by using the `_lazyInit` method.");
     }
-}, F = class e extends R {
+}, O = class e extends R {
     static {
         i(this, "XInjectionDynamicExportsOutOfRange");
     }
@@ -221,17 +240,25 @@ var A = class e extends Error {
     constructor(e) {
         super(e, `The 'ProviderModule.${e.toString()}' is trying to dynamically export providers/modules out of the declared range of the static exports!`);
     }
+}, N = class e extends R {
+    static {
+        i(this, "XInjectionProviderModuleMissingIdentifierError");
+    }
+    name=e.name;
+    constructor(e) {
+        super(e, "An `identifier` must be supplied!");
+    }
 };
 
-import { Container as N } from "inversify";
+import { Container as U } from "inversify";
 
-var U = new N({
+var G = new U({
     defaultScope: "Singleton"
 });
 
-import { Container as G } from "inversify";
+import { Container as V } from "inversify";
 
-var V = class {
+var W = class {
     static {
         i(this, "ProviderModuleUtils");
     }
@@ -246,9 +273,6 @@ var V = class {
     bindToContainer(e, i) {
         return r.isProviderIdentifier(e) ? this.bindSelfTokenToContainer(e, i) : r.isClassToken(e) ? this.bindClassTokenToContainer(e, i) : r.isValueToken(e) ? this.bindValueTokenToContainer(e) : !!r.isFactoryToken(e) && this.bindFactoryTokenToContainer(e, i);
     }
-    bindManyToContainer(e, i) {
-        e.forEach((e => this.bindToContainer(e, i)));
-    }
     bindSelfTokenToContainer(e, i) {
         return this.setBindingScope(e, this.container.bind(r.toServiceIdentifier(e)).toSelf(), i), 
         this.moduleNaked.__isCurrentBound(e);
@@ -268,13 +292,13 @@ var V = class {
     setBindingScope(e, i, t) {
         if (r.isValueToken(e)) return i;
         switch (r.getInjectionScopeByPriority(e, t)) {
-          case d.Singleton:
+          case s.Singleton:
             return i.inSingletonScope();
 
-          case d.Transient:
+          case s.Transient:
             return i.inTransientScope();
 
-          case d.Request:
+          case s.Request:
             return i.inRequestScope();
         }
     }
@@ -300,22 +324,25 @@ var V = class {
     dynamicExports;
     onReady;
     onDispose;
+    importedProvidersMap;
     moduleUtils;
+    imports;
     providers;
+    importedProviders;
     exports;
-    imports;
     registeredBindingSideEffects;
-    constructor({identifier: e = Symbol(n), imports: i, providers: t, exports: o, defaultScope: r, dynamicExports: s, onReady: d, onDispose: c, ...a}) {
-        const u = a;
-        this.identifier = e, this.isAppModule = u.isAppModule ?? !1, this.isAppModule || this._lazyInit({
+    constructor({identifier: e, imports: i, providers: t, exports: n, defaultScope: r, dynamicExports: o, onReady: s, onDispose: d, ...c}) {
+        const a = c;
+        this.identifier = this.setIdentifier(e), this.isDisposed = a.isDisposed ?? !1, this.isAppModule = a.isAppModule ?? !1, 
+        this.isAppModule || this._lazyInit({
             imports: i,
             providers: t,
-            exports: o,
+            exports: n,
             defaultScope: r,
-            dynamicExports: s,
-            onReady: d,
-            onDispose: c,
-            ...a
+            dynamicExports: o,
+            onReady: s,
+            onDispose: d,
+            ...c
         });
     }
     get(e, i) {
@@ -330,21 +357,41 @@ var V = class {
         }));
     }
     onActivationEvent(e, i) {
-        this.container.onActivation(r.toServiceIdentifier(e), i);
+        this.shouldThrowIfDisposed(), this.container.onActivation(r.toServiceIdentifier(e), i);
     }
     onDeactivationEvent(e, i) {
-        this.container.onDeactivation(r.toServiceIdentifier(e), i);
+        this.shouldThrowIfDisposed(), this.container.onDeactivation(r.toServiceIdentifier(e), i);
     }
     toNaked() {
         return this;
     }
+    clone(i) {
+        let t = [ ...this.providers ];
+        return i?.providersMap && (t = t.map((e => i.providersMap(e, this, !1)))), new e(o.buildInternalConstructorParams({
+            isAppModule: this.isAppModule,
+            identifier: this.identifier,
+            isDisposed: this.isDisposed,
+            defaultScope: this.defaultScope.native,
+            dynamicExports: this.dynamicExports,
+            onReady: this.onReady,
+            onDispose: this.onDispose,
+            importedProvidersMap: i?.importedProvidersMap,
+            imports: [ ...this.imports ],
+            providers: t,
+            exports: [ ...this.exports ]
+        }));
+    }
     toString() {
-        return this.identifier.description;
+        return this.identifier?.description ?? "Unknown";
+    }
+    setIdentifier(e) {
+        if (!e) throw new N(this);
+        return e;
     }
     prepareContainer(e) {
-        return this.isAppModule ? e.container?.() ?? U : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
-        e.container()) : new G({
-            parent: U,
+        return this.isAppModule ? e.container?.() ?? G : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
+        e.container()) : new V({
+            parent: G,
             defaultScope: this.defaultScope.inversify
         });
     }
@@ -358,17 +405,18 @@ var V = class {
                     const e = n.toNaked();
                     return void this.injectImportedModules([ e ]);
                 }
-                const o = n;
-                this.moduleUtils.bindToContainer({
+                const o = n, s = this.importedProvidersMap({
                     scope: r.getInjectionScopeByPriority(o, t.defaultScope.native),
                     provide: r.toServiceIdentifier(o),
                     useFactory: i((() => t.get(o)), "useFactory")
-                }, t.defaultScope.native);
+                }, o, t);
+                this.importedProviders.set(t, [ ...this.importedProviders.get(t) ?? [], s ]), this.moduleUtils.bindToContainer(s, t.defaultScope.native), 
+                t._onUnbind(o, (() => this.__unbind(s)));
             }));
         }));
     }
     injectProviders() {
-        this.moduleUtils.bindManyToContainer(this.providers, this.defaultScope.native);
+        this.providers.forEach((e => this.moduleUtils.bindToContainer(e, this.defaultScope.native)));
     }
     registerBindingSideEffect(e, i, t) {
         this.registeredBindingSideEffects.has(e) || this.registeredBindingSideEffects.set(e, {
@@ -388,25 +436,27 @@ var V = class {
         this.registeredBindingSideEffects.delete(e)) : this.registeredBindingSideEffects.forEach((({onUnbindEffects: e}) => e.forEach((e => e())))));
     }
     shouldThrowWhenModuleDynamicExportsDontMatchTheStaticExports(e, i, t) {
-        if (t.length > i.length || t.some((e => !i.includes(e)))) throw new F(e);
+        if (t.length > i.length || t.some((e => !i.includes(e)))) throw new O(e);
     }
     shouldThrowIfDisposed() {
-        if (null === this.container) throw new O(this);
+        if (null === this.container) throw new F(this);
     }
     async _dispose() {
         await (this.onDispose?.(this)), await this.__unbindAll(), this.container = null, 
-        this.imports = null, this.providers = null, this.exports = null, this.dynamicExports = null, 
-        this.registeredBindingSideEffects = null, this.isDisposed = !0;
+        this.imports = null, this.providers = null, this.importedProviders = null, this.exports = null, 
+        this.dynamicExports = null, this.registeredBindingSideEffects = null, this.isDisposed = !0;
     }
-    _lazyInit({imports: e = [], providers: i = [], exports: t = [], defaultScope: n = d.Singleton, dynamicExports: o, onReady: r, onDispose: s, ...a}) {
-        this.isDisposed = !1, this.imports = e, this.providers = i, this.exports = t, this.defaultScope = {
+    _lazyInit({imports: e = [], providers: i = [], exports: t = [], defaultScope: n = s.Singleton, dynamicExports: r, onReady: o, onDispose: c, ...a}) {
+        return this.isDisposed = !1, this.imports = e, this.providers = i, this.importedProviders = a.importedProviders ?? new Map, 
+        this.exports = t, this.defaultScope = {
             native: n,
-            inversify: c(n)
-        }, this.dynamicExports = o, this.onReady = r, this.onDispose = s, this.container = this.prepareContainer({
+            inversify: d(n)
+        }, this.dynamicExports = r, this.onReady = o, this.onDispose = c, this.importedProvidersMap = a.importedProvidersMap ?? (e => e), 
+        this.container = this.prepareContainer({
             ...a
-        }), this.moduleUtils = new V(this), this.registeredBindingSideEffects = new Map, 
+        }), this.moduleUtils = new W(this), this.registeredBindingSideEffects = new Map, 
         this.injectImportedModules(this._getImportedModules()), this.injectProviders(), 
-        this.onReady?.(this);
+        this.onReady?.(this), this;
     }
     _getImportedModules() {
         return this.shouldThrowIfDisposed(), this.imports;
@@ -479,14 +529,14 @@ var V = class {
     async __unbindAll() {
         this.shouldThrowIfDisposed(), await this.container.unbindAll(), this.removeRegisteredBindingSideEffects("all");
     }
-}, W = class extends q {
+}, $ = class extends q {
     static {
         i(this, "GlobalAppModule");
     }
     nakedModule=this;
     isLoaded=!1;
     constructor() {
-        super(s.buildInternalConstructorParams({
+        super(o.buildInternalConstructorParams({
             identifier: Symbol(t),
             isAppModule: !0
         }));
@@ -501,6 +551,6 @@ var V = class {
     async _dispose() {
         this.isLoaded = !1, super._dispose();
     }
-}, $ = new W;
+}, z = new $;
 
-export { n as ANONYMOUS_MODULE_DEFAULT_ID, $ as AppModule, t as GLOBAL_APP_MODULE_ID, W as GlobalAppModule, U as GlobalContainer, S as Inject, b as InjectFromBase, g as Injectable, d as InjectionScope, m as MultiInject, T as Named, B as Optional, D as PostConstruct, k as PreDestroy, q as ProviderModule, s as ProviderModuleHelpers, r as ProviderTokenHelpers, P as Tagged, x as Unmanaged, F as XInjectionDynamicExportsOutOfRange, A as XInjectionError, O as XInjectionProviderModuleDisposedError, R as XInjectionProviderModuleError, a as bindingScopeToInjectionScope, c as injectionScopeToBindingScope, h as isClass, p as isClassOrFunction, l as isPlainObject };//# sourceMappingURL=index.js.map
+export { z as AppModule, t as GLOBAL_APP_MODULE_ID, $ as GlobalAppModule, G as GlobalContainer, m as Inject, E as InjectFromBase, v as Injectable, s as InjectionScope, y as MultiInject, T as Named, w as Optional, D as PostConstruct, M as PreDestroy, q as ProviderModule, o as ProviderModuleHelpers, r as ProviderTokenHelpers, k as Tagged, j as Unmanaged, O as XInjectionDynamicExportsOutOfRange, A as XInjectionError, F as XInjectionProviderModuleDisposedError, R as XInjectionProviderModuleError, N as XInjectionProviderModuleMissingIdentifierError, c as bindingScopeToInjectionScope, d as injectionScopeToBindingScope, u as isClass, h as isClassOrFunction, p as isFunction, l as isPlainObject };//# sourceMappingURL=index.js.map