js-dev-tool 1.0.1 → 1.0.3

package/tool-lib/cmt-trick.js

@@ -10,14 +10,11 @@
 /**
  * @file comment trick toggle
  */
-
 /**
  *
  * @param {string} code
  */
 function cleanup(code) {
-  // DEVNOTE: 2023/10/27 - PCRE2 style: https://regex101.com/r/r3aGp5/2
-  // NOTE: cleanup 用の regex
   const pcreStyle = String.raw`
 \s*\/
   (?:
@@ -33,13 +30,10 @@ function cleanup(code) {
   )
 \s*\/{2,}\*\/
 `;
-  // to js regex
-  // /\s*\/(?:\s*\/+\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)([\s\S]+?)\/\*\/[\s\S]+|\s*\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)[\s\S]+\/\*\/([\s\S]+?))\s*\/{2,}\*\//g
   return code.replace(
     new RegExp(pcreStyle.replace(/\s*\(\?#.*\)\s*$|#\s.*$|\s+/gm, ""), "g"), ($0, $1, $2) => $1 || $2,
   );
 }
-
 /**
  * @param {string} code
  */
@@ -57,56 +51,19 @@ function doIt(code) {
     },
   );
 }
-
-//  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// url: https://github.com/marketplace/models/azure-openai/gpt-4-1/playground?preset=jeffy-g%2Fts-js-adviser
-// DEVNOTE: 2025/9/8 7:15:24 - この code の original は OpenAI GPT-4.1 が提示したものだが、
-// そのままでは、意図した挙動にならず、修正
-//  -> 結局、origin `doIt` でしっかり処理できていたので、不要に
-//  -> 一回しか置換できないと勘違いし、doIt を review してもらったが、
-//     原因は `//* ctt` のようになっていなかったため (token "ctt" が抜けていた)
-//  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// /** @type {RegExp} */
-// const BLOCK_RE = /^(?:\s*(\/+)\*+\s*(.+))$/gm;
-// /**
-//  * @param {string} code
-//  */
-// function doIt(code) {
-//   return code.replace(BLOCK_RE, ($0, $1, $2, offset, str) => {
-//     // すぐ後ろに* cttなどがあれば...
-//     if (/ctt|comment-toggle-trick|https:\/\/coderwall/.test($2)) {
-//     // if (str.slice(offset).match(/^\/*\*\s?(ctt|comment-toggle-trick|https:\/\/coderwall)/)) {
-//       const slashes = $1.length === 2 ? "/" : "//";
-//       console.log(
-//         "the-comment-toggle-trick: %s",
-//         slashes === "/" ? "-->enable before<--, mute after" : "mute before, -->enable after<--"
-//       );
-//       return slashes;
-//     }
-//     return $0;
-//   });
-// }
-
-// yarn test -base ./tool-lib -test re/\\.js$/ -help cmtTrick
-// yarn test -base ./tool-lib -test re/\\.js$/ -cmd cmtTrick:clean
 /**
  * @returns {TJSToolEntry}
  * @version 2.0 2023-10-27 supports `mode` feature
  */
 module.exports = () => {
   return {
-    // ^\s*\/+\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)[\s\S]+\s*\/+\*\/|\/\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)[\s\S]+\/\*\/\s*([\s\S]+)\s*\/+\*\/
     taskName: "comment trick toggle",
     fn(mode) {
       processSources(
         /** @type {string} */ (this.taskName), (code) => {
           return mode === "clean" ? cleanup(code) : doIt(code);
         }, {
-          /* ctt
-          ...params
-          /*/
           ...params,
-          //*/
         },
       );
     },
@@ -122,4 +79,4 @@ module.exports = () => {
 `;
     },
   };
-};
+};

package/tool-lib/ps.js

@@ -7,20 +7,45 @@
 */
 /// <reference path="./tools.d.ts"/>
 // @ts-check
-
 const DEBUG = 0;
+/** @type {(err: NodeJS.ErrnoException, cb: () => void) => void} */
+const handleError = (err, done) => {
+  console.error(err);
+  done();
+};
 /**
  * @file `processSources` will be globalized
  */
 module.exports = {
   /**
-   *
    * @param {import("fs")} fs
    * @param {import("../utils")} utils
    */
   globalize: (fs, utils) => {
     /**
-     *
+     * @param {string} dir
+     * @param {string[]} sourceFiles
+     * @param {RegExp} testRe
+     * @param {true=} recurse
+     */
+    const visitDirectory = (dir, sourceFiles, testRe, recurse) => {
+      if (dir.length) {
+        if (!fs.existsSync(dir)) {
+          console.info(`directory: [${dir}] is not found`);
+        } else {
+          utils.walkDirSync(dir, (dirent) => {
+            const currentPath = `${dir}/${dirent.name}`;
+            if (dirent.isFile() && testRe.test(dirent.name)) {
+              DEBUG && console.log("processSources::", dirent.name);
+              sourceFiles.push(currentPath);
+            } else if (recurse && dirent.isDirectory()) {
+              visitDirectory(currentPath, sourceFiles, testRe, true);
+            }
+          });
+        }
+      }
+    };
+    /**
      * @param {string} taskName
      * @param {(source: string) => Promise<string> | string} process
      * @param {TProcessSourcesOpt} [opt]
@@ -34,112 +59,80 @@ module.exports = {
         suffix = "",
         targets,
       } = opt;
-
-      /** @type {string[]} */
+      /**
+       * 主に javascript 系 file を push する.
+       * 
+       * directory は除外
+       * @type {string[]}
+       */
       let sourceFiles;
       if ((!targets && root) || bases || base) {
         sourceFiles = [];
-        const re = params.test || test;
-        const actualBases = Array.isArray(bases) ? bases : [base];
-        DEBUG && console.log("processSources::", actualBases, re);
-        // DEVNOTE: 2022/05/28 - bash bug?, cannot evaluate regex string at "tool.sh"
-        DEBUG && console.log("processSources::re", re, re.constructor);
-        /**
-         * @param {string} dir
-         * @param {true=} recurse
-         */
-        const visitDirectry = (dir, recurse) => {
-          if (dir.length) {
-            if (!fs.existsSync(dir)) {
-              console.info(`directory: [${dir}] is not found`);
-            } else {
-              utils.walkDirSync(dir, (dirent) => {
-                const path = `${dir}/${dirent.name}`;
-                if (dirent.isFile() && re.test(dirent.name)) {
-                  DEBUG && console.log("processSources::", dirent.name);
-                  sourceFiles.push(path);
-                } else if (recurse && dirent.isDirectory()) {
-                  visitDirectry(path, true);
-                }
-              });
-            }
-          }
-        };
+        const reFile = params.test || test;
+        const actualBases = isArray(bases) ? bases : [base];
+        DEBUG && console.log("processSources::", actualBases, reFile);
+        DEBUG && console.log("processSources::re", reFile, reFile.constructor);
         if (root) {
-          visitDirectry(root.trim(), true);
+          visitDirectory(root.trim(), sourceFiles, reFile, true);
         } else {
-          // DEVNOTE: remove extra whitespaces
-          actualBases.forEach((base) => base && visitDirectry(base.trim()));
+          actualBases.forEach((base) => base && visitDirectory(base.trim(), sourceFiles, reFile));
         }
       } else {
-        sourceFiles = params.targets || params.args || targets;
+        sourceFiles = params.targets || params.args || targets || [];
         if (sourceFiles.length && params.basePath) {
-          // DEVNOTE: remove extra whitespaces
           sourceFiles = sourceFiles.map((s) => s && s.trim());
           const basePath = getBasePaths()?.[0] || ".";
-          // const basePath = Array.isArray(params.basePath) ? params.basePath[0] : params.basePath;
           utils.prependStringTo(sourceFiles, basePath, "/");
         }
       }
-
       sourceFiles = sourceFiles.filter(Boolean);
       DEBUG && console.log("processSources::processSources:", sourceFiles);
       let count = sourceFiles.length;
       let written = 0;
       /** @type {(fileName?: string) => void} */
       const done = (fileName) => {
-        --count === 0 &&
-          (console.timeEnd(taskName),
-          utils.log(`[${taskName}] file written: ${written}`));
+        --count === 0 && (
+          console.timeEnd(taskName), utils.log(`[${taskName}] file written: ${written}`)
+        );
         if (verbose && fileName) {
           utils.log(`[${taskName}] done: ${fileName}`);
         }
       };
-      /** @param {NodeJS.ErrnoException} err */
-      const handleError = (err) => {
-        console.error(err);
-        done();
-      };
       count && console.time(taskName);
       for (const sourceFile of sourceFiles) {
-        fs.stat(sourceFile, (err, stat) => {
+        fs.stat(sourceFile, (statErr, stat) => {
+          if (statErr) {
+            return handleError(statErr, () => done(sourceFile));
+          }
           if (stat.isFile()) {
-            fs.readFile(sourceFile, "utf8", async (err, code) => {
-              if (!err) {
-                const result = await runProcess(code, process);
-                // TODO: changeable extensions
-                const outputFileName = sourceFile.replace(/(?=\.js$)/, suffix);
-                // DEVNOTE: 2023/10/27 - Do not write no changes code
-                if (result !== code) {
-                  fs.writeFile(outputFileName, result, () => {
-                    written++, done(outputFileName);
-                  });
-                } else {
-                  done(outputFileName);
-                }
-                return;
+            fs.readFile(sourceFile, "utf8", async (readErr, code) => {
+              if (readErr) {
+                return handleError(readErr, () => done(sourceFile));
+              }
+              const result = await runProcess(code, process);
+              const outputPath = sourceFile.replace(/(?=\.js$)/, suffix);
+              if (result !== code) {
+                fs.writeFile(outputPath, result, () => {
+                  written++, done(outputPath);
+                });
+              } else {
+                done(outputPath);
               }
-              handleError(err);
             });
-          } else if (err) {
-            handleError(err);
           } else {
-            done();
+            done(sourceFile);
           }
         });
       }
     }
-    // OK
     globalThis.processSources = processSources;
   },
 };
 globalThis.getBasePaths = function () {
   const bp = params.basePath;
-  return Array.isArray(bp)
-    ? bp
-    : typeof bp === "string" && bp.length
-      ? [bp]
-      : void 0;
+  return isArray(bp)
+    ? bp : typeof bp === "string" && bp.length
+      ? [bp] : void 0;
 };
 /**
  * @param {string} code
@@ -155,4 +148,4 @@ function runProcess(code, process) {
       resolve(result);
     }
   });
-}
+}

package/tool-lib/rws.js

@@ -10,7 +10,6 @@
 /**
  * @file (R)ecord(W)ebpack(S)ize
  */
-
 /**
  * actually, return value will be like `TVersionString + "-dev"`
  *
@@ -43,12 +42,14 @@ const decrementVersion = (nversionArray) => {
   }
   return normalizeVersion(nversionArray);
 };
-
 /**
- *
+ * This function is used for preview.
+ * 
+ * + Too many record entries can be hard to see,  
+ *   so if there are more than 10 entries, they will be truncated.
  * @param {TVersionRecords} record
  */
-const reduceRecord = (record) => {
+const shortenRecord = (record) => {
   let keys = /** @type {TVersionString[]} */ (Object.keys(record));
   if (keys.length > 10) {
     keys = keys.slice(keys.length - 10);
@@ -62,7 +63,6 @@ const reduceRecord = (record) => {
   }
   return record;
 };
-
 /**
  * @param {import("fs")} fs
  * @param {import("../utils")} utils
@@ -81,8 +81,6 @@ module.exports = (fs, utils) => {
       /** @type {TVersionString} */
       const versionStr = thisPackage.version;
       const tags = /** @type {TRwsTags[]} */ (["webpack", "umd", "bin"]);
-      // const tags = /** @type {TRwsTags[]} */(["webpack", "umd", "bin"]).concat(params["rws-tags"] || []);
-
       /**
        * @param {TSizeRecordEntry} a
        * @param {TSizeRecordEntry} b
@@ -91,7 +89,6 @@ module.exports = (fs, utils) => {
       const isDiff = (a, b) => {
         return tags.some((tag) => {
           const x = a[tag], y = b[tag];
-          // DEVNOTE: 2023/10/27 - means `tag` is not exist
           if (typeof x !== "number" && typeof y !== "number") {
             return false;
           }
@@ -109,17 +106,18 @@ module.exports = (fs, utils) => {
       });
       if (params["rws-tags"]) {
         const tagArray = Array.isArray(params["rws-tags"]) ? params["rws-tags"] : [params["rws-tags"]];
-        tagArray.forEach((tagToekn) => {
-          const [tag, sourcePath] = tagToekn.split(":");
+        tagArray.forEach((tagToken) => {
+          const colon = tagToken.indexOf(":");
+          if (colon < 1) return;
+          const tag = /** @type {TRwsTags} */ (tagToken.slice(0, colon));
+          const sourcePath = tagToken.slice(colon + 1);
           if (fs.existsSync(sourcePath)) {
             entry[/** @type {TRwsTags} */ (tag)] = fs.statSync(sourcePath).size;
             tags.push(/** @type {TRwsTags} */ (tag));
           }
         });
       }
-
       params.debug && console.log(entry);
-      // if (entry.webpack || entry.umd || entry.bin) {
       if (tags.some((tag) => entry[tag])) {
         let nversionArray = /** @type {RegExpExecArray} */ ( /(\d+)\.(\d+)\.(\d+)(-\w+)?/.exec(versionStr) );
         const $0 = nversionArray.shift();
@@ -127,27 +125,23 @@ module.exports = (fs, utils) => {
         let prevEntry = sizeRecord[/** @type {TVersionString} */ ($0)];
         if (!prevEntry)
           do {
-            // DEVNOTE: 2023/10/24 - Modified the code to maintain a version string like `1.3.3-dev`!
             const version = decrementVersion(nversionArray);
-            // DEVNOTE: debug log
-            // console. log(`decrementVersion: nversion=${nversionArray}, version=${version}`);
             prevEntry = sizeRecord[version];
             if (prevEntry || version.startsWith("0.0.0")) {
               break;
             }
           } while (1);
-
         let needWrite = true;
         let msg = "";
         if (prevEntry) {
           if (isDiff(prevEntry, entry)) {
             sizeRecord[versionStr] = entry;
-            utils.log(reduceRecord(sizeRecord));
+            utils.log(shortenRecord(sizeRecord));
             msg = "[%s] is updated";
           } else {
             needWrite = false;
             console.log(
-              `${this.taskName}: No change from previours webpack size record.`,
+              `${this.taskName}: No change from previous webpack size record.`,
               prevEntry,
             );
           }
@@ -178,4 +172,4 @@ module.exports = (fs, utils) => {
 `;
     },
   };
-};
+};

