js-dev-tool 1.0.12 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dev-tool",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "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/regex.d.ts

@@ -38,6 +38,14 @@ export type ExtractGroupNames<S extends string> =
 export type ReGroups<R extends RegExp> = {
   [K in ExtractGroupNames<ReSource<R>>]?: string;
 };
+export type PreprocessEscapes<S extends string, Result extends string = ""> =
+  S extends `\\\\${infer Rest}`
+    ? PreprocessEscapes<Rest, `${Result}__`>
+    : S extends `\\${infer Next}${infer Rest}`
+      ? PreprocessEscapes<Rest, `${Result}_`>
+      : S extends `${infer Char}${infer Rest}`
+        ? PreprocessEscapes<Rest, `${Result}${Char}`>
+        : Result;
 /**
  * Counts the exact number of capture groups in a string pattern.
  * @template S - A string pattern.
@@ -46,17 +54,21 @@ export type ReGroups<R extends RegExp> = {
  * @todo FIXME: 多く count してしまう場合あり. 2025/3/18 15:47:57
  * @deprecated text base の parse には限界があり cost が見合わないので、この type は将来削除予定!
  */
-export type CountCaptureGroups<S extends string, Counter extends unknown[] = []> =
-    S extends `${infer _Before}(${infer Rest}`
-      ? Rest extends `?:${infer After}`
+export type CountCaptureGroups<
+  S extends string,
+  Counter extends unknown[] = []
+> =
+  S extends `${infer _Before}(${infer Rest}`
+    ? _Before extends "\\"
+      ? never
+      : Rest extends `?:${infer After}`
+        | `?=${infer After}`
+        | `?!${infer After}`
+        | `?<=${infer After}`
+        | `?<!${infer After}`
         ? CountCaptureGroups<After, Counter>
-        : Rest extends `?=${infer After}`
-          | `?!${infer After}`
-          | `?<=${infer After}`
-          | `?<!${infer After}`
-          ? CountCaptureGroups<After, Counter>
-          : CountCaptureGroups<Rest, [...Counter, unknown]>
-      : Counter['length'];
+      : CountCaptureGroups<Rest, [...Counter, unknown]>
+    : Counter['length'];
 /**
  * Represents a fixed version of RegExpExecArray that includes the matched string,
  * captures, and optionally named groups.
@@ -67,7 +79,9 @@ export type CountCaptureGroups<S extends string, Counter extends unknown[] = []>
 export type RegExpExecArrayFixed<
   R extends RegExp,
   S extends ReSource<R> = ReSource<R>,
-  GroupCount extends number = CountCaptureGroups<S>
+  GroupCount extends number = CountCaptureGroups<
+    PreprocessEscapes<S>
+  >
 > = [match: string, ...ExtractCaptures<GroupCount>] & {
   groups?: ReGroups<R>;
 };
@@ -79,9 +93,32 @@ export type RegExpExecArrayFixed<
 export type ExtractCaptures<Count extends number, Result extends unknown[] = []> =
   Result['length'] extends Count
     ? Result : ExtractCaptures<Count, [...Result, string]>;
-const re1 = createRegExp("(test)(group)", "g");
+/**
+ * Creates the parameter types for String.replace callback function.
+ * 
+ * @example
+ * type Params = ReplaceCallbackParams<typeof myRegex>;
+ * // [match: string, ...captures: string[], offset: number, string: string, groups?: {...}]
+ */
+export type ReplaceCallbackParams<
+  R extends RegExp,
+  S extends ReSource<R> = ReSource<R>,
+  GroupCount extends number = CountCaptureGroups<
+    PreprocessEscapes<S>
+  >
+> = [
+  match: string,
+  ...captures: ExtractCaptures<GroupCount>,
+  offset: number,
+  input: string,
+  groups: ReGroups<R>
+];
+export type ReplacerFunctionSignature<R extends RegExp> = (...args: ReplaceCallbackParams<R>) => string;
+const re1 = createRegExp("(test)(group)()()()()()()()(22)", "g");
+type TRe1Replacer = ReplacerFunctionSignature<typeof re1>;
 type ExecResult1 = RegExpExecArrayFixed<typeof re1>;
 const re2 = createRegExp("(?<name1>test)(?<name2>group)", "g");
+type TRe2Replacer = ReplacerFunctionSignature<typeof re2>;
 type ExecResult2 = RegExpExecArrayFixed<typeof re2>;
 const result = re2.exec("test group") as RegExpExecArrayFixed<typeof re2>;
 if (result) {

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.12"
+  "version": "1.0.14"
 }

package/tool-lib/cjbm.js

@@ -13,30 +13,33 @@
  */
 const fs = require("fs");
 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 +50,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 +59,25 @@ 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, _offset, _input, { clause, dynamicName, globalName, moduleName, qcDynamic, qcEsm, qcGlobal }
   ) => {
-    const kw = $0.startsWith("import") ? "import" : "export";
+    const kword = $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}")`}`;
+    const modId = `${qc}${whichName}.${ext}${qc}`;
+    return `${kword}${
+      
+      globalName ? ` ${modId}` :
+      
+      clause? ` ${clause} from ${modId}` :
+      
+      `(${modId})`
+    }`;
   };
   return replacer;
 }

package/tool-lib/tools.d.ts

@@ -6,21 +6,16 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <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>;
 /**
  * @date 2023-10-25
  */
 declare global {
-    type TRegexImportExportDetectorReplacer = function(
-        string, string, string, string, string, string, string, string, number, string,
-        TRegexDetectRet
-    ): string;
+    type TRegexImportExportDetectorReplacer = XRegex.ReplacerFunctionSignature<typeof reOk>;
     declare function processSources(
         taskName: string,
         process: (source: string) => Promise<string> | string,