@ecmaos/coreutils 0.2.1 → 0.3.1

package/src/commands/rm.ts

@@ -7,7 +7,9 @@ function printUsage(process: Process | undefined, terminal: Terminal): void {
   const usage = `Usage: rm [OPTION]... FILE...
 Remove (unlink) the FILE(s).
 
-  --help  display this help and exit`
+  -f, --force     ignore nonexistent files and arguments, never prompt
+  -r, -R, --recursive   remove directories and their contents recursively
+  --help          display this help and exit`
   writelnStderr(process, terminal, usage)
 }
 
@@ -32,10 +34,32 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
         return 0
       }
 
+      let recursive = false
+      let force = false
       const pathArray: string[] = []
+      
       for (const arg of argv) {
         if (arg.startsWith('-') && arg !== '--') {
-          if (arg !== '-f' && arg !== '-r' && arg !== '-rf' && arg !== '-fr') {
+          // Handle combined flags like -rf, -fr, -rR, etc.
+          if (arg === '--recursive' || arg === '-R') {
+            recursive = true
+          } else if (arg === '--force') {
+            force = true
+          } else if (arg.length > 1) {
+            // Parse individual flags in combined options like -rf
+            for (let i = 1; i < arg.length; i++) {
+              const flag = arg[i]
+              if (flag === 'r' || flag === 'R') {
+                recursive = true
+              } else if (flag === 'f') {
+                force = true
+              } else {
+                await writelnStderr(process, terminal, `rm: invalid option -- '${flag}'`)
+                await writelnStderr(process, terminal, "Try 'rm --help' for more information.")
+                return 1
+              }
+            }
+          } else {
             await writelnStderr(process, terminal, `rm: invalid option -- '${arg.slice(1)}'`)
             await writelnStderr(process, terminal, "Try 'rm --help' for more information.")
             return 1
@@ -104,24 +128,42 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
 
       for (const target of expandedPaths) {
         if (!target || typeof target !== 'string') {
-          await writelnStderr(process, terminal, `rm: ${String(target)}: No such file or directory`)
-          hasError = true
+          if (!force) {
+            await writelnStderr(process, terminal, `rm: ${String(target)}: No such file or directory`)
+            hasError = true
+          }
           continue
         }
 
         const fullPath = path.resolve(shell.cwd, target)
 
         try {
-          const stat = await shell.context.fs.promises.stat(fullPath)
-          if (stat.isDirectory()) {
-            await shell.context.fs.promises.rmdir(fullPath)
-          } else {
-            await shell.context.fs.promises.unlink(fullPath)
+          // Check if it's a directory to validate recursive flag requirement
+          try {
+            const stat = await shell.context.fs.promises.stat(fullPath)
+            if (stat.isDirectory() && !recursive) {
+              await writelnStderr(process, terminal, `rm: ${target}: is a directory`)
+              hasError = true
+              continue
+            }
+          } catch (statError) {
+            // If stat fails, the file might not exist
+            // If force is enabled, we'll try to remove it anyway (rm will handle it)
+            // If force is not enabled, we'll let rm handle the error
           }
+
+          // Use fs.promises.rm with appropriate options
+          await shell.context.fs.promises.rm(fullPath, {
+            recursive: recursive,
+            force: force
+          })
         } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error)
-          await writelnStderr(process, terminal, `rm: ${target}: ${errorMessage}`)
-          hasError = true
+          // If force is enabled, ignore errors
+          if (!force) {
+            const errorMessage = error instanceof Error ? error.message : String(error)
+            await writelnStderr(process, terminal, `rm: ${target}: ${errorMessage}`)
+            hasError = true
+          }
         }
       }
 

package/src/commands/rmdir.ts

@@ -1,14 +1,14 @@
 import path from 'path'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
-import { writelnStdout, writelnStderr } from '../shared/helpers.js'
+import { writelnStderr } from '../shared/helpers.js'
 
 function printUsage(process: Process | undefined, terminal: Terminal): void {
   const usage = `Usage: rmdir [OPTION]... DIRECTORY...
 Remove the DIRECTORY(ies), if they are empty.
 
   --help  display this help and exit`
-  writelnStdout(process, terminal, usage)
+  writelnStderr(process, terminal, usage)
 }
 
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {

package/src/commands/sockets.ts

@@ -26,7 +26,7 @@ Examples:
   sockets create https://example.com:443 -t webtransport
   sockets close abc-123-def-456
   sockets show abc-123-def-456`
-  writelnStdout(process, terminal, usage)
+  writelnStderr(process, terminal, usage)
 }
 
 function findConnectionById(kernel: Kernel, id: string): SocketConnection | undefined {

package/src/commands/stat.ts

@@ -3,14 +3,14 @@ import chalk from 'chalk'
 import * as zipjs from '@zip.js/zip.js'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
-import { writelnStdout } from '../shared/helpers.js'
+import { writelnStdout, writelnStderr } from '../shared/helpers.js'
 
 function printUsage(process: Process | undefined, terminal: Terminal): void {
   const usage = `Usage: stat [OPTION]... FILE...
 Display file or file system status.
 
   --help  display this help and exit`
-  writelnStdout(process, terminal, usage)
+  writelnStderr(process, terminal, usage)
 }
 
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {
@@ -28,22 +28,50 @@ export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal):
         return 0
       }
 
