copy-file-util 0.1.5 → 0.1.6

package/bin/cli.js

@@ -21,24 +21,18 @@
 //    $ node bin/cli.js --cd=spec/fixtures source/mock.html target/{{pkg.type}}/{{pkg.name}}-v{{pkg.version}}.html
 
 // Imports
+import { cliArgvUtil } from 'cli-argv-util';
 import { copyFile } from '../dist/copy-file.js';
 import { dna } from 'dna-engine';
 import chalk from 'chalk';
 import fs    from 'fs';
 import log   from 'fancy-log';
 
-// Parameters
-const validFlags =  ['cd', 'folder', 'note', 'quiet'];
-const args =        process.argv.slice(2);
-const flags =       args.filter(arg => /^--/.test(arg));
-const flagMap =     Object.fromEntries(flags.map(flag => flag.replace(/^--/, '').split('=')));
-const flagOn =      Object.fromEntries(validFlags.map(flag => [flag, flag in flagMap]));
-const invalidFlag = Object.keys(flagMap).find(key => !validFlags.includes(key));
-const params =      args.filter(arg => !/^--/.test(arg));
-
-// Data
-const source = params[0];
-const target = params[1];
+// Parameters and flags
+const validFlags = ['cd', 'folder', 'note', 'quiet'];
+const cli =        cliArgvUtil.parse(validFlags);
+const source =     cli.params[0];
+const target =     cli.params[1];
 
 // Utilities
 const readPackage = () => JSON.parse(fs.readFileSync('package.json', 'utf-8'));
@@ -50,26 +44,26 @@ const printReport = (result) => {
    const name =   chalk.gray('copy-file');
    const origin = chalk.blue.bold(result.origin);
    const dest =   chalk.magenta(result.dest);
-   const arrow =  chalk.gray.bold(' ⟹  ');  //extra space for alignment
+   const arrow =  chalk.gray.bold('→');
    const info =   chalk.white(`(${result.duration}ms)`);
    log(name, origin, arrow, dest, info);
    };
 
 // Copy File
 const error =
-   invalidFlag ?              'Invalid flag: ' + invalidFlag :
-   params.length > 2 ?        'Extraneous parameter: ' + params[2] :
-   !source ?                  'Missing source file.' :
-   !target && flagOn.folder ? 'Missing target folder.' :
-   !target ?                  'Missing target file.' :
+   cli.invalidFlag ?              cli.invalidFlagMsg :
+   cli.paramCount > 2 ?           'Extraneous parameter: ' + cli.params[2] :
+   !source ?                      'Missing source file.' :
+   !target && cli.flagOn.folder ? 'Missing target folder.' :
+   !target ?                      'Missing target file.' :
    null;
 if (error)
    throw Error('[copy-file-util] ' + error);
-const targetKey = flagOn.folder ? 'targetFolder' : 'targetFile';
+const targetKey = cli.flagOn.folder ? 'targetFolder' : 'targetFile';
 const options = {
-   cd:          flagMap.cd ?? null,
+   cd:          cli.flagMap.cd ?? null,
    [targetKey]: target.replace(/{{[^{}]*}}/g, getPackageField),
    };
 const result = copyFile.cp(source, options);
-if (!flagOn.quiet)
+if (!cli.flagOn.quiet)
    printReport(result);

package/dist/copy-file.d.ts

@@ -1,13 +1,13 @@
-//! copy-file-util v0.1.5 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
+//! copy-file-util v0.1.6 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
 
-export declare type Settings = {
+export type Settings = {
     cd: string;
     targetFile: string;
     targetFolder: string;
     fileExtension: string;
 };
-export declare type Options = Partial<Settings>;
-export declare type Result = {
+export type Options = Partial<Settings>;
+export type Result = {
     origin: string;
     dest: string;
     duration: number;

package/dist/copy-file.js

@@ -1,4 +1,4 @@
-//! copy-file-util v0.1.5 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
+//! copy-file-util v0.1.6 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
 
 import fs from 'fs';
 import path from 'path';

package/dist/copy-file.umd.cjs

@@ -1,4 +1,4 @@
-//! copy-file-util v0.1.5 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
+//! copy-file-util v0.1.6 ~~ https://github.com/center-key/copy-file-util ~~ MIT License
 
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "copy-file-util",
-   "version": "0.1.5",
+   "version": "0.1.6",
    "description": "Copy or rename a file with optional package version number (CLI tool designed for use in npm scripts)",
    "license": "MIT",
    "type": "module",
@@ -80,6 +80,7 @@
    },
    "dependencies": {
       "chalk": "~5.1",
+      "cli-argv-util": "~0.1",
       "dna-engine": "~2.2",
       "fancy-log": "~2.0",
       "slash": "~5.0"
@@ -87,16 +88,16 @@
    "devDependencies": {
       "@types/fancy-log": "~2.0",
       "@types/node": "~18.11",
-      "@typescript-eslint/eslint-plugin": "~5.42",
-      "@typescript-eslint/parser": "~5.42",
+      "@typescript-eslint/eslint-plugin": "~5.43",
+      "@typescript-eslint/parser": "~5.43",
       "add-dist-header": "~0.3",
       "assert-deep-strict-equal": "~1.0",
       "cpy-cli": "~4.2",
-      "eslint": "~8.27",
+      "eslint": "~8.28",
       "jshint": "~2.13",
       "mocha": "~10.1",
       "rimraf": "~3.0",
       "run-scripts-util": "~0.1",
-      "typescript": "~4.8"
+      "typescript": "~4.9"
    }
 }