@ecmaos/coreutils 0.1.5 → 0.2.1

package/src/commands/less.ts

@@ -1,11 +1,19 @@
 import path from 'path'
 import ansi from 'ansi-escape-sequences'
-import type { CommandLineOptions } from 'command-line-args'
 import type { IDisposable } from '@xterm/xterm'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
 import { writelnStderr } from '../shared/helpers.js'
 
+function printUsage(process: Process | undefined, terminal: Terminal): void {
+  const usage = `Usage: less [OPTION]... FILE
+View file contents interactively.
+
+  FILE    the file to view (if omitted, reads from stdin)
+  --help  display this help and exit`
+  writelnStderr(process, terminal, usage)
+}
+
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
   return new TerminalCommand({
     command: 'less',
@@ -13,21 +21,25 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     kernel,
     shell,
     terminal,
-    options: [
-      { name: 'help', type: Boolean, description: kernel.i18n.t('Display help') },
-      { name: 'path', type: String, typeLabel: '{underline path}', defaultOption: true, description: 'The path to the file to view' }
-    ],
-    run: async (argv: CommandLineOptions, process?: Process) => {
+    run: async (pid: number, argv: string[]) => {
+      const process = kernel.processes.get(pid) as Process | undefined
+
       if (!process) return 1
 
+      if (argv.length > 0 && (argv[0] === '--help' || argv[0] === '-h')) {
+        printUsage(process, terminal)
+        return 0
+      }
+
       let lines: string[] = []
       let currentLine = 0
       let keyListener: IDisposable | null = null
       let linesRendered = 0
 
       try {
-        if (argv.path) {
-          const filePath = argv.path as string
+        const filePath = argv.length > 0 && argv[0] !== undefined && !argv[0].startsWith('-') ? argv[0] : undefined
+
+        if (filePath) {
           const expandedPath = shell.expandTilde(filePath)
           const fullPath = path.resolve(shell.cwd, expandedPath)
 

package/src/commands/ln.ts

@@ -1,10 +1,22 @@
 import path from 'path'
 import chalk from 'chalk'
-import type { CommandLineOptions } from 'command-line-args'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
 import { writelnStdout, writelnStderr } from '../shared/helpers.js'
 
+function printUsage(process: Process | undefined, terminal: Terminal): void {
+  const usage = `Usage: ln [OPTION]... [-T] TARGET LINK_NAME
+   or:  ln [OPTION]... TARGET
+   or:  ln [OPTION]... TARGET... DIRECTORY
+Create links between files.
+
+  -s, --symbolic  make symbolic links instead of hard links
+  -f, --force     remove existing destination files
+  -v, --verbose   print name of each linked file
+  --help          display this help and exit`
+  writelnStderr(process, terminal, usage)
+}
+
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
   return new TerminalCommand({
     command: 'ln',
@@ -12,18 +24,43 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     kernel,
     shell,
     terminal,
-    options: [
-      { name: 'help', type: Boolean, description: kernel.i18n.t('Display help') },
-      { name: 'symbolic', type: Boolean, alias: 's', description: 'Create symbolic links instead of hard links' },
-      { name: 'force', type: Boolean, alias: 'f', description: 'Remove existing destination files' },
-      { name: 'verbose', type: Boolean, alias: 'v', description: 'Print name of each linked file' },
-      { name: 'args', type: String, multiple: true, defaultOption: true, description: 'The target and optional link name' }
-    ],
-    run: async (argv: CommandLineOptions, process?: Process) => {
-      const args = (argv.args as string[]) || []
-      const symbolic = argv.symbolic as boolean || false
-      const force = argv.force as boolean || false
-      const verbose = argv.verbose as boolean || false
+    run: async (pid: number, argv: string[]) => {
+      const process = kernel.processes.get(pid) as Process | undefined
+
+      if (argv.length > 0 && (argv[0] === '--help' || argv[0] === '-h')) {
+        printUsage(process, terminal)
+        return 0
+      }
+
+      const args: string[] = []
+      let symbolic = false
+      let force = false
+      let verbose = false
+
+      for (const arg of argv) {
+        if (arg === '--help' || arg === '-h') {
+          printUsage(process, terminal)
+          return 0
+        } else if (arg === '-s' || arg === '--symbolic') {
+          symbolic = true
+        } else if (arg === '-f' || arg === '--force') {
+          force = true
+        } else if (arg === '-v' || arg === '--verbose') {
+          verbose = true
+        } else if (arg.startsWith('-')) {
+          const flags = arg.slice(1).split('')
+          if (flags.includes('s')) symbolic = true
+          if (flags.includes('f')) force = true
+          if (flags.includes('v')) verbose = true
+          const invalidFlags = flags.filter(f => !['s', 'f', 'v'].includes(f))
+          if (invalidFlags.length > 0) {
+            await writelnStderr(process, terminal, `ln: invalid option -- '${invalidFlags[0]}'`)
+            return 1
+          }
+        } else {
+          args.push(arg)
+        }
+      }
 
       if (args.length === 0) {
         await writelnStderr(process, terminal, chalk.red('ln: missing file operand'))

package/src/commands/ls.ts

@@ -1,11 +1,19 @@
 import path from 'path'
 import chalk from 'chalk'
+import columnify from 'columnify'
 import humanFormat from 'human-format'
-import type { CommandLineOptions } from 'command-line-args'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
 import { writelnStdout } from '../shared/helpers.js'
 
+function printUsage(process: Process | undefined, terminal: Terminal): void {
+  const usage = `Usage: ls [OPTION]... [FILE]...
+List information about the FILEs (the current directory by default).
+
+  --help  display this help and exit`
+  writelnStdout(process, terminal, usage)
+}
+
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
   return new TerminalCommand({
     command: 'ls',
@@ -13,12 +21,15 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     kernel,
     shell,
     terminal,
-    options: [
-      { name: 'help', type: Boolean, description: kernel.i18n.t('Display help') },
-      { name: 'path', type: String, typeLabel: '{underline path}', defaultOption: true, description: 'The path to the directory to list' }
-    ],
-    run: async (argv: CommandLineOptions, process?: Process) => {
-      const target = (argv.path as string) || shell.cwd
+    run: async (pid: number, argv: string[]) => {
+      const process = kernel.processes.get(pid) as Process | undefined
+
+      if (argv.length > 0 && (argv[0] === '--help' || argv[0] === '-h')) {
+        printUsage(process, terminal)
+        return 0
+      }
+
+      const target = argv.length > 0 && argv[0] !== undefined && !argv[0].startsWith('-') ? argv[0] : shell.cwd
       const fullPath = target ? path.resolve(shell.cwd, target === '' ? '.' : target) : shell.cwd
       const stats = await shell.context.fs.promises.stat(fullPath)
       const entries: string[] = stats.isDirectory() ? await shell.context.fs.promises.readdir(fullPath) : [fullPath]
@@ -143,91 +154,103 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
         .filter((entry, index, self) => self.findIndex(e => e?.name === entry?.name) === index)
         .filter((entry): entry is NonNullable<typeof entry> => entry !== null && entry !== undefined)
 
-      const data = [
-        ['Name', 'Size', 'Modified', 'Mode', 'Owner', 'Info'],
-        ...directories.sort((a, b) => a.name.localeCompare(b.name)).map(directory => {
-          const displayName = directory.linkTarget
-            ? `${directory.name} ${chalk.cyan('⟶')} ${directory.linkTarget}`
-            : directory.name
-          const modeStats = directory.linkStats && directory.linkStats.isSymbolicLink() 
-            ? directory.linkStats 
-            : directory.stats
-          const modeString = modeStats 
-            ? getModeString(modeStats, directory.linkStats?.isSymbolicLink() ? directory.stats : undefined)
-            : ''
-          const linkInfo = getLinkInfo(directory.linkTarget, directory.linkStats, directory.stats)
-          return [
-            displayName,
-            '',
-            directory.stats ? getTimestampString(directory.stats.mtime) : '',
-            modeString,
-            directory.stats ? getOwnerString(directory.stats) : '',
-            linkInfo
-          ]
-        }),
-        ...files.sort((a, b) => a.name.localeCompare(b.name)).map(file => {
-          const displayName = file.linkTarget
-            ? `${file.name} ${chalk.cyan('⟶')} ${file.linkTarget}`
-            : file.name
-          const modeStats = file.linkStats && file.linkStats.isSymbolicLink() 
-            ? file.linkStats 
-            : file.stats
-          const modeString = modeStats 
-            ? getModeString(modeStats, file.linkStats?.isSymbolicLink() ? file.stats : undefined)
-            : ''
-          return [
-            displayName,
-            file.stats ? humanFormat(file.stats.size) : '',
-            file.stats ? getTimestampString(file.stats.mtime) : '',
-            modeString,
-            file.stats ? getOwnerString(file.stats) : '',
-            (() => {
-              const linkInfo = getLinkInfo(file.linkTarget, file.linkStats, file.stats)
-              if (linkInfo) return linkInfo
-              
-              if (descriptions.has(path.resolve(fullPath, file.name))) return descriptions.get(path.resolve(fullPath, file.name))
-              if (file.name.includes('.')) {
-                const ext = file.name.split('.').pop()
-                if (ext && descriptions.has('.' + ext)) return descriptions.get('.' + ext)
-              }
-              if (!file.stats) return ''
-              if (file.stats.isBlockDevice() || file.stats.isCharacterDevice()) {
-                // TODO: zenfs `fs.mounts` is deprecated - use a better way of getting device info
-              }
+      const isDevDirectory = fullPath.startsWith('/dev')
+      const columns = isDevDirectory ? ['Name', 'Mode', 'Owner', 'Info'] : ['Name', 'Size', 'Modified', 'Mode', 'Owner', 'Info']
+
+      const directoryRows = directories.sort((a, b) => a.name.localeCompare(b.name)).map(directory => {
+        const displayName = directory.linkTarget
+          ? `${directory.name} ${chalk.cyan('⟶')} ${directory.linkTarget}`
+          : directory.name
+        const modeStats = directory.linkStats && directory.linkStats.isSymbolicLink() 
+          ? directory.linkStats 
+          : directory.stats
+        const modeString = modeStats 
+          ? getModeString(modeStats, directory.linkStats?.isSymbolicLink() ? directory.stats : undefined)
+          : ''
+        const linkInfo = getLinkInfo(directory.linkTarget, directory.linkStats, directory.stats)
+        
+        const modeType = modeString?.charAt(0) || ''
+        const coloredName = modeType === 'd' ? chalk.blue(displayName) 
+          : modeType === 'l' ? chalk.cyan(displayName) 
+          : chalk.green(displayName)
+
+        const row: Record<string, string> = {
+          Name: coloredName,
+          Mode: chalk.gray(modeString),
+          Owner: directory.stats ? chalk.gray(getOwnerString(directory.stats)) : '',
+          Info: chalk.gray(linkInfo)
+        }
+
+        if (!isDevDirectory) {
+          row.Size = ''
+          row.Modified = directory.stats ? chalk.gray(getTimestampString(directory.stats.mtime)) : ''
+        }
+
+        return row
+      })
 
-              return ''
-            })()
-          ]
+      const fileRows = files.sort((a, b) => a.name.localeCompare(b.name)).map(file => {
+        const displayName = file.linkTarget
+          ? `${file.name} ${chalk.cyan('⟶')} ${file.linkTarget}`
+          : file.name
+        const modeStats = file.linkStats && file.linkStats.isSymbolicLink() 
+          ? file.linkStats 
+          : file.stats
+        const modeString = modeStats 
+          ? getModeString(modeStats, file.linkStats?.isSymbolicLink() ? file.stats : undefined)
+          : ''
+        
+        const modeType = modeString?.charAt(0) || ''
+        const coloredName = modeType === 'd' ? chalk.blue(displayName) 
+          : modeType === 'l' ? chalk.cyan(displayName) 
+          : chalk.green(displayName)
+
+        const info = (() => {
+          const linkInfo = getLinkInfo(file.linkTarget, file.linkStats, file.stats)
+          if (linkInfo) return linkInfo
+          
+          if (descriptions.has(path.resolve(fullPath, file.name))) return descriptions.get(path.resolve(fullPath, file.name)) || ''
+          if (file.name.includes('.')) {
+            const ext = file.name.split('.').pop()
+            if (ext && descriptions.has('.' + ext)) return descriptions.get('.' + ext) || ''
+          }
+          if (!file.stats) return ''
+          if (file.stats.isBlockDevice() || file.stats.isCharacterDevice()) {
+            // TODO: zenfs `fs.mounts` is deprecated - use a better way of getting device info
+          }
+
+          return ''
+        })()
+
+        const row: Record<string, string> = {
+          Name: coloredName,
+          Mode: chalk.gray(modeString),
+          Owner: file.stats ? chalk.gray(getOwnerString(file.stats)) : '',
+          Info: chalk.gray(info)
+        }
+
+        if (!isDevDirectory) {
+          row.Size = file.stats ? chalk.gray(humanFormat(file.stats.size)) : ''
+          row.Modified = file.stats ? chalk.gray(getTimestampString(file.stats.mtime)) : ''
+        }
+
+        return row
+      })
+
+      const data = [...directoryRows, ...fileRows]
+
+      if (data.length > 0) {
+        const table = columnify(data, {
+          columns,
+          columnSplitter: '  ',
+          showHeaders: true,
+          headingTransform: (heading: string) => chalk.bold(heading)
         })
-      ] as string[][]
-
-      // Special output for certain directories
-      if (fullPath.startsWith('/dev')) data.forEach(row => row.splice(1, 2)) // remove size and modified columns
-
-      const columnWidths = data[0]?.map((_, colIndex) => Math.max(...data.map(row => {
-        // Remove ANSI escape sequences before calculating length
-        const cleanedCell = row[colIndex]?.replace(/\u001b\[.*?m/g, '')
-        // count all emojis as two characters
-        return cleanedCell?.length || 0
-      })))
-
-      for (const [rowIndex, row] of data.entries()) {
-        const line = row
-          .map((cell, index) => {
-            const paddedCell = cell.padEnd(columnWidths?.[index] ?? 0)
-            if (index === 0 && rowIndex > 0) {
-              if (row[3]?.startsWith('d')) return chalk.blue(paddedCell)
-              else if (row[3]?.startsWith('l')) return chalk.cyan(paddedCell)
-              else return chalk.green(paddedCell)
-            } else return rowIndex === 0 ? chalk.bold(paddedCell) : chalk.gray(paddedCell)
-          })
-          .join('  ')
-
-        if (data.length > 1) await writelnStdout(process, terminal, line)
+
+        await writelnStdout(process, terminal, table)
       }
 
       return 0
     }
   })
 }
-

package/src/commands/mkdir.ts

@@ -1,7 +1,15 @@
 import path from 'path'
-import type { CommandLineOptions } from 'command-line-args'
-import type { Kernel, Shell, Terminal } from '@ecmaos/types'
+import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
+import { writelnStdout, writelnStderr } from '../shared/helpers.js'
+
+function printUsage(process: Process | undefined, terminal: Terminal): void {
+  const usage = `Usage: mkdir [OPTION]... DIRECTORY...
+Create the DIRECTORY(ies), if they do not already exist.
+
+  --help  display this help and exit`
+  writelnStdout(process, terminal, usage)
+}
 
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
   return new TerminalCommand({
@@ -10,16 +18,37 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     kernel,
     shell,
     terminal,
-    options: [
-      { name: 'help', type: Boolean, description: kernel.i18n.t('Display help') },
-      { name: 'path', type: String, typeLabel: '{underline path}', defaultOption: true, description: 'The path to the directory to create' }
-    ],
-    run: async (argv: CommandLineOptions) => {
-      const target = (argv.path as string) || shell.cwd
-      const fullPath = target ? path.resolve(shell.cwd, target) : shell.cwd
-      await shell.context.fs.promises.mkdir(fullPath)
-      return 0
+    run: async (pid: number, argv: string[]) => {
+      const process = kernel.processes.get(pid) as Process | undefined
+
+      if (argv.length > 0 && (argv[0] === '--help' || argv[0] === '-h')) {
+        printUsage(process, terminal)
+        return 0
+      }
+
+      if (argv.length === 0) {
+        await writelnStderr(process, terminal, 'mkdir: missing operand')
+        await writelnStderr(process, terminal, "Try 'mkdir --help' for more information.")
+        return 1
+      }
+
+      let hasError = false
+
+      for (const target of argv) {
+        if (!target || target.startsWith('-')) continue
+
+        const fullPath = target ? path.resolve(shell.cwd, target) : shell.cwd
+        
+        try {
+          await shell.context.fs.promises.mkdir(fullPath)
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error)
+          await writelnStderr(process, terminal, `mkdir: ${target}: ${errorMessage}`)
+          hasError = true
+        }
+      }
+
+      return hasError ? 1 : 0
     }
   })
 }
-

package/src/commands/mv.ts

@@ -1,10 +1,17 @@
 import path from 'path'
 import chalk from 'chalk'
-import type { CommandLineOptions } from 'command-line-args'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
 import { writelnStderr } from '../shared/helpers.js'
 
+function printUsage(process: Process | undefined, terminal: Terminal): void {
+  const usage = `Usage: mv [OPTION]... SOURCE... DEST
+Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
+
+  --help  display this help and exit`
+  writelnStderr(process, terminal, usage)
+}
+
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
   return new TerminalCommand({
     command: 'mv',
@@ -12,13 +19,29 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     kernel,
     shell,
     terminal,
-    options: [
-      { name: 'help', type: Boolean, description: kernel.i18n.t('Display help') },
-      { name: 'args', type: String, multiple: true, defaultOption: true, description: 'The source and destination paths' }
-    ],
-    run: async (argv: CommandLineOptions, process?: Process) => {
-      const args = (argv.args as string[]) || []
-      const [sourceInput, destinationInput] = args
+    run: async (pid: number, argv: string[]) => {
+      const process = kernel.processes.get(pid) as Process | undefined
+
+      if (argv.length > 0 && (argv[0] === '--help' || argv[0] === '-h')) {
+        printUsage(process, terminal)
+        return 0
+      }
+
+      const args: string[] = []
+      for (const arg of argv) {
+        if (arg && !arg.startsWith('-')) {
+          args.push(arg)
+        }
+      }
+
+      if (args.length < 2) {
+        await writelnStderr(process, terminal, chalk.red('Usage: mv <source> <destination>'))
+        return 1
+      }
+
+      const sourceInput = args[0]
+      const destinationInput = args[args.length - 1]
+
       if (!sourceInput || !destinationInput) {
         await writelnStderr(process, terminal, chalk.red('Usage: mv <source> <destination>'))
         return 1
@@ -48,4 +71,3 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
     }
   })
 }
-