@navios/core 0.2.2 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/core",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -12,8 +12,8 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@navios/common": "^0.1.6",
-    "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,18 @@
     }
   },
   "devDependencies": {
-    "@navios/common": "^0.1.6",
-    "tsx": "^4.19.4",
-    "typescript": "^5.8.3",
-    "zod": "^3.24.4"
+    "@navios/builder": "^0.3.0",
+    "@types/supertest": "^6.0.3",
+    "supertest": "^7.1.4",
+    "tsx": "^4.20.5",
+    "typescript": "^5.9.2",
+    "zod": "^4.1.4"
   },
   "dependencies": {
-    "@fastify/cors": "^11.0.1",
+    "@fastify/cors": "^11.1.0",
     "@fastify/multipart": "^9.0.3",
-    "@navios/di": "^0.1.11",
-    "fastify": "^5.3.2",
-    "fastify-type-provider-zod": "^4.0.2"
+    "@navios/di": "^0.2.1",
+    "fastify": "^5.5.0",
+    "fastify-type-provider-zod": "^5.0.3"
   }
 }

package/project.json

@@ -9,7 +9,12 @@
     "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"
@@ -17,7 +22,7 @@
     },
     "test:ci": {
       "executor": "nx:run-commands",
-      "inputs": ["^projectSources","project"],
+      "inputs": ["^projectSources", "project"],
       "options": {
         "command": "vitest run",
         "cwd": "packages/core"
@@ -25,7 +30,7 @@
     },
     "build": {
       "executor": "nx:run-commands",
-      "inputs": ["projectSources"],
+      "inputs": ["projectSources", "{projectRoot}/tsup.config.mts"],
       "outputs": ["{projectRoot}/lib"],
       "dependsOn": ["check", "test:ci"],
       "options": {

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

@@ -15,7 +15,7 @@ import {
 
 describe('ConfigService', () => {
   it('should be able to get a config value', async () => {
-    const service = await inject(ConfigServiceToken, env)
+    const service = await inject(ConfigServiceToken, { ...env })
     expect(service).toBeDefined()
     expect(service.get('NODE_ENV')).toBe(env.NODE_ENV)
   })

package/src/__tests__/controller.spec.mts

@@ -1,7 +1,7 @@
-import { builder } from '@navios/common'
+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'
 

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

@@ -1,4 +1,4 @@
-import type { BaseEndpointConfig } from '@navios/common'
+import type { BaseEndpointConfig } from '@navios/builder'
 import type { ClassType } from '@navios/di'
 import type { FastifyReply, FastifyRequest } from 'fastify'
 

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

@@ -1,11 +1,11 @@
 import type { MultipartFile, MultipartValue } from '@fastify/multipart'
-import type { BaseEndpointConfig } from '@navios/common'
+import type { BaseEndpointConfig } from '@navios/builder'
 import type { FastifyRequest } from 'fastify'
-import type { AnyZodObject, ZodRawShape } from 'zod'
+import type { ZodRawShape } from 'zod/v4'
 
 import { Injectable, InjectionToken } from '@navios/di'
 
-import { ZodArray, ZodObject, ZodOptional } from 'zod'
+import { ZodArray, ZodObject, ZodOptional } from 'zod/v4'
 
 import type { HandlerMetadata } from '../metadata/index.mjs'
 
@@ -38,8 +38,8 @@ export class MultipartAdapterService extends EndpointAdapterService {
         target.urlParams = request.params
       })
     }
-    const requestSchema = config.requestSchema as unknown as AnyZodObject
-    const shape = requestSchema._def.shape()
+    const requestSchema = config.requestSchema as unknown as ZodObject
+    const shape = requestSchema._zod.def.shape
     const structure = this.analyzeSchema(shape)
     getters.push(async (target, request) => {
       const req: Record<string, any> = {}
@@ -65,9 +65,13 @@ export class MultipartAdapterService extends EndpointAdapterService {
     }
     let value
     if (part.type === 'file') {
-      value = new File([await part.toBuffer()], part.filename, {
-        type: part.mimetype,
-      })
+      value = new File(
+        [(await part.toBuffer()) as unknown as ArrayBuffer],
+        part.filename,
+        {
+          type: part.mimetype,
+        },
+      )
     } else {
       value = part.value
       if (isObject && typeof value === 'string') {

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

@@ -1,4 +1,4 @@
-import type { BaseStreamConfig } from '@navios/common'
+import type { BaseStreamConfig } from '@navios/builder'
 import type { ClassType } from '@navios/di'
 import type { FastifyReply, FastifyRequest } from 'fastify'
 

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/common'
+import { NaviosException } from '@navios/builder'
 import { Injectable, InjectionToken, syncInject } 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<

package/src/decorators/endpoint.decorator.mts

@@ -3,10 +3,10 @@ import type {
   EndpointFunctionArgs,
   HttpMethod,
   Util_FlatObject,
-} from '@navios/common'
-import type { AnyZodObject, z, ZodType } from 'zod'
+} from '@navios/builder'
+import type { z, ZodObject, 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'
@@ -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/multipart.decorator.mts

@@ -3,10 +3,10 @@ import type {
   EndpointFunctionArgs,
   HttpMethod,
   Util_FlatObject,
-} from '@navios/common'
-import type { AnyZodObject, z, ZodType } from 'zod'
+} from '@navios/builder'
+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'
@@ -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

@@ -3,9 +3,9 @@ import type {
   EndpointFunctionArgs,
   HttpMethod,
   Util_FlatObject,
-} from '@navios/common'
+} 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'
@@ -16,7 +16,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,7 +48,7 @@ export function Stream<
 }) {
   return (
     target: (
-      params: QuerySchema extends AnyZodObject
+      params: QuerySchema extends ZodObject
         ? RequestSchema extends ZodType
           ? EndpointFunctionArgs<Url, QuerySchema, RequestSchema>
           : EndpointFunctionArgs<Url, QuerySchema, undefined>

package/src/logger/logger.factory.mts

@@ -1,6 +1,6 @@
 import { Injectable, InjectableType, InjectionToken } from '@navios/di'
 
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import type { LoggerService } from './logger-service.interface.mjs'
 

package/src/metadata/handler.metadata.mts

@@ -1,4 +1,4 @@
-import type { HttpMethod } from '@navios/common'
+import type { HttpMethod } from '@navios/builder'
 import type { ClassTypeWithInstance, InjectionToken } from '@navios/di'
 import type { HttpHeader } from 'fastify/types/utils.js'
 

package/tsconfig.json

@@ -4,10 +4,15 @@
     "module": "Node18",
     "outDir": "dist"
   },
-  "include": ["src/**/*"],
   "references": [
     {
-      "path": "../common"
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "../builder"
     },
     {
       "path": "../di"

package/tsconfig.lib.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["src/**/*.spec.mts"]
+}

package/tsconfig.spec.json

@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist"
+  },
+  "include": ["src/**/*.spec.mts", "e2e/**/*.mts", "vitest.config.mts"],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}

package/tsup.config.mts

@@ -5,6 +5,7 @@ export default defineConfig({
   outDir: 'lib',
   format: ['esm', 'cjs'],
   clean: true,
+  tsconfig: 'tsconfig.lib.json',
   treeshake: 'smallest',
   sourcemap: true,
   platform: 'node',