@navios/core 0.1.0 → 0.1.2

package/src/service-locator/proxy-service-locator.mts

@@ -1,4 +1,4 @@
-import type { AnyZodObject, input, output } from 'zod'
+import type { AnyZodObject, output, z, ZodOptional } from 'zod'
 
 import type { FactoryNotFound, UnknownError } from './index.mjs'
 import type { InjectionToken } from './injection-token.mjs'
@@ -33,11 +33,17 @@ export class ProxyServiceLocator implements ServiceLocator {
   ): void {
     return this.serviceLocator.registerAbstractFactory(token, factory)
   }
-  public getInstance<Instance, Schema extends AnyZodObject | undefined>(
+  public getInstance<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Promise<[undefined, Instance] | [UnknownError | FactoryNotFound]> {
-    // @ts-expect-error
     return this.ctx.inject(token, args).then(
       (instance) => {
         return [undefined, instance]
@@ -47,16 +53,29 @@ export class ProxyServiceLocator implements ServiceLocator {
       },
     )
   }
-  public getOrThrowInstance<Instance, Schema extends AnyZodObject | undefined>(
+  public getOrThrowInstance<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Promise<Instance> {
-    // @ts-expect-error We need to pass the args to the ctx.inject method
     return this.ctx.inject(token, args)
   }
-  public getSyncInstance<Instance, Schema extends AnyZodObject | undefined>(
+  public getSyncInstance<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Instance | null {
     return this.serviceLocator.getSyncInstance(token, args)
   }

package/src/service-locator/service-locator.mts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-empty-object-type */
-import type { AnyZodObject, z } from 'zod'
+import type { AnyZodObject, z, ZodOptional } from 'zod'
 
 import type { ServiceLocatorAbstractFactoryContext } from './service-locator-abstract-factory-context.mjs'
 import type { ServiceLocatorInstanceHolder } from './service-locator-instance-holder.mjs'
@@ -65,7 +65,7 @@ export class ServiceLocator {
 
   public registerAbstractFactory<
     Instance,
-    Schema extends AnyZodObject | undefined,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
   >(
     token: InjectionToken<Instance, Schema>,
     factory: (
@@ -88,10 +88,14 @@ export class ServiceLocator {
 
   public getInstanceIdentifier<
     Instance,
-    Schema extends AnyZodObject | undefined,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
   >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): string {
     const validatedArgs = token.schema
       ? token.schema.safeParse(args)
@@ -106,9 +110,16 @@ export class ServiceLocator {
     return this.makeInstanceName(token, validatedArgs)
   }
 
-  public async getInstance<Instance, Schema extends AnyZodObject | undefined>(
+  public async getInstance<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Promise<[undefined, Instance] | [UnknownError | FactoryNotFound]> {
     const validatedArgs = token.schema
       ? token.schema.safeParse(args)
@@ -161,10 +172,14 @@ export class ServiceLocator {
 
   public async getOrThrowInstance<
     Instance,
-    Schema extends AnyZodObject | undefined,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
   >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Promise<Instance> {
     const [error, instance] = await this.getInstance(token, args)
     if (error) {
@@ -185,11 +200,15 @@ export class ServiceLocator {
 
   private async createInstance<
     Instance,
-    Schema extends AnyZodObject | undefined,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
   >(
     instanceName: string,
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Promise<[undefined, Instance] | [FactoryNotFound | UnknownError]> {
     this.logger?.log(
       `[ServiceLocator]#createInstance() Creating instance for ${instanceName}`,
@@ -206,8 +225,12 @@ export class ServiceLocator {
 
   private async createInstanceFromAbstractFactory<
     Instance,
-    Schema extends AnyZodObject | undefined,
-    Args extends Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+    Args extends Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   >(
     instanceName: string,
     token: InjectionToken<Instance, Schema>,
@@ -320,7 +343,6 @@ export class ServiceLocator {
             : undefined
           const instanceName = self.makeInstanceName(token, validatedArgs)
           dependencies.add(instanceName)
-          // @ts-expect-error TS2322 This is correct type
           return self.getOrThrowInstance(injectionToken, args)
         }
         throw new Error(
@@ -338,9 +360,16 @@ export class ServiceLocator {
     }
   }
 
-  public getSyncInstance<Instance, Schema extends AnyZodObject | undefined>(
+  public getSyncInstance<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
     token: InjectionToken<Instance, Schema>,
-    args: Schema extends AnyZodObject ? z.input<Schema> : undefined,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
   ): Instance | null {
     const validatedArgs = token.schema
       ? token.schema.safeParse(args)
@@ -427,7 +456,15 @@ export class ServiceLocator {
   makeInstanceName(token: InjectionToken<any, any>, args: any) {
     let stringifiedArgs = args
       ? ':' +
-        JSON.stringify(args)
+        JSON.stringify(args, (_, value) => {
+          if (typeof value === 'function') {
+            return `function:${value.name}(${value.length})`
+          }
+          if (typeof value === 'symbol') {
+            return value.toString()
+          }
+          return value
+        })
           .replaceAll(/"/g, '')
           .replaceAll(/:/g, '=')
           .replaceAll(/,/g, '|')

package/src/service-locator/sync-injector.mts

@@ -1,4 +1,4 @@
-import type { AnyZodObject, z } from 'zod'
+import type { AnyZodObject, z, ZodOptional } from 'zod'
 
 import type { ClassType } from './injection-token.mjs'
 
@@ -13,6 +13,11 @@ export function syncInject<T, S extends AnyZodObject>(
   token: InjectionToken<T, S>,
   args: z.input<S>,
 ): T
+export function syncInject<T, S extends ZodOptional<AnyZodObject>>(
+  token: InjectionToken<T, S>,
+  args: z.input<S>,
+): T
+
 export function syncInject<T>(token: InjectionToken<T, undefined>): T
 export function syncInject<
   T,

package/src/services/controller-adapter.service.mts

@@ -5,6 +5,7 @@ import type { ModuleMetadata } from '../metadata/index.mjs'
 import type { ClassType } from '../service-locator/index.mjs'
 
 import { HttpException } from '../exceptions/index.mjs'
+import { Logger } from '../logger/index.mjs'
 import { extractControllerMetadata } from '../metadata/index.mjs'
 import {
   getServiceLocator,
@@ -19,6 +20,9 @@ import { GuardRunnerService } from './guard-runner.service.mjs'
 @Injectable()
 export class ControllerAdapterService {
   guardRunner = syncInject(GuardRunnerService)
+  private logger = syncInject(Logger, {
+    context: ControllerAdapterService.name,
+  })
 
   setupController(
     controller: ClassType,
@@ -119,6 +123,10 @@ export class ControllerAdapterService {
           }
         },
       })
+
+      this.logger.debug(
+        `Registered ${httpMethod} ${url} for ${controller.name}:${classMethod}`,
+      )
     }
   }
 }

package/src/services/module-loader.service.mts

@@ -2,11 +2,15 @@ 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 } from '../service-locator/index.mjs'
+import { inject, Injectable, syncInject } from '../service-locator/index.mjs'
 
 @Injectable()
 export class ModuleLoaderService {
+  private logger = syncInject(Logger, {
+    context: ModuleLoaderService.name,
+  })
   private modulesMetadata: Map<string, ModuleMetadata> = new Map()
   private loadedModules: Map<string, any> = new Map()
   private initialized = false
@@ -41,6 +45,7 @@ export class ModuleLoaderService {
     if (instance.onModuleInit) {
       await instance.onModuleInit()
     }
+    this.logger.debug(`Module ${moduleName} loaded`)
     this.loadedModules.set(moduleName, instance)
   }