-      const argPath = argv.length > 0 && argv[0] && !argv[0].startsWith('-') ? argv[0] : shell.cwd
-      const fullPath = argPath ? path.resolve(shell.cwd, argPath) : shell.cwd
-      const stats = await shell.context.fs.promises.stat(fullPath)
-      await writelnStdout(process, terminal, JSON.stringify(stats, null, 2))
-
-      const extension = path.extname(fullPath)
-      if (extension === '.zip') {
-        const blob = new Blob([new Uint8Array(await shell.context.fs.promises.readFile(fullPath))])
-        const zipReader = new zipjs.ZipReader(new zipjs.BlobReader(blob))
-        const entries = await zipReader.getEntries()
-        await writelnStdout(process, terminal, chalk.bold('\nZIP Entries:'))
-        for (const entry of entries) {
-          await writelnStdout(process, terminal, `${chalk.blue(entry.filename)} (${entry.uncompressedSize} bytes)`)
+      // Filter out options/flags and get target paths
+      const targets = argv.length > 0 
+        ? argv.filter(arg => !arg.startsWith('-'))
+        : [shell.cwd]
+
+      if (targets.length === 0) {
+        targets.push(shell.cwd)
+      }
+
+      let hasError = false
+
+      for (const target of targets) {
+        const fullPath = path.resolve(shell.cwd, target)
+        
+        try {
+          const stats = await shell.context.fs.promises.stat(fullPath)
+          
+          if (targets.length > 1) {
+            await writelnStdout(process, terminal, `${target}:`)
+          }
+          await writelnStdout(process, terminal, JSON.stringify(stats, null, 2))
+
+          const extension = path.extname(fullPath)
+          if (extension === '.zip') {
+            const blob = new Blob([new Uint8Array(await shell.context.fs.promises.readFile(fullPath))])
+            const zipReader = new zipjs.ZipReader(new zipjs.BlobReader(blob))
+            const entries = await zipReader.getEntries()
+            await writelnStdout(process, terminal, chalk.bold('\nZIP Entries:'))
+            for (const entry of entries) {
+              await writelnStdout(process, terminal, `${chalk.blue(entry.filename)} (${entry.uncompressedSize} bytes)`)
+            }
+          }
+          
+          if (targets.length > 1) {
+            await writelnStdout(process, terminal, '')
+          }
+        } catch (error) {
+          const errorMessage = error instanceof Error ? error.message : String(error)
+          await writelnStderr(process, terminal, `stat: ${target}: ${errorMessage}`)
+          hasError = true
         }
       }
-      return 0
+
+      return hasError ? 1 : 0
     }
   })
 }

package/src/commands/tail.ts

@@ -2,7 +2,7 @@ import path from 'path'
 import type { Kernel, Process, Shell, Terminal } from '@ecmaos/types'
 import { TerminalEvents } from '@ecmaos/types'
 import { TerminalCommand } from '../shared/terminal-command.js'
-import { writelnStdout } from '../shared/helpers.js'
+import { writelnStderr } from '../shared/helpers.js'
 
 function printUsage(process: Process | undefined, terminal: Terminal): void {
   const usage = `Usage: tail [OPTION]... [FILE]...
@@ -10,7 +10,7 @@ Print the last 10 lines of each FILE to standard output.
 
   -n, -nNUMBER        print the last NUMBER lines instead of 10
   --help             display this help and exit`
-  writelnStdout(process, terminal, usage)
+  writelnStderr(process, terminal, usage)
 }
 
 export function createCommand(kernel: Kernel, shell: Shell, terminal: Terminal): TerminalCommand {