js-dev-tool 1.0.20 → 1.0.21

package/package.json

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

package/regex.d.ts

@@ -75,6 +75,9 @@ export declare function createRegExp<
   const P extends string,
   const F extends string = ""
 >(pattern: P, flags?: F): TypedRegExp<P, F>;
+type IsEmptyRecord<T> =
+  [T] extends [undefined] ? true :
+  [keyof T] extends [never] ? true : false;
 /*!
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 //                            Named Capture Groups
@@ -91,7 +94,9 @@ export type ExtractGroupNames<S extends unknown> =
     ? FirstChar<Rest> extends "=" | "!"
       ? ExtractGroupNames<Rest>
       : Rest extends `${infer GroupName}>${infer After}`
-        ? GroupName | ExtractGroupNames<After>
+        ? GroupName extends ""
+          ? "ExtractGroupNames: regex pattern error!"
+          : GroupName | ExtractGroupNames<After>
         : never
     : never;
 /**
@@ -100,10 +105,14 @@ export type ExtractGroupNames<S extends unknown> =
  * @template R - A RegExp type.
  * @date 2025/12/24 14:46:30 - It may be possible to extract the group name accurately (?)
  */
-export type RegExpNamedGroups<R extends RegExp> = R extends { readonly source: infer T }
- ? {
-  [K in ExtractGroupNames<T>]?: string;
-} : never;
+export type RegExpNamedGroups<R extends RegExp> =
+  R extends RegExp & { readonly source: infer S extends string }
+    ? ExtractGroupNames<S> extends infer K
+      ? [K] extends [never]
+        ? undefined
+        : { [P in K & string]: string | undefined }
+      : undefined
+    : undefined;
 /*!
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 //                               Capture Groups
@@ -150,9 +159,10 @@ export type CountCaptureGroups<
 export type RegExpExecArrayFixed<
   R extends RegExp,
   S extends RegExpSource<R> = RegExpSource<R>,
-  GroupCount extends number = CountCaptureGroups<S>
+  GroupCount extends number = CountCaptureGroups<S>,
+  NamedGroups = RegExpNamedGroups<R>
 > = [match: string, ...BuildCaptureTuple<GroupCount>] & {
-  groups?: RegExpNamedGroups<R>;
+  groups: IsEmptyRecord<NamedGroups> extends true ? undefined : NamedGroups;
   index: number;
   input: string;
 };
@@ -185,13 +195,19 @@ export type BuildCaptureTuple<
 export type ReplaceCallbackParams<
   R extends RegExp,
   S extends RegExpSource<R> = RegExpSource<R>,
-  GroupCount extends number = CountCaptureGroups<S>
-> = [
+  GroupCount extends number = CountCaptureGroups<S>,
+  NamedGroups = RegExpNamedGroups<R>
+> = IsEmptyRecord<NamedGroups> extends true ? [
   match: string,
   ...captures: BuildCaptureTuple<GroupCount>,
   offset: number,
   input: string,
-  groups: RegExpNamedGroups<R>
+] : [
+  match: string,
+  ...captures: BuildCaptureTuple<GroupCount>,
+  offset: number,
+  input: string,
+  groups: NamedGroups
 ];
 export type ReplacerFunctionSignature<R extends unknown> =
   R extends (
@@ -324,15 +340,15 @@ type StripLine<S extends string, Acc extends string = ""> =
  * (?:\\#\\w+)     # keep literal "#"
  * ` as const;
  *
- * type Src = PCREStyleToJsRegExpSourceByLine<typeof RE_SOURCE>;
+ * type Src = PCREStyleToJsRegExpSource<typeof RE_SOURCE>;
  * // "^(:?##\\w+)" ... (depending on your actual input)
  */
-export type PCREStyleToJsRegExpSourceByLine<
+export type PCREStyleToJsRegExpSource<
   Input extends string,
   Acc extends string = "",
   S extends string = NormalizeNewlines<Input>,
 > =
   S extends `${infer Line}\n${infer Rest}`
-    ? PCREStyleToJsRegExpSourceByLine<Input, `${Acc}${StripLine<Line>}`, Rest>
+    ? PCREStyleToJsRegExpSource<Input, `${Acc}${StripLine<Line>}`, Rest>
     : `${Acc}${StripLine<S>}`;
 export as namespace XRegex;

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.20"
+  "version": "1.0.21"
 }

package/tool-lib/cjbm.js

@@ -41,8 +41,12 @@ function getReplacer(ext) {
    */
   /** @type {TImportExportDetectRegexReplacer} */
   return (
-    match, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _offset, _input, groups
+    ...args
   ) => {
+    const [
+      match,,,,,,,,,,,,,
+      groups
+    ] = args;
     if (/\s*?\/\*/.test(match)) return match;
     const {
       clause,