js-dev-tool 1.0.17 → 1.0.18

package/package.json

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

package/regex.d.ts

@@ -62,15 +62,19 @@ declare global {
 //                                   Basics
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
+export type Brand<Tag extends string> = {
+  [k in Tag]: true;
+};
+export type TypedRegExpBrand = Brand<"__TypedRegExp">;
+export type TypedRegExp<const P extends string, const 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 = ""
@@ -196,5 +200,8 @@ export type ReplaceCallbackParams<
 export type ReplacerFunctionSignature<R extends unkown> =
   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.18"
 }

package/tool-lib/cjbm.js

@@ -21,7 +21,7 @@ const path = require("path");
  * @returns {XRegex.TypedRegExp<P, F>} A typed RegExp object.
  */
 function createRegExp(pattern, flags) {
-  return new RegExp(pattern, flags);
+  return /** @type {XRegex.TypedRegExp<P, F>} */(new RegExp(pattern, flags));
 }
 const reImportExportDetection = createRegExp(
   `(?<!\\s*\\/\\/+.*?)(?:(?<!@)import|export)\\s*(?:(?<qcGlobal>["'])(?!https?:)(?=[.\\/]+)\