copy-folder-util 1.2.1 → 1.2.3

package/dist/copy-folder.d.ts

@@ -1,4 +1,4 @@
-//! copy-folder-util v1.2.1 ~~ https://github.com/center-key/copy-folder-util ~~ MIT License
+//! copy-folder-util v1.2.3 ~~ https://github.com/center-key/copy-folder-util ~~ MIT License
 
 export type Settings = {
     basename: string | null;
@@ -11,6 +11,7 @@ export type Results = {
     count: number;
     duration: number;
     files: {
+        filename: string;
         origin: string;
         dest: string;
     }[];

package/dist/copy-folder.js

@@ -1,4 +1,4 @@
-//! copy-folder-util v1.2.1 ~~ https://github.com/center-key/copy-folder-util ~~ MIT License
+//! copy-folder-util v1.2.3 ~~ https://github.com/center-key/copy-folder-util ~~ MIT License
 
 import { cliArgvUtil } from 'cli-argv-util';
 import chalk from 'chalk';
@@ -63,11 +63,11 @@ const copyFolder = {
         };
         const files = [];
         const posixPath = (nativePath) => slash(nativePath.replace(/.*:/, ''));
-        const relativePath = (fullPath, start) => fullPath.substring(fullPath.indexOf(start) + start.length + 1);
         const filter = (origin, dest) => {
             const isFile = fs.statSync(origin).isFile();
             const name = path.basename(origin);
             const ext = path.extname(origin);
+            const ancestor = cliArgvUtil.calcAncestor(posixPath(origin), posixPath(dest));
             const keepFolder = !isFile && !copyFolder.extraneous.folders.includes(name);
             const keepFile = isFile &&
                 (filterOff.base || name.replace(/[.].*/, '') === settings.basename) &&
@@ -75,8 +75,9 @@ const copyFolder = {
                 !copyFolder.extraneous.files.includes(name);
             if (keepFile)
                 files.push({
-                    origin: relativePath(posixPath(origin), source),
-                    dest: relativePath(posixPath(dest), target),
+                    filename: name,
+                    origin: path.dirname(ancestor.source) + '/',
+                    dest: path.dirname(ancestor.target) + '/',
                 });
             return keepFolder || keepFile;
         };
@@ -95,12 +96,12 @@ const copyFolder = {
         };
         const settings = { ...defaults, ...options };
         const name = chalk.gray('copy-folder');
-        const indent = chalk.gray('|');
         const ancestor = cliArgvUtil.calcAncestor(results.source, results.target);
         const infoColor = results.count ? chalk.white : chalk.red.bold;
         const info = infoColor(`(files: ${results.count}, ${results.duration}ms)`);
         log(name, ancestor.message, info);
-        const logFile = (file) => log(name, indent, cliArgvUtil.calcAncestor(file.origin, file.dest).message);
+        const message = (source, filename, target) => chalk.gray(source) + cliArgvUtil.calcAncestor(filename, target).message;
+        const logFile = (file, i) => log(name, chalk.magenta(i + 1), message(file.origin, file.filename, file.dest));
         if (!settings.summaryOnly)
             results.files.forEach(logFile);
         return results;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "copy-folder-util",
-   "version": "1.2.1",
+   "version": "1.2.3",
    "description": "Recursively copy files from one folder to another folder (CLI tool designed for use in npm package.json scripts)",
    "license": "MIT",
    "type": "module",