@adimm/x-injection 0.6.5 → 0.8.0

package/dist/index.js

@@ -48,36 +48,36 @@ function h(e) {
     return "function" == typeof e;
 }
 
-function l(e) {
+function f(e) {
     return "function" == typeof e && !Function.prototype.toString.call(e).startsWith("class ");
 }
 
-function p(e) {
+function l(e) {
     return "[object Object]" === Object.prototype.toString.call(e);
 }
 
-function f(e) {
-    if (!1 === p(e)) return !1;
+function p(e) {
+    if (!1 === l(e)) return !1;
     const i = e.constructor;
     if (void 0 === i) return !0;
     const t = i.prototype;
-    return !1 !== p(t) && !1 !== t.hasOwnProperty("isPrototypeOf");
+    return !1 !== l(t) && !1 !== t.hasOwnProperty("isPrototypeOf");
 }
 
 function v(e) {
     return void 0 === e ? n() : n(d(e));
 }
 
-i(u, "isClass"), i(h, "isClassOrFunction"), i(l, "isFunction"), i(p, "isObject"), 
-i(f, "isPlainObject"), function(e) {
+i(u, "isClass"), i(h, "isClassOrFunction"), i(f, "isFunction"), i(l, "isObject"), 
+i(p, "isPlainObject"), function(e) {
     function t(e) {
-        return y(e) && "useClass" in e;
+        return b(e) && "useClass" in e;
     }
     function n(e) {
-        return y(e) && "useValue" in e;
+        return b(e) && "useValue" in e;
     }
     function o(e) {
-        return y(e) && "useFactory" in e;
+        return b(e) && "useFactory" in e;
     }
     function r(e) {
         return "string" == typeof e || "symbol" == typeof e || h(e);
@@ -88,12 +88,12 @@ i(f, "isPlainObject"), function(e) {
     function d(e) {
         return e.map((e => s(e)));
     }
-    function p(e, i) {
+    function l(e, i) {
         return u(e) ? {
             ...i,
             provide: i?.provide ?? e,
             useClass: i?.useClass ?? e
-        } : l(e) ? {
+        } : f(e) ? {
             ...i,
             provide: i?.provide ?? e,
             useFactory: i?.useFactory ?? e
@@ -103,13 +103,13 @@ i(f, "isPlainObject"), function(e) {
         };
     }
     function v(e, i) {
-        return g(e) ?? S(e) ?? i;
-    }
-    function m(e) {
-        if (y(e)) return e;
+        return m(e) ?? S(e) ?? i;
     }
     function g(e) {
-        const i = m(e);
+        if (b(e)) return e;
+    }
+    function m(e) {
+        const i = g(e);
         if (i) return i.scope;
     }
     function S(e) {
@@ -118,16 +118,16 @@ i(f, "isPlainObject"), function(e) {
         const t = c(i)?.scope;
         return t ? a(t) : void 0;
     }
-    function y(e) {
-        return f(e) && "object" == typeof e && "provide" in e;
+    function b(e) {
+        return p(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(s, "toServiceIdentifier"), e.toServiceIdentifier = s, i(d, "toServiceIdentifiers"), 
-    e.toServiceIdentifiers = d, i(p, "toDependencyProviderWithOptions"), e.toDependencyProviderWithOptions = p, 
-    i(v, "getInjectionScopeByPriority"), e.getInjectionScopeByPriority = v, i(m, "tryGetProviderOptions"), 
-    e.tryGetProviderOptions = m, i(g, "tryGetScopeFromProvider"), e.tryGetScopeFromProvider = g, 
-    i(S, "tryGetDecoratorScopeFromClass"), e.tryGetDecoratorScopeFromClass = S, i(y, "hasProvideProperty");
+    e.toServiceIdentifiers = d, i(l, "toDependencyProviderWithOptions"), e.toDependencyProviderWithOptions = l, 
+    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(b, "hasProvideProperty");
 }(o || (o = {})), function(e) {
     function t(e) {
         return e;
@@ -139,26 +139,26 @@ i(f, "isPlainObject"), function(e) {
     e.isDynamicExport = n;
 }(r || (r = {})), i(v, "Injectable");
 
-import { inject as m } from "inversify";
+import { inject as g } from "inversify";
 
-function g(e) {
-    return m(o.toServiceIdentifier(e));
+function m(e) {
+    return g(o.toServiceIdentifier(e));
 }
 
-i(g, "Inject");
+i(m, "Inject");
 
 import { multiInject as S } from "inversify";
 
-function y(e) {
+function b(e) {
     return S(o.toServiceIdentifier(e));
 }
 
-i(y, "MultiInject");
+i(b, "MultiInject");
 
-import { injectFromBase as b } from "inversify";
+import { injectFromBase as y } from "inversify";
 
 function I(e) {
-    return b(e);
+    return y(e);
 }
 
 i(I, "InjectFromBase");
@@ -179,44 +179,28 @@ function k() {
 
 i(k, "Optional");
 
-import { postConstruct as w } from "inversify";
+import { tagged as w } from "inversify";
 
-function _() {
-    return w();
+function _(e, i) {
+    return w(e, i);
 }
 
-i(_, "PostConstruct");
+i(_, "Tagged");
 
-import { preDestroy as B } from "inversify";
+import { unmanaged as P } from "inversify";
 
-function D() {
-    return B();
+function B() {
+    return P();
 }
 
-i(D, "PreDestroy");
+i(B, "Unmanaged");
 
-import { tagged as P } from "inversify";
-
-function A(e, i) {
-    return P(e, i);
-}
-
-i(A, "Tagged");
-
-import { unmanaged as C } from "inversify";
-
-function x() {
-    return C();
-}
-
-i(x, "Unmanaged");
-
-var R = class e extends Error {
+var A = class e extends Error {
     static {
         i(this, "InjectionError");
     }
     name=e.name;
-}, j = class e extends Error {
+}, D = class e extends Error {
     static {
         i(this, "InjectionProviderModuleError");
     }
@@ -224,7 +208,7 @@ var R = class e extends Error {
     constructor(e, i) {
         super(`{ProviderModule.${e.toString()}} => ${i}`);
     }
-}, G = class e extends j {
+}, C = class e extends D {
     static {
         i(this, "InjectionProviderModuleDisposedError");
     }
@@ -232,15 +216,7 @@ var R = 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 j {
-    static {
-        i(this, "InjectionDynamicExportsOutOfRange");
-    }
-    name=e.name;
-    constructor(e) {
-        super(e, `The 'ProviderModule.${e.toString()}' is trying to dynamically export providers/modules out of the declared range of the static exports!`);
-    }
-}, O = class e extends j {
+}, R = class e extends D {
     static {
         i(this, "InjectionProviderModuleMissingIdentifierError");
     }
@@ -248,7 +224,7 @@ var R = class e extends Error {
     constructor(e) {
         super(e, "An `identifier` must be supplied!");
     }
-}, N = class e extends j {
+}, j = class e extends D {
     static {
         i(this, "InjectionProviderModuleGlobalMarkError");
     }
@@ -258,15 +234,15 @@ var R = class e extends Error {
     }
 };
 
-import { Container as U } from "inversify";
+import { Container as x } from "inversify";
 
-var V = new U({
+var G = new x({
     defaultScope: "Singleton"
 });
 
-import { Container as W } from "inversify";
+import { Container as F } from "inversify";
 
-var q = class {
+var O = class {
     static {
         i(this, "ProviderModuleUtils");
     }
@@ -275,7 +251,7 @@ var q = class {
     }
     module;
     moduleNaked;
-    appModule=L;
+    appModule=q;
     constructor(e, i) {
         this.module = e, this.moduleNaked = e.toNaked(), this.appModule = i.appModule?.() ?? this.appModule, 
         this.checkIfShouldBeAddedToTheGlobalRegister();
@@ -284,7 +260,7 @@ var q = class {
         return o.isProviderIdentifier(e) ? this.bindSelfTokenToContainer(e, i) : o.isClassToken(e) ? this.bindClassTokenToContainer(e, i) : o.isValueToken(e) ? this.bindValueTokenToContainer(e) : !!o.isFactoryToken(e) && this.bindFactoryTokenToContainer(e, i);
     }
     checkIfShouldBeAddedToTheGlobalRegister() {
-        !this.moduleNaked.isAppModule && this.module.isMarkedAsGlobal && z.add(this.module);
+        !this.moduleNaked.isAppModule && this.module.isMarkedAsGlobal && N.add(this.module);
     }
     bindSelfTokenToContainer(e, i) {
         return this.setBindingScope(e, this.container.bind(o.toServiceIdentifier(e)).toSelf(), i), 
@@ -325,7 +301,7 @@ var q = class {
         const t = e;
         t.onEvent?.activation && i.onActivation(t.onEvent.activation), t.onEvent?.deactivation && i.onDeactivation(t.onEvent.deactivation);
     }
-}, $ = class e {
+}, U = class e {
     static {
         i(this, "ProviderModule");
     }
@@ -344,7 +320,7 @@ var q = class {
     providers;
     importedProviders;
     exports;
-    registeredBindingSideEffects;
+    registeredSideEffects;
     constructor({identifier: e, imports: i, providers: t, exports: n, defaultScope: o, markAsGlobal: r, dynamicExports: s, onReady: d, onDispose: a, ...c}) {
         const u = c;
         this.identifier = this.setIdentifier(e), this.isDisposed = u.isDisposed ?? !1, this.isAppModule = u.isAppModule ?? !1, 
@@ -367,22 +343,15 @@ var q = class {
     }
     getMany(...e) {
         return e.map((e => {
-            const i = f(e) && "provider" in e;
+            const i = p(e) && "provider" in e;
             return this.get(i ? e.provider : e, !!i && e.isOptional);
         }));
     }
-    onActivationEvent(e, i) {
-        this.shouldThrowIfDisposed(), this.container.onActivation(o.toServiceIdentifier(e), i);
-    }
-    onDeactivationEvent(e, i) {
-        this.shouldThrowIfDisposed(), this.container.onDeactivation(o.toServiceIdentifier(e), i);
-    }
     toNaked() {
         return this;
     }
     clone(i) {
-        let t = [ ...this.providers ];
-        return i?.providersMap && (t = t.map((e => i.providersMap(e, this)))), new e(r.buildInternalConstructorParams({
+        const t = i, n = new e(r.buildInternalConstructorParams({
             isAppModule: this.isAppModule,
             markAsGlobal: this.isMarkedAsGlobal,
             identifier: this.identifier,
@@ -390,76 +359,107 @@ var q = class {
             dynamicExports: this.dynamicExports,
             onReady: this.onReady,
             onDispose: this.onDispose,
-            importedProvidersMap: i?.importedProvidersMap,
+            importedProvidersMap: this.importedProvidersMap,
             imports: [ ...this.imports ],
-            providers: t,
-            exports: [ ...this.exports ]
+            providers: [ ...this.providers ],
+            exports: [ ...this.exports ],
+            ...t
         }));
+        return n.registeredSideEffects = new Map(this.registeredSideEffects), n;
+    }
+    async dispose() {
+        await (this.onDispose?.(this)), await this.__unbindAll(), this.container = null, 
+        this.imports = null, this.providers = null, this.importedProviders = null, this.exports = null, 
+        this.dynamicExports = null, this.registeredSideEffects = null, this.isDisposed = !0;
     }
     toString() {
         return this.identifier?.description ?? "Unknown";
     }
     setIdentifier(e) {
-        if (!e) throw new O(this);
+        if (!e) throw new R(this);
         return e;
     }
     prepareContainer(e) {
-        return this.isAppModule ? e.container?.() ?? V : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
-        e.container()) : new W({
-            parent: V,
+        return this.isAppModule ? e.container?.() ?? G : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
+        e.container()) : new F({
+            parent: G,
             defaultScope: this.defaultScope.inversify
         });
     }
     injectImportedModules(t) {
         t && 0 !== t.length && t.forEach((t => {
-            if ("GlobalAppModule" === t.toString()) throw new j(this, "The 'GlobalAppModule' can't be imported!");
-            const n = t._getExportableModulesAndProviders(), r = t.dynamicExports?.(this, n);
-            void 0 !== r && this.shouldThrowWhenModuleDynamicExportsDontMatchTheStaticExports(t, n, r), 
+            if ("GlobalAppModule" === t.toString()) throw new D(this, "The 'GlobalAppModule' can't be imported!");
+            const n = (t = "function" == typeof t ? t() : t)._getExportableModulesAndProviders(), r = t.dynamicExports?.(this, n);
             (r ?? n).forEach((n => {
                 if (n instanceof e) {
                     const e = n.toNaked();
                     return void this.injectImportedModules([ e ]);
                 }
-                const r = n, s = this.importedProvidersMap({
+                const r = n, s = o.toServiceIdentifier(r), d = this.importedProvidersMap({
                     scope: o.getInjectionScopeByPriority(r, t.defaultScope.native),
-                    provide: o.toServiceIdentifier(r),
+                    provide: s,
                     useFactory: i((() => t.get(r)), "useFactory")
                 }, r, t);
-                this.importedProviders.set(t, [ ...this.importedProviders.get(t) ?? [], s ]), this.moduleUtils.bindToContainer(s, t.defaultScope.native), 
-                t._onUnbind(r, (() => this.__unbind(s)));
+                this.importedProviders.set(t, [ ...this.importedProviders.get(t) ?? [], d ]), this.moduleUtils.bindToContainer(d, t.defaultScope.native);
+                const a = t;
+                a.onUnbindInternal(r, this.identifier, (() => this.__unbind(d))), this._onUnbind(d, (() => {
+                    this.removeOnUnbindEffectsFromImportedModule(s, a);
+                }));
             }));
         }));
     }
     injectProviders() {
         this.providers.forEach((e => this.moduleUtils.bindToContainer(e, this.defaultScope.native)));
     }
-    registerBindingSideEffect(e, i, t) {
-        this.registeredBindingSideEffects.has(e) || this.registeredBindingSideEffects.set(e, {
+    onUnbindInternal(e, i, t) {
+        this.shouldThrowIfDisposed(), this.registerBindingSideEffect(e, "unbind", t, {
+            registerModule: i
+        });
+    }
+    registerBindingSideEffect(e, i, t, n) {
+        const r = o.toServiceIdentifier(e);
+        this.registeredSideEffects.has(r) || this.registeredSideEffects.set(r, {
             onBindEffects: [],
+            onGetEffects: [],
             onRebindEffects: [],
             onUnbindEffects: []
         });
-        const n = this.registeredBindingSideEffects.get(e);
-        "bind" === i ? n.onBindEffects.push(t) : "rebind" === i ? n.onRebindEffects.push(t) : n.onUnbindEffects.push(t);
+        const s = this.registeredSideEffects.get(r);
+        "bind" === i ? s.onBindEffects.push(t) : "get" === i ? s.onGetEffects.push({
+            once: n.once,
+            invoked: !1,
+            cb: t
+        }) : "rebind" === i ? s.onRebindEffects.push(t) : "unbind" === i && s.onUnbindEffects.push({
+            registerModule: n?.registerModule,
+            cb: t
+        });
     }
     invokeRegisteredBindingSideEffects(e, i) {
-        const t = this.registeredBindingSideEffects.get(e);
-        t && t[`${i}Effects`].forEach((e => e()));
+        const t = o.toServiceIdentifier(e), n = this.registeredSideEffects.get(t);
+        n && n[`${i}Effects`].forEach((e => {
+            if ("function" == typeof e) return e();
+            if ("onGet" === i) {
+                const i = e;
+                if (i.invoked && i.once) return;
+                i.invoked = !0;
+            }
+            e.cb();
+        }));
     }
     removeRegisteredBindingSideEffects(e) {
-        this.registeredBindingSideEffects && ("all" !== e ? this.registeredBindingSideEffects.has(e) && (this.registeredBindingSideEffects.get(e)?.onUnbindEffects.forEach((e => e())), 
-        this.registeredBindingSideEffects.delete(e)) : this.registeredBindingSideEffects.forEach((({onUnbindEffects: e}) => e.forEach((e => e())))));
+        if (!this.registeredSideEffects) return;
+        if ("all" === e) return this.registeredSideEffects.forEach((({onUnbindEffects: e}) => e.forEach((e => e.cb())))), 
+        void this.registeredSideEffects.clear();
+        const i = o.toServiceIdentifier(e);
+        this.registeredSideEffects.has(i) && (this.registeredSideEffects.get(i)?.onUnbindEffects.forEach((e => e.cb())), 
+        this.registeredSideEffects.delete(i));
     }
-    shouldThrowWhenModuleDynamicExportsDontMatchTheStaticExports(e, i, t) {
-        if (t.length > i.length || t.some((e => !i.includes(e)))) throw new F(e);
+    removeOnUnbindEffectsFromImportedModule(e, i) {
+        const t = i.registeredSideEffects.get(e);
+        t && (t.onUnbindEffects = t.onUnbindEffects.filter((e => e.registerModule !== this.identifier)));
     }
     shouldThrowIfDisposed() {
-        if (null === this.container) throw new G(this);
-    }
-    async _dispose() {
-        await (this.onDispose?.(this)), await this.__unbindAll(), this.container = null, 
-        this.imports = null, this.providers = null, this.importedProviders = null, this.exports = null, 
-        this.dynamicExports = null, this.registeredBindingSideEffects = null, this.isDisposed = !0;
+        if (null === this.container) throw new C(this);
     }
     _lazyInit({markAsGlobal: e, imports: i = [], providers: t = [], exports: n = [], defaultScope: o = s.Singleton, dynamicExports: r, onReady: a, onDispose: c, ...u}) {
         return this.isMarkedAsGlobal = e ?? !1, this.isDisposed = !1, this.imports = i, 
@@ -470,9 +470,8 @@ var q = class {
         }, this.dynamicExports = r, this.onReady = a, this.onDispose = c, this.importedProvidersMap = u.importedProvidersMap ?? (e => e), 
         this.container = this.prepareContainer({
             ...u
-        }), this.moduleUtils = new q(this, u), this.registeredBindingSideEffects = new Map, 
-        this.injectImportedModules(this._getImportedModules()), this.injectProviders(), 
-        this.onReady?.(this), this;
+        }), this.moduleUtils = new O(this, u), this.registeredSideEffects = new Map, this.injectImportedModules(this._getImportedModules()), 
+        this.injectProviders(), this.onReady?.(this), this;
     }
     _getImportedModules() {
         return this.shouldThrowIfDisposed(), this.imports;
@@ -486,6 +485,12 @@ var q = class {
     _onBind(e, i) {
         this.shouldThrowIfDisposed(), this.registerBindingSideEffect(e, "bind", i);
     }
+    _onGet(e, i, t) {
+        if (this.shouldThrowIfDisposed(), "boolean" != typeof i) throw new D(this, `The 'once' parameter is required when using the '${this._onGet.name}' method!`);
+        this.registerBindingSideEffect(e, "get", t, {
+            once: i
+        });
+    }
     _onRebind(e, i) {
         this.shouldThrowIfDisposed(), this.registerBindingSideEffect(e, "rebind", i);
     }
@@ -501,7 +506,8 @@ var q = class {
         return this.invokeRegisteredBindingSideEffects(e, "onBind"), i;
     }
     __get(e, i) {
-        return this.shouldThrowIfDisposed(), this.container.get(o.toServiceIdentifier(e), i);
+        return this.shouldThrowIfDisposed(), this.invokeRegisteredBindingSideEffects(e, "onGet"), 
+        this.container.get(o.toServiceIdentifier(e), i);
     }
     async __getAsync(e, i) {
         return this.shouldThrowIfDisposed(), this.container.getAsync(o.toServiceIdentifier(e), i);
@@ -545,7 +551,7 @@ var q = class {
     async __unbindAll() {
         this.shouldThrowIfDisposed(), await this.container.unbindAll(), this.removeRegisteredBindingSideEffects("all");
     }
-}, z = new Set, H = class extends $ {
+}, N = new Set, V = class extends U {
     static {
         i(this, "GlobalAppModule");
     }
@@ -558,26 +564,26 @@ var q = class {
         }));
     }
     register(e) {
-        if (this.isLoaded) throw new R(`The '${this.toString()}' has already been registered!`);
+        if (this.isLoaded) throw new A(`The '${this.toString()}' has already been registered!`);
         return this.nakedModule._lazyInit(e), this.checkIfRegisteredModulesHaveGlobalMark(this.toNaked(), this.imports), 
         this.isLoaded = !0, this;
     }
     toNaked() {
         return super.toNaked();
     }
-    async _dispose() {
-        this.isLoaded = !1, super._dispose();
+    async dispose() {
+        this.isLoaded = !1, super.dispose();
     }
     checkIfRegisteredModulesHaveGlobalMark(e, i, t = !1) {
         i.forEach((i => {
-            if (i instanceof $) {
-                if (i.isMarkedAsGlobal) return z.delete(i), void (i.exports && this.checkIfRegisteredModulesHaveGlobalMark(i, i.exports, !0));
-                throw new N(i, t ? `Is not marked as \`global\` but has been imported into the \`AppModule\`via the \`${e.toString()}\` module!` : "Is not marked as `global` but has been imported into the `AppModule`!");
+            if (i instanceof U) {
+                if (i.isMarkedAsGlobal) return N.delete(i), void (i.exports && this.checkIfRegisteredModulesHaveGlobalMark(i, i.exports, !0));
+                throw new j(i, t ? `Is not marked as \`global\` but has been imported into the \`AppModule\`via the \`${e.toString()}\` module!` : "Is not marked as `global` but has been imported into the `AppModule`!");
             }
-        })), t || z.forEach((e => {
-            throw new N(e, "Is marked as 'global' and has not been imported into the 'AppModule'!");
+        })), t || N.forEach((e => {
+            throw new j(e, "Is marked as 'global' and has not been imported into the 'AppModule'!");
         }));
     }
-}, L = new H;
+}, q = new V;
 
-export { L as AppModule, t as GLOBAL_APP_MODULE_ID, H as GlobalAppModule, V as GlobalContainer, g as Inject, I as InjectFromBase, v as Injectable, F as InjectionDynamicExportsOutOfRange, R as InjectionError, G as InjectionProviderModuleDisposedError, j as InjectionProviderModuleError, N as InjectionProviderModuleGlobalMarkError, O as InjectionProviderModuleMissingIdentifierError, s as InjectionScope, y as MultiInject, T as Named, k as Optional, _ as PostConstruct, D as PreDestroy, $ as ProviderModule, r as ProviderModuleHelpers, o as ProviderTokenHelpers, A as Tagged, x as Unmanaged, a as bindingScopeToInjectionScope, d as injectionScopeToBindingScope, u as isClass, h as isClassOrFunction, l as isFunction, f as isPlainObject };//# sourceMappingURL=index.js.map
+export { q as AppModule, t as GLOBAL_APP_MODULE_ID, V as GlobalAppModule, G as GlobalContainer, m as Inject, I as InjectFromBase, v as Injectable, A as InjectionError, C as InjectionProviderModuleDisposedError, D as InjectionProviderModuleError, j as InjectionProviderModuleGlobalMarkError, R as InjectionProviderModuleMissingIdentifierError, s as InjectionScope, b as MultiInject, T as Named, k as Optional, U as ProviderModule, r as ProviderModuleHelpers, o as ProviderTokenHelpers, _ as Tagged, B as Unmanaged, a as bindingScopeToInjectionScope, d as injectionScopeToBindingScope, u as isClass, h as isClassOrFunction, f as isFunction, p as isPlainObject };//# sourceMappingURL=index.js.map