@navios/commander 0.7.1 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/commander",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -35,6 +35,6 @@
     "zod": "^4.2.1"
   },
   "dependencies": {
-    "@navios/di": "^0.6.1"
+    "@navios/di": "^0.9.0"
   }
 }

package/src/decorators/cli-module.decorator.mts

@@ -1,4 +1,4 @@
-import type { ClassType } from '@navios/core'
+import type { ClassType, Registry } from '@navios/core'
 
 import { Injectable, InjectableScope, InjectionToken } from '@navios/core'
 
@@ -20,6 +20,16 @@ export interface CliModuleOptions {
    * Imported modules' commands will be available in this module.
    */
   imports?: ClassType[] | Set<ClassType>
+  /**
+   * Priority level for the module.
+   * Higher priority modules will be loaded first.
+   */
+  priority?: number
+  /**
+   * Registry to use for the module.
+   * Registry is used to store the module and its commands.
+   */
+  registry?: Registry
 }
 
 /**
@@ -45,7 +55,7 @@ export interface CliModuleOptions {
  * ```
  */
 export function CliModule(
-  { commands = [], imports = [] }: CliModuleOptions = {
+  { commands = [], imports = [], priority, registry }: CliModuleOptions = {
     commands: [],
     imports: [],
   },
@@ -69,6 +79,8 @@ export function CliModule(
     return Injectable({
       token,
       scope: InjectableScope.Singleton,
+      priority,
+      registry,
     })(target, context)
   }
 }

package/src/decorators/command.decorator.mts

@@ -1,4 +1,4 @@
-import type { ClassType } from '@navios/core'
+import type { ClassType, Registry } from '@navios/core'
 import type { ZodObject } from 'zod'
 
 import { Injectable, InjectableScope, InjectionToken } from '@navios/core'
@@ -21,6 +21,16 @@ export interface CommandOptions {
    * If provided, options will be validated and parsed according to this schema.
    */
   optionsSchema?: ZodObject
+  /**
+   * Priority level for the command.
+   * Higher priority commands will be loaded first.
+   */
+  priority?: number
+  /**
+   * Registry to use for the command.
+   * Registry is used to store the command and its options schema.
+   */
+  registry?: Registry
 }
 
 /**
@@ -53,7 +63,12 @@ export interface CommandOptions {
  * }
  * ```
  */
-export function Command({ path, optionsSchema }: CommandOptions) {
+export function Command({
+  path,
+  optionsSchema,
+  priority,
+  registry,
+}: CommandOptions) {
   return function (target: ClassType, context: ClassDecoratorContext) {
     if (context.kind !== 'class') {
       throw new Error(
@@ -67,6 +82,8 @@ export function Command({ path, optionsSchema }: CommandOptions) {
     return Injectable({
       token,
       scope: InjectableScope.Singleton,
+      priority,
+      registry,
     })(target, context)
   }
 }

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

@@ -1,6 +1,6 @@
 import type { ClassTypeWithInstance, NaviosModule } from '@navios/core'
 
-import { Container, inject, Injectable } from '@navios/core'
+import { Container, getInjectableToken, inject, Injectable } from '@navios/core'
 
 import type { CommandHandler } from '../interfaces/index.mjs'
 import type { CliModuleMetadata, CommandMetadata } from '../metadata/index.mjs'
@@ -65,7 +65,8 @@ export class CliModuleLoaderService {
     if (parentMetadata) {
       this.mergeMetadata(metadata, parentMetadata)
     }
-    const moduleName = module.name
+    const moduleToken = getInjectableToken(module)
+    const moduleName = moduleToken.id
     if (this.modulesMetadata.has(moduleName)) {
       return
     }