@navios/core 0.1.15 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/core",
-  "version": "0.1.15",
+  "version": "0.2.0",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -11,7 +11,7 @@
     "url": "https://github.com/Arilas/navios.git"
   },
   "license": "MIT",
-  "typings": "./dist/index.d.ts",
+  "typings": "./dist/src/index.d.mts",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "peerDependencies": {
@@ -40,6 +40,7 @@
   "dependencies": {
     "@fastify/cors": "^11.0.1",
     "@fastify/multipart": "^9.0.3",
+    "@navios/di": "^0.1.2",
     "fastify": "^5.3.2",
     "fastify-type-provider-zod": "^4.0.2"
   }

package/src/adapters/endpoint-adapter.service.mts

@@ -1,15 +1,12 @@
 import type { BaseEndpointConfig } from '@navios/common'
+import type { ClassType } from '@navios/di'
 import type { FastifyReply, FastifyRequest } from 'fastify'
 
+import { inject, Injectable, InjectionToken } from '@navios/di'
+
 import type { HandlerMetadata } from '../metadata/index.mjs'
-import type { ClassType } from '../service-locator/index.mjs'
 import type { ExecutionContext } from '../services/index.mjs'
 
-import {
-  inject,
-  Injectable,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 import { StreamAdapterService } from './stream-adapter.service.mjs'
 
 export const EndpointAdapterToken =

package/src/adapters/handler-adapter.interface.mts

@@ -1,7 +1,7 @@
+import type { ClassType } from '@navios/di'
 import type { FastifyReply, FastifyRequest } from 'fastify'
 
 import type { HandlerMetadata } from '../metadata/index.mjs'
-import type { ClassType } from '../service-locator/index.mjs'
 import type { ExecutionContext } from '../services/index.mjs'
 
 export interface HandlerAdapterInterface {

package/src/adapters/multipart-adapter.service.mts

@@ -3,11 +3,12 @@ import type { BaseEndpointConfig } from '@navios/common'
 import type { FastifyRequest } from 'fastify'
 import type { AnyZodObject, ZodRawShape } from 'zod'
 
+import { Injectable, InjectionToken } from '@navios/di'
+
 import { ZodArray, ZodObject, ZodOptional } from 'zod'
 
 import type { HandlerMetadata } from '../metadata/index.mjs'
 
-import { Injectable, InjectionToken } from '../service-locator/index.mjs'
 import { EndpointAdapterService } from './endpoint-adapter.service.mjs'
 
 export const MultipartAdapterToken =

package/src/adapters/stream-adapter.service.mts

@@ -1,17 +1,13 @@
 import type { BaseStreamConfig } from '@navios/common'
+import type { ClassType } from '@navios/di'
 import type { FastifyReply, FastifyRequest } from 'fastify'
 
+import { inject, Injectable, InjectionToken } from '@navios/di'
+
 import type { HandlerMetadata } from '../metadata/index.mjs'
-import type { ClassType } from '../service-locator/index.mjs'
 import type { ExecutionContext } from '../services/index.mjs'
 import type { HandlerAdapterInterface } from './handler-adapter.interface.mjs'
 
-import {
-  inject,
-  Injectable,
-  InjectionToken,
-} from '../service-locator/index.mjs'
-
 export const StreamAdapterToken = InjectionToken.create<StreamAdapterService>(
   Symbol.for('StreamAdapterService'),
 )

package/src/attribute.factory.mts

@@ -1,3 +1,4 @@
+import type { ClassType } from '@navios/di'
 import type { z, ZodType } from 'zod'
 
 import type {
@@ -5,7 +6,6 @@ import type {
   HandlerMetadata,
   ModuleMetadata,
 } from './metadata/index.mjs'
-import type { ClassType } from './service-locator/index.mjs'
 
 import {
   getControllerMetadata,

package/src/config/config.provider.mts

@@ -1,14 +1,15 @@
-import { z } from 'zod'
-
-import type { ConfigService } from './config-service.interface.mjs'
-
-import { Logger } from '../logger/index.mjs'
 import {
   Injectable,
   InjectableType,
   InjectionToken,
   syncInject,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import { z } from 'zod'
+
+import type { ConfigService } from './config-service.interface.mjs'
+
+import { Logger } from '../logger/index.mjs'
 import { ConfigServiceInstance } from './config.service.mjs'
 
 export const ConfigProviderOptions = z.object({
@@ -52,8 +53,5 @@ export class ConfigProviderFactory {
 export function provideConfig<ConfigMap extends Record<string, unknown>>(
   options: z.input<typeof ConfigProviderOptions>,
 ) {
-  return InjectionToken.bound(ConfigProvider, options) as InjectionToken<
-    ConfigServiceInstance<ConfigMap>,
-    undefined
-  >
+  return InjectionToken.bound(ConfigProvider, options)
 }

package/src/decorators/controller.decorator.mts

@@ -1,11 +1,8 @@
-import type { ClassType } from '../service-locator/index.mjs'
+import type { ClassType } from '@navios/di'
+
+import { Injectable, InjectableScope, InjectionToken } from '@navios/di'
 
 import { getControllerMetadata } from '../metadata/index.mjs'
-import {
-  Injectable,
-  InjectableScope,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 
 export interface ControllerOptions {
   guards?: ClassType[] | Set<ClassType>

package/src/decorators/module.decorator.mts

@@ -1,11 +1,8 @@
-import type { ClassType } from '../service-locator/index.mjs'
+import type { ClassType } from '@navios/di'
+
+import { Injectable, InjectableScope, InjectionToken } from '@navios/di'
 
 import { getModuleMetadata } from '../metadata/index.mjs'
-import {
-  Injectable,
-  InjectableScope,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 
 export interface ModuleOptions {
   controllers?: ClassType[] | Set<ClassType>

package/src/decorators/use-guards.decorator.mts

@@ -1,9 +1,10 @@
-import type { CanActivate } from '../interfaces/index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../interfaces/index.mjs'
 
 import {
   getControllerMetadata,

package/src/index.mts

@@ -1,3 +1,4 @@
+export * from '@navios/di'
 export * from './adapters/index.mjs'
 export * from './config/index.mjs'
 export * from './decorators/index.mjs'
@@ -5,7 +6,6 @@ export * from './exceptions/index.mjs'
 export * from './interfaces/index.mjs'
 export * from './logger/index.mjs'
 export * from './metadata/index.mjs'
-export * from './service-locator/index.mjs'
 export * from './services/index.mjs'
 export * from './tokens/index.mjs'
 export * from './attribute.factory.mjs'

package/src/logger/console-logger.service.mts

@@ -2,10 +2,11 @@ import type { InspectOptions } from 'util'
 
 import { inspect } from 'util'
 
+import { getGlobalServiceLocator, Injectable } from '@navios/di'
+
 import type { LogLevel } from './log-levels.mjs'
 import type { LoggerService } from './logger-service.interface.mjs'
 
-import { getServiceLocator, Injectable } from '../service-locator/index.mjs'
 import { Request } from '../tokens/index.mjs'
 import {
   clc,
@@ -178,7 +179,7 @@ export class ConsoleLogger implements LoggerService {
       this.originalContext = context
     }
     if (opts?.requestId) {
-      const locator = getServiceLocator()
+      const locator = getGlobalServiceLocator()
       locator
         .getEventBus()
         .on(locator.getInstanceIdentifier(Request, undefined), 'create', () => {

package/src/logger/logger.factory.mts

@@ -1,10 +1,9 @@
+import { Injectable, InjectableType, InjectionToken } from '@navios/di'
+
 import { z } from 'zod'
 
-import {
-  Injectable,
-  InjectableType,
-  InjectionToken,
-} from '../service-locator/index.mjs'
+import type { LoggerService } from './logger-service.interface.mjs'
+
 import { LoggerInstance } from './logger.service.mjs'
 
 export const LoggerInjectionToken = 'LoggerInjectionToken'

package/src/logger/logger.service.mts

@@ -1,7 +1,8 @@
+import { Injectable } from '@navios/di'
+
 import type { LogLevel } from './log-levels.mjs'
 import type { LoggerService } from './logger-service.interface.mjs'
 
-import { Injectable } from '../service-locator/index.mjs'
 import { ConsoleLogger } from './console-logger.service.mjs'
 import { isLogLevelEnabled, isObject } from './utils/index.mjs'
 

package/src/metadata/controller.metadata.mts

@@ -1,9 +1,10 @@
-import type { CanActivate } from '../interfaces/index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../interfaces/index.mjs'
 import type { HandlerMetadata } from './handler.metadata.mjs'
 
 import { getAllEndpointMetadata } from './handler.metadata.mjs'

package/src/metadata/handler.metadata.mts

@@ -1,12 +1,9 @@
 import type { HttpMethod } from '@navios/common'
+import type { ClassTypeWithInstance, InjectionToken } from '@navios/di'
 import type { HttpHeader } from 'fastify/types/utils.js'
 
 import type { HandlerAdapterInterface } from '../adapters/index.mjs'
 import type { CanActivate } from '../interfaces/index.mjs'
-import type {
-  ClassTypeWithInstance,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 
 export const EndpointMetadataKey = Symbol('EndpointMetadataKey')
 

package/src/metadata/index.mts

@@ -1,4 +1,3 @@
 export * from './controller.metadata.mjs'
 export * from './handler.metadata.mjs'
-export * from './injectable.metadata.mjs'
 export * from './module.metadata.mjs'

package/src/metadata/module.metadata.mts

@@ -1,9 +1,10 @@
-import type { CanActivate } from '../index.mjs'
 import type {
   ClassType,
   ClassTypeWithInstance,
   InjectionToken,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { CanActivate } from '../index.mjs'
 
 export const ModuleMetadataKey = Symbol('ControllerMetadataKey')
 

package/src/navios.application.mts

@@ -1,11 +1,19 @@
 import type { FastifyCorsOptions } from '@fastify/cors'
 import type { FastifyMultipartOptions } from '@fastify/multipart'
+import type { ClassTypeWithInstance } from '@navios/di'
 import type {
   FastifyInstance,
   FastifyListenOptions,
   FastifyServerOptions,
 } from 'fastify'
 
+import {
+  getGlobalServiceLocator,
+  inject,
+  Injectable,
+  syncInject,
+} from '@navios/di'
+
 import cors from '@fastify/cors'
 import multipart from '@fastify/multipart'
 import { fastify } from 'fastify'
@@ -16,16 +24,9 @@ import {
 
 import type { NaviosModule } from './interfaces/index.mjs'
 import type { LoggerService, LogLevel } from './logger/index.mjs'
-import type { ClassTypeWithInstance } from './service-locator/index.mjs'
 
 import { HttpException } from './exceptions/index.mjs'
 import { Logger, PinoWrapper } from './logger/index.mjs'
-import {
-  getServiceLocator,
-  inject,
-  Injectable,
-  syncInject,
-} from './service-locator/index.mjs'
 import {
   ControllerAdapterService,
   ModuleLoaderService,
@@ -75,7 +76,7 @@ export class NaviosApplication {
     await this.moduleLoader.loadModules(this.appModule)
     this.server = await this.getFastifyInstance(this.options)
     this.configureFastifyInstance(this.server)
-    getServiceLocator().registerInstance(Application, this.server)
+    getGlobalServiceLocator().storeInstance(this.server, Application)
     // Add schema validator and serializer
     this.server.setValidatorCompiler(validatorCompiler)
     this.server.setSerializerCompiler(serializerCompiler)

package/src/navios.factory.mts

@@ -1,13 +1,15 @@
+import type { ClassTypeWithInstance } from '@navios/di'
+
+import { inject } from '@navios/di'
+
 import type { NaviosModule } from './interfaces/index.mjs'
 import type {
   NaviosApplicationContextOptions,
   NaviosApplicationOptions,
 } from './navios.application.mjs'
-import type { ClassTypeWithInstance } from './service-locator/index.mjs'
 
 import { isNil, LoggerInstance } from './logger/index.mjs'
 import { NaviosApplication } from './navios.application.mjs'
-import { inject } from './service-locator/index.mjs'
 
 export class NaviosFactory {
   static async create(

package/src/services/controller-adapter.service.mts

@@ -1,19 +1,20 @@
+import type { ClassType } from '@navios/di'
 import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify'
 import type { ZodTypeProvider } from 'fastify-type-provider-zod'
 
-import type { HandlerAdapterInterface } from '../adapters/index.mjs'
-import type { ModuleMetadata } from '../metadata/index.mjs'
-import type { ClassType } from '../service-locator/index.mjs'
-
-import { Logger } from '../logger/index.mjs'
-import { extractControllerMetadata } from '../metadata/index.mjs'
 import {
-  getServiceLocator,
+  getGlobalServiceLocator,
   inject,
   Injectable,
   InjectionToken,
   syncInject,
-} from '../service-locator/index.mjs'
+} from '@navios/di'
+
+import type { HandlerAdapterInterface } from '../adapters/index.mjs'
+import type { ModuleMetadata } from '../metadata/index.mjs'
+
+import { Logger } from '../logger/index.mjs'
+import { extractControllerMetadata } from '../metadata/index.mjs'
 import { ExecutionContextToken, Reply, Request } from '../tokens/index.mjs'
 import { ExecutionContext } from './execution-context.mjs'
 import { GuardRunnerService } from './guard-runner.service.mjs'
@@ -100,11 +101,11 @@ export class ControllerAdapterService {
     executionContext: ExecutionContext,
     handler: (request: FastifyRequest, reply: FastifyReply) => Promise<void>,
   ) {
-    const locator = getServiceLocator()
+    const locator = getGlobalServiceLocator()
     return async (request: FastifyRequest, reply: FastifyReply) => {
-      locator.registerInstance(Request, request)
-      locator.registerInstance(Reply, reply)
-      locator.registerInstance(ExecutionContextToken, executionContext)
+      locator.storeInstance(request, Request)
+      locator.storeInstance(reply, Reply)
+      locator.storeInstance(executionContext, ExecutionContextToken)
       executionContext.provideRequest(request)
       executionContext.provideReply(reply)
       try {

package/src/services/guard-runner.service.mts

@@ -1,13 +1,11 @@
+import type { ClassTypeWithInstance } from '@navios/di'
+
+import { inject, Injectable, InjectionToken } from '@navios/di'
+
 import type { CanActivate } from '../interfaces/index.mjs'
-import type { ClassTypeWithInstance } from '../service-locator/index.mjs'
 import type { ExecutionContext } from './execution-context.mjs'
 
 import { HttpException } from '../exceptions/index.mjs'
-import {
-  inject,
-  Injectable,
-  InjectionToken,
-} from '../service-locator/index.mjs'
 
 @Injectable()
 export class GuardRunnerService {

package/src/services/module-loader.service.mts

@@ -1,10 +1,12 @@
+import type { ClassTypeWithInstance } from '@navios/di'
+
+import { inject, Injectable, syncInject } from '@navios/di'
+
 import type { NaviosModule } from '../interfaces/index.mjs'
 import type { ModuleMetadata } from '../metadata/index.mjs'
-import type { ClassTypeWithInstance } from '../service-locator/index.mjs'
 
 import { Logger } from '../logger/index.mjs'
 import { extractModuleMetadata } from '../metadata/index.mjs'
-import { inject, Injectable, syncInject } from '../service-locator/index.mjs'
 
 @Injectable()
 export class ModuleLoaderService {

package/src/tokens/application.token.mts

@@ -1,6 +1,6 @@
 import type { FastifyInstance } from 'fastify'
 
-import { InjectionToken } from '../service-locator/index.mjs'
+import { InjectionToken } from '@navios/di'
 
 const ApplicationInjectionToken = 'ApplicationInjectionToken'
 

package/src/tokens/execution-context.token.mts

@@ -1,4 +1,5 @@
-import { InjectionToken } from '../service-locator/index.mjs'
+import { InjectionToken } from '@navios/di'
+
 import { ExecutionContext } from '../services/index.mjs'
 
 export const ExecutionContextInjectionToken = 'ExecutionContextInjectionToken'

package/src/tokens/reply.token.mts

@@ -1,6 +1,6 @@
 import type { FastifyReply } from 'fastify'
 
-import { InjectionToken } from '../service-locator/index.mjs'
+import { InjectionToken } from '@navios/di'
 
 const ReplyInjectionToken = 'ReplyInjectionToken'
 

package/src/tokens/request.token.mts

@@ -1,6 +1,6 @@
 import type { FastifyRequest } from 'fastify'
 
-import { InjectionToken } from '../service-locator/index.mjs'
+import { InjectionToken } from '@navios/di'
 
 const RequestInjectionToken = 'RequestInjectionToken'
 

package/src/metadata/injectable.metadata.mts

@@ -1,11 +0,0 @@
-import type {
-  InjectableScope,
-  InjectableType,
-  InjectionToken,
-} from '../index.mjs'
-
-export interface InjectableMetadata<Instance = any, Schema = any> {
-  type: InjectableType
-  scope: InjectableScope
-  token: InjectionToken<Instance, Schema>
-}

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

@@ -1,171 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { z } from 'zod'
-
-import {
-  getInjectableToken,
-  Injectable,
-  InjectableType,
-} from '../decorators/index.mjs'
-import { InjectableScope } from '../enums/index.mjs'
-import { syncInject } from '../index.mjs'
-import { inject } from '../inject.mjs'
-import { InjectionToken } from '../injection-token.mjs'
-import { getServiceLocator } from '../injector.mjs'
-
-describe('Injectable decorator', () => {
-  it('should work with class', async () => {
-    @Injectable()
-    class Test {}
-
-    const value = await inject(Test)
-    expect(value).toBeInstanceOf(Test)
-  })
-
-  it('should work with inner inject', async () => {
-    @Injectable()
-    class Test {
-      makeFoo() {
-        return 'foo'
-      }
-    }
-
-    @Injectable()
-    class Test2 {
-      fooMaker = inject(Test)
-
-      async makeFoo() {
-        const fooMaker = await this.fooMaker
-        return fooMaker.makeFoo()
-      }
-    }
-
-    const value = await inject(Test2)
-    expect(value).toBeInstanceOf(Test2)
-    const result = await value.makeFoo()
-    expect(result).toBe('foo')
-  })
-
-  it('should work with factory', async () => {
-    @Injectable({ type: InjectableType.Factory })
-    class Test {
-      create() {
-        return 'foo'
-      }
-    }
-
-    const value = await inject(Test)
-    expect(value).toBe('foo')
-  })
-  it('should work with request scope', async () => {
-    @Injectable({
-      scope: InjectableScope.Instance,
-      type: InjectableType.Factory,
-    })
-    class Test {
-      create() {
-        return Date.now()
-      }
-    }
-
-    const value = await inject(Test)
-    await new Promise((resolve) => setTimeout(resolve, 10))
-    const value2 = await inject(Test)
-    expect(value).not.toBe(value2)
-  })
-
-  it('should work with injection token', async () => {
-    const token = InjectionToken.create('Test')
-
-    @Injectable({ token })
-    class Test {}
-
-    const value = await inject(token)
-    expect(value).toBeInstanceOf(Test)
-  })
-
-  it('should work with injection token and schema', async () => {
-    class TestFoo {
-      constructor(public readonly foo: string) {}
-    }
-    const token = InjectionToken.create(
-      TestFoo,
-      z.object({
-        foo: z.string(),
-      }),
-    )
-
-    @Injectable({ token, type: InjectableType.Factory })
-    class Test {
-      create(ctx: any, args: { foo: string }) {
-        return new TestFoo(args.foo)
-      }
-    }
-
-    const value = await inject(token, { foo: 'bar' })
-    const differentValue = await inject(token, { foo: 'baz' })
-    const sameValue = await inject(token, { foo: 'bar' })
-    expect(value).toBeInstanceOf(TestFoo)
-    expect(value.foo).toBe('bar')
-    expect(differentValue).toBeInstanceOf(TestFoo)
-    expect(differentValue.foo).toBe('baz')
-    expect(value).not.toBe(differentValue)
-    expect(value).toBe(sameValue)
-  })
-  it('should work with invalidation', async () => {
-    @Injectable()
-    class Test {
-      value = Date.now()
-    }
-
-    @Injectable()
-    class Test2 {
-      test = inject(Test)
-
-      async makeFoo() {
-        const test = await this.test
-        return test.value
-      }
-    }
-    const identifier = getServiceLocator().getInstanceIdentifier(
-      getInjectableToken(Test),
-      undefined,
-    )
-    const inst1 = await inject(Test2)
-    expect(inst1).toBeInstanceOf(Test2)
-    const result1 = await inst1.makeFoo()
-    const inst2 = await inject(Test2)
-    expect(inst1).toBe(inst2)
-    const result2 = await inst2.makeFoo()
-    await getServiceLocator().invalidate(identifier)
-    await new Promise((resolve) => setTimeout(resolve, 10))
-    const inst3 = await inject(Test2)
-    expect(inst1).not.toBe(inst3)
-    const result3 = await inst3.makeFoo()
-    expect(result1).not.toBe(result3)
-    expect(result2).not.toBe(result3)
-    expect(result1).toBe(result2)
-  })
-
-  it('should work with syncInject', async () => {
-    @Injectable()
-    class Test {
-      value = Date.now()
-    }
-
-    @Injectable()
-    class Test2 {
-      test = syncInject(Test)
-
-      makeFoo() {
-        return this.test.value
-      }
-    }
-    const inst1 = await inject(Test2)
-    expect(inst1).toBeInstanceOf(Test2)
-    const result1 = inst1.makeFoo()
-    const inst2 = await inject(Test2)
-    expect(inst1).toBe(inst2)
-    const result2 = await inst2.makeFoo()
-    expect(result1).toBe(result2)
-  })
-})