js-dev-tool 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dev-tool",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "bin": {
     "jstool": "tools.js"
   },

package/progress/progress-extras.js

@@ -35,25 +35,19 @@ const wppHandlerV4 = ((renderer, cwd) => {
   };
 })(lib.renderLine, process.cwd());
 /** @type {TWebpackProgressHandler} */
-const wppHandlerV5 = ((renderer, cwd) => {
-  const cwdLen = cwd.length;
+const wppHandlerV5 = ((renderer/*, cwd*/) => {
+  const maxLen = 70;
   return (percentage, message, ...args) => {
     if (!message) {
       message = "- done -";
     }
     let pathOrPluginName = args.shift() || "";
-    if (pathOrPluginName) {
-      const x = pathOrPluginName.lastIndexOf(cwd) + 1;
-      if (x > 0) {
-        pathOrPluginName = pathOrPluginName.slice(x + cwdLen);
-      }
-    }
     renderer(
-      `pct: ${(percentage * 100).toFixed(4)}%, process: [${message}]${pathOrPluginName ? `, info: [${pathOrPluginName}]` : ""}${args.length ? " - " : ""}${args.join(", ")}`,
+      `pct: ${(percentage * 100).toFixed(4)}%, process: [${message}]${pathOrPluginName ? `, info: [${pathOrPluginName}]` : ""}${args.length ? " - " : ""}${args[0]?.slice(args[0].length - maxLen) || ""}`,
     );
     percentage === 1 && console.log();
   };
-})(lib.renderLine, process.cwd());
+})(lib.renderLine/*, process.cwd()*/);
 /** @type {boolean} */
 let checkedCache;
 /**

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.7"
+  "version": "1.0.9"
 }

package/tool-lib/cjbm.js

@@ -76,8 +76,10 @@ const emitProcessCallback = (ext) => {
    * @param {string[]} sourceFiles
    */
   return (sourceFiles) => {
-    if (sourceFiles && sourceFiles.length) {
-      for (let i = 0, sourceFilesLen = sourceFiles.length; i < sourceFilesLen;) {
+    /** @type {number} */
+    let sourceFilesLen;
+    if (sourceFiles && (sourceFilesLen = sourceFiles.length)) {
+      for (let i = 0; i < sourceFilesLen;) {
         const sourceFile = sourceFiles[i++];
         const parsed = path.parse(sourceFile);
         if (parsed.ext !== `.${ext}`) {
@@ -118,12 +120,13 @@ module.exports = () => {
     },
     get help() {
       return `${this.taskName}
-  ex - jstool -cmd cjbm [-root ./build | -basePath "./dist/esm,extra-tests/mini-semaphore"] [-ext js] [-targets "['core.js', 'object.js']"]
+  ex - jstool -cmd cjbm [-root ./build | -basePath "./dist/esm,extra-tests/mini-semaphore"] [-ext js] [-test /\\.js$/] [-targets "['core.js', 'object.js']"]
   note:
     root     - Recursively searches for files.
                This option is useful, but if there are directories that need to be avoided, use the 'basePath' option
     basePath - can be "<path>,<path>,..." (array type arg)
     ext      - specifies the module extension for import clauses. default is "js"
+    test     - Any file extension can be specified. (The default is /\\.js$/)
     targets  - specify this if you want to apply it only to a specific file.
                the file specified here should be directly under \`basePath\`!
                value must be array type arg, "['<path>', '<path>',...]" or "<path>,<path>,..."

package/tools.js

@@ -49,6 +49,18 @@ const terserOptions = {
     quote_style: 3,
   },
 };
+function getVersionRegex() {
+  const RE_SOURCE = String.raw`
+"?version("\s*:\s*)?
+  \s"?
+  (\d+)\.(\d+)\.(\d+) # version section
+  (                   # tag section
+    (?: -[A-Za-z0-9\-]+(?:\.[A-Za-z0-9\-]+)*)?
+    (?:\+[A-Za-z0-9\-]+(?:\.[A-Za-z0-9\-]+)*)?
+  )?"?
+`;
+  return new RegExp(RE_SOURCE.replace(/\(\?\#[\s\S]*?(?<!\\)\)|(?<![\\])(?:\#\s*$|\#[\s\S]*?$)|\s+/gm, ""), "g");
+}
 /**
  * @type {Record<string, TJSToolEntry>}
  */
@@ -96,7 +108,7 @@ const ToolFunctions = {
       let nextVersion;
       !isArray(pkgJsons) && (pkgJsons = [pkgJsons]);
       utils.fireReplace(
-        /"?version("\s*:\s*)?\s"?(\d+)\.(\d+)\.(\d+)(-\w+)?"?/,
+        getVersionRegex(),
         /** @type {TStringReplacer} */($0, isJson, $major, $minor, $patch, tag) => {
           /** @type {string | number} */
           let _major = $major;
@@ -115,8 +127,8 @@ const ToolFunctions = {
           } else {
             _patch = +_patch + 1;
           }
-          currentVersion = `${$major}.${$minor}.${$patch}${tag ? tag : ""}`;
-          nextVersion = `${_major}.${_minor}.${_patch}${tag ? tag : ""}`;
+          currentVersion = `${$major}.${$minor}.${$patch}${tag || ""}`;
+          nextVersion = `${_major}.${_minor}.${_patch}${tag || ""}`;
           return isJson ? `"version": "${nextVersion}"` : `version ${nextVersion}`;
         },
         pkgJsons,
@@ -127,7 +139,9 @@ const ToolFunctions = {
           ? [params.extras]
           : [];
       if (paths.length) {
-        utils.fireReplace(/(v)?(\d+\.\d+\.\d+)(?:-\w+)?/g, /** @type {TStringReplacer} */($0, $prefix, $versionStr) => {
+        utils.fireReplace(
+          /(v)?(\d+\.\d+\.\d+(?:[^\s"]+)?)/g,
+          /** @type {TStringReplacer} */($0, $prefix, $versionStr) => {
             if ($versionStr === currentVersion && $prefix) {
               return "v" + nextVersion;
             }