@navios/core 0.1.15 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/core",
-  "version": "0.1.15",
+  "version": "0.2.1",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -11,11 +11,11 @@
     "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": {
-    "@navios/common": "^0.1.5",
+    "@navios/common": "^0.1.6",
     "zod": "^3.23.8"
   },
   "exports": {
@@ -32,7 +32,7 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@navios/common": "^0.1.5",
+    "@navios/common": "^0.1.6",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
     "zod": "^3.24.4"
@@ -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,16 @@
-import { z } from 'zod'
-
-import type { ConfigService } from './config-service.interface.mjs'
-
-import { Logger } from '../logger/index.mjs'
 import {
+  BoundInjectionToken,
   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({
@@ -51,9 +53,9 @@ 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
-  >
+): BoundInjectionToken<
+  ConfigServiceInstance<ConfigMap>,
+  typeof ConfigProviderOptions
+> {
+  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/endpoint.decorator.mts

@@ -2,6 +2,7 @@ import type {
   BaseEndpointConfig,
   EndpointFunctionArgs,
   HttpMethod,
+  Util_FlatObject,
 } from '@navios/common'
 import type { AnyZodObject, z, ZodType } from 'zod'
 
@@ -18,19 +19,25 @@ export type EndpointParams<
   QuerySchema = EndpointDeclaration['config']['querySchema'],
 > = QuerySchema extends AnyZodObject
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        QuerySchema,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          QuerySchema,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, QuerySchema, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, QuerySchema, undefined, true>>
   : EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        undefined,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          undefined,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, undefined, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, undefined, undefined, true>>
 
 export type EndpointResult<
   EndpointDeclaration extends {

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/multipart.decorator.mts

@@ -2,6 +2,7 @@ import type {
   BaseEndpointConfig,
   EndpointFunctionArgs,
   HttpMethod,
+  Util_FlatObject,
 } from '@navios/common'
 import type { AnyZodObject, z, ZodType } from 'zod'
 
@@ -18,19 +19,25 @@ export type MultipartParams<
   QuerySchema = EndpointDeclaration['config']['querySchema'],
 > = QuerySchema extends AnyZodObject
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        QuerySchema,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          QuerySchema,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, QuerySchema, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, QuerySchema, undefined, true>>
   : EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        undefined,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          undefined,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, undefined, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, undefined, undefined, true>>
 
 export type MultipartResult<
   EndpointDeclaration extends {

package/src/decorators/stream.decorator.mts

@@ -2,6 +2,7 @@ import type {
   BaseStreamConfig,
   EndpointFunctionArgs,
   HttpMethod,
+  Util_FlatObject,
 } from '@navios/common'
 import type { FastifyReply } from 'fastify'
 import type { AnyZodObject, ZodType } from 'zod'
@@ -17,19 +18,25 @@ export type StreamParams<
   QuerySchema = EndpointDeclaration['config']['querySchema'],
 > = QuerySchema extends AnyZodObject
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        QuerySchema,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          QuerySchema,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, QuerySchema, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, QuerySchema, undefined, true>>
   : EndpointDeclaration['config']['requestSchema'] extends ZodType
-    ? EndpointFunctionArgs<
-        Url,
-        undefined,
-        EndpointDeclaration['config']['requestSchema']
+    ? Util_FlatObject<
+        EndpointFunctionArgs<
+          Url,
+          undefined,
+          EndpointDeclaration['config']['requestSchema'],
+          true
+        >
       >
-    : EndpointFunctionArgs<Url, undefined, undefined>
+    : Util_FlatObject<EndpointFunctionArgs<Url, undefined, undefined, true>>
 
 export function Stream<
   Method extends HttpMethod = HttpMethod,

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>
-}