@navios/core 0.3.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/core",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -12,8 +12,8 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@navios/builder": "^0.2.0",
-    "zod": "^3.23.8"
+    "@navios/builder": "^0.3.0",
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "typings": "./lib/index.d.mts",
   "main": "./lib/index.js",
@@ -31,16 +31,15 @@
     }
   },
   "devDependencies": {
-    "@navios/builder": "^0.2.0",
-    "tsx": "^4.19.4",
-    "typescript": "^5.8.3",
-    "zod": "^3.24.4"
+    "@navios/builder": "^0.3.0",
+    "@types/bun": "^1.2.22",
+    "@types/supertest": "^6.0.3",
+    "supertest": "^7.1.4",
+    "tsx": "^4.20.5",
+    "typescript": "^5.9.2",
+    "zod": "^4.1.8"
   },
   "dependencies": {
-    "@fastify/cors": "^11.0.1",
-    "@fastify/multipart": "^9.0.3",
-    "@navios/di": "^0.1.12",
-    "fastify": "^5.3.2",
-    "fastify-type-provider-zod": "^4.0.2"
+    "@navios/di": "^0.4.0"
   }
 }

package/project.json

@@ -9,15 +9,28 @@
     "check": {
       "executor": "nx:run-commands",
       "outputs": ["{projectRoot}/dist"],
-      "inputs": ["^projectSources", "projectSources"],
+      "inputs": [
+        "^projectSources",
+        "projectSources",
+        "{projectRoot}/tsconfig.json",
+        "{projectRoot}/tsconfig.lib.json"
+      ],
       "options": {
         "command": ["tsc -b"],
         "cwd": "packages/core"
       }
     },
