cli-argv-util 1.5.0 → 1.5.1

package/dist/cli-argv-util.d.ts

@@ -1,4 +1,4 @@
-//! cli-argv-util v1.5.0 ~~ https://github.com/center-key/cli-argv-util ~~ MIT License
+//! cli-argv-util v1.5.1 ~~ https://github.com/center-key/cli-argv-util ~~ MIT License
 
 export type StringFlagMap = {
     [flag: string]: string | undefined;
@@ -29,8 +29,12 @@ type JsonObject = {
 };
 declare const cliArgvUtil: {
     assert(ok: unknown, message: string | null): void;
-    readPackageJson(): JsonObject | null;
-    unescape(flags: StringFlagMap): StringFlagMap;
+    readPackageJson(): JsonObject;
+    escapers: {
+        regex: RegExp;
+        char: string;
+    }[];
+    unescape(text: string, pkg: JsonObject): string;
     parse(validFlags: string[]): Result;
     run(packageJson: {
         [key: string]: unknown;

package/dist/cli-argv-util.js

@@ -1,4 +1,4 @@
-//! cli-argv-util v1.5.0 ~~ https://github.com/center-key/cli-argv-util ~~ MIT License
+//! cli-argv-util v1.5.1 ~~ https://github.com/center-key/cli-argv-util ~~ MIT License
 
 import { execSync } from 'node:child_process';
 import chalk from 'chalk';
@@ -11,8 +11,9 @@ const cliArgvUtil = {
             throw new Error(`[replacer-util] ${message}`);
     },
     readPackageJson() {
-        const pkgExists = fs.existsSync('package.json');
-        const pkg = pkgExists ? JSON.parse(fs.readFileSync('package.json', 'utf-8')) : null;
+        const pkgFile = 'package.json';
+        const getPkg = () => JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
+        const pkg = fs.existsSync(pkgFile) ? getPkg() : {};
         const fixHiddenKeys = (pkgObj) => {
             const unhide = (key) => {
                 const newKey = key.replace(/[@./]/g, '-');
@@ -21,60 +22,59 @@ const cliArgvUtil = {
             };
             Object.keys(pkgObj).forEach(unhide);
         };
-        if (pkg?.dependencies)
+        if (pkg.dependencies)
             fixHiddenKeys(pkg.dependencies);
-        if (pkg?.devDependencies)
+        if (pkg.devDependencies)
             fixHiddenKeys(pkg.devDependencies);
+        if (!pkg.cliConfig && pkg.replacerConfig)
+            pkg.cliConfig = pkg.replacerConfig;
         return pkg;
     },
-    unescape(flags) {
-        const escapers = [
-            [/{{apos}}/g, "'"],
-            [/{{bang}}/g, '!'],
-            [/{{close-curly}}/g, '}'],
-            [/{{equals}}/g, '='],
-            [/{{gt}}/g, '>'],
-            [/{{hash}}/g, '#'],
-            [/{{lt}}/g, '<'],
-            [/{{open-curly}}/g, '{'],
-            [/{{pipe}}/g, '|'],
-            [/{{quote}}/g, '"'],
-            [/{{semi}}/g, ';'],
-            [/{{space}}/g, ' '],
-        ];
+    escapers: [
+        { regex: /{{apos}}/g, char: "'" },
+        { regex: /{{bang}}/g, char: '!' },
+        { regex: /{{close-curly}}/g, char: '}' },
+        { regex: /{{equals}}/g, char: '=' },
+        { regex: /{{gt}}/g, char: '>' },
+        { regex: /{{hash}}/g, char: '#' },
+        { regex: /{{lt}}/g, char: '<' },
+        { regex: /{{open-curly}}/g, char: '{' },
+        { regex: /{{pipe}}/g, char: '|' },
+        { regex: /{{quote}}/g, char: '"' },
+        { regex: /{{semi}}/g, char: ';' },
+        { regex: /{{space}}/g, char: ' ' },
+    ],
+    unescape(text, pkg) {
         const macroPattern = /^{{macro:(.*)}}$/;
-        const flagEntries = Object.entries(flags);
-        const usesMacros = flagEntries.some(entry => entry[1]?.match(macroPattern));
-        const pkg = usesMacros ? cliArgvUtil.readPackageJson() : {};
-        if (!pkg.cliConfig && pkg.replacerConfig)
-            pkg.cliConfig = pkg.replacerConfig;
-        const macros = pkg.cliConfig?.macros;
-        const unescapeOne = (flagValue, escaper) => flagValue.replace(escaper[0], escaper[1]);
-        const expandMacro = (flagValue) => {
-            const macroName = flagValue.match(macroPattern)?.[1];
-            const macroValue = macros?.[macroName];
-            const missing = macroName && !macroValue;
-            cliArgvUtil.assert(!missing, `Macro "${macroName}" used but not defined in package.json`);
-            return macroName ? macroValue : flagValue;
-        };
-        const doReplacements = (flagValue) => !flagValue ? undefined : escapers.reduce(unescapeOne, expandMacro(flagValue));
-        return Object.fromEntries(flagEntries.map(pair => [pair[0], doReplacements(pair[1])]));
+        const macros = (pkg.cliConfig?.macros ?? {});
+        const macroName = text.match(macroPattern)?.[1];
+        const macroValue = macros[macroName];
+        const expandedText = macroName ? macroValue : text;
+        const missing = macroName && !macroValue;
+        cliArgvUtil.assert(!missing, `Macro "${macroName}" used but not defined in package.json`);
+        const replace = (flagValue, escaper) => flagValue.replace(escaper.regex, escaper.char);
+        return cliArgvUtil.escapers.reduce(replace, expandedText);
     },
     parse(validFlags) {
+        const pkg = cliArgvUtil.readPackageJson();
         const toCamel = (token) => token.replace(/-./g, char => char[1].toUpperCase());
         const toEntry = (pair) => [toCamel(pair[0]), pair[1]];
         const toPair = (flag) => flag.replace(/^--/, '').split('=');
+        const unescape = (value) => !value ? undefined : cliArgvUtil.unescape(value, pkg);
         const args = cliArgvUtil.unquoteArgs(process.argv.slice(2));
         const pairs = args.filter(arg => /^--/.test(arg)).map(toPair);
-        const flagMap = Object.fromEntries(pairs.map(toEntry));
-        const onEntries = validFlags.map(flag => [toCamel(flag), toCamel(flag) in flagMap]);
+        const flagMapRaw = Object.fromEntries(pairs.map(toEntry));
+        const flagEntries = Object.entries(flagMapRaw);
+        const flagMap = Object.fromEntries(flagEntries.map(pair => [pair[0], unescape(pair[1])]));
+        const onEntries = validFlags.map(flag => [toCamel(flag), toCamel(flag) in flagMapRaw]);
         const flagOn = Object.fromEntries(onEntries);
         const invalidFlag = pairs.find(pair => !validFlags.includes(pair[0]))?.[0] ?? null;
         const helpMsg = '\nValid flags are --' + validFlags.join(' --');
-        const params = args.filter(arg => !/^--/.test(arg));
+        const rawParams = args.filter(arg => !/^--/.test(arg));
+        const params = rawParams.map(param => cliArgvUtil.unescape(param, pkg));
         return {
-            flagMap: cliArgvUtil.unescape(flagMap),
-            flagMapRaw: flagMap,
+            flagMap: flagMap,
+            flagMapRaw: flagMapRaw,
             flagOn: flagOn,
             invalidFlag: invalidFlag,
             invalidFlagMsg: invalidFlag ? 'Invalid flag: --' + invalidFlag + helpMsg : null,

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cli-argv-util",
-   "version": "1.5.0",
+   "version": "1.5.1",
    "description": "Simple utility to parse command line parameters and flags (arguments vector)",
    "license": "MIT",
    "type": "module",
@@ -36,6 +36,8 @@
    },
    "cliConfig": {
       "macros": {
+         "html-filename": "file.html",
+         "png-filename": "file.png",
          "lucky-number": "777"
       }
    },
@@ -61,17 +63,17 @@
       "slash": "~5.1"
    },
    "devDependencies": {
-      "@eslint/js": "~9.39",
-      "@types/node": "~25.0",
+      "@eslint/js": "~10.0",
+      "@types/node": "~25.5",
       "add-dist-header": "~1.6",
       "assert-deep-strict-equal": "~1.2",
       "copy-file-util": "~1.3",
-      "eslint": "~9.39",
+      "eslint": "~10.1",
       "jshint": "~2.13",
       "mocha": "~11.7",
       "rimraf": "~6.1",
       "run-scripts-util": "~1.3",
       "typescript": "~5.9",
-      "typescript-eslint": "~8.54"
+      "typescript-eslint": "~8.57"
    }
 }