@vanillaes/esmtk 0.15.1 → 0.16.0

package/.vscode/launch.json

@@ -241,7 +241,43 @@
             "args": ["rm", "./test/cp2/test1.txt"],
             "console": "integratedTerminal",
         },
-                {
+        {
+            "name": "RemoveFile - Error file is a directory",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveGlob",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/*.js"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveGlob - Error glob not found",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/*.ts"],
+            "console": "integratedTerminal",
+        },
+        {
             "name": "RemoveDirectory",
             "type": "node",
             "request": "launch",
@@ -252,6 +288,54 @@
             "cwd": "${workspaceFolder}",
             "args": ["rm", "-r", "./test/cp2/"],
             "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveMultipleFiles",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/test1.txt", "./test/cp2/test2.txt"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveMultipleGlobs",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/*.txt", "./test/cp2/*.js"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveMultipleGlobs - Error glob not found",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/*.txt", "./test/cp2/*.ts"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "RemoveMultipleMixed",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["rm", "./test/cp2/test1.txt", "./test/cp2/*.js"],
+            "console": "integratedTerminal",
         }
     ]
 }

package/bin/commands/cp.js

@@ -26,11 +26,11 @@ export async function cp (paths, options) {
 
     if (source.includes('*')) {
       const sources = await expandSource(source)
-      await copyMultipleAsync(sources, target)
+      await copyMultipleAsync(sources, target, options?.force)
     }
   }
 
-  if (paths.length >= 2) {
+  if (paths.length > 2) {
     let sources = paths.slice(0, -1)
     sources = await await Promise.all(sources.map(source => expandSource(source)))
     sources = sources.flat()

package/bin/commands/rm.js

@@ -1,16 +1,34 @@
-import { removeAsync, removeRecursiveAsync } from '../../src/rm.js'
+import { removeAsync, removeMultipleAsync, removeRecursiveAsync } from '../../src/rm.js'
+import { expandSource } from '../../src/util.js'
 
 /**
  * POSIX rm Implemented in Node
- * @param {string} path path of file(s)/directorie(s) to remove
+ * @param {string[]} paths Variadic of file paths
  * @param {any} options rm options
  */
-export async function rm (path, options) {
-  if (!options?.recursive) {
-    await removeAsync(path, options?.force)
+export async function rm (paths, options) {
+  if (paths.length === 1) {
+    if (!options?.recursive && !paths[0].includes('*')) {
+      const file = paths[0]
+      await removeAsync(file, options?.force)
+    }
+
+    if (options?.recursive) {
+      const directory = paths[0]
+      await removeRecursiveAsync(directory, options?.force)
+    }
+
+    if (paths[0].includes('*')) {
+      const glob = paths[0]
+      const files = await expandSource(glob)
+      await removeMultipleAsync(files, options?.force)
+    }
   }
 
-  if (options?.recursive) {
-    await removeRecursiveAsync(path, options?.force)
+  if (paths.length > 1) {
+    let files = await await Promise.all(paths.map(path => expandSource(path)))
+    files = files.flat()
+
+    await removeMultipleAsync(files, options?.force)
   }
 }

package/bin/esmtk.js

@@ -52,7 +52,6 @@ program.command('minify <input> <output>')
   })
 
 program.command('cp')
-  .argument('[paths...]')
   .usage(`[-r] source target
 
     Examples:
@@ -62,18 +61,27 @@ program.command('cp')
       $ cp -r SOURCEDIR DIRECTORY
   `)
   .description('Copy files and directories')
+  .argument('[paths...]')
   .option('-r, --recursive', 'Copy directories recursively', false)
   .action((paths, options) => {
     cp(paths, options)
   })
 
-program.command('rm <path>')
-  .usage('[-rf] file|directory')
-  .description('Remove a file|directory')
+program.command('rm')
+  .usage(`[-r] path/glob
+
+    Examples:
+      $ rm FILE
+      $ rm FILES...
+      $ rm GLOB...
+      $ rm -r DIRECTORY
+  `)
+  .description('Remove files or directories')
+  .argument('[paths...]')
   .option('-f, --force', 'Do not prompt before overwriting', false)
   .option('-r, --recursive', 'Remove directories recursively', false)
-  .action((path, options) => {
-    rm(path, options)
+  .action((paths, options) => {
+    rm(paths, options)
   })
 
 program.parse(process.argv)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillaes/esmtk",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "ES Module Toolkit",
   "keywords": [
     "esm",
@@ -45,6 +45,7 @@
     "standard": "^17.1.2"
   },
   "devDependencies": {
-    "@types/node": "^25.3.5"
+    "@types/json5": "^0.0.30",
+    "@types/node": "^25.5.0"
   }
 }

package/src/index.d.ts

@@ -1,3 +1,3 @@
 export { copyAsync, copyRecursiveAsync } from "./cp.js";
-export { removeAsync, removeRecursiveAsync } from "./rm.js";
+export { removeAsync, removeMultipleAsync, removeRecursiveAsync } from "./rm.js";
 export { expandSource, fileExists, installed, match, which } from "./util.js";

package/src/index.js

@@ -1,3 +1,3 @@
 export { copyAsync, copyRecursiveAsync } from './cp.js'
-export { removeAsync, removeRecursiveAsync } from './rm.js'
+export { removeAsync, removeMultipleAsync, removeRecursiveAsync } from './rm.js'
 export { expandSource, fileExists, installed, match, which } from './util.js'

package/src/rm.d.ts

@@ -4,6 +4,13 @@
  * @param {boolean} force Ignore exceptions if the file doesn't exist (default false)
  */
 export function removeAsync(path: string, force?: boolean): Promise<void>;
+/**
+ * Remove a multiple files/globs asynchronously
+ *
+ * @param {string[]} files The files/globs to delete
+ * @param {boolean} force If the file already exists, overwrite it (default false)
+ */
+export function removeMultipleAsync(files: string[], force?: boolean): Promise<void>;
 /**
  * Recursively remove a file|directory asynchronously
  * @param {string} path The file|directory to remove

package/src/rm.js

@@ -9,22 +9,42 @@ import { rm, stat } from 'node:fs/promises'
 export async function removeAsync (path, force = false) {
   const exists = await fileExists(path)
   if (!exists) {
-    console.error(`rm: path ${path} does not exist`)
+    console.error(`rm: ${path} No such file or directory`)
     process.exit(1)
   }
   const stats = await stat(path)
   if (stats.isSymbolicLink()) {
-    console.error(`rm: path ${path} is a sybolic link`)
+    console.error(`rm: ${path} is a sybolic link`)
+    process.exit(1)
+  }
+  if (!stats.isFile()) {
+    console.error(`rm: ${path} is a directory`)
     process.exit(1)
   }
 
   try {
-    await rm(path, { force })
+    await rm(path, { force: true })
   } catch (err) {
     console.error(`rm: error ${err.message}`)
   }
 }
 
+/**
+ * Remove a multiple files/globs asynchronously
+ *
+ * @param {string[]} files The files/globs to delete
+ * @param {boolean} force If the file already exists, overwrite it (default false)
+ */
+export async function removeMultipleAsync (files, force = false) {
+  try {
+    for (const file of files) {
+      await rm(file, { force: true })
+    }
+  } catch (err) {
+    console.error(`cp": error ${err.message}`)
+  }
+}
+
 /**
  * Recursively remove a file|directory asynchronously
  * @param {string} path The file|directory to remove
@@ -33,17 +53,17 @@ export async function removeAsync (path, force = false) {
 export async function removeRecursiveAsync (path, force = false) {
   const exists = await fileExists(path)
   if (!exists) {
-    console.error(`rm: path ${path} does not exist`)
+    console.error(`rm: ${path} No such file or directory`)
     process.exit(1)
   }
   const stats = await stat(path)
   if (stats.isSymbolicLink()) {
-    console.error(`rm: path ${path} is a sybolic link`)
+    console.error(`rm: ${path} is a sybolic link`)
     process.exit(1)
   }
 
   try {
-    await rm(path, { force, recursive: true })
+    await rm(path, { force: true, recursive: true })
   } catch (err) {
     console.error(`rm": error ${err.message}`)
   }

package/src/util.js

@@ -15,7 +15,7 @@ export async function expandSource (source) {
   if (isGlob) {
     const paths = await match(source)
     if (paths.length === 0) {
-      console.error(`cp: ${paths} no matches found`)
+      console.error(`cp: ${source} no matches found`)
       process.exit(1)
     }
     return paths