@navios/di 0.5.1 → 0.6.1

package/src/__tests__/service-instantiator.spec.mts

@@ -1,12 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { FactoryContext } from '../factory-context.mjs'
-import type { FactoryRecord } from '../registry.mjs'
+import type { FactoryContext } from '../internal/context/factory-context.mjs'
+import type { FactoryRecord } from '../token/registry.mjs'
 import type { Injectors } from '../utils/get-injectors.mjs'
 
 import { InjectableScope, InjectableType } from '../enums/index.mjs'
-import { InjectionToken } from '../injection-token.mjs'
-import { ServiceInstantiator } from '../service-instantiator.mjs'
+import { DIError } from '../errors/index.mjs'
+import { Instantiator } from '../internal/core/instantiator.mjs'
+import { InjectionToken } from '../token/injection-token.mjs'
 
 // Mock classes for testing
 class TestService {
@@ -36,8 +37,8 @@ class TestFactoryWithoutCreate {
   // Missing create method
 }
 
-describe('ServiceInstantiator', () => {
-  let instantiator: ServiceInstantiator
+describe('Instantiator', () => {
+  let instantiator: Instantiator
   let mockInjectors: Injectors
   let mockContext: FactoryContext
   let mockAddDestroyListener: ReturnType<typeof vi.fn>
@@ -60,7 +61,7 @@ describe('ServiceInstantiator', () => {
       addDestroyListener: mockAddDestroyListener,
     }
 
-    instantiator = new ServiceInstantiator(mockInjectors)
+    instantiator = new Instantiator(mockInjectors)
   })
 
   function createFactoryRecord<T>(
@@ -126,7 +127,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(result[0]!.message).toContain('Unknown service type: Unknown')
     })
 
@@ -147,8 +148,8 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
-      expect(result[0]!.message).toBe('Constructor error')
+      expect(result[0]).toBeInstanceOf(DIError)
+      expect(result[0]!.message).toBe('Error: Constructor error')
     })
   })
 
@@ -237,7 +238,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(result[0]!.message).toContain('cannot be instantiated')
     })
 
@@ -266,7 +267,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(result[0]!.message).toContain('cannot be instantiated')
       expect(consoleSpy).toHaveBeenCalledWith(
         expect.stringContaining("has problem with it's definition"),
@@ -303,7 +304,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(result[0]!.message).toContain(
         'does not implement the create method',
       )
@@ -355,7 +356,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(result[0]!.message).toContain('cannot be instantiated')
     })
 
@@ -377,7 +378,7 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
+      expect(result[0]).toBeInstanceOf(DIError)
       expect(consoleSpy).toHaveBeenCalledWith(
         expect.stringContaining('asyncInject instead of inject'),
       )
@@ -402,8 +403,8 @@ describe('ServiceInstantiator', () => {
       const result = await instantiator.instantiateService(mockContext, record)
 
       expect(result).toHaveLength(1)
-      expect(result[0]).toBeInstanceOf(Error)
-      expect(result[0]!.message).toBe('Factory create error')
+      expect(result[0]).toBeInstanceOf(DIError)
+      expect(result[0]!.message).toBe('Error: Factory create error')
     })
   })
 })

package/src/__tests__/service-locator-event-bus.spec.mts

@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { ServiceLocatorEventBus } from '../service-locator-event-bus.mjs'
+import { LifecycleEventBus } from '../internal/lifecycle/lifecycle-event-bus.mjs'
 
