@tachybase/di 1.6.3-alpha.3 → 1.6.8-alpha.1

package/lib/container-instance.class.js

@@ -166,6 +166,17 @@ const _ContainerInstance = class _ContainerInstance {
     if (Array.isArray(identifierOrIdentifierArray)) {
       identifierOrIdentifierArray.forEach((id) => this.remove(id));
     } else {
+      const multiGroup = this.multiServiceIds.get(identifierOrIdentifierArray);
+      if (multiGroup) {
+        multiGroup.tokens.forEach((maskedToken) => {
+          const serviceMetadata2 = this.metadataMap.get(maskedToken);
+          if (serviceMetadata2) {
+            this.disposeServiceInstance(serviceMetadata2);
+            this.metadataMap.delete(maskedToken);
+          }
+        });
+        this.multiServiceIds.delete(identifierOrIdentifierArray);
+      }
       const serviceMetadata = this.metadataMap.get(identifierOrIdentifierArray);
       if (serviceMetadata) {
         this.disposeServiceInstance(serviceMetadata);
@@ -323,7 +334,7 @@ const _ContainerInstance = class _ContainerInstance {
     this.throwIfDisposed();
     const shouldResetValue = force || !!serviceMetadata.type || !!serviceMetadata.factory;
     if (shouldResetValue) {
-      if (typeof (serviceMetadata == null ? void 0 : serviceMetadata.value)["dispose"] === "function") {
+      if ((serviceMetadata == null ? void 0 : serviceMetadata.value) != null && typeof serviceMetadata.value["dispose"] === "function") {
         try {
           serviceMetadata.value.dispose();
         } catch (error) {

package/lib/error/cannot-inject-value.error.js

@@ -29,7 +29,7 @@ const _CannotInjectValueError = class _CannotInjectValueError extends Error {
     this.name = "CannotInjectValueError";
   }
   get message() {
-    return `Cannot inject value into "${this.target.constructor.name}.${this.propertyName}". Please make sure you setup reflect-metadata properly and you don't use interfaces without service tokens as injection value.`;
+    return `Cannot inject value into "${this.target.name}.${this.propertyName}". Please make sure you setup reflect-metadata properly and you don't use interfaces without service tokens as injection value.`;
   }
 };
 __name(_CannotInjectValueError, "CannotInjectValueError");

package/package.json

@@ -1,11 +1,20 @@
 {
   "name": "@tachybase/di",
-  "version": "1.6.3-alpha.3",
+  "version": "1.6.8-alpha.1",
   "description": "",
+  "homepage": "https://github.com/tegojs/tego#readme",
+  "bugs": {
+    "url": "https://github.com/tegojs/tego/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tegojs/tego",
+    "directory": "packages/di"
+  },
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@tachybase/utils": "1.6.3-alpha.3"
+    "@tachybase/utils": "1.6.8-alpha.1"
   }
 }

package/src/__tests__/container-registry.test.ts

@@ -96,7 +96,7 @@ describe('ContainerRegistry', () => {
       container1 = new ContainerInstance('remove-test');
       await ContainerRegistry.removeContainer(container1);
 
-      expect(async () => {
+      await expect(async () => {
         await ContainerRegistry.removeContainer(container1);
       }).rejects.toThrow('No container is registered with the given ID.');
     });

package/src/__tests__/lifecycle.test.ts

@@ -142,11 +142,12 @@ describe('Service Lifecycle and Cleanup', () => {
         }
       }
 
-      container.set({ type: TestService, scope: 'singleton' });
-      const instance1 = container.get(TestService);
-      const instance2 = container.get(TestService);
+      // Singleton services are stored in the default Container
+      Container.set({ type: TestService, scope: 'singleton' });
+      const instance1 = Container.get(TestService);
+      const instance2 = Container.get(TestService);
 
-      container.remove(TestService);
+      Container.remove(TestService);
 
       expect(disposeCount).toBe(1);
     });
@@ -202,6 +203,7 @@ describe('Service Lifecycle and Cleanup', () => {
       container.set({ id: 'multi-service', type: TestService, multiple: true });
       container.set({ id: 'multi-service', type: TestService, multiple: true });
 
+      // Must get the services to create instances
       const services = container.getMany('multi-service');
 
       container.remove('multi-service');
@@ -228,6 +230,9 @@ describe('Service Lifecycle and Cleanup', () => {
       container.set({ id: 'multi-service', type: Service1, multiple: true });
       container.set({ id: 'multi-service', type: Service2, multiple: true });
 
+      // Must get the services to create instances
+      const services = container.getMany('multi-service');
+
       container.remove('multi-service');
 
       expect(service1Disposed).toBe(true);

package/src/container-instance.class.ts

@@ -236,6 +236,21 @@ export class ContainerInstance {
     if (Array.isArray(identifierOrIdentifierArray)) {
       identifierOrIdentifierArray.forEach((id) => this.remove(id));
     } else {
+      // Handle multiple services (registered with multiple: true)
+      const multiGroup = this.multiServiceIds.get(identifierOrIdentifierArray);
+      if (multiGroup) {
+        // Remove all masked services
+        multiGroup.tokens.forEach((maskedToken) => {
+          const serviceMetadata = this.metadataMap.get(maskedToken);
+          if (serviceMetadata) {
+            this.disposeServiceInstance(serviceMetadata);
+            this.metadataMap.delete(maskedToken);
+          }
+        });
+        this.multiServiceIds.delete(identifierOrIdentifierArray);
+      }
+
+      // Handle single service
       const serviceMetadata = this.metadataMap.get(identifierOrIdentifierArray);
 
       if (serviceMetadata) {
@@ -471,7 +486,10 @@ export class ContainerInstance {
 
     if (shouldResetValue) {
       /** If we wound a function named destroy we call it without any params. */
-      if (typeof (serviceMetadata?.value as Record<string, unknown>)['dispose'] === 'function') {
+      if (
+        serviceMetadata?.value != null &&
+        typeof (serviceMetadata.value as Record<string, unknown>)['dispose'] === 'function'
+      ) {
         try {
           (serviceMetadata.value as { dispose: CallableFunction }).dispose();
         } catch (error) {

package/src/error/cannot-inject-value.error.ts

@@ -8,7 +8,7 @@ export class CannotInjectValueError extends Error {
 
   get message(): string {
     return (
-      `Cannot inject value into "${this.target.constructor.name}.${this.propertyName}". ` +
+      `Cannot inject value into "${this.target.name}.${this.propertyName}". ` +
       `Please make sure you setup reflect-metadata properly and you don't use interfaces without service tokens as injection value.`
     );
   }