+    "lint": {
+      "executor": "nx:run-commands",
+      "inputs": ["^projectSources", "project"],
+      "options": {
+        "command": "oxlint --fix",
+        "cwd": "packages/core"
+      }
+    },
     "test:ci": {
       "executor": "nx:run-commands",
-      "inputs": ["^projectSources","project"],
+      "inputs": ["^projectSources", "project"],
       "options": {
         "command": "vitest run",
         "cwd": "packages/core"
@@ -25,9 +38,9 @@
     },
     "build": {
       "executor": "nx:run-commands",
-      "inputs": ["projectSources"],
+      "inputs": ["projectSources", "{projectRoot}/tsup.config.mts"],
       "outputs": ["{projectRoot}/lib"],
-      "dependsOn": ["check", "test:ci"],
+      "dependsOn": ["check", "test:ci", "lint"],
       "options": {
         "command": "tsup",
         "cwd": "packages/core"

package/src/__tests__/config.service.spec.mts

@@ -1,27 +1,29 @@
 import { env } from 'node:process'
 
-import { describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it } from 'vitest'
 
 import {
-  ConfigService,
   ConfigServiceToken,
+  Container,
   EnvConfigProvider,
-  getGlobalServiceLocator,
   inject,
   Injectable,
   Logger,
-  syncInject,
 } from '../index.mjs'
 
 describe('ConfigService', () => {
+  let container: Container
+  beforeEach(() => {
+    container = new Container()
+  })
   it('should be able to get a config value', async () => {
-    const service = await inject(ConfigServiceToken, env)
+    const service = await container.get(ConfigServiceToken, { ...env })
     expect(service).toBeDefined()
     expect(service.get('NODE_ENV')).toBe(env.NODE_ENV)
   })
 
   it('should be possible to use bound config service', async () => {
-    const service = await inject(EnvConfigProvider)
+    const service = await container.get(EnvConfigProvider)
     expect(service).toBeDefined()
     expect(service.get('NODE_ENV')).toBe(env.NODE_ENV)
   })
@@ -29,11 +31,11 @@ describe('ConfigService', () => {
   it('should be possible to use inside service as a syncInject', async () => {
     @Injectable()
     class TestService {
-      public readonly configService = syncInject(EnvConfigProvider)
-      public readonly logger = syncInject(Logger)
+      public readonly configService = inject(EnvConfigProvider)
+      public readonly logger = inject(Logger)
     }
 
-    const service = await inject(TestService)
+    const service = await container.get(TestService)
 
     expect(service.configService).toBeDefined()
     expect(service.configService.get('NODE_ENV')).toBe(env.NODE_ENV)

package/src/__tests__/controller.spec.mts

@@ -1,7 +1,7 @@
 import { builder } from '@navios/builder'
 
 import { describe, expect, it } from 'vitest'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import type { EndpointParams } from '../decorators/index.mjs'
 
@@ -51,7 +51,6 @@ describe('Controller decorator', () => {
     }
 
     const metadata = extractControllerMetadata(Test)
-    console.log(metadata)
     expect(metadata).toBeDefined()
     expect(metadata.endpoints).toBeInstanceOf(Set)
     expect(metadata.endpoints.size).toBe(2)

package/src/attribute.factory.mts

@@ -1,5 +1,5 @@
 import type { ClassType } from '@navios/di'
-import type { z, ZodType } from 'zod'
+import type { z, ZodType } from 'zod/v4'
 
 import type {
   ControllerMetadata,

package/src/config/config.provider.mts

@@ -2,7 +2,7 @@ import { env } from 'node:process'
 
 import { FactoryInjectionToken, InjectionToken } from '@navios/di'
 
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import type { ConfigServiceOptions } from './config.service.mjs'
 
@@ -13,7 +13,7 @@ import {
 } from './config.service.mjs'
 
 export const ConfigProviderOptions = z.object({
-  load: z.function().returns(ConfigServiceOptionsSchema),
+  load: z.function({ output: ConfigServiceOptionsSchema }),
 })
 
 export function provideConfig<ConfigMap extends ConfigServiceOptions>(

package/src/config/config.service.mts

@@ -1,14 +1,14 @@
 import { NaviosException } from '@navios/builder'
-import { Injectable, InjectionToken, syncInject } from '@navios/di'
+import { inject, Injectable, InjectionToken } from '@navios/di'
 
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import type { ConfigServiceInterface as IConfigService } from './config-service.interface.mjs'
 import type { Path, PathValue } from './types.mjs'
 
 import { Logger } from '../logger/index.mjs'
 
-export const ConfigServiceOptionsSchema = z.record(z.unknown())
+export const ConfigServiceOptionsSchema = z.record(z.string(), z.unknown())
 export type ConfigServiceOptions = z.infer<typeof ConfigServiceOptionsSchema>
 
 export const ConfigServiceToken = InjectionToken.create<
@@ -23,7 +23,7 @@ export class ConfigService<
   Config extends ConfigServiceOptions = Record<string, unknown>,
 > implements IConfigService<Config>
 {
-  private readonly logger = syncInject(Logger, {
+  private readonly logger = inject(Logger, {
     context: ConfigService.name,
   })
 

package/src/decorators/controller.decorator.mts

@@ -25,7 +25,7 @@ export function Controller({ guards }: ControllerOptions = {}) {
     }
     return Injectable({
       token,
-      scope: InjectableScope.Instance,
+      scope: InjectableScope.Request,
     })(target, context)
   }
 }

package/src/decorators/endpoint.decorator.mts

@@ -4,12 +4,12 @@ import type {
   HttpMethod,
   Util_FlatObject,
 } from '@navios/builder'
-import type { AnyZodObject, z, ZodType } from 'zod'
+import type { z, ZodType } from 'zod/v4'
 
-import { ZodDiscriminatedUnion } from 'zod'
+import { ZodDiscriminatedUnion } from 'zod/v4'
 
-import { EndpointAdapterToken } from '../adapters/index.mjs'
 import { getEndpointMetadata } from '../metadata/index.mjs'
+import { EndpointAdapterToken } from '../tokens/index.mjs'
 
 export type EndpointParams<
   EndpointDeclaration extends {
@@ -17,7 +17,7 @@ export type EndpointParams<
   },
   Url extends string = EndpointDeclaration['config']['url'],
   QuerySchema = EndpointDeclaration['config']['querySchema'],
-> = QuerySchema extends AnyZodObject
+> = QuerySchema extends ZodType
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
     ? Util_FlatObject<
         EndpointFunctionArgs<
@@ -45,7 +45,6 @@ export type EndpointResult<
   },
 > =
   EndpointDeclaration['config']['responseSchema'] extends ZodDiscriminatedUnion<
-    any,
     infer Options
   >
     ? Promise<z.input<Options[number]>>
@@ -68,13 +67,13 @@ export function Endpoint<
 }) {
   return (
     target: (
-      params: QuerySchema extends AnyZodObject
+      params: QuerySchema extends ZodType
         ? RequestSchema extends ZodType
-          ? EndpointFunctionArgs<Url, QuerySchema, RequestSchema>
-          : EndpointFunctionArgs<Url, QuerySchema, undefined>
+          ? EndpointFunctionArgs<Url, QuerySchema, RequestSchema, true>
+          : EndpointFunctionArgs<Url, QuerySchema, undefined, true>
         : RequestSchema extends ZodType
-          ? EndpointFunctionArgs<Url, undefined, RequestSchema>
-          : EndpointFunctionArgs<Url, undefined, undefined>,
+          ? EndpointFunctionArgs<Url, undefined, RequestSchema, true>
+          : EndpointFunctionArgs<Url, undefined, undefined, true>,
     ) => Promise<z.input<ResponseSchema>>,
     context: ClassMethodDecoratorContext,
   ) => {

package/src/decorators/header.decorator.mts

@@ -1,4 +1,4 @@
-import type { HttpHeader } from 'fastify/types/utils.js'
+import type { HttpHeader } from '../interfaces/index.mjs'
 
 import { getEndpointMetadata } from '../metadata/index.mjs'
 

package/src/decorators/multipart.decorator.mts

@@ -4,12 +4,12 @@ import type {
   HttpMethod,
   Util_FlatObject,
 } from '@navios/builder'
-import type { AnyZodObject, z, ZodType } from 'zod'
+import type { z, ZodObject, ZodType } from 'zod/v4'
 
-import { ZodDiscriminatedUnion } from 'zod'
+import { ZodDiscriminatedUnion } from 'zod/v4'
 
-import { MultipartAdapterToken } from '../adapters/index.mjs'
 import { getEndpointMetadata } from '../metadata/index.mjs'
+import { MultipartAdapterToken } from '../tokens/index.mjs'
 
 export type MultipartParams<
   EndpointDeclaration extends {
@@ -17,7 +17,7 @@ export type MultipartParams<
   },
   Url extends string = EndpointDeclaration['config']['url'],
   QuerySchema = EndpointDeclaration['config']['querySchema'],
-> = QuerySchema extends AnyZodObject
+> = QuerySchema extends ZodObject
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
     ? Util_FlatObject<
         EndpointFunctionArgs<
@@ -68,7 +68,7 @@ export function Multipart<
 }) {
   return (
     target: (
-      params: QuerySchema extends AnyZodObject
+      params: QuerySchema extends ZodObject
         ? RequestSchema extends ZodType
           ? EndpointFunctionArgs<Url, QuerySchema, RequestSchema>
           : EndpointFunctionArgs<Url, QuerySchema, undefined>

package/src/decorators/stream.decorator.mts

@@ -4,11 +4,10 @@ import type {
   HttpMethod,
   Util_FlatObject,
 } from '@navios/builder'
-import type { FastifyReply } from 'fastify'
-import type { AnyZodObject, ZodType } from 'zod'
+import type { ZodObject, ZodType } from 'zod/v4'
 
-import { StreamAdapterToken } from '../adapters/index.mjs'
 import { getEndpointMetadata } from '../metadata/index.mjs'
+import { StreamAdapterToken } from '../tokens/index.mjs'
 
 export type StreamParams<
   EndpointDeclaration extends {
@@ -16,7 +15,7 @@ export type StreamParams<
   },
   Url extends string = EndpointDeclaration['config']['url'],
   QuerySchema = EndpointDeclaration['config']['querySchema'],
-> = QuerySchema extends AnyZodObject
+> = QuerySchema extends ZodObject
   ? EndpointDeclaration['config']['requestSchema'] extends ZodType
     ? Util_FlatObject<
         EndpointFunctionArgs<
@@ -48,14 +47,14 @@ export function Stream<
 }) {
   return (
     target: (
-      params: QuerySchema extends AnyZodObject
+      params: QuerySchema extends ZodObject
         ? RequestSchema extends ZodType
           ? EndpointFunctionArgs<Url, QuerySchema, RequestSchema>
           : EndpointFunctionArgs<Url, QuerySchema, undefined>
         : RequestSchema extends ZodType
           ? EndpointFunctionArgs<Url, undefined, RequestSchema>
           : EndpointFunctionArgs<Url, undefined, undefined>,
-      reply: FastifyReply,
+      reply: any,
     ) => Promise<void>,
     context: ClassMethodDecoratorContext,
   ) => {

package/src/factories/endpoint-adapter.factory.mts

@@ -0,0 +1,21 @@
+import type { FactoryContext, InjectionToken } from '@navios/di'
+
+import { Factory, inject } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { EndpointAdapterToken } from '../tokens/index.mjs'
+
+@Factory({
+  token: EndpointAdapterToken,
+})
+export class EndpointAdapterFactory {
+  private readonly environment = inject(NaviosEnvironment)
+
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(EndpointAdapterToken)
+    if (!service) {
+      throw new Error('EndpointAdapterToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/factories/http-adapter.factory.mts

@@ -0,0 +1,20 @@
+import type { FactoryContext } from '@navios/di'
+
+import { Factory, inject, InjectionToken } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { HttpAdapterToken } from '../tokens/index.mjs'
+
+@Factory({
+  token: HttpAdapterToken,
+})
+export class HttpAdapterFactory {
+  private readonly environment = inject(NaviosEnvironment)
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(HttpAdapterToken)
+    if (!service) {
+      throw new Error('HttpAdapterToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/factories/index.mts

@@ -0,0 +1,6 @@
+export * from './endpoint-adapter.factory.mjs'
+export * from './http-adapter.factory.mjs'
+export * from './multipart-adapter.factory.mjs'
+export * from './request.factory.mjs'
+export * from './reply.factory.mjs'
+export * from './stream-adapter.factory.mjs'

package/src/factories/multipart-adapter.factory.mts

@@ -0,0 +1,21 @@
+import type { FactoryContext, InjectionToken } from '@navios/di'
+
+import { Factory, inject } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { MultipartAdapterToken } from '../tokens/index.mjs'
+
+@Factory({
+  token: MultipartAdapterToken,
+})
+export class MultipartAdapterFactory {
+  private readonly environment = inject(NaviosEnvironment)
+
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(MultipartAdapterToken)
+    if (!service) {
+      throw new Error('MultipartAdapterToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/factories/reply.factory.mts

@@ -0,0 +1,21 @@
+import type { FactoryContext, InjectionToken } from '@navios/di'
+
+import { Factory, inject, InjectableScope } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { Reply } from '../tokens/index.mjs'
+
+@Factory({
+  token: Reply,
+  scope: InjectableScope.Request,
+})
+export class ReplyFactory {
+  private readonly environment = inject(NaviosEnvironment)
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(Reply)
+    if (!service) {
+      throw new Error('ReplyToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/factories/request.factory.mts

@@ -0,0 +1,21 @@
+import type { FactoryContext, InjectionToken } from '@navios/di'
+
+import { Factory, inject, InjectableScope } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { Request } from '../tokens/index.mjs'
+
+@Factory({
+  token: Request,
+  scope: InjectableScope.Request,
+})
+export class RequestFactory {
+  private readonly environment = inject(NaviosEnvironment)
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(Request)
+    if (!service) {
+      throw new Error('RequestToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/factories/stream-adapter.factory.mts

@@ -0,0 +1,20 @@
+import type { FactoryContext, InjectionToken } from '@navios/di'
+
+import { Factory, inject } from '@navios/di'
+
+import { NaviosEnvironment } from '../navios.environment.mjs'
+import { StreamAdapterToken } from '../tokens/index.mjs'
+
+@Factory({
+  token: StreamAdapterToken,
+})
+export class StreamAdapterFactory {
+  private readonly environment = inject(NaviosEnvironment)
+  create(ctx: FactoryContext) {
+    const service = this.environment.getHttpToken(StreamAdapterToken)
+    if (!service) {
+      throw new Error('StreamAdapterToken service not found in environment')
+    }
+    return ctx.inject(service as InjectionToken<any, undefined>)
+  }
+}

package/src/index.mts

@@ -1,5 +1,4 @@
 export * from '@navios/di'
-export * from './adapters/index.mjs'
 export * from './config/index.mjs'
 export * from './decorators/index.mjs'
 export * from './exceptions/index.mjs'
@@ -9,5 +8,6 @@ export * from './metadata/index.mjs'
 export * from './services/index.mjs'
 export * from './tokens/index.mjs'
 export * from './attribute.factory.mjs'
+export * from './factories/index.mjs'
 export * from './navios.application.mjs'
 export * from './navios.factory.mjs'

package/src/interfaces/abstract-execution-context.inteface.mts

@@ -0,0 +1,13 @@
+import type {
+  ControllerMetadata,
+  HandlerMetadata,
+  ModuleMetadata,
+} from '../metadata/index.mjs'
+
+export interface AbstractExecutionContext {
+  getModule(): ModuleMetadata
+  getController(): ControllerMetadata
+  getHandler(): HandlerMetadata
+  getRequest(): any
+  getReply(): any
+}

package/src/interfaces/abstract-http-adapter.interface.mts

@@ -0,0 +1,20 @@
+import type { ModuleMetadata } from '../metadata/index.mjs'
+import type { AbstractHttpCorsOptions } from './abstract-http-cors-options.interface.mjs'
+import type { AbstractHttpListenOptions } from './abstract-http-listen-options.interface.mjs'
+
+export interface AbstractHttpAdapterInterface<
+  ServerInstance,
+  CorsOptions = AbstractHttpCorsOptions,
+  Options = {},
+  MultipartOptions = {},
+> {
+  setupHttpServer(options: Options): Promise<void>
+  onModulesInit(modules: Map<string, ModuleMetadata>): Promise<void>
+  ready(): Promise<void>
+  getServer(): ServerInstance
+  setGlobalPrefix(prefix: string): void
+  enableCors(options: CorsOptions): void
+  enableMultipart(options: MultipartOptions): void
+  listen(options: AbstractHttpListenOptions): Promise<string>
+  dispose(): Promise<void>
+}

package/src/interfaces/abstract-http-cors-options.interface.mts

@@ -0,0 +1,59 @@
+import type { LogLevel } from '../logger/index.mjs'
+
+interface ArrayOfValueOrArray<T> extends Array<ValueOrArray<T>> {}
+
+type OriginType = string | boolean | RegExp
+type ValueOrArray<T> = T | ArrayOfValueOrArray<T>
+
+export interface AbstractHttpCorsOptions {
+  /**
+   * Configures the Access-Control-Allow-Origin CORS header.
+   */
+  origin?: ValueOrArray<OriginType>
+  /**
+   * Configures the Access-Control-Allow-Credentials CORS header.
+   * Set to true to pass the header, otherwise it is omitted.
+   */
+  credentials?: boolean
+  /**
+   * Configures the Access-Control-Expose-Headers CORS header.
+   * Expects a comma-delimited string (ex: 'Content-Range,X-Content-Range')
+   * or an array (ex: ['Content-Range', 'X-Content-Range']).
+   * If not specified, no custom headers are exposed.
+   */
+  exposedHeaders?: string | string[]
+  /**
+   * Configures the Access-Control-Allow-Headers CORS header.
+   * Expects a comma-delimited string (ex: 'Content-Type,Authorization')
+   * or an array (ex: ['Content-Type', 'Authorization']). If not
+   * specified, defaults to reflecting the headers specified in the
+   * request's Access-Control-Request-Headers header.
+   */
+  allowedHeaders?: string | string[]
+  /**
+   * Configures the Access-Control-Allow-Methods CORS header.
+   * Expects a comma-delimited string (ex: 'GET,PUT,POST') or an array (ex: ['GET', 'PUT', 'POST']).
+   */
+  methods?: string | string[]
+  /**
+   * Configures the Access-Control-Max-Age CORS header.
+   * Set to an integer to pass the header, otherwise it is omitted.
+   */
+  maxAge?: number
+  /**
+   * Configures the Cache-Control header for CORS preflight responses.
+   * Set to an integer to pass the header as `Cache-Control: max-age=${cacheControl}`,
+   * or set to a string to pass the header as `Cache-Control: ${cacheControl}` (fully define
+   * the header value), otherwise the header is omitted.
+   */
+  cacheControl?: number | string
+
+  /**
+   * Sets the Fastify log level specifically for the internal OPTIONS route
+   * used to handle CORS preflight requests. For example, setting this to `'silent'`
+   * will prevent these requests from being logged.
+   * Useful for reducing noise in application logs.
+   * Default: inherits Fastify's global log level.
+   */
+  logLevel?: LogLevel
+}

package/src/interfaces/abstract-http-handler-adapter.interface.mts

@@ -0,0 +1,13 @@
+import type { ClassType, RequestContextHolder } from '@navios/di'
+
+import type { HandlerMetadata } from '../metadata/index.mjs'
+
+export interface AbstractHttpHandlerAdapterInterface {
+  prepareArguments?: (
+    handlerMetadata: HandlerMetadata<any>,
+  ) => ((target: Record<string, any>, request: any) => Promise<void> | void)[]
+  provideHandler: (
+    controller: ClassType,
+    handlerMetadata: HandlerMetadata<any>,
+  ) => (context: RequestContextHolder, request: any, reply: any) => Promise<any>
+}

package/src/interfaces/abstract-http-listen-options.interface.mts

@@ -0,0 +1,4 @@
+export interface AbstractHttpListenOptions {
+  port: number
+  host?: string
+}

package/src/interfaces/can-activate.mts

@@ -1,5 +1,7 @@
-import type { ExecutionContext } from '../services/index.mjs'
+import type { AbstractExecutionContext } from '../interfaces/index.mjs'
 
 export interface CanActivate {
-  canActivate(executionContext: ExecutionContext): Promise<boolean> | boolean
+  canActivate(
+    executionContext: AbstractExecutionContext,
+  ): Promise<boolean> | boolean
 }

package/src/interfaces/http-header.mts

@@ -0,0 +1,18 @@
+import type { OutgoingHttpHeaders } from 'http'
+
+export type OmitIndexSignature<T> = {
+  [K in keyof T as string extends K
+    ? never
+    : number extends K
+      ? never
+      : K]: T[K]
+}
+
+/**
+ * HTTP header strings
+ * Use this type only for input values, not for output values.
+ */
+
+export type HttpHeader =
+  | keyof OmitIndexSignature<OutgoingHttpHeaders>
+  | (string & Record<never, never>)