@navios/core 0.2.0 → 0.2.2

package/src/config/config.service.mts

@@ -1,16 +1,33 @@
 import { NaviosException } from '@navios/common'
+import { Injectable, InjectionToken, syncInject } from '@navios/di'
 
-import type { LoggerService } from '../logger/index.mjs'
-import type { ConfigService } from './config-service.interface.mjs'
+import { z } from 'zod'
+
+import type { ConfigServiceInterface as IConfigService } from './config-service.interface.mjs'
 import type { Path, PathValue } from './types.mjs'
 
-export class ConfigServiceInstance<Config = Record<string, unknown>>
-  implements ConfigService<Config>
+import { Logger } from '../logger/index.mjs'
+
+export const ConfigServiceOptionsSchema = z.record(z.unknown())
+export type ConfigServiceOptions = z.infer<typeof ConfigServiceOptionsSchema>
+
+export const ConfigServiceToken = InjectionToken.create<
+  IConfigService,
+  typeof ConfigServiceOptionsSchema
+>(Symbol.for('ConfigService'), ConfigServiceOptionsSchema)
+
+@Injectable({
+  token: ConfigServiceToken,
+})
+export class ConfigService<
+  Config extends ConfigServiceOptions = Record<string, unknown>,
+> implements IConfigService<Config>
 {
-  constructor(
-    private config: Config = {} as Config,
-    private logger: LoggerService,
-  ) {}
+  private readonly logger = syncInject(Logger, {
+    context: ConfigService.name,
+  })
+
+  constructor(private config: Config = {} as Config) {}
 
   getConfig(): Config {
     return this.config

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 {
@@ -71,11 +78,6 @@ export function Endpoint<
     ) => Promise<z.input<ResponseSchema>>,
     context: ClassMethodDecoratorContext,
   ) => {
-    if (typeof target !== 'function') {
-      throw new Error(
-        '[Navios] Endpoint decorator can only be used on functions.',
-      )
-    }
     if (context.kind !== 'method') {
       throw new Error(
         '[Navios] Endpoint decorator can only be used on methods.',

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/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "Node18",
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"],
+  "references": [
+    {
+      "path": "../common"
+    },
+    {
+      "path": "../di"
+    }
+  ]
+}

package/tsup.config.mts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  entry: ['src/index.mts'],
+  outDir: 'lib',
+  format: ['esm', 'cjs'],
+  clean: true,
+  treeshake: 'smallest',
+  sourcemap: true,
+  platform: 'node',
+  experimentalDts: true,
+})

package/vitest.config.mts

@@ -0,0 +1,9 @@
+import { defineProject } from 'vitest/config'
+
+export default defineProject({
+  test: {
+    typecheck: {
+      enabled: true,
+    },
+  },
+})