js-dev-tool 1.0.13 → 1.0.15

package/README.md

@@ -37,12 +37,13 @@ rws help: (R)ecord(W)ebpack(S)ize
     dest     - if not specified then apply "./logs/webpack-size.json"
 
 cjbm help: (C)onvert (J)S to (B)rowser (M)odule
-  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>,..."
@@ -75,12 +76,15 @@ minify help: jstool -cmd minify -basePath extra-tests/web/mini-semaphore [-test
     test     - can be omit, default is `/\.js$/`
     suffix   - can be omit, default is ".mini"
 
-rmc help: $ jstool -cmd rmc -basePath "./dist/cjs,./dist/cjs/gulp" -test "/\.(js|d\.ts)$/"
+rmc help: $ jstool -cmd rmc [-rmc4ts[:keepBangLine]] -basePath "./dist/cjs,./dist/cjs/gulp" -test "/\.(js|d\.ts)$/"
   note: basePath - can be "<path>,<path>,..." (array type arg)
-    test     - can be omit, defulat `/.js$/`
-    rmc4ts   - for typescript source.
+    test  - can be omit, defulat `/.js$/`
+    rmc4ts- for typescript source.
       keep comment that start with "/*" when "*/" end mark appears in same line.
       if start with "/*-" remove it
+    rmc4ts=keepBangLine (2025/12/24)
+          - In addition to the "rmc4ts" processing, it also preserves line comments that start with "//!".
+
 ```
 
 ---

package/package.json

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

package/regex.d.ts

@@ -8,14 +8,32 @@
 /**
  * @file js-dev-scripts/regex.d.ts
  */
+declare global {
+  interface RegExpConstructor {
+    new <const P extends string, const F extends string = "">(pattern: string, flags?: F): RegExp & {
+      readonly source: P;
+      readonly flags: F;
+    };
+    <const P extends string, const F extends string = "">(pattern: string, flags?: F): RegExp & {
+      readonly source: P;
+      readonly flags: F;
+    };
+    readonly "prototype": RegExp;
+  }
+}
 /**
  * Extracts the literal type from the source property of a RegExp.
  * @template R - A RegExp type.
  */
 export type ReSource<R extends RegExp> = R extends RegExp & { readonly source: infer T } ? T : never;
-export declare function createRegExp<P extends string>(pattern: P, flags?: string): RegExp & {
+export type TypedRegExp<const P extends string, const F extends string = ""> = RegExp & {
   readonly source: P;
+  readonly flags: F;
 };
+export declare function createRegExp<
+  const P extends string,
+  const F extends string = ""
+>(pattern: P, flags?: F): TypedRegExp<P, F>;
 type FirstChar<S extends string> = S extends `${infer F}${infer _}` ? F : never;
 /**
  * Recursively extracts parts that match the format (?<GroupName>...) from a string pattern,
@@ -38,25 +56,37 @@ export type ExtractGroupNames<S extends string> =
 export type ReGroups<R extends RegExp> = {
   [K in ExtractGroupNames<ReSource<R>>]?: string;
 };
+/**
+ * Preprocesses escape sequences in a string pattern by replacing escaped backslashes and characters.
+ * 
+ * + NOTE: This type is used to preprocess the pattern string before counting capture groups.
+ * 
+ * @template S - A string pattern.
+ * @template Result - The resulting string after preprocessing. 
+ * @internal
+ */
+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.
  * @template Counter - An array used to count the capture groups.
- * 
- * @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}`
-        ? CountCaptureGroups<After, Counter>
-        : Rest extends `?=${infer After}`
-          | `?!${infer After}`
-          | `?<=${infer After}`
-          | `?<!${infer After}`
-          ? CountCaptureGroups<After, Counter>
-          : CountCaptureGroups<Rest, [...Counter, unknown]>
-      : Counter['length'];
+export type CountCaptureGroups<
+  S extends string,
+  Counter extends unknown[] = []
+> =
+  __PreprocessEscapes<S> extends `${infer _Before}(${infer Rest}`
+    ? Rest extends `${"?:" | "?=" | "?!" | "?<=" | "?<!"}${infer After}`
+      ? CountCaptureGroups<After, Counter>
+      : CountCaptureGroups<Rest, [...Counter, unknown]>
+    : Counter['length'];
 /**
  * Represents a fixed version of RegExpExecArray that includes the matched string,
  * captures, and optionally named groups.
@@ -70,6 +100,8 @@ export type RegExpExecArrayFixed<
   GroupCount extends number = CountCaptureGroups<S>
 > = [match: string, ...ExtractCaptures<GroupCount>] & {
   groups?: ReGroups<R>;
+  index: number;
+  input: string;
 };
 /**
  * Generates an array type with a length corresponding to the number of capture groups.
@@ -79,9 +111,30 @@ 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<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.13"
+  "version": "1.0.15"
 }

package/tool-lib/cjbm.js

@@ -6,7 +6,6 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <reference path="./tools.d.ts"/>
-/// <reference path="../regex.d.ts"/>
 // @ts-check
 /**
  * @file (C)onvert (J)S to (B)rowser (M)odule
@@ -14,44 +13,25 @@
 const fs = require("fs");
 const path = require("path");
 /**
- * @import * as Regex from "../regex.d.ts";
+ * @type {typeof XRegex.createRegExp}
  */
-const RE_TEXT = String.raw`
-# NOTE: PCRE での検証時は line comment assertion を (?<!\/\/|\/\/\s)(?:(?<!@)import|export) とすること (regex101.com)
-# 正しくは: (?<!\s*\/\/+.*?)(?:(?<!@)import|export)
-(?<!\s*\/\/+.*?)(?:(?<!@)import|export)
-\s*
-(?:
-  # 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*
-    (?<qcDynamic>["'])(?!https?:)(?=[.\/]+)(?<dynamicName>(?:[.\/]+)?[^'"]+?)(?:\.(?<dynamicExt>(?:c|m)?jsx?))?\k<qcDynamic>
-  \s*\)|
-  # esm import/export
-  (?:(?<clause>.+?|(?:\w+\s*,)?\s*\{[^}]+\})\s*from)\s*
-    (?<qcEsm>["'])(?!https?:)(?=[.\/]+)
-    (?:
-      (?<moduleName>(?:[.\/]+)?[^'"]+?)(?:\.(?<moduleExt>(?:c|m)?jsx?))?
-    )\k<qcEsm>
-)
-(?=\s*;)?
-`;
+function createRegExp(pattern, flags) {
+  return new RegExp(pattern, flags);
+}
+const reImportExportDetection = createRegExp(
+  `(?<!\\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*;)?`, "g"
+);
 /**
- * @date 2025/12/22 16:09:36
- * @see https://regex101.com/r/uMMsD4/31
+ * @typedef {XRegex.ReplacerFunctionSignature<typeof reImportExportDetection>} TImportExportDetectRegexReplacer
  */
-const reImportExportDetection = new RegExp(
-  RE_TEXT.replace(/\s*\(\?\#.*\)\s*$|(?<!\\)\#\s*.*$|\s+/gm, ""), "g",
-);
 /**
  * Generates a replacer function to update import/export statements with a new file extension.
  *
  * @param {string} ext - The new file extension to use.
- * @returns {TRegexImportExportDetectorReplacer} A function to update import/export statements with the specified file extension.
+ * @returns {TImportExportDetectRegexReplacer} 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 を参照
  */
@@ -60,11 +40,18 @@ function getReplacer(ext) {
    * NOTE: Replacement is only performed with the syntax "$` is $1".
    * String concatenation is not allowed.
    */
-  /** @type {TRegexImportExportDetectorReplacer} */
-  const replacer = (
-    $0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _o, _s, { clause, dynamicName, globalName, moduleName, qcDynamic, qcEsm, qcGlobal }
+  /** @type {TImportExportDetectRegexReplacer} */
+  return (
+    match, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _offset, _input, groups
   ) => {
-    const kw = $0.startsWith("import") ? "import" : "export";
+    const {
+      clause,
+      dynamicName,
+      globalName,
+      moduleName,
+      qcDynamic, qcEsm, qcGlobal,
+    } = groups;
+    const kword = match.startsWith("import") ? "import" : "export";
     const qc = qcDynamic || qcEsm || qcGlobal;
     let whichName = /** @type {string} */ (
       globalName || moduleName || dynamicName
@@ -72,9 +59,16 @@ function getReplacer(ext) {
     if (whichName[whichName.length - 1] === "/") {
       whichName += "index";
     }
-    return `${kw}${globalName? ` ${qc}${whichName}.${ext}${qc}`: clause? ` ${clause} from ${qc}${whichName}.${ext}${qc}`: `(${qc}${whichName}.${ext}${qc})`}`;
+    const modId = `${qc}${whichName}.${ext}${qc}`;
+    return `${kword}${
+      
+      globalName ? ` ${modId}` :
+      
+      clause? ` ${clause} from ${modId}` :
+      
+      `(${modId})`
+    }`;
   };
-  return replacer;
 }
 /**
  * @param {string} ext

package/tool-lib/tools.d.ts

@@ -6,21 +6,10 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <reference path="../regex.d.ts"/>
-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, string, string, string,
-        number, string,
-        TRegexDetectRet
-    ): string;
     declare function processSources(
         taskName: string,
         process: (source: string) => Promise<string> | string,
@@ -87,7 +76,7 @@ declare global {
         /** replace */
         regex: RegExp;
         /** rmc */
-        rmc4ts: boolean;
+        rmc4ts: boolean | "keepBangLine";
         /**
          * webpacked source path. 
          * @default `./dist/webpack/index.js`

package/tools.js

@@ -206,9 +206,12 @@ const ToolFunctions = {
     fn() {
       const rmc = require("rm-cstyle-cmts");
       if (params.rmc4ts) {
+        const keepBangLine = params.rmc4ts === "keepBangLine";
         rmc.setListener(({ event, fragment }) => {
           if (event === /*EScannerEvent.MultiLineComment*/ 1) {
             return /^\/\*(\*|!)\s|^\/\*(?!-).+\*\/$/.test(fragment);
+          } else if (keepBangLine && event === /*EScannerEvent.SingleLineComment*/0) {
+            return /^\/\/+!/.test(fragment);
           }
           return false;
         });
@@ -228,12 +231,14 @@ const ToolFunctions = {
         },
       );
     },
-    help: `$ jstool -cmd rmc -basePath "./dist/cjs,./dist/cjs/gulp" -test "/\\.(js|d\\.ts)$/"
+    help: `$ jstool -cmd rmc [-rmc4ts[:keepBangLine]] -basePath "./dist/cjs,./dist/cjs/gulp" -test "/\\.(js|d\\.ts)$/"
   note: basePath - can be "<path>,<path>,..." (array type arg)
-    test     - can be omit, defulat \`/\.js$/\`
-    rmc4ts   - for typescript source.
+    test  - can be omit, defulat \`/\.js$/\`
+    rmc4ts- for typescript source.
       keep comment that start with "/*" when "*/" end mark appears in same line.
       if start with "/*-" remove it
+    rmc4ts=keepBangLine (2025/12/24)
+          - In addition to the "rmc4ts" processing, it also preserves line comments that start with "//!".
 `,
   },
   backup: {