@navios/commander-tui 1.1.0 → 1.2.0

package/src/__tests__/services/logger.spec.ts

@@ -1,12 +1,14 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { TestContainer } from '@navios/core/testing'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import type { LogLevel } from '@navios/core'
 
 import { ScreenLoggerInstance } from '../../services/logger.ts'
 import { Screen } from '../../tokens/index.ts'
 import { createMockScreenInstance } from '../utils/factories.ts'
 
+import type { ScreenInstance } from '../../index.js'
 import type { MockScreenInstance } from '../utils/factories.ts'
-import type { LogLevel } from '@navios/core'
 
 describe('ScreenLoggerInstance', () => {
   let container: TestContainer
@@ -17,7 +19,7 @@ describe('ScreenLoggerInstance', () => {
   beforeEach(() => {
     container = new TestContainer()
     mockScreen = createMockScreenInstance()
-    container.bind(Screen).toValue(mockScreen)
+    container.bind(Screen).toValue(mockScreen as unknown as ScreenInstance)
   })
 
   afterEach(async () => {

package/src/factories/index.ts

@@ -1 +1,2 @@
+export * from './isomorphic-logger.factory.js'
 export * from './screen.factory.ts'

package/src/factories/isomorphic-logger.factory.ts

@@ -0,0 +1,23 @@
+import { Factory, inject, Logger, type FactoryContext } from '@navios/core'
+
+import { ScreenManager } from '../services/screen_manager.js'
+import { IsomorphicLogger, ScreenLogger } from '../tokens/logger.js'
+
+import type { IsomorphicLoggerInterface } from '../interfaces/isomorphic-logger.js'
+import type { LoggerOptions } from '../schemas/index.js'
+
+@Factory({
+  token: IsomorphicLogger,
+})
+export class IsomorphicLoggerFactory {
+  private readonly screenManager = inject(ScreenManager)
+
+  async create(ctx: FactoryContext, options: LoggerOptions): Promise<IsomorphicLoggerInterface> {
+    if (this.screenManager.isTuiBound()) {
+      return ctx.inject(ScreenLogger, options)
+    }
+    return ctx.inject(Logger, {
+      context: options.context,
+    })
+  }
+}

package/src/index.ts

@@ -3,6 +3,11 @@
 // ============================================
 export * from './types/index.ts'
 
+// ============================================
+// Interfaces
+// ============================================
+export * from './interfaces/index.ts'
+
 // ============================================
 // Components
 // ============================================

package/src/interfaces/index.ts

@@ -0,0 +1 @@
+export * from './isomorphic-logger.ts'

package/src/interfaces/isomorphic-logger.ts

@@ -0,0 +1,9 @@
+import type { LoggerInstance } from '@navios/core'
+
+import type { ScreenLoggerInstance } from '../services/logger.ts'
+
+type PublicLoggerMethods = Pick<LoggerInstance, keyof LoggerInstance>
+type PublicScreenLoggerMethods = Pick<ScreenLoggerInstance, keyof ScreenLoggerInstance>
+type ScreenOwnMethods = Partial<Omit<PublicScreenLoggerMethods, keyof PublicLoggerMethods>>
+
+export interface IsomorphicLoggerInterface extends PublicLoggerMethods, ScreenOwnMethods {}

package/src/services/logger.ts

@@ -68,7 +68,7 @@ export class ScreenLoggerInstance implements LoggerService {
   }
 
   trace(msg: string | object, label?: string): this {
-    const trace = captureTrace()
+    const trace = captureTrace(1)
     return this.write('verbose', msg, label, trace, 'trace')
   }
 

package/src/services/screen_manager.tsx

@@ -101,7 +101,7 @@ export class ScreenManager {
     this.renderer = await createCliRenderer({
       exitOnCtrlC: options?.exitOnCtrlC ?? true,
       useAlternateScreen: true,
-      useMouse: options?.useMouse ?? false,
+      useMouse: options?.useMouse ?? true,
     })
 
     this.root = createRoot(this.renderer)

package/src/tokens/logger.ts

@@ -2,9 +2,18 @@ import { InjectionToken } from '@navios/core'
 
 import { LoggerOptionsSchema } from '../schemas/index.ts'
 
+import type { IsomorphicLoggerInterface } from '../interfaces/isomorphic-logger.ts'
 import type { ScreenLoggerInstance } from '../services/index.ts'
 
 export const ScreenLogger = InjectionToken.create<ScreenLoggerInstance, typeof LoggerOptionsSchema>(
   'ScreenLoggerInstance',
   LoggerOptionsSchema,
 )
+/**
+ * Isomorphic logger token for shared logger between TUI and Server.
+ * This token is used to inject the logger instance into the application.
+ */
+export const IsomorphicLogger = InjectionToken.create<
+  IsomorphicLoggerInterface,
+  typeof LoggerOptionsSchema
+>('IsomorphicLogger', LoggerOptionsSchema)

package/src/types/screen.types.ts

@@ -119,6 +119,6 @@ export interface BindOptions {
   autoClose?: boolean | number
   /** Theme to use for the TUI (theme object or preset name) */
   theme?: Theme | ThemePreset
-  /** Enable mouse support (default: false) */
+  /** Enable mouse support (default: true) */
   useMouse?: boolean
 }

package/src/utils/format.ts

@@ -43,10 +43,11 @@ export function formatObject(obj: unknown, depth: number = 2, currentDepth: numb
 /**
  * Capture a stack trace, filtering out internal frames
  */
-export function captureTrace(): string {
+export function captureTrace(offset: number = 0): string {
   const err = new Error()
   const stack = err.stack ?? ''
   const lines = stack.split('\n')
+  const begin = lines.findIndex((line) => line.includes('captureTrace'))
   // Skip the first 4 lines: Error, captureTrace, trace method, and the log method
-  return lines.slice(4).join('\n')
+  return lines.slice(begin !== -1 ? begin + 1 + offset : 4).join('\n')
 }