package/tool-lib/tools.d.ts

@@ -6,7 +6,6 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <reference path="../regex.d.ts"/>
-
 declare const ImportExportDetectRegex = `(?<!\\/\\/+\\s*)(?:import|export)\\s*(?:"(?!https?:)(?=[.\\/]+)\
 (?:(?<globalName>(?:[.\\/]+)?[^"]+?)(?:\\.(?<globalExt>(?:c|m)?jsx?))?)"|\
 \\(\\s*"(?!https?:)(?=[.\\/]+)(?<dynamicName>(?:[.\\/]+)?[^"]+?)(?:\\.(?<dynamicExt>(?:c|m)?jsx?))?"\\s*\\)|\
@@ -14,54 +13,29 @@ declare const ImportExportDetectRegex = `(?<!\\/\\/+\\s*)(?:import|export)\\s*(?
 (?:\\.(?<moduleExt>(?:c|m)?jsx?))?)")(?=\\s*;)?`;
 declare const reOk: ReturnType<typeof XRegex.createRegExp<typeof ImportExportDetectRegex>>;
 type TRegexDetectRet = XRegex.ReGroups<typeof reOk>;
-/* ctt
-// DONE: 2025/3/18 17:49:31 ok, result is 1, works
-type OKK = TRegexDetectRet extends TImportExportRegexGroup ? 1: 0;
-/*/
-//*/
-
 /**
  * @date 2023-10-25
  */
 declare global {
-
-    // DEVNOTE: 2025/3/18 17:51:42 - Retained for a while as a product of the past
-    // type TRegexImportExportDetectorGroupNames =
-    //     | "clause"
-    //     | "dynamicExt"
-    //     | "dynamicName"
-    //     | "globalExt"
-    //     | "globalName"
-    //     | "moduleExt"
-    //     | "moduleName";
-    // type TImportExportRegexGroup = {
-    //     [K in TRegexImportExportDetectorGroupNames]?: string;
-    // };
     type TRegexImportExportDetectorReplacer = function(
         string, string, string, string, string, string, string, string, number, string,
         TRegexDetectRet
     ): string;
-
     declare function processSources(
         taskName: string,
         process: (source: string) => Promise<string> | string,
         options?: TProcessSourcesOpt
     ): void;
-
     /** regex replace sig */
     declare type TStringReplacer = (matchs: string, ...args: any[]) => string;
-
     /** use `(R)ecord(W)ebpack(S)ize` */
     declare type TRwsTags = "webpack" | "umd" | "bin";
-
-
     declare var params: ReturnType<typeof import("tin-args")<TToolArgs>>;
-
+    declare const isArray: typeof Array.isArray;
     /**
      * @date 2025/2/18 0:46:03
      */
     declare function getBasePaths(): string[] | undefined;
-
     /**
      * + tool option `verb`
      */
@@ -70,7 +44,6 @@ declare global {
      * tools command arg types
      */
     declare type TToolArgs = {
-
         /**
          * parameter is used to specify the root directory of the source code scan.
          * 
@@ -83,16 +56,13 @@ declare global {
          * @since 1.4.28
          */
         shell?: string;
-
         /**
          * print jstool version
          * @date 2025/1/23 11:37:58
          */
         v?: true;
-
-        /** task command shortten name */
+        /** task command shorten name */
         cmd: string;
-
         /**
          * processSources
          * cjbm, minify, rmc
@@ -102,31 +72,22 @@ declare global {
         targets: string[];
         /** minify, rmc */
         suffix: string;
-
-        // version
         major?: true;
         minor?: true;
         patch?: true;
         extras: string[];
-
         /** rws, backup */
         dest: string;
         /** backup */
         projectName: string;
-
         /** for `cjbm` replace extension. default is `js` */
         ext: string;
-
         /** shared, minify, rmc */
         test: RegExp;
-
         /** stripWebpack, stripSome */
         regex: RegExp;
-
         /** rmc */
         rmc4ts: boolean;
-
-        // rws
         /**
          * webpacked source path. 
          * @default `./dist/webpack/index.js`
@@ -149,15 +110,12 @@ declare global {
          * ```
          */
         "rws-tags": `${string}:${string}` | `${string}:${string}`[];
-
         /** zip comment */
         comment: string;
         /** specify target package.json(s) [version] */
         pkgJsons: string[];
-
         /** want help? form - "-help <cmd name>" */
         help: string;
-
         /**
          * for stripSome
          * @date 2024-01-05
@@ -165,28 +123,12 @@ declare global {
         after: string;
         /** want print written file name? */
         verb: true;
-
         /**
          * @date 2025/4/6 17:09:40
          */
         debug?: true;
     }
-
-    // /**
-    //  * @typedef {
-    //     (path: string, handler: (dirent: import("fs").Dirent) => void) => void
-    // } TWalkDirSyncFunction
-    // */
     declare type TWalkDirSyncFunction = (path: string, handler: (dirent: import("fs").Dirent) => void) => void;
-
-    // /**
-    //  * @typedef TProcessSourcesOpt
-    //  * @prop {string} [base]
-    //  * @prop {string[]} [bases] Array of search directory paths, overriding "base"
-    //  * @prop {RegExp} [test] default: `/\.js$/`
-    //  * @prop {string[]} [targets]
-    //  * @prop {string} [suffix]
-    //  */
     declare type TProcessSourcesOpt = {
         root?: string;
         base?: string;
@@ -197,49 +139,16 @@ declare global {
         targets?: string[];
         suffix?: string;
     }
-
-    // /**
-    //  * @typedef {{
-    // *    fn: () => void;
-    // *    help: string;
-    // *    taskName: string;
-    // * }} TJSToolEntry
-    // */
     declare type TJSToolEntry = {
         fn: (mode?: string) => void;
         help: string;
         taskName: string;
     }
-
     /**
      * version command type
      */
     declare type TVersionString = `${number}.${number}.${number}`;
-    // unused
-    // type TNVersion = [number, number, number];
     declare type TVersionRecords = Record<TVersionString, Partial<Record<TRwsTags, number>>>;
     declare type TSizeRecordEntry = TVersionRecords["0.0.0"];
-
-    // /**
-    // * @typedef TRecordWebpackSizeArgs
-    // * @prop {string} dest - record path
-    // * @prop {string} webpack - webpacked source path. default `./dist/webpack/index.js`
-    // * @prop {string} umd - webpacked umd source path. default `./dist/umd/index.js`
-    // * @prop {string} bin - webpacked bin source path. default `./dist/bin/index.js`
-    // * 
-    // * @typedef TCJBMArgs currentlly support `js` only
-    // * @prop {string | string[]} basePath - source scan path
-    // */
-    // type TRecordWebpackSizeArgs = {
-    //     /** record path */
-    //     dest: string;
-    //     /** {@link TToolArgs.webpack webpack} */
-    //     webpack: string;
-    //     /** {@link TToolArgs.umd umd} */
-    //     umd: string;
-    //     /** {@link TToolArgs.bin bin} */
-    //     bin: string;
-    // }
 }
-
-export = {};
+export = {};

package/tool-lib/zip-task.js

@@ -7,7 +7,6 @@
 */
 /// <reference path="./tools.d.ts"/>
 // @ts-check
-
 /**
  * @file zip compression task
  */
@@ -31,4 +30,4 @@ module.exports =
       },
       help: `jstool -cmd zip [-comment "the comment"] lib/webpack.js lib/type-ids.js`,
     };
-  };
+  };

package/tools.d.ts

@@ -1,7 +1,7 @@
 export type {
-    TToolArgs,
-    TJSToolEntry,
-    TZipArgs,
-    TRecordWebpackSizeArgs,
-    TCJBMArgs
-} from "./tools.js";
+  TToolArgs,
+  TJSToolEntry,
+  TZipArgs,
+  TRecordWebpackSizeArgs,
+  TCJBMArgs
+} from "./tools.js";