@navios/core 0.2.1 → 0.3.0

package/src/config/config.provider.mts

@@ -1,61 +1,33 @@
-import {
-  BoundInjectionToken,
-  Injectable,
-  InjectableType,
-  InjectionToken,
-  syncInject,
-} from '@navios/di'
+import { env } from 'node:process'
 
-import { z } from 'zod'
+import { FactoryInjectionToken, InjectionToken } from '@navios/di'
 
-import type { ConfigService } from './config-service.interface.mjs'
+import { z } from 'zod'
 
-import { Logger } from '../logger/index.mjs'
-import { ConfigServiceInstance } from './config.service.mjs'
+import type { ConfigServiceOptions } from './config.service.mjs'
 
-export const ConfigProviderOptions = z.object({
-  load: z.function(),
-})
-
-export const ConfigProvider = InjectionToken.create<
+import {
   ConfigService,
-  typeof ConfigProviderOptions
->(ConfigServiceInstance, ConfigProviderOptions)
+  ConfigServiceOptionsSchema,
+  ConfigServiceToken,
+} from './config.service.mjs'
 
-@Injectable({
-  token: ConfigProvider,
-  type: InjectableType.Factory,
+export const ConfigProviderOptions = z.object({
+  load: z.function().returns(ConfigServiceOptionsSchema),
 })
-export class ConfigProviderFactory {
-  logger = syncInject(Logger, {
-    context: 'ConfigService',
-  })
-
-  async create(
-    ctx: any,
-    args: z.infer<typeof ConfigProviderOptions>,
-  ): Promise<ConfigService> {
-    const { load } = args
-    const logger = this.logger
-    try {
-      const config = await load()
-
-      return new ConfigServiceInstance(
-        config,
-        logger,
-      ) as unknown as ConfigService
-    } catch (error) {
-      logger.error('Error loading config', error)
-      throw error
-    }
-  }
-}
 
-export function provideConfig<ConfigMap extends Record<string, unknown>>(
+export function provideConfig<ConfigMap extends ConfigServiceOptions>(
   options: z.input<typeof ConfigProviderOptions>,
-): BoundInjectionToken<
-  ConfigServiceInstance<ConfigMap>,
-  typeof ConfigProviderOptions
+): FactoryInjectionToken<
+  ConfigService<ConfigMap>,
+  typeof ConfigServiceOptionsSchema
 > {
-  return InjectionToken.bound(ConfigProvider, options)
+  return InjectionToken.factory(ConfigServiceToken, async () => options.load())
 }
+
+export const EnvConfigProvider = InjectionToken.bound<
+  ConfigService<Record<string, string>>,
+  typeof ConfigServiceOptionsSchema
+>(ConfigServiceToken, {
+  ...env,
+})

package/src/config/config.service.mts

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

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

@@ -3,7 +3,7 @@ import type {
   EndpointFunctionArgs,
   HttpMethod,
   Util_FlatObject,
-} from '@navios/common'
+} from '@navios/builder'
 import type { AnyZodObject, z, ZodType } from 'zod'
 
 import { ZodDiscriminatedUnion } from 'zod'

package/src/decorators/stream.decorator.mts

@@ -3,7 +3,7 @@ import type {
   EndpointFunctionArgs,
   HttpMethod,
   Util_FlatObject,
-} from '@navios/common'
+} from '@navios/builder'
 import type { FastifyReply } from 'fastify'
 import type { AnyZodObject, ZodType } from 'zod'
 

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

@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "Node18",
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"],
+  "references": [
+    {
+      "path": "../builder"
+    },
+    {
+      "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,
+    },
+  },
+})