@navios/commander 1.4.0 → 1.5.1

package/src/__tests__/commander.factory.e2e.spec.mts

@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { z } from 'zod'
-
-import type { CommandHandler } from '../interfaces/command-handler.interface.mjs'
+import { z } from 'zod/v4'
 
 import { CommanderFactory } from '../commander.factory.mjs'
 import { CliModule } from '../decorators/cli-module.decorator.mjs'
 import { Command } from '../decorators/command.decorator.mjs'
 
+import type { CommandHandler } from '../interfaces/command-handler.interface.mjs'
+
 describe('CommanderApplication E2E - run() with different argv', () => {
   describe('simple command without options', () => {
     const executeMock = vi.fn()
@@ -112,9 +112,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       })
 
       @Command({ path: 'deploy', optionsSchema })
-      class DeployCommand implements CommandHandler<
-        z.infer<typeof optionsSchema>
-      > {
+      class DeployCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
         async execute(options: z.infer<typeof optionsSchema>) {
           executeMock(options)
         }
@@ -144,9 +142,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       })
 
       @Command({ path: 'build', optionsSchema })
-      class BuildCommand implements CommandHandler<
-        z.infer<typeof optionsSchema>
-      > {
+      class BuildCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
         async execute(options: z.infer<typeof optionsSchema>) {
           executeMock(options)
         }
@@ -181,9 +177,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'greet', optionsSchema })
-    class GreetCommand implements CommandHandler<
-      z.infer<typeof optionsSchema>
-    > {
+    class GreetCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
       async execute(options: z.infer<typeof optionsSchema>) {
         executeMock(options)
       }
@@ -243,13 +237,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       await app.init()
 
       const adapter = app.getAdapter()
-      await adapter.run([
-        'node',
-        'script.js',
-        'greet',
-        '--name=Charlie',
-        '--greeting=Hey',
-      ])
+      await adapter.run(['node', 'script.js', 'greet', '--name=Charlie', '--greeting=Hey'])
 
       expect(executeMock).toHaveBeenCalledWith({
         name: 'Charlie',
@@ -293,9 +281,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'serve', optionsSchema })
-    class ServeCommand implements CommandHandler<
-      z.infer<typeof optionsSchema>
-    > {
+    class ServeCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
       async execute(options: z.infer<typeof optionsSchema>) {
         executeMock(options)
       }
@@ -378,9 +364,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'start', optionsSchema })
-    class StartCommand implements CommandHandler<
-      z.infer<typeof optionsSchema>
-    > {
+    class StartCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
       async execute(options: z.infer<typeof optionsSchema>) {
         executeMock(options)
       }
@@ -520,9 +504,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       })
 
       @Command({ path: 'db rollback', optionsSchema })
-      class DbRollbackWithOptionsCommand implements CommandHandler<
-        z.infer<typeof optionsSchema>
-      > {
+      class DbRollbackWithOptionsCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
         async execute(options: z.infer<typeof optionsSchema>) {
           executeMock(options)
         }
@@ -562,9 +544,9 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       await app.init()
 
       const adapter = app.getAdapter()
-      await expect(
-        adapter.run(['node', 'script.js', 'invalid']),
-      ).rejects.toThrow('[Navios Commander] Command not found: invalid')
+      await expect(adapter.run(['node', 'script.js', 'invalid'])).rejects.toThrow(
+        '[Navios Commander] Command not found: invalid',
+      )
 
       await app.close()
     })
