js-dev-tool 1.0.6 → 1.0.8

package/package.json

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

package/scripts/normalize-commit-msg.mjs

@@ -0,0 +1,22 @@
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const commitMsgPath = path.resolve(__dirname, "..", ".codex", "commit_msg.txt");
+
+if (!fs.existsSync(commitMsgPath)) {
+  process.exit(0);
+}
+
+let msg = fs.readFileSync(commitMsgPath, "utf8");
+
+msg = msg.replace(/\r\n/g, "\n");
+msg = msg
+  .split("\n")
+  .map(line => line.replace(/\s+$/u, ""))
+  .join("\n");
+msg = msg.replace(/\n+$/u, "\n");
+
+fs.writeFileSync(commitMsgPath, msg, "utf8");

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.6"
+  "version": "1.0.8"
 }

package/tool-lib/cjbm.js

@@ -11,6 +11,8 @@
 /**
  * @file (C)onvert (J)S to (B)rowser (M)odule
  */
+const fs = require("fs");
+const path = require("path");
 /**
  * @import * as Regex from "../regex.d.ts";
  */
@@ -66,6 +68,33 @@ function getReplacer(ext) {
   };
   return replacer;
 }
+/**
+ * @param {string} ext
+ */
+const emitProcessCallback = (ext) => {
+  /**
+   * @param {string[]} sourceFiles
+   */
+  return (sourceFiles) => {
+    /** @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}`) {
+          const afterPath = `${parsed.dir}/${parsed.name}.${ext}`;
+          fs.rename(sourceFile, afterPath, err => {
+            if (err) console.error(err);
+            else {
+              console.log(`renamed: ${sourceFile} => ${afterPath}`);
+            }
+          });
+        }
+      }
+    }
+  };
+};
 /**
  * @returns {TJSToolEntry}
  */
@@ -78,31 +107,14 @@ module.exports = () => {
     fn() {
       const bases = getBasePaths();
       const ext = params.ext || "js";
-      /** ### regex summary
-       * ```perl
-       * (?:import|export)                    # comments
-       * \s*
-       * (?:
-       *   "(?=[.\/]+)|                       # character ["] \x22 e.g - import "../global/index"
-       *   (?:
-       *     [\w_]+\s+|                       # default import, e.g - import fs from "./file";
-       *     (?:[\w_]+\s*,\s*)?\{[^}]+\}\s*|  # e.g - import View, { TitiledSphereMesh } from "./view";
-       *     \*\s*as\s+[\w_]+\s+|             # e.g - export * as OO from "./rateLimiter";
-       *     \*\s*                            # e.g - export * from "./rateLimiter";
-       *   )from\s*"(?:[.\/]+)                # Positive Lookahead (./|../|../../) ...
-       * )
-       * (?:[^"]*)
-       * (?<!\.js)                            # Negative Lookbehind not(/\.(?:c|m)?js/)
-       * (?="\s*;?)
-       * ```
-       * @see regex details see {@link https://regex101.com/r/EpuQLT/32 regex101.com}
-       */
+      /* const sourceFiles = await */
       processSources(
         /** @type {string} */ (this.taskName), (data) => {
           reImportExportDetection.lastIndex = 0;
           return data.replace(reImportExportDetection, getReplacer(ext));
         }, {
           bases,
+          cb: emitProcessCallback(ext)
         },
       );
     },

package/tool-lib/ps.js

@@ -50,7 +50,7 @@ module.exports = {
      * @param {(source: string) => Promise<string> | string} process
      * @param {TProcessSourcesOpt} [opt]
      */
-    function processSources(taskName, process, opt = {}) {
+    async function processSources(taskName, process, opt = {}) {
       const {
         root = params.root,
         base = "./build",
@@ -58,6 +58,7 @@ module.exports = {
         test = /\.js$/,
         suffix = "",
         targets,
+        cb
       } = opt;
       /**
        * 主に javascript 系 file を push する.
@@ -89,41 +90,49 @@ module.exports = {
       DEBUG && console.log("processSources::processSources:", sourceFiles);
       let count = sourceFiles.length;
       let written = 0;
+      /** @type {() => void} */
+      let psResolve;
       /** @type {(fileName?: string) => void} */
       const done = (fileName) => {
         --count === 0 && (
-          console.timeEnd(taskName), utils.log(`[${taskName}] file written: ${written}`)
+          console.timeEnd(taskName), utils.log(`[${taskName}] file written: ${written}`),
+          psResolve()
         );
         if (verbose && fileName) {
           utils.log(`[${taskName}] done: ${fileName}`);
         }
       };
-      count && console.time(taskName);
-      for (const sourceFile of sourceFiles) {
-        fs.stat(sourceFile, (statErr, stat) => {
-          if (statErr) {
-            return handleError(statErr, () => done(sourceFile));
-          }
-          if (stat.isFile()) {
-            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);
-              }
-            });
-          } else {
-            done(sourceFile);
-          }
-        });
-      }
+      await /** @type {Promise<void>} */(new Promise(resolve => {
+        psResolve = resolve;
+        count && console.time(taskName);
+        for (const sourceFile of sourceFiles) {
+          fs.stat(sourceFile, (statErr, stat) => {
+            if (statErr) {
+              return handleError(statErr, () => done(sourceFile));
+            }
+            if (stat.isFile()) {
+              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);
+                }
+              });
+            } else {
+              done(sourceFile);
+            }
+          });
+        }
+      }));
+      cb && cb(sourceFiles);
+      return sourceFiles;
     }
     globalThis.processSources = processSources;
   },

package/tool-lib/tools.d.ts

@@ -25,7 +25,7 @@ declare global {
         taskName: string,
         process: (source: string) => Promise<string> | string,
         options?: TProcessSourcesOpt
-    ): void;
+    ): Promise<string[]>;
     /** regex replace sig */
     declare type TStringReplacer = (matchs: string, ...args: any[]) => string;
     /** use `(R)ecord(W)ebpack(S)ize` */
@@ -138,6 +138,7 @@ declare global {
         test?: RegExp;
         targets?: string[];
         suffix?: string;
+        cb?: (sourceFiles: string[]) => void
     }
     declare type TJSToolEntry = {
         fn: (mode?: string) => void;

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;
             }