@adimm/x-injection 2.0.4 → 2.1.0

package/README.md

@@ -310,7 +310,7 @@ The below list shows them in order of priority _(highest to lowest)_, meaning th
 3. By providing the [defaultScope](https://adimarianmutu.github.io/x-injection/interfaces/ProviderModuleOptions.html#defaultscope) property when initializing a `ProviderModule`:
    ```ts
    const RainModuleDef = new ProviderModuleDef({
-     identifier: 'RainModule',
+     id: 'RainModule',
      defaultScope: InjectionScope.Transient,
    });
    ```
@@ -499,7 +499,7 @@ const UnknownModule = ProviderModule.create({
   exports: [SecondService],
 });
 
-InnerModule.update.addImport(UnknownModule);
+InnerModule.update.addImport(UnknownModule, true); // Don't forget to provide `true` to the `addToExports` optional parameter!
 
 const secondService = OuterModule.get(SecondService);
 ```
@@ -543,13 +543,9 @@ The [ProviderModuleBlueprint](https://adimarianmutu.github.io/x-injection/classe
 
 Whenever you _import_ a `blueprint` into a `module`, it'll automatically be "transformed" to a `ProviderModule` instance by the engine, this step is crucial as a `blueprint` per se does not contain a _container_, just its _definitions_.
 
-This has a "gotcha", because the conversion happens internally, you'll "not" be able to get a reference to that imported module, not directly at least _(I may change this in a future patch)_, this means that if you don't have the reference of the `ProviderModule`, you can't remove it from the _imported_ module _(if you'll ever need to remove it)_.
-
 > [!NOTE]
 >
-> There's currently an workaround for this, you can `subscribe` to the `Import` event and get from there the `ProviderModule` instance, just make sure to check the `id` of the module via `module.toString()` when doing so.
-
-It is also important, to understand the _injection_ `scope` of an imported `blueprint`; we previously learned that when we import a `blueprint` into a `module` it automatically creates an instance of the `ProviderModule` from it, this means that all the `singleton` providers of the `blueprint` definition are now _scoped singleton_, where _scoped_ means _singleton in relation to their imported module_.
+> Therefore it is important to understand the _injection_ `scope` of an imported `blueprint`; we previously learned that when we import a `blueprint` into a `module` it automatically creates an instance of the `ProviderModule` from it, this means that all the `singleton` providers of the `blueprint` definition are now _scoped singleton_, where _scoped_ means _singleton in relation to their imported module_.
 
 ### isGlobal
 
@@ -812,7 +808,7 @@ const ApiModuleBp = new ProviderModule.blueprint({
 
 // Clone returns a `deep` clone and wraps all the `methods` to break their reference!
 const ApiModuleBpMocked = ApiModuleBp.clone().updateDefinition({
-  identifier: 'ApiModuleMocked',
+  id: 'ApiModuleMocked',
   providers: [
     {
       provide: UserService,

package/dist/index.cjs

@@ -17,11 +17,11 @@ var e, t = Object.defineProperty, i = Object.getOwnPropertyDescriptor, o = Objec
     InjectFromBase: () => N,
     Injectable: () => q,
     InjectionError: () => I,
-    InjectionProviderModuleDisposedError: () => P,
+    InjectionProviderModuleDisposedError: () => w,
     InjectionProviderModuleError: () => b,
     InjectionProviderModuleMissingIdentifierError: () => x,
     InjectionProviderModuleMissingProviderError: () => E,
-    InjectionProviderModuleUnknownProviderError: () => w,
+    InjectionProviderModuleUnknownProviderError: () => P,
     InjectionScope: () => u,
     MiddlewareType: () => a,
     MultiInject: () => U,
@@ -194,7 +194,7 @@ var g, I = class e extends Error {
         } catch {}
         super(`{ProviderModule.${i}} => ${t}`);
     }
-}, w = class e extends b {
+}, P = class e extends b {
     static {
         n(this, "InjectionProviderModuleUnknownProviderError");
     }
@@ -202,7 +202,7 @@ var g, I = class e extends Error {
     constructor(e, t) {
         super(e, `The [${h.providerTokenToString(t)}] provider is of an unknown type!`);
     }
-}, P = class e extends b {
+}, w = class e extends b {
     static {
         n(this, "InjectionProviderModuleDisposedError");
     }
@@ -270,7 +270,7 @@ var g, I = class e extends Error {
                 return t.useFactory(...i);
             }))), "bind")
         } ], {bind: o} = i.find((({providerTypeMatches: t}) => t(e))) ?? {};
-        if (!o) throw new w(this.providerModule, e);
+        if (!o) throw new P(this.providerModule, e);
         const r = h.isProviderIdentifier(e);
         let s = o();
         if (h.isValueToken(e) || r || (s = this.setBindingScope(e, s)), r) return;
@@ -388,7 +388,7 @@ var g, I = class e extends Error {
         return this.providerModule.moduleContainer;
     }
     get subscribe() {
-        if (null === this.event$) throw new P(this.providerModule);
+        if (null === this.event$) throw new w(this.providerModule);
         return this.event$.subscribe.bind(this.event$);
     }
     moduleDef;
@@ -444,22 +444,24 @@ var g, I = class e extends Error {
         this.addProvider(i, t);
     }
     removeImport(e) {
-        if (!this.moduleDef.imports.has(e)) return !1;
-        if (!1 === this.providerModule.middlewaresManager.applyMiddlewares(a.BeforeRemoveImport, e)) return !1;
-        this.unsubscribeFromImportedModuleEvents(e);
-        return this.providerModule.importedModuleContainers.get(e).dispose(), this.providerModule.importedModuleContainers.delete(e), 
-        this.moduleDef.imports.delete(e), this.emitEventSafely({
+        const t = g.isModule(e) ? e : this.getImportedModuleById(e);
+        if (!t) return !1;
+        if (!1 === this.providerModule.middlewaresManager.applyMiddlewares(a.BeforeRemoveImport, t)) return !1;
+        this.unsubscribeFromImportedModuleEvents(t);
+        return this.providerModule.importedModuleContainers.get(t).dispose(), this.providerModule.importedModuleContainers.delete(t), 
+        this.moduleDef.imports.delete(t), this.emitEventSafely({
             type: p.ImportRemoved,
-            change: e
-        }), this.removeFromExports(e), !0;
+            change: t
+        }), this.removeFromExports(t), !0;
     }
     removeProvider(e) {
-        if (!this.moduleDef.providers.has(e)) return !1;
-        return !1 !== this.providerModule.middlewaresManager.applyMiddlewares(a.BeforeRemoveProvider, e) && (this.moduleDef.providers.delete(e), 
-        this.moduleContainer.container.unbindSync(h.toProviderIdentifier(e)), this.emitEventSafely({
+        const t = h.isProviderIdentifier(e) ? this.getProviderByIdentifier(e) : e;
+        if (!t) return !1;
+        return !1 !== this.providerModule.middlewaresManager.applyMiddlewares(a.BeforeRemoveProvider, t) && (this.moduleDef.providers.delete(t), 
+        this.moduleContainer.container.unbindSync(h.toProviderIdentifier(t)), this.emitEventSafely({
             type: p.ProviderRemoved,
-            change: e
-        }), this.removeFromExports(e), !0);
+            change: t
+        }), this.removeFromExports(t), !0);
     }
     removeFromExports(e) {
         if (!this.moduleDef.exports.has(e)) return !1;
@@ -475,6 +477,12 @@ var g, I = class e extends Error {
             change: e
         }), !0);
     }
+    getImportedModuleById(e) {
+        return this.moduleDef.imports.values().find((t => t.id === e));
+    }
+    getProviderByIdentifier(e) {
+        return this.moduleDef.providers.values().find((t => h.toProviderIdentifier(t) === e));
+    }
     emitEventSafely(e) {
         if (!this.emittingModules.has(this.providerModule)) try {
             this.emittingModules.add(this.providerModule), this.event$.emit(e);
@@ -535,7 +543,7 @@ var g, I = class e extends Error {
         i ? i.push(t) : this.middlewaresMap.set(e, [ t ]);
     }
     applyMiddlewares(e, ...t) {
-        if (null === this.middlewaresMap) throw new P(this.providerModule);
+        if (null === this.middlewaresMap) throw new w(this.providerModule);
         const i = this.middlewaresMap.get(e);
         switch (e) {
           case a.BeforeAddImport:
@@ -709,7 +717,7 @@ var g, I = class e extends Error {
         if (!this.options.id || 0 === this.options.id.toString().trim().length) throw new x(this);
     }
     throwIfDisposed() {
-        if (this.isDisposed) throw new P(this);
+        if (this.isDisposed) throw new w(this);
     }
 };