@@ -648,9 +630,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'app deploy', optionsSchema: deploySchema })
-    class DeployCommand implements CommandHandler<
-      z.infer<typeof deploySchema>
-    > {
+    class DeployCommand implements CommandHandler<z.infer<typeof deploySchema>> {
       async execute(options: z.infer<typeof deploySchema>) {
         executeMock(options)
       }
@@ -768,9 +748,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'process', optionsSchema })
-    class ProcessCommand implements CommandHandler<
-      z.infer<typeof optionsSchema>
-    > {
+    class ProcessCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
       async execute(options: z.infer<typeof optionsSchema>) {
         executeMock(options)
       }
@@ -790,13 +768,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       await app.init()
 
       const adapter = app.getAdapter()
-      await adapter.run([
-        'node',
-        'script.js',
-        'process',
-        '--path',
-        '/usr/local/bin',
-      ])
+      await adapter.run(['node', 'script.js', 'process', '--path', '/usr/local/bin'])
 
       expect(executeMock).toHaveBeenCalledWith({
         path: '/usr/local/bin',
@@ -835,9 +807,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       })
 
       @Command({ path: 'json-process', optionsSchema: jsonSchema })
-      class JsonProcessCommand implements CommandHandler<
-        z.infer<typeof jsonSchema>
-      > {
+      class JsonProcessCommand implements CommandHandler<z.infer<typeof jsonSchema>> {
         async execute(options: z.infer<typeof jsonSchema>) {
           executeMock(options)
         }
@@ -902,9 +872,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
     })
 
     @Command({ path: 'welcome', optionsSchema })
-    class WelcomeCommand implements CommandHandler<
-      z.infer<typeof optionsSchema>
-    > {
+    class WelcomeCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
       async execute(options: z.infer<typeof optionsSchema>) {
         executeMock(options)
       }
@@ -971,15 +939,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       await app.init()
 
       const adapter = app.getAdapter()
-      await adapter.run([
-        'node',
-        'script.js',
-        'welcome',
-        '--name',
-        'Charlie',
-        '--count',
-        '3',
-      ])
+      await adapter.run(['node', 'script.js', 'welcome', '--name', 'Charlie', '--count', '3'])
 
       expect(executeMock).toHaveBeenCalledWith({
         name: 'Charlie',
@@ -1076,16 +1036,14 @@ describe('CommanderApplication E2E - run() with different argv', () => {
       await app.close()
     })
 
-    it('should validate options with Zod schema', async () => {
+    it('should validate options with zod/v4 schema', async () => {
       const optionsSchema = z.object({
         name: z.string().min(1),
         email: z.string().email(),
       })
 
       @Command({ path: 'create-user', optionsSchema })
-      class CreateUserCommand implements CommandHandler<
-        z.infer<typeof optionsSchema>
-      > {
+      class CreateUserCommand implements CommandHandler<z.infer<typeof optionsSchema>> {
         async execute(options: z.infer<typeof optionsSchema>) {
           executeMock(options)
         }
@@ -1145,9 +1103,7 @@ describe('CommanderApplication E2E - run() with different argv', () => {
 
       // 3 commands: cmd1, cmd2, and the built-in help command
       expect(commands).toHaveLength(3)
-      expect(commands.map((c) => c.path)).toEqual(
-        expect.arrayContaining(['cmd1', 'cmd2', 'help']),
-      )
+      expect(commands.map((c) => c.path)).toEqual(expect.arrayContaining(['cmd1', 'cmd2', 'help']))
 
       await app.close()
     })

package/src/commander.factory.mts

@@ -245,7 +245,9 @@ export class CommanderFactory {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         theme: options.tuiOptions?.theme as any,
         useMouse: options.tuiOptions?.useMouse,
-        useOpenTUI: options.tuiOptions?.useOpenTUI || options.tuiOptions?.adapter === 'ink',
+        useOpenTUI:
+          options.tuiOptions?.useOpenTUI ??
+          (options.tuiOptions?.adapter === 'ink' ? true : undefined),
       })
 
       return app

package/src/commands/help.command.mts

@@ -1,5 +1,5 @@
 import { inject, Logger } from '@navios/core'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { Command } from '../decorators/command.decorator.mjs'
 import { CommandRegistryService } from '../services/command-registry.service.mjs'

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

@@ -1,11 +1,8 @@
-import type { ClassType, Registry } from '@navios/core'
-
 import { Module, getModuleMetadata, getModuleCustomEntry } from '@navios/core'
 
-import {
-  CommandEntryKey,
-  type CommandEntryValue,
-} from '../metadata/command-entry.metadata.mjs'
+import type { ClassType, Registry } from '@navios/core'
+
+import { CommandEntryKey, type CommandEntryValue } from '../metadata/command-entry.metadata.mjs'
 
 /**
  * Options for the `@CliModule` decorator.
@@ -108,9 +105,7 @@ export function CliModule(
 ) {
   return (target: ClassType, context: ClassDecoratorContext) => {
     if (context.kind !== 'class') {
-      throw new Error(
-        '[Navios Commander] @CliModule decorator can only be used on classes.',
-      )
+      throw new Error('[Navios Commander] @CliModule decorator can only be used on classes.')
     }
 
     // Apply standard @Module decorator first

package/src/decorators/command.decorator.mts

@@ -1,7 +1,7 @@
 import { Injectable, InjectableScope, InjectionToken } from '@navios/core'
 
 import type { ClassType, ClassTypeWithInstance, Registry } from '@navios/core'
-import type { ZodObject } from 'zod'
+import type { z } from 'zod/v4'
 
 import { getCommandMetadata } from '../metadata/index.mjs'
 
@@ -29,10 +29,10 @@ export interface CommandOptions {
    */
   description?: string
   /**
-   * Optional Zod schema for validating command options.
+   * Optional zod/v4 schema for validating command options.
    * If provided, options will be validated and parsed according to this schema.
    */
-  optionsSchema?: ZodObject
+  optionsSchema?: z.ZodObject
   /**
    * Priority level for the command.
    * Higher priority commands will be loaded first.
@@ -57,7 +57,7 @@ export interface CommandOptions {
  * @example
  * ```typescript
  * import { Command, CommandHandler } from '@navios/commander'
- * import { z } from 'zod'
+ * import { z } from 'zod/v4'
  *
  * const optionsSchema = z.object({
  *   name: z.string(),

package/src/define-environment.mts

@@ -1,10 +1,10 @@
-import type { AnyInjectableType, InjectionToken } from '@navios/core'
-
 import { AdapterToken } from '@navios/core'
 
-import { CommanderAdapterService } from './services/commander-adapter.service.mjs'
-import { CommandRegistryService } from './services/command-registry.service.mjs'
+import type { AnyInjectableType, InjectionToken } from '@navios/core'
+
 import { CliParserService } from './services/cli-parser.service.mjs'
+import { CommandRegistryService } from './services/command-registry.service.mjs'
+import { CommanderAdapterService } from './services/commander-adapter.service.mjs'
 
 /**
  * Defines the CLI environment configuration for use with NaviosFactory.

package/src/interfaces/command-handler.interface.mts

@@ -9,7 +9,7 @@
  * @example
  * ```typescript
  * import { Command, CommandHandler } from '@navios/commander'
- * import { z } from 'zod'
+ * import { z } from 'zod/v4'
  *
  * const optionsSchema = z.object({
  *   name: z.string()

package/src/interfaces/commander-execution-context.interface.mts

@@ -54,7 +54,7 @@ export class CommanderExecutionContext {
   /**
    * Gets the validated command options.
    *
-   * Options are validated against the command's Zod schema if one was provided.
+   * Options are validated against the command's zod/v4 schema if one was provided.
    *
    * @returns The validated options object
    */

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

@@ -1,5 +1,6 @@
+import { createClassContext } from '@navios/core/legacy-compat'
+
 import type { ClassType } from '@navios/core'
-import { createClassContext } from '@navios/di/legacy-compat'
 
 import {
   CliModule as OriginalCliModule,

package/src/legacy-compat/decorators/command.decorator.mts

@@ -1,5 +1,6 @@
+import { createClassContext } from '@navios/core/legacy-compat'
+
 import type { ClassType } from '@navios/core'
-import { createClassContext } from '@navios/di/legacy-compat'
 
 import {
   Command as OriginalCommand,
@@ -19,7 +20,7 @@ export type { CommandOptions }
  * @example
  * ```typescript
  * import { Command, CommandHandler } from '@navios/commander/legacy-compat'
- * import { z } from 'zod'
+ * import { z } from 'zod/v4'
  *
  * const optionsSchema = z.object({
  *   name: z.string(),

package/src/metadata/command-entry.metadata.mts

@@ -1,7 +1,7 @@
-import type { ClassType } from '@navios/core'
-
 import { extractModuleMetadata } from '@navios/core'
 
+import type { ClassType } from '@navios/core'
+
 /**
  * Symbol key for storing commands in ModuleMetadata.customEntries.
  * Used by @CliModule to store command classes.
@@ -34,8 +34,5 @@ export type CommandEntryValue = Set<ClassType>
  */
 export function extractModuleCommands(moduleClass: ClassType): Set<ClassType> {
   const metadata = extractModuleMetadata(moduleClass)
-  return (
-    (metadata.customEntries.get(CommandEntryKey) as CommandEntryValue) ??
-    new Set()
-  )
+  return (metadata.customEntries.get(CommandEntryKey) as CommandEntryValue) ?? new Set()
 }

package/src/metadata/command.metadata.mts

@@ -1,5 +1,5 @@
 import type { ClassType } from '@navios/core'
-import type { ZodObject } from 'zod'
+import type { z } from 'zod/v4'
 
 /**
  * @internal
@@ -22,9 +22,9 @@ export interface CommandMetadata {
    */
   description?: string
   /**
-   * Optional Zod schema for validating command options.
+   * Optional zod/v4 schema for validating command options.
    */
-  optionsSchema?: ZodObject
+  optionsSchema?: z.ZodObject
   /**
    * Map of custom attributes that can be attached to the command.
    */
@@ -39,7 +39,7 @@ export interface CommandMetadata {
  * @param context - The decorator context
  * @param path - The command path
  * @param description - Optional description for help text
- * @param optionsSchema - Optional Zod schema
+ * @param optionsSchema - Optional zod/v4 schema
  * @returns The command metadata
  */
 export function getCommandMetadata(
@@ -47,12 +47,10 @@ export function getCommandMetadata(
   context: ClassDecoratorContext,
   path: string,
   description?: string,
-  optionsSchema?: ZodObject,
+  optionsSchema?: z.ZodObject,
 ): CommandMetadata {
   if (context.metadata) {
-    const metadata = context.metadata[CommandMetadataKey] as
-      | CommandMetadata
-      | undefined
+    const metadata = context.metadata[CommandMetadataKey] as CommandMetadata | undefined
     if (metadata) {
       return metadata
     } else {

package/src/overrides/help.command.mts

@@ -1,6 +1,6 @@
 import { ScreenLogger } from '@navios/commander-tui'
 import { inject } from '@navios/core'
-import { z } from 'zod'
+import { z } from 'zod/v4'
 
 import { Command } from '../decorators/command.decorator.mjs'
 import { CommandRegistryService } from '../services/command-registry.service.mjs'
@@ -27,7 +27,7 @@ type HelpOptions = z.infer<typeof helpOptionsSchema>
   priority: 1000,
 })
 export class HelpCommand implements CommandHandler<HelpOptions> {
-  private logger = inject(ScreenLogger, { screen: { name: 'Help', static: true }, context: 'Help' })
+  private logger = inject(ScreenLogger, { screen: 'Help', context: 'Help' })
   private commandRegistry = inject(CommandRegistryService)
 
   async execute(options: HelpOptions): Promise<void> {