@vanillaes/esmtk 0.14.0 → 0.15.1

package/.vscode/launch.json

@@ -106,7 +106,55 @@
             ],
             "program": "${workspaceFolder}/bin/esmtk.js",
             "cwd": "${workspaceFolder}",
-            "args": ["cp", "./test/cp/test1.txt", "./test/cp2"],
+            "args": ["cp", "./test/cp/test1.txt", "./test/cp2/test1.txt"],
+            "console": "integratedTerminal",
+        },
+                {
+            "name": "CopyGlobToFolder",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/*.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyFileToFile - Error source doesn't exist",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/testx.txt", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyFileToFile - Error source is a directory",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/", "./test/cp2/test1.txt"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyFileToFile - Error target directory doesn't exist",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/test1.txt", "./test/cpx/"],
             "console": "integratedTerminal",
         },
         {
@@ -121,6 +169,66 @@
             "args": ["cp", "-r", "./test/cp/", "./test/cp2"],
             "console": "integratedTerminal",
         },
+        {
+            "name": "CopyMultipleFiles",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/test1.txt", "./test/cp/test1.js", "./test/cp/test2.txt", "./test/cp/test2.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyMultipleFiles - Error file doesn't exist",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/test1.ts", "./test/cp/test1.js", "./test/cp/test2.txt", "./test/cp/test2.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyMultipleGlobs",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/*.txt", "./test/cp/*.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyMultipleGlobs - Error glob not found",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/*.ts", "./test/cp/*.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
+        {
+            "name": "CopyMultipleMixed",
+            "type": "node",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/bin/esmtk.js",
+            "cwd": "${workspaceFolder}",
+            "args": ["cp", "./test/cp/test1.txt", "./test/cp/test2.txt", "./test/cp/*.js", "./test/cp2/"],
+            "console": "integratedTerminal",
+        },
         {
             "name": "RemoveFile",
             "type": "node",

package/bin/commands/cp.js

@@ -1,16 +1,41 @@
-import { copyAsync, copyRecursiveAsync } from '../../src/cp.js'
+import { copyAsync, copyMultipleAsync, copyRecursiveAsync } from '../../src/cp.js'
+import { expandSource } from '../../src/index.js'
 
 /**
  * POSIX cp Implemented in Node
- * @param {string} path path of file(s)/directorie(s) to copy
- * @param {any} options cp options
+ *
+ * @param {string[]} paths Variadic of source/destination paths
+ * @param {any} options 'cp' options
  */
-export async function cp (source, target, options) {
-  if (!options?.recursive) {
-    await copyAsync(source, target, options?.force)
+export async function cp (paths, options) {
+  if (paths.length < 2) {
+    console.error('cp: Not enough arguments')
   }
 
-  if (options?.recursive) {
-    await copyRecursiveAsync(source, target, options?.force)
+  if (paths.length === 2) {
+    const source = paths[0]
+    const target = paths[1]
+
+    if (!options?.recursive && !source.includes('*')) {
+      await copyAsync(source, target, options?.force)
+    }
+
+    if (options?.recursive) {
+      await copyRecursiveAsync(source, target, options?.force)
+    }
+
+    if (source.includes('*')) {
+      const sources = await expandSource(source)
+      await copyMultipleAsync(sources, target)
+    }
+  }
+
+  if (paths.length >= 2) {
+    let sources = paths.slice(0, -1)
+    sources = await await Promise.all(sources.map(source => expandSource(source)))
+    sources = sources.flat()
+    const target = paths.slice(-1)[0]
+
+    await copyMultipleAsync(sources, target, options?.force)
   }
 }

package/bin/esmtk.js

@@ -51,13 +51,20 @@ program.command('minify <input> <output>')
     minify(input, output, options)
   })
 
-program.command('cp <source> <target>')
-  .usage('[-rf] source target')
-  .description('Copy files from the source to the target')
-  .option('-f, --force', 'Do not prompt before overwriting', false)
+program.command('cp')
+  .argument('[paths...]')
+  .usage(`[-r] source target
+
+    Examples:
+      $ cp SOURCE DEST
+      $ cp SOURCE... DIRECTORY
+      $ cp SOURCEGLOB... DIRECTORY
+      $ cp -r SOURCEDIR DIRECTORY
+  `)
+  .description('Copy files and directories')
   .option('-r, --recursive', 'Copy directories recursively', false)
-  .action((source, target, options) => {
-    cp(source, target, options)
+  .action((paths, options) => {
+    cp(paths, options)
   })
 
 program.command('rm <path>')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillaes/esmtk",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "ES Module Toolkit",
   "keywords": [
     "esm",
@@ -37,6 +37,9 @@
     "preversion": "npm run lint && npm run types",
     "postversion": "git push --follow-tags"
   },
+  "engines": {
+    "node": ">=22"
+  },
   "dependencies": {
     "commander": "^14.0.3",
     "standard": "^17.1.2"

package/src/cp.d.ts

@@ -1,12 +1,22 @@
 /**
  * Copy a single file asynchronously
+ *
  * @param {string} source The source file
  * @param {string} target The target file
  * @param {boolean} force If the file already exists, overwrite it (default false)
  */
 export function copyAsync(source: string, target: string, force?: boolean): Promise<void>;
+/**
+ * Copy a multiple files/globs asynchronously
+ *
+ * @param {string[]} sources The source files/globs
+ * @param {string} target The target file
+ * @param {boolean} force If the file already exists, overwrite it (default false)
+ */
+export function copyMultipleAsync(sources: string[], target: string, force?: boolean): Promise<void>;
 /**
  * Recursively copy a directory asynchronously
+ *
  * @param {string} source The source directory
  * @param {string} target The target directory
  * @param {boolean} force If the file already exists, overwrite it (default false)

package/src/cp.js

@@ -1,9 +1,10 @@
 import { fileExists } from './index.js'
-import { basename, dirname } from 'node:path'
+import { basename, sep } from 'node:path'
 import { cp, stat } from 'node:fs/promises'
 
 /**
  * Copy a single file asynchronously
+ *
  * @param {string} source The source file
  * @param {string} target The target file
  * @param {boolean} force If the file already exists, overwrite it (default false)
@@ -11,45 +12,78 @@ import { cp, stat } from 'node:fs/promises'
 export async function copyAsync (source, target, force = false) {
   const sExists = await fileExists(source)
   if (!sExists) {
-    console.error(`cp: source ${source} does not exist`)
+    console.error(`cp: ${source} No such file or directory`)
     process.exit(1)
   }
   const sStats = await stat(source)
   if (sStats.isSymbolicLink()) {
-    console.error(`cp: source ${source} is a sybolic link`)
+    console.error(`cp: ${source} is a sybolic link (not copied)`)
     process.exit(1)
   }
-
-  const tDir = dirname(target)
-  const tDirExists = await fileExists(tDir)
-  if (!tDirExists) {
-    console.error(`cp: target directory ${tDir} does not exist`)
+  if (!sStats.isFile()) {
+    console.error(`cp: ${source} is a directory (not copied)`)
     process.exit(1)
   }
 
   const tExists = await fileExists(target)
-  if (tExists) {
+  const tIsDir = target.endsWith(sep)
+  // copy file-to-directory
+  if (tIsDir) {
+    if (!tExists) {
+      console.error(`cp: ${target} No such file or directory`)
+      process.exit(1)
+    }
     const tStats = await stat(target)
     if (tStats.isSymbolicLink()) {
-      console.error(`cp: target ${target} is a sybolic link`)
+      console.error(`cp: ${target} is a sybolic link (not copied)`)
       process.exit(1)
     }
-    if (tStats.isDirectory()) {
-      const sourceFile = basename(source)
-      target = target.endsWith('/') ? target.slice(0, -1) : target
-      target = `${target}/${sourceFile}`
-    }
+
+    // append source file name to target directory
+    const sourceFile = basename(source)
+    target = target.endsWith('/') ? target.slice(0, -1) : target
+    target = `${target}/${sourceFile}`
   }
 
   try {
-    await cp(source, target, { force })
+    await cp(source, target, { force: true })
   } catch (err) {
     console.error(`cp: error ${err.message}`)
   }
 }
 
+/**
+ * Copy a multiple files/globs asynchronously
+ *
+ * @param {string[]} sources The source files/globs
+ * @param {string} target The target file
+ * @param {boolean} force If the file already exists, overwrite it (default false)
+ */
+export async function copyMultipleAsync (sources, target, force = false) {
+  const tExists = await fileExists(target)
+  if (!tExists) {
+    console.error(`cp: ${target} No such file or directory`)
+    process.exit(1)
+  }
+  const tStats = await stat(target)
+  if (tStats.isSymbolicLink()) {
+    console.error(`cp: ${target} is a sybolic link (not copied)`)
+    process.exit(1)
+  }
+
+  try {
+    target = target.endsWith('/') ? target.slice(0, -1) : target
+    for (const source of sources) {
+      await cp(source, `${target}/${basename(source)}`, { force: true })
+    }
+  } catch (err) {
+    console.error(`cp": error ${err.message}`)
+  }
+}
+
 /**
  * Recursively copy a directory asynchronously
+ *
  * @param {string} source The source directory
  * @param {string} target The target directory
  * @param {boolean} force If the file already exists, overwrite it (default false)
@@ -57,32 +91,32 @@ export async function copyAsync (source, target, force = false) {
 export async function copyRecursiveAsync (source, target, force = false) {
   const sExists = await fileExists(source)
   if (!sExists) {
-    console.error(`cp: source ${source} does not exist`)
+    console.error(`cp: ${source} No such file or directory`)
     process.exit(1)
   }
   const sStats = await stat(source)
   if (sStats.isSymbolicLink()) {
-    console.error(`cp: source ${source} is a sybolic link`)
+    console.error(`cp: ${source} is a sybolic link (not copied)`)
     process.exit(1)
   }
 
   const tExists = await fileExists(target)
   if (!tExists) {
-    console.error(`cp: target directory ${target} does not exist`)
+    console.error(`cp: ${target} No such file or directory`)
     process.exit(1)
   }
   const tStats = await stat(target)
   if (tStats.isSymbolicLink()) {
-    console.error(`cp: target ${target} is a sybolic link`)
+    console.error(`cp: ${target} is a sybolic link (not copied)`)
     process.exit(1)
   }
   if (!tStats.isDirectory()) {
-    console.error(`cp: target ${target} is not a directory`)
+    console.error(`cp: target ${target} Not a directory`)
     process.exit(1)
   }
 
   try {
-    await cp(source, target, { force, recursive: true })
+    await cp(source, target, { force: true, recursive: true })
   } catch (err) {
     console.error(`cp": error ${err.message}`)
   }

package/src/index.d.ts

@@ -1,3 +1,3 @@
 export { copyAsync, copyRecursiveAsync } from "./cp.js";
 export { removeAsync, removeRecursiveAsync } from "./rm.js";
-export { fileExists, installed, which } from "./util.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 { fileExists, installed, which } from './util.js'
+export { expandSource, fileExists, installed, match, which } from './util.js'

package/src/util.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Expand source file/glob into a list of paths
+ *
+ * @param {*} source the source file/glob
+ * @returns {Promise<string[]>} an array of paths
+ */
+export function expandSource(source: any): Promise<string[]>;
 /**
  * Check if a file/folder exists
  * @param {string} path the path to the file/folder
@@ -10,6 +17,12 @@ export function fileExists(path: string): Promise<boolean>;
  * @returns {Promise<boolean>} true if the package is installed, false otherwise
  */
 export function installed(pkg: string): Promise<boolean>;
+/**
+ * Description
+ * @param {string} pattern glob pattern(s) to match
+ * @returns {Promise<string[]>} an array of paths
+ */
+export function match(pattern: string): Promise<string[]>;
 /**
  * Check to see if an application is installed globally
  * @param {string} program the name of the application

package/src/util.js

@@ -1,9 +1,34 @@
 import { exec } from 'child_process'
-import { access, constants } from 'node:fs/promises'
+import { access, constants, glob } from 'node:fs/promises'
 import { promisify } from 'node:util'
 
 const execAsync = promisify(exec)
 
+/**
+ * Expand source file/glob into a list of paths
+ *
+ * @param {*} source the source file/glob
+ * @returns {Promise<string[]>} an array of paths
+ */
+export async function expandSource (source) {
+  const isGlob = source.includes('*')
+  if (isGlob) {
+    const paths = await match(source)
+    if (paths.length === 0) {
+      console.error(`cp: ${paths} no matches found`)
+      process.exit(1)
+    }
+    return paths
+  } else {
+    const exists = await fileExists(source)
+    if (!exists) {
+      console.error(`cp: ${source} No such file or directory`)
+      process.exit(1)
+    }
+    return [source]
+  }
+}
+
 /**
  * Check if a file/folder exists
  * @param {string} path the path to the file/folder
@@ -32,6 +57,15 @@ export async function installed (pkg) {
   }
 }
 
+/**
+ * Description
+ * @param {string} pattern glob pattern(s) to match
+ * @returns {Promise<string[]>} an array of paths
+ */
+export async function match (pattern) {
+  return await Array.fromAsync(glob(pattern))
+}
+
 /**
  * Check to see if an application is installed globally
  * @param {string} program the name of the application