@navios/core 0.1.3 → 0.1.4

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

@@ -6,8 +6,17 @@ import type { ServiceLocatorAbstractFactoryContext } from './service-locator-abs
 import type { ServiceLocatorInstanceHolder } from './service-locator-instance-holder.mjs'
 
 import { InjectableScope } from './enums/index.mjs'
-import { ErrorsEnum, FactoryNotFound, UnknownError } from './errors/index.mjs'
-import { getInjectableToken } from './index.mjs'
+import {
+  ErrorsEnum,
+  FactoryNotFound,
+  FactoryTokenNotResolved,
+  UnknownError,
+} from './errors/index.mjs'
+import {
+  BoundInjectionToken,
+  FactoryInjectionToken,
+  getInjectableToken,
+} from './index.mjs'
 import { InjectionToken } from './injection-token.mjs'
 import { ServiceLocatorEventBus } from './service-locator-event-bus.mjs'
 import {
@@ -86,7 +95,7 @@ export class ServiceLocator {
     }
   }
 
-  public getInstanceIdentifier<
+  private resolveTokenArgs<
     Instance,
     Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
   >(
@@ -96,18 +105,57 @@ export class ServiceLocator {
       : Schema extends ZodOptional<AnyZodObject>
         ? z.input<Schema> | undefined
         : undefined,
-  ): string {
-    const validatedArgs = token.schema
-      ? token.schema.safeParse(args)
-      : undefined
+  ):
+    | [
+        undefined,
+        Schema extends AnyZodObject
+          ? z.input<Schema>
+          : Schema extends ZodOptional<AnyZodObject>
+            ? z.input<Schema> | undefined
+            : undefined,
+      ]
+    | [FactoryTokenNotResolved | UnknownError] {
+    let realArgs = args
+    if (token instanceof BoundInjectionToken) {
+      realArgs = token.value
+    } else if (token instanceof FactoryInjectionToken) {
+      if (token.resolved) {
+        realArgs = token.value
+      } else {
+        return [new FactoryTokenNotResolved(token.name)]
+      }
+    }
+    if (!token.schema) {
+      return [undefined, realArgs]
+    }
+    const validatedArgs = token.schema?.safeParse(realArgs)
     if (validatedArgs && !validatedArgs.success) {
       this.logger?.error(
         `[ServiceLocator]#getInstance(): Error validating args for ${token.name.toString()}`,
         validatedArgs.error,
       )
-      throw new UnknownError(validatedArgs.error)
+      return [new UnknownError(validatedArgs.error)]
+    }
+    // @ts-expect-error We return correct type
+    return [undefined, validatedArgs?.data]
+  }
+
+  public getInstanceIdentifier<
+    Instance,
+    Schema extends AnyZodObject | ZodOptional<AnyZodObject> | undefined,
+  >(
+    token: InjectionToken<Instance, Schema>,
+    args: Schema extends AnyZodObject
+      ? z.input<Schema>
+      : Schema extends ZodOptional<AnyZodObject>
+        ? z.input<Schema> | undefined
+        : undefined,
+  ): string {
+    const [err, realArgs] = this.resolveTokenArgs(token, args)
+    if (err) {
+      throw err
     }
-    return this.makeInstanceName(token, validatedArgs)
+    return this.makeInstanceName(token, realArgs)
   }
 
   public async getInstance<
@@ -121,17 +169,17 @@ export class ServiceLocator {
         ? z.input<Schema> | undefined
         : undefined,
   ): Promise<[undefined, Instance] | [UnknownError | FactoryNotFound]> {
-    const validatedArgs = token.schema
-      ? token.schema.safeParse(args)
-      : undefined
-    if (validatedArgs && !validatedArgs.success) {
-      this.logger?.error(
-        `[ServiceLocator]#getInstance(): Error validating args for ${token.name.toString()}`,
-        validatedArgs.error,
-      )
-      return [new UnknownError(validatedArgs.error)]
+    const [err, realArgs] = this.resolveTokenArgs(token, args)
+    if (err instanceof UnknownError) {
+      throw err
+    } else if (
+      err instanceof FactoryTokenNotResolved &&
+      token instanceof FactoryInjectionToken
+    ) {
+      await token.resolve()
+      return this.getInstance(token, args)
     }
-    const instanceName = this.makeInstanceName(token, validatedArgs)
+    const instanceName = this.makeInstanceName(token, realArgs)
     const [error, holder] = this.manager.get(instanceName)
     if (!error) {
       if (holder.status === ServiceLocatorInstanceHolderStatus.Creating) {
@@ -167,7 +215,8 @@ export class ServiceLocator {
       default:
         return [error]
     }
-    return this.createInstance(instanceName, token, args)
+    // @ts-expect-error TS2322 It's validated
+    return this.createInstance(instanceName, token, realArgs)
   }
 
   public async getOrThrowInstance<
@@ -213,13 +262,22 @@ export class ServiceLocator {
     this.logger?.log(
       `[ServiceLocator]#createInstance() Creating instance for ${instanceName}`,
     )
+    let realToken =
+      token instanceof BoundInjectionToken ||
+      token instanceof FactoryInjectionToken
+        ? token.token
+        : token
     if (
-      this.abstractFactories.has(token) ||
-      this.instanceFactories.has(token)
+      this.abstractFactories.has(realToken) ||
+      this.instanceFactories.has(realToken)
     ) {
-      return this.createInstanceFromAbstractFactory(instanceName, token, args)
+      return this.createInstanceFromAbstractFactory(
+        instanceName,
+        realToken,
+        args,
+      )
     } else {
-      return [new FactoryNotFound(token.name.toString())]
+      return [new FactoryNotFound(realToken.name.toString())]
     }
   }
 
@@ -276,7 +334,7 @@ export class ServiceLocator {
               )
             })
           }
-          if (holder.ttl === 0) {
+          if (holder.ttl === 0 || !shouldStore) {
             // One time instance
             await this.invalidate(instanceName)
           }
@@ -371,17 +429,11 @@ export class ServiceLocator {
         ? z.input<Schema> | undefined
         : undefined,
   ): Instance | null {
-    const validatedArgs = token.schema
-      ? token.schema.safeParse(args)
-      : undefined
-    if (validatedArgs && !validatedArgs.success) {
-      this.logger?.error(
-        `[ServiceLocator]#getInstance(): Error validating args for ${token.name.toString()}`,
-        validatedArgs.error,
-      )
-      throw new UnknownError(validatedArgs.error)
+    const [err, realArgs] = this.resolveTokenArgs(token, args)
+    if (err) {
+      return null
     }
-    const instanceName = this.makeInstanceName(token, validatedArgs)
+    const instanceName = this.makeInstanceName(token, realArgs)
     const [error, holder] = this.manager.get(instanceName)
     if (error) {
       return null

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

@@ -24,14 +24,6 @@ export function syncInject<
   Token extends InjectionToken<T>,
   S extends AnyZodObject | unknown = Token['schema'],
 >(token: Token, args?: S extends AnyZodObject ? z.input<S> : never): T {
-  if (token.schema) {
-    const parsed = token.schema.safeParse(args)
-    if (!parsed.success) {
-      throw new Error(
-        `[ServiceLocator] Invalid arguments for ${token.name.toString()}: ${parsed.error}`,
-      )
-    }
-  }
   let realToken: InjectionToken<T, S> = token
   if (!(token instanceof InjectionToken)) {
     realToken = getInjectableToken(token) as InjectionToken<T, S>