js-dev-tool 1.2.6 → 1.2.8

package/basic-types.d.ts

@@ -24,12 +24,12 @@ type TBD<T> = T | undefined;
 type TBC<T> = T | null;
 type Maybe<T> = T | null | undefined;
 /**
- * T is falsy then return A, trusy then B
- * 
+ * T is falsy then return A, truthy then B
+ *
  * ```ts
  * type ConditionalX<T, A, B> = T extends (void | false | undefined) ? A : B // <- maybe not works
  * type Conditional<T, A, B> = void extends T ? A : T extends (void | false | undefined) ? A : B;
- * 
+ *
  * function x<T extends true | void, R extends ConditionalX<T, string, string[]>>(need?: T): R {
  *   return (need? "": [""]) as R;
  * }
@@ -80,15 +80,18 @@ type Prettify<T> = { [K in keyof T]: T[K] } & {};
 type Constructor<T> = new (...args: any[]) => T;
 /**
  * mark a specific property as `required`
- * 
- * + About `Merge` parameter - Accepts values ​​of `1` or `0`.
+ *
+ * + About `Flatten` parameter - Accepts values ​​of `1` or `0`.
  *   - If it is **1**, the types are displayed concatenated.
  *   - If it is **0**, the types are displayed separated by "&".
+ *
+ * @date Renamed due to reasons. (`RequireThese` to `RequireKeys`)
  */
-type RequireThese<
-  T, K extends keyof T, Merge extends 1 | 0 = 0,
-  Intersected = T & Required<Pick<T, K>>
-> = Merge extends 1 ? Prettify<Intersected> : Intersected;
+type RequireKeys<
+  T, K extends keyof T = keyof T,
+  Flatten extends 1 | 0 = 0,
+  Intersected = T & { [P in K]-?: T[P] }
+> = Flatten extends 1 ? Prettify<Intersected> : Intersected;
 /**
  * pick any `property` as excludes
  */
@@ -118,8 +121,9 @@ type TypedCtor<T> = {
 interface ITypedCtor<T> extends TypedCtor<T> {}
 /**
  * Array.sort etc...
+ * @date 2026/03/03 - Improved to allow comparison of different types
  */
-declare type TComparator<T> = (a: T, b: T) => number;
+declare type TComparator<T, T2 = T> = (a: T, b: T2) => number;
 /**
  * Generates all combinations of the string S. The order of characters does not matter.
  * @template S - The target string type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dev-tool",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "bin": {
     "jstool": "tools.js"
   },
@@ -85,11 +85,11 @@
   "dependencies": {
     "colors.ts": "^1.0.20",
     "fflate": "^0.8.2",
-    "literate-regex": "^0.6.9",
-    "mini-semaphore": "^1.5.1",
+    "literate-regex": "^0.6.11",
+    "mini-semaphore": "^1.5.4",
     "replace": "^1.2.2",
-    "rm-cstyle-cmts": "^3.4.2",
+    "rm-cstyle-cmts": "^3.4.4",
     "terser": "^5.46.0",
-    "tin-args": "^0.1.3"
+    "tin-args": "^0.1.4"
   }
 }

package/tools.js

@@ -9,16 +9,14 @@
 */
 // @ts-check
 "use strict";
+require("colors.ts");
 const fs = require("fs");
 const path = require("path");
 const rmc = require("rm-cstyle-cmts");
 /* utilities module by own. */
 const utils = require("./utils");
-// @ts-expect- error
 global.params = require("tin-args")();
-// @ts-expect- error
 global.verbose = params.verb;
-// @ts-expect- error
 global.isArray = Array.isArray;
 require("./tool-lib/ps").globalize(fs, utils);
 utils.log(params);
@@ -83,21 +81,28 @@ const ToolFunctions = {
     fn() {
       const re = params.regex;
       const after = params.after || "";
+      let targets = params.args || params.targets
+      if (typeof targets === "string") targets = [targets];
+      params.targets = targets;
       if (re) {
         processSources(this.taskName, (data) => data.replace(re, after), {
           base: "",
-          targets: params.args || params.targets,
         });
       }
     },
-    help: `jstool -cmd replace [-after <replacement>] -regex \"/^\\s+<!--[\\s\\S]+?-->(?:\\r?\\n)?/gm\" [-targets "<path>,<path>,..." | <args: file, file file...>]
-  note:
-    targets - must be array type arg, "['<path>', '<path>',...]" or "<path>,<path>,..."
-    note: targets - can use args parameter instead
-       It is better to use the <args: file, file file...>
-       e.g - jstool -cmd replace -after ".." -regex "re/(?<=reference path=\")(\\.)(?=\\/index.d.ts\")/" build/**/*.js
-                                                                                                         ^^^^^^^^^^^^^
-`,
+    get help() {
+      return `jstool -cmd replace [-after <replacement>] -regex \"/^\\s+<!--[\\s\\S]+?-->(?:\\r?\\n)?/gm\" [-targets "<path>,<path>,..." | <args: file, file file...>]
+
+${"Options:".red}
+  ${"after".cyan}  ${`: If omitted, "" (empty string) is used, meaning that the matched string is deleted.`.gray(16)}
+  ${"targets".cyan}${`: Single path string or Array type arg, "['<path>', '<path>',...]" or "<path>,<path>,..."`.gray(16)}
+
+${"remarks".magenta}${": targets - can use args parameter instead".gray(16)}${`
+  It is better to use the <args: file, file file...>
+  e.g - ${"jstool".yellow} ${"-cmd".green} ${"replace".cyan} ${"-after".green} ${`".."`.red} ${"-regex".green} ${String.raw`'re/(?<=reference path=")(\.)(?=\/index.d.ts")/'`.magenta} ${"build/**/*.js".gray(16)}
+                                                                                                ^^^^^^^^^^^^^
+`.gray(16)}`;
+    },
   },
   version: {
     taskName: "version",
@@ -287,19 +292,11 @@ function isJSToolEntry(entry) {
   if (typeof entry !== "object") return false;
   return typeof entry.fn === "function" && typeof entry.help === "string";
 }
-let colorEnable = false;
-function enableColors() {
-  if (!colorEnable) {
-    require("colors.ts");
-    colorEnable = true;
-  }
-}
 /**
  * @param {string} cmd
  * @returns {void}
  */
 function printHelp(cmd) {
-  enableColors();
   const entry = ToolFunctions[cmd];
   console.log(`${cmd.yellow + " help:".green} ${entry.help.gray(8)}`);
 }
@@ -318,7 +315,6 @@ if (params.cmd) {
     process.cwd(),
   );
 } else if (params.v) {
-  enableColors();
   const thisVersion = require("./package.json").version;
   console.log(
     `${"jstool".magenta} in "js-dev-scripts", version: ${thisVersion.green}

package/tsconfig.json

@@ -15,6 +15,7 @@
     "module": "nodenext",
     "outDir": "./build",
     // "baseUrl": ".",
+    "rootDir": ".",
     "paths": {
       "*": [
         "./*"
@@ -22,12 +23,12 @@
     },
   },
   "include": [
-    "index.js",
-    "utils.js",
-    "tools.js",
     "*.d.ts",
-    "./**/*.js",
     "./**/*.d.ts",
+    "./index.js",
+    "./utils.js",
+    "./tools.js",
+    "./**/*.js",
   ],
   "exclude": [
     "./**/npm-outdated*.js",