@adimm/x-injection 0.6.4 → 0.7.0

package/README.md

@@ -356,12 +356,6 @@ const CatModule = new ProviderModule({
 
 Hopefully the provided example shows how powerful the `dynamicExports` property it is, but, there are some things to keep in mind in order to avoid nasty bugs!
 
-1. You **must always** return only the providers/modules declared into the static `exports` array.
-2. You **can** return _less_ providers/modules as long as they are still part of the static `exports` array.
-3. You **cannot** return _more_ providers/modules than the static `exports` array!
-
-> When point number `1` and point number `3` are triggered, the library will throw a descriptive error which should help to find the culprit module.
-
 ## Advanced Usage
 
 Each `ProviderModule` instance implements the `IProviderModule` interface for simplicity, but can be cast to `IProviderModuleNaked` for advanced operations:

package/dist/index.cjs

@@ -11,36 +11,35 @@ var e, i = Object.defineProperty, t = Object.getOwnPropertyDescriptor, n = Objec
         enumerable: !0
     });
 })(s, {
-    AppModule: () => Q,
+    AppModule: () => K,
     GLOBAL_APP_MODULE_ID: () => d,
-    GlobalAppModule: () => K,
-    GlobalContainer: () => $,
+    GlobalAppModule: () => J,
+    GlobalContainer: () => L,
     Inject: () => E,
-    InjectFromBase: () => w,
-    Injectable: () => I,
-    InjectionDynamicExportsOutOfRange: () => V,
+    InjectFromBase: () => k,
+    Injectable: () => b,
     InjectionError: () => q,
     InjectionProviderModuleDisposedError: () => U,
     InjectionProviderModuleError: () => N,
-    InjectionProviderModuleGlobalMarkError: () => L,
-    InjectionProviderModuleMissingIdentifierError: () => W,
+    InjectionProviderModuleGlobalMarkError: () => W,
+    InjectionProviderModuleMissingIdentifierError: () => V,
     InjectionScope: () => c,
     MultiInject: () => M,
-    Named: () => B,
+    Named: () => w,
     Optional: () => D,
     PostConstruct: () => A,
-    PreDestroy: () => x,
-    ProviderModule: () => Y,
+    PreDestroy: () => R,
+    ProviderModule: () => z,
     ProviderModuleHelpers: () => p,
     ProviderTokenHelpers: () => h,
-    Tagged: () => O,
+    Tagged: () => G,
     Unmanaged: () => F,
     bindingScopeToInjectionScope: () => l,
     injectionScopeToBindingScope: () => u,
     isClass: () => v,
     isClassOrFunction: () => g,
-    isFunction: () => m,
-    isPlainObject: () => y
+    isFunction: () => S,
+    isPlainObject: () => m
 }), module.exports = (e = s, ((e, o, s, d) => {
     if (o && "object" == typeof o || "function" == typeof o) for (let a of n(o)) r.call(e, a) || a === s || i(e, a, {
         get: () => o[a],
@@ -94,36 +93,36 @@ function g(e) {
     return "function" == typeof e;
 }
 
-function m(e) {
+function S(e) {
     return "function" == typeof e && !Function.prototype.toString.call(e).startsWith("class ");
 }
 
-function S(e) {
+function y(e) {
     return "[object Object]" === Object.prototype.toString.call(e);
 }
 
-function y(e) {
-    if (!1 === S(e)) return !1;
+function m(e) {
+    if (!1 === y(e)) return !1;
     const i = e.constructor;
     if (void 0 === i) return !0;
     const t = i.prototype;
-    return !1 !== S(t) && !1 !== t.hasOwnProperty("isPrototypeOf");
+    return !1 !== y(t) && !1 !== t.hasOwnProperty("isPrototypeOf");
 }
 
-function I(e) {
+function b(e) {
     return void 0 === e ? (0, a.injectable)() : (0, a.injectable)(u(e));
 }
 
-o(v, "isClass"), o(g, "isClassOrFunction"), o(m, "isFunction"), o(S, "isObject"), 
-o(y, "isPlainObject"), function(e) {
+o(v, "isClass"), o(g, "isClassOrFunction"), o(S, "isFunction"), o(y, "isObject"), 
+o(m, "isPlainObject"), function(e) {
     function i(e) {
-        return S(e) && "useClass" in e;
+        return y(e) && "useClass" in e;
     }
     function t(e) {
-        return S(e) && "useValue" in e;
+        return y(e) && "useValue" in e;
     }
     function n(e) {
-        return S(e) && "useFactory" in e;
+        return y(e) && "useFactory" in e;
     }
     function r(e) {
         return "string" == typeof e || "symbol" == typeof e || g(e);
@@ -139,7 +138,7 @@ o(y, "isPlainObject"), function(e) {
             ...i,
             provide: i?.provide ?? e,
             useClass: i?.useClass ?? e
-        } : m(e) ? {
+        } : S(e) ? {
             ...i,
             provide: i?.provide ?? e,
             useFactory: i?.useFactory ?? e
@@ -152,7 +151,7 @@ o(y, "isPlainObject"), function(e) {
         return h(e) ?? p(e) ?? i;
     }
     function u(e) {
-        if (S(e)) return e;
+        if (y(e)) return e;
     }
     function h(e) {
         const i = u(e);
@@ -164,8 +163,8 @@ o(y, "isPlainObject"), function(e) {
         const t = (0, f.getClassMetadata)(i)?.scope;
         return t ? l(t) : void 0;
     }
-    function S(e) {
-        return y(e) && "object" == typeof e && "provide" in e;
+    function y(e) {
+        return m(e) && "object" == typeof e && "provide" in e;
     }
     o(i, "isClassToken"), e.isClassToken = i, o(t, "isValueToken"), e.isValueToken = t, 
     o(n, "isFactoryToken"), e.isFactoryToken = n, o(r, "isProviderIdentifier"), e.isProviderIdentifier = r, 
@@ -173,7 +172,7 @@ o(y, "isPlainObject"), function(e) {
     e.toServiceIdentifiers = d, o(a, "toDependencyProviderWithOptions"), e.toDependencyProviderWithOptions = a, 
     o(c, "getInjectionScopeByPriority"), e.getInjectionScopeByPriority = c, o(u, "tryGetProviderOptions"), 
     e.tryGetProviderOptions = u, o(h, "tryGetScopeFromProvider"), e.tryGetScopeFromProvider = h, 
-    o(p, "tryGetDecoratorScopeFromClass"), e.tryGetDecoratorScopeFromClass = p, o(S, "hasProvideProperty");
+    o(p, "tryGetDecoratorScopeFromClass"), e.tryGetDecoratorScopeFromClass = p, o(y, "hasProvideProperty");
 }(h || (h = {})), function(e) {
     function i(e) {
         return e;
@@ -183,12 +182,12 @@ o(y, "isPlainObject"), function(e) {
     }
     o(i, "buildInternalConstructorParams"), e.buildInternalConstructorParams = i, o(t, "isDynamicExport"), 
     e.isDynamicExport = t;
-}(p || (p = {})), o(I, "Injectable");
+}(p || (p = {})), o(b, "Injectable");
 
-var b = require("inversify");
+var I = require("inversify");
 
 function E(e) {
-    return (0, b.inject)(h.toServiceIdentifier(e));
+    return (0, I.inject)(h.toServiceIdentifier(e));
 }
 
 o(E, "Inject");
@@ -203,24 +202,24 @@ o(M, "MultiInject");
 
 var P = require("inversify");
 
-function w(e) {
+function k(e) {
     return (0, P.injectFromBase)(e);
 }
 
-o(w, "InjectFromBase");
+o(k, "InjectFromBase");
 
 var _ = require("inversify");
 
-function B(e) {
+function w(e) {
     return (0, _.named)(e);
 }
 
-o(B, "Named");
+o(w, "Named");
 
-var k = require("inversify");
+var B = require("inversify");
 
 function D() {
-    return (0, k.optional)();
+    return (0, B.optional)();
 }
 
 o(D, "Optional");
@@ -235,24 +234,24 @@ o(A, "PostConstruct");
 
 var C = require("inversify");
 
-function x() {
+function R() {
     return (0, C.preDestroy)();
 }
 
-o(x, "PreDestroy");
+o(R, "PreDestroy");
 
-var R = require("inversify");
+var x = require("inversify");
 
-function O(e, i) {
-    return (0, R.tagged)(e, i);
+function G(e, i) {
+    return (0, x.tagged)(e, i);
 }
 
-o(O, "Tagged");
+o(G, "Tagged");
 
-var G = require("inversify");
+var O = require("inversify");
 
 function F() {
-    return (0, G.unmanaged)();
+    return (0, O.unmanaged)();
 }
 
 o(F, "Unmanaged");
@@ -279,14 +278,6 @@ var q = class e extends Error {
         super(e, "Has been disposed! You can re-initialize it by using the `_lazyInit` method.");
     }
 }, V = class e extends N {
-    static {
-        o(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!`);
-    }
-}, W = class e extends N {
     static {
         o(this, "InjectionProviderModuleMissingIdentifierError");
     }
@@ -294,7 +285,7 @@ var q = class e extends Error {
     constructor(e) {
         super(e, "An `identifier` must be supplied!");
     }
-}, L = class e extends N {
+}, W = class e extends N {
     static {
         o(this, "InjectionProviderModuleGlobalMarkError");
     }
@@ -302,9 +293,9 @@ var q = class e extends Error {
     constructor(e, i) {
         super(e, i);
     }
-}, $ = new (require("inversify").Container)({
+}, L = new (require("inversify").Container)({
     defaultScope: "Singleton"
-}), z = require("inversify"), H = class {
+}), H = require("inversify"), $ = class {
     static {
         o(this, "ProviderModuleUtils");
     }
@@ -313,7 +304,7 @@ var q = class e extends Error {
     }
     module;
     moduleNaked;
-    appModule=Q;
+    appModule=K;
     constructor(e, i) {
         this.module = e, this.moduleNaked = e.toNaked(), this.appModule = i.appModule?.() ?? this.appModule, 
         this.checkIfShouldBeAddedToTheGlobalRegister();
@@ -322,7 +313,7 @@ var q = class e extends Error {
         return h.isProviderIdentifier(e) ? this.bindSelfTokenToContainer(e, i) : h.isClassToken(e) ? this.bindClassTokenToContainer(e, i) : h.isValueToken(e) ? this.bindValueTokenToContainer(e) : !!h.isFactoryToken(e) && this.bindFactoryTokenToContainer(e, i);
     }
     checkIfShouldBeAddedToTheGlobalRegister() {
-        !this.moduleNaked.isAppModule && this.module.isMarkedAsGlobal && J.add(this.module);
+        !this.moduleNaked.isAppModule && this.module.isMarkedAsGlobal && Y.add(this.module);
     }
     bindSelfTokenToContainer(e, i) {
         return this.setBindingScope(e, this.container.bind(h.toServiceIdentifier(e)).toSelf(), i), 
@@ -363,7 +354,7 @@ var q = class e extends Error {
         const t = e;
         t.onEvent?.activation && i.onActivation(t.onEvent.activation), t.onEvent?.deactivation && i.onDeactivation(t.onEvent.deactivation);
     }
-}, Y = class e {
+}, z = class e {
     static {
         o(this, "ProviderModule");
     }
@@ -405,7 +396,7 @@ var q = class e extends Error {
     }
     getMany(...e) {
         return e.map((e => {
-            const i = y(e) && "provider" in e;
+            const i = m(e) && "provider" in e;
             return this.get(i ? e.provider : e, !!i && e.isOptional);
         }));
     }
@@ -419,8 +410,8 @@ var q = class e extends Error {
         return this;
     }
     clone(i) {
-        let t = [ ...this.providers ];
-        return i?.providersMap && (t = t.map((e => i.providersMap(e, this)))), new e(p.buildInternalConstructorParams({
+        const t = i;
+        return new e(p.buildInternalConstructorParams({
             isAppModule: this.isAppModule,
             markAsGlobal: this.isMarkedAsGlobal,
             identifier: this.identifier,
@@ -428,31 +419,36 @@ var q = class e extends Error {
             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
         }));
     }
+    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;
+    }
     toString() {
         return this.identifier?.description ?? "Unknown";
     }
     setIdentifier(e) {
-        if (!e) throw new W(this);
+        if (!e) throw new V(this);
         return e;
     }
     prepareContainer(e) {
-        return this.isAppModule ? e.container?.() ?? $ : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
-        e.container()) : new z.Container({
-            parent: $,
+        return this.isAppModule ? e.container?.() ?? L : e.container ? (console.warn(`[xInjection]: The '${this.toString()}' module is using a dynamic container!`), 
+        e.container()) : new H.Container({
+            parent: L,
             defaultScope: this.defaultScope.inversify
         });
     }
     injectImportedModules(i) {
         i && 0 !== i.length && i.forEach((i => {
             if ("GlobalAppModule" === i.toString()) throw new N(this, "The 'GlobalAppModule' can't be imported!");
-            const t = i._getExportableModulesAndProviders(), n = i.dynamicExports?.(this, t);
-            void 0 !== n && this.shouldThrowWhenModuleDynamicExportsDontMatchTheStaticExports(i, t, n), 
+            const t = (i = "function" == typeof i ? i() : i)._getExportableModulesAndProviders(), n = i.dynamicExports?.(this, t);
             (n ?? t).forEach((t => {
                 if (t instanceof e) {
                     const e = t.toNaked();
@@ -488,17 +484,9 @@ var q = class e extends Error {
         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())))));
     }
-    shouldThrowWhenModuleDynamicExportsDontMatchTheStaticExports(e, i, t) {
-        if (t.length > i.length || t.some((e => !i.includes(e)))) throw new V(e);
-    }
     shouldThrowIfDisposed() {
         if (null === this.container) throw new U(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;
-    }
     _lazyInit({markAsGlobal: e, imports: i = [], providers: t = [], exports: n = [], defaultScope: r = c.Singleton, dynamicExports: o, onReady: s, onDispose: d, ...a}) {
         return this.isMarkedAsGlobal = e ?? !1, this.isDisposed = !1, this.imports = i, 
         this.providers = t, this.importedProviders = a.importedProviders ?? new Map, this.exports = n, 
@@ -508,7 +496,7 @@ var q = class e extends Error {
         }, this.dynamicExports = o, this.onReady = s, this.onDispose = d, this.importedProvidersMap = a.importedProvidersMap ?? (e => e), 
         this.container = this.prepareContainer({
             ...a
-        }), this.moduleUtils = new H(this, a), this.registeredBindingSideEffects = new Map, 
+        }), this.moduleUtils = new $(this, a), this.registeredBindingSideEffects = new Map, 
         this.injectImportedModules(this._getImportedModules()), this.injectProviders(), 
         this.onReady?.(this), this;
     }
@@ -583,7 +571,7 @@ var q = class e extends Error {
     async __unbindAll() {
         this.shouldThrowIfDisposed(), await this.container.unbindAll(), this.removeRegisteredBindingSideEffects("all");
     }
-}, J = new Set, K = class extends Y {
+}, Y = new Set, J = class extends z {
     static {
         o(this, "GlobalAppModule");
     }
@@ -597,21 +585,23 @@ var q = class e extends Error {
     }
     register(e) {
         if (this.isLoaded) throw new q(`The '${this.toString()}' has already been registered!`);
-        return this.nakedModule._lazyInit(e), this.checkIfImportsHaveGlobalMark(), this.isLoaded = !0, 
-        this;
+        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();
-    }
-    checkIfImportsHaveGlobalMark() {
-        this.imports.forEach((e => {
-            if (!e.isMarkedAsGlobal) throw new L(e, "Is not marked as `global` but has been imported into the `AppModule`!");
-            J.delete(e);
-        })), J.forEach((e => {
-            throw new L(e, "Is marked as 'global' and has not been imported into the 'AppModule'!");
+    async dispose() {
+        this.isLoaded = !1, super.dispose();
+    }
+    checkIfRegisteredModulesHaveGlobalMark(e, i, t = !1) {
+        i.forEach((i => {
+            if (i instanceof z) {
+                if (i.isMarkedAsGlobal) return Y.delete(i), void (i.exports && this.checkIfRegisteredModulesHaveGlobalMark(i, i.exports, !0));
+                throw new W(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 || Y.forEach((e => {
+            throw new W(e, "Is marked as 'global' and has not been imported into the 'AppModule'!");
         }));
     }
-}, Q = new K;//# sourceMappingURL=index.cjs.map
+}, K = new J;//# sourceMappingURL=index.cjs.map