js-dev-tool 1.0.11 → 1.0.13

package/common/index.js

@@ -11,6 +11,7 @@
 // @ts-check
 const fs = require("fs");
 const path = require("path");
+const rl = require("readline");
 /**
  * @param {string} dest
  */
@@ -35,10 +36,10 @@ function createLogStreamAndResolvePath(logPath) {
  */
 function renderLine(msg, row) {
   const output = process.stderr || process.stdout;
-  output.cursorTo(0, row);
+  rl.cursorTo(output, 0, row);
   msg && (
     output.write(msg),
-    output.clearLine(1)
+    rl.clearLine(output, 1)
   );
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dev-tool",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "bin": {
     "jstool": "tools.js"
   },
@@ -32,6 +32,7 @@
     "tools.js",
     "utils.js",
     "tsconfig.json",
+    "!tool-lib/cjbm-*",
     "!scripts/unzip.ts",
     "!scripts/bin",
     "!extras/npm",

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.11"
+  "version": "1.0.13"
 }

package/tool-lib/cjbm.js

@@ -17,26 +17,32 @@ const path = require("path");
  * @import * as Regex from "../regex.d.ts";
  */
 const RE_TEXT = String.raw`
-# NOTE: When validating with PCRE, use line comment assertion as (?<!\/\/|\/\/\s) (regex101.com)
-(?<!\/\/\s*.+?)(?:(?<!@)import|export)
+# NOTE: PCRE での検証時は line comment assertion を (?<!\/\/|\/\/\s)(?:(?<!@)import|export) とすること (regex101.com)
+# 正しくは: (?<!\s*\/\/+.*?)(?:(?<!@)import|export)
+(?<!\s*\/\/+.*?)(?:(?<!@)import|export)
 \s*
 (?:
-  "(?!https?:)(?=[.\/]+)(?:
-    (?<globalName>(?:[.\/]+)?[^"]+?)(?:\.(?<globalExt>(?:c|m)?jsx?))?
-  )"|
+  # 2025/12/22 14:57:44 - support quote character detection ["']
+  # global import, import "./"; import './global.mjs';
+  (?<qcGlobal>["'])(?!https?:)(?=[.\/]+)(?:
+    (?<globalName>(?:[.\/]+)?[^'"]+?)(?:\.(?<globalExt>(?:c|m)?jsx?))?
+  )\k<qcGlobal>|
+  # dynamic import, import("...") import('...')
   \(\s*
-    "(?!https?:)(?=[.\/]+)(?<dynamicName>(?:[.\/]+)?[^"]+?)(?:\.(?<dynamicExt>(?:c|m)?jsx?))?"
+    (?<qcDynamic>["'])(?!https?:)(?=[.\/]+)(?<dynamicName>(?:[.\/]+)?[^'"]+?)(?:\.(?<dynamicExt>(?:c|m)?jsx?))?\k<qcDynamic>
   \s*\)|
-  (?:(?<clause>.+?|(?:\w+\s*,)?\s*\{[^}]+\})\s*from)\s*"(?!https?:)(?=[.\/]+)
-  (?:
-    (?<moduleName>(?:[.\/]+)?[^"]+?)(?:\.(?<moduleExt>(?:c|m)?jsx?))?
-  )"
+  # esm import/export
+  (?:(?<clause>.+?|(?:\w+\s*,)?\s*\{[^}]+\})\s*from)\s*
+    (?<qcEsm>["'])(?!https?:)(?=[.\/]+)
+    (?:
+      (?<moduleName>(?:[.\/]+)?[^'"]+?)(?:\.(?<moduleExt>(?:c|m)?jsx?))?
+    )\k<qcEsm>
 )
 (?=\s*;)?
 `;
 /**
- * @date 2025/2/15 20:11:22
- * @see https://regex101.com/r/uMMsD4/22
+ * @date 2025/12/22 16:09:36
+ * @see https://regex101.com/r/uMMsD4/31
  */
 const reImportExportDetection = new RegExp(
   RE_TEXT.replace(/\s*\(\?\#.*\)\s*$|(?<!\\)\#\s*.*$|\s+/gm, ""), "g",
@@ -47,6 +53,7 @@ const reImportExportDetection = new RegExp(
  * @param {string} ext - The new file extension to use.
  * @returns {TRegexImportExportDetectorReplacer} A function to update import/export statements with the specified file extension.
  * @date 2025/2/16 18:38:39
+ * @date 2025/12/22 16:05:13 - ./tool-lib/cjbm-resources/cjbm-browser-test.mjs を参照
  */
 function getReplacer(ext) {
   /**
@@ -55,16 +62,17 @@ function getReplacer(ext) {
    */
   /** @type {TRegexImportExportDetectorReplacer} */
   const replacer = (
-    $0, _1, _2, _3, _4, _5, _6, _7, _o, _s, { clause, dynamicName, globalName, moduleName }
+    $0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _o, _s, { clause, dynamicName, globalName, moduleName, qcDynamic, qcEsm, qcGlobal }
   ) => {
     const kw = $0.startsWith("import") ? "import" : "export";
+    const qc = qcDynamic || qcEsm || qcGlobal;
     let whichName = /** @type {string} */ (
       globalName || moduleName || dynamicName
     );
     if (whichName[whichName.length - 1] === "/") {
       whichName += "index";
     }
-    return `${kw}${globalName ? ` "${whichName}.${ext}"` : clause ? ` ${clause} from "${whichName}.${ext}"` : `("${whichName}.${ext}")`}`;
+    return `${kw}${globalName? ` ${qc}${whichName}.${ext}${qc}`: clause? ` ${clause} from ${qc}${whichName}.${ext}${qc}`: `(${qc}${whichName}.${ext}${qc})`}`;
   };
   return replacer;
 }

package/tool-lib/tools.d.ts

@@ -6,11 +6,10 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <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*\\)|\
-(?:(?<clause>.+?|(?:\\w+\\s*,)?\\s*\\{[^}]+\\})\\s*from)\\s*"(?!https?:)(?=[.\\/]+)(?:(?<moduleName>(?:[.\\/]+)?[^"]+?)\
-(?:\\.(?<moduleExt>(?:c|m)?jsx?))?)")(?=\\s*;)?`;
+declare const ImportExportDetectRegex = `(?<!\\s*\\/\\/+.*?)(?:(?<!@)import|export)\\s*(?:(?<qcGlobal>["'])(?!https?:)(?=[.\\/]+)\
+(?:(?<globalName>(?:[.\\/]+)?[^'"]+?)(?:\\.(?<globalExt>(?:c|m)?jsx?))?)\\k<qcGlobal>|\\(\\s*(?<qcDynamic>["'])(?!https?:)(?=[.\\/]+)(?<dynamicName>(?:[.\\/]+)?[^'"]+?)\
+(?:\\.(?<dynamicExt>(?:c|m)?jsx?))?\\k<qcDynamic>\\s*\\)|(?:(?<clause>.+?|(?:\\w+\\s*,)?\\s*\\{[^}]+\\})\\s*from)\\s*(?<qcEsm>["'])(?!https?:)(?=[.\\/]+)\
+(?:(?<moduleName>(?:[.\\/]+)?[^'"]+?)(?:\\.(?<moduleExt>(?:c|m)?jsx?))?)\\k<qcEsm>)(?=\\s*;)?`;
 declare const reOk: ReturnType<typeof XRegex.createRegExp<typeof ImportExportDetectRegex>>;
 type TRegexDetectRet = XRegex.ReGroups<typeof reOk>;
 /**
@@ -18,7 +17,8 @@ type TRegexDetectRet = XRegex.ReGroups<typeof reOk>;
  */
 declare global {
     type TRegexImportExportDetectorReplacer = function(
-        string, string, string, string, string, string, string, string, number, string,
+        string, string, string, string, string, string, string, string, string, string, string,
+        number, string,
         TRegexDetectRet
     ): string;
     declare function processSources(