-describe('ServiceLocatorEventBus', () => {
-  let eventBus: ServiceLocatorEventBus
+describe('LifecycleEventBus', () => {
+  let eventBus: LifecycleEventBus
   let mockLogger: Console
 
   beforeEach(() => {
@@ -11,12 +11,12 @@ describe('ServiceLocatorEventBus', () => {
       debug: vi.fn(),
       warn: vi.fn(),
     } as any as Console
-    eventBus = new ServiceLocatorEventBus(mockLogger)
+    eventBus = new LifecycleEventBus(mockLogger)
   })
 
   describe('constructor', () => {
     it('should create event bus without logger', () => {
-      const eventBusWithoutLogger = new ServiceLocatorEventBus()
+      const eventBusWithoutLogger = new LifecycleEventBus()
       expect(eventBusWithoutLogger).toBeDefined()
     })
 
@@ -32,7 +32,7 @@ describe('ServiceLocatorEventBus', () => {
       eventBus.on('test-ns', 'create', listener)
 
       expect(mockLogger.debug).toHaveBeenCalledWith(
-        '[ServiceLocatorEventBus]#on(): ns:test-ns event:create',
+        '[LifecycleEventBus]#on(): ns:test-ns event:create',
       )
     })
 
@@ -54,10 +54,10 @@ describe('ServiceLocatorEventBus', () => {
       eventBus.on('test-ns', 'destroy', listener2)
 
       expect(mockLogger.debug).toHaveBeenCalledWith(
-        '[ServiceLocatorEventBus]#on(): ns:test-ns event:create',
+        '[LifecycleEventBus]#on(): ns:test-ns event:create',
       )
       expect(mockLogger.debug).toHaveBeenCalledWith(
-        '[ServiceLocatorEventBus]#on(): ns:test-ns event:destroy',
+        '[LifecycleEventBus]#on(): ns:test-ns event:destroy',
       )
     })
 
@@ -86,7 +86,7 @@ describe('ServiceLocatorEventBus', () => {
 
       expect(listener).toHaveBeenCalledWith('create')
       expect(mockLogger.debug).toHaveBeenCalledWith(
-        '[ServiceLocatorEventBus]#emit(): test-ns:create',
+        '[LifecycleEventBus]#emit(): test-ns:create',
       )
     })
 

package/src/__tests__/service-locator-manager.spec.mts

@@ -2,23 +2,23 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { InjectableScope, InjectableType } from '../enums/index.mjs'
 import { DIError } from '../errors/index.mjs'
-import { ServiceLocatorInstanceHolderStatus } from '../service-locator-instance-holder.mjs'
-import { ServiceLocatorManager } from '../service-locator-manager.mjs'
+import { HolderManager } from '../internal/holder/holder-manager.mjs'
+import { InstanceStatus } from '../internal/holder/instance-holder.mjs'
 
-describe('ServiceLocatorManager', () => {
-  let manager: ServiceLocatorManager
+describe('HolderManager', () => {
+  let manager: HolderManager
   let mockLogger: Console
 
   beforeEach(() => {
     mockLogger = {
       log: vi.fn(),
     } as any as Console
-    manager = new ServiceLocatorManager(mockLogger)
+    manager = new HolderManager(mockLogger)
   })
 
   describe('constructor', () => {
     it('should create manager without logger', () => {
-      const managerWithoutLogger = new ServiceLocatorManager()
+      const managerWithoutLogger = new HolderManager()
       expect(managerWithoutLogger).toBeDefined()
     })
 
@@ -34,7 +34,7 @@ describe('ServiceLocatorManager', () => {
       expect(result).toHaveLength(1)
       expect(result[0]).toBeInstanceOf(DIError)
       expect(mockLogger.log).toHaveBeenCalledWith(
-        '[ServiceLocatorManager]#getInstanceHolder() Instance non-existent not found',
+        '[HolderManager]#get() Instance non-existent not found',
       )
     })
 
@@ -62,7 +62,7 @@ describe('ServiceLocatorManager', () => {
       )
 
       // Manually set status to destroying
-      holder.status = ServiceLocatorInstanceHolderStatus.Destroying
+      holder.status = InstanceStatus.Destroying
 
       const result = manager.get('destroying-instance')
 
@@ -70,7 +70,7 @@ describe('ServiceLocatorManager', () => {
       expect(result[0]).toBeInstanceOf(DIError)
       expect(result[1]).toBe(holder)
       expect(mockLogger.log).toHaveBeenCalledWith(
-        '[ServiceLocatorManager]#getInstanceHolder() Instance destroying-instance is destroying',
+        '[HolderManager]#get() Instance destroying-instance is destroying',
       )
     })
 
@@ -83,9 +83,9 @@ describe('ServiceLocatorManager', () => {
       )
 
       // Manually set status to error with an error instance
-      holder.status = ServiceLocatorInstanceHolderStatus.Error
+      holder.status = InstanceStatus.Error
       const errorInstance = DIError.instanceNotFound('error-instance')
-      holder.instance = errorInstance
+      holder.instance = errorInstance as unknown as Error
 
       const result = manager.get('error-instance')
 
@@ -93,7 +93,7 @@ describe('ServiceLocatorManager', () => {
       expect(result[0]).toBeInstanceOf(DIError)
       expect(result[1]).toBe(holder)
       expect(mockLogger.log).toHaveBeenCalledWith(
-        '[ServiceLocatorManager]#getInstanceHolder() Instance error-instance is in error state',
+        '[HolderManager]#get() Instance error-instance is in error state',
       )
     })
   })
@@ -148,7 +148,7 @@ describe('ServiceLocatorManager', () => {
         InjectableScope.Singleton,
       )
 
-      holder.status = ServiceLocatorInstanceHolderStatus.Destroying
+      holder.status = InstanceStatus.Destroying
 
       const result = manager.has('destroying-instance')
 
@@ -230,7 +230,7 @@ describe('ServiceLocatorManager', () => {
 
       expect(deferred).toBeDefined()
       expect(deferred.promise).toBeInstanceOf(Promise)
-      expect(holder.status).toBe(ServiceLocatorInstanceHolderStatus.Creating)
+      expect(holder.status).toBe(InstanceStatus.Creating)
       expect(holder.name).toBe('test-instance')
       expect(holder.instance).toBeNull()
       expect(holder.creationPromise).toBe(deferred.promise)
@@ -265,7 +265,7 @@ describe('ServiceLocatorManager', () => {
         InjectableScope.Singleton,
       )
 
-      expect(holder.status).toBe(ServiceLocatorInstanceHolderStatus.Created)
+      expect(holder.status).toBe(InstanceStatus.Created)
       expect(holder.name).toBe('test-instance')
       expect(holder.instance).toBe(instance)
       expect(holder.creationPromise).toBeNull()