js-dev-tool 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dev-tool",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "bin": {
     "jstool": "tools.js"
   },
@@ -50,7 +50,7 @@
     "fflate": "^0.8.2",
     "mini-semaphore": "^1.4.4",
     "replace": "^1.2.2",
-    "rm-cstyle-cmts": "^3.3.25",
+    "rm-cstyle-cmts": "^3.3.26",
     "terser": "^5.44.1",
     "tin-args": "^0.1.1"
   }

package/regex.d.ts

@@ -7,9 +7,11 @@
 */
 /**
  * @file js-dev-scripts/regex.d.ts
+ * @desc It is recommended to add `"skipLibCheck": true` to your tsconfig.
+ * @todo publish as "annotate-regex"
  */
 declare global {
-  interface RegExp/* extends TypedRegExp<string, string>*/ {
+  interface RegExp {
     /**
      * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
      * @template {string} P
@@ -38,10 +40,7 @@ declare global {
      * @param {F} [flags] The flags for the regular expression.
      * @returns {RegExp & { readonly source: P; readonly flags: F }} A typed RegExp object.
      */
-    new <const P extends string, const F extends string = "">(pattern: P, flags?: F): RegExp & {
-      readonly source: P;
-      readonly flags: F;
-    };
+    new <const P extends string, const F extends string = "">(pattern: P, flags?: F): TypedRegExp<P, F>;
     /**
      * Creates a typed RegExp object with literal types for the pattern and flags.
      * @template {string} P
@@ -50,10 +49,7 @@ declare global {
      * @param {F} [flags] The flags for the regular expression.
      * @returns {RegExp & { readonly source: P; readonly flags: F }} A typed RegExp object.
      */
-    <const P extends string, const F extends string = "">(pattern: P, flags?: F): RegExp & {
-      readonly source: P;
-      readonly flags: F;
-    };
+    <const P extends string, const F extends string = "">(pattern: P, flags?: F): TypedRegExp<P, F>;
     readonly "prototype": RegExp;
   }
 }
@@ -62,15 +58,19 @@ declare global {
 //                                   Basics
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
+export type Brand<Tag extends string> = {
+  [k in Tag]: true;
+};
+export type TypedRegExpBrand = Brand<"__TypedRegExp">;
+export type TypedRegExp<P extends string, F extends string = ""> = RegExp & {
+  readonly source: P;
+  readonly flags: F;
+} & TypedRegExpBrand;
 /**
  * Extracts the literal type from the source property of a RegExp.
  * @template R - A RegExp type.
  */
 export type RegExpSource<R extends RegExp> = R extends RegExp & { readonly source: infer T } ? T : never;
-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 = ""
@@ -86,7 +86,7 @@ type FirstChar<S extends string> = S extends `${infer F}${infer _}` ? F : never;
  * without considering nesting, and unions them.
  * @template S - A string pattern.
  */
-export type ExtractGroupNames<S extends string> =
+export type ExtractGroupNames<S extends unknown> =
   S extends `${infer _Before}(?<${infer Rest}`
     ? FirstChar<Rest> extends "=" | "!"
       ? ExtractGroupNames<Rest>
@@ -193,8 +193,11 @@ export type ReplaceCallbackParams<
   input: string,
   groups: RegExpNamedGroups<R>
 ];
-export type ReplacerFunctionSignature<R extends unkown> =
+export type ReplacerFunctionSignature<R extends unknown> =
   R extends (
     RegExp & { readonly source: infer T }
-  ) ? (...args: ReplaceCallbackParams<R, T>) => string : string;
+  ) ? R extends TypedRegExpBrand
+    ? (...args: ReplaceCallbackParams<R/* , T */>) => string
+    : (match: string, ...rest: any[]) => string
+  : string;
 export as namespace XRegex;

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.17"
+  "version": "1.0.19"
 }

package/tool-lib/cjbm.js

@@ -13,21 +13,15 @@
 const fs = require("fs");
 const path = require("path");
 /**
- * Creates a typed RegExp object with literal types for the pattern and flags.
- * @template {string} P
- * @template {string} F
- * @param {P} pattern The regular expression pattern.
- * @param {F} [flags] The flags for the regular expression.
- * @returns {XRegex.TypedRegExp<P, F>} A typed RegExp object.
+ * DEVNOTE: Improved `RegExpConstructor` interface makes `createRegExp` unnecessary
+ * @date 2025/12/25 22:10:17
  */
-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"
+const reImportExportDetection = new RegExp(
+  `(?:(?:^\\s*?\\/\\*+?[\\s\\S]*?\\*\\/)|(?<!\\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*;)?)`, "gm"
 );
 /**
  * @typedef {XRegex.ReplacerFunctionSignature<typeof reImportExportDetection>} TImportExportDetectRegexReplacer
@@ -49,6 +43,7 @@ function getReplacer(ext) {
   return (
     match, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _offset, _input, groups
   ) => {
+    if (/\s*?\/\*/.test(match)) return match;
     const {
       clause,
       dynamicName,