js-dev-tool 1.0.3 → 1.0.7

package/README.md

@@ -1,4 +1,4 @@
-# js-tool
+# js-dev-tool
 
 A collection of command-line tools to assist in JavaScript project development.
 
@@ -56,13 +56,12 @@ cmtTrick help: Do comment trick toggle
     bases          - must be array type arg, "['<path>', '<path>',...]" or "<path>,<path>,..."
     test           - terget extension, default is /\\.js$/
 
-stripWebpack help: jstool -cmd stripWebpack -regex "%npm_package_defs_regex%"
-stripSome help: jstool -cmd stripSome [-after <replacement>] -regex "/^\s+<!--[\s\S]+?-->(?:\r?\n)?/gm" [-targets "<path>,<path>,..." | <args: file, file file...>]
+replace 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 stripSome -after ".." -regex "re/(?<=reference path=")(\.)(?=\/index.d.ts")/" build/**/*.js
+       e.g - jstool -cmd replace -after ".." -regex "re/(?<=reference path=")(\.)(?=\/index.d.ts")/" build/**/*.js
                                                                                                          ^^^^^^^^^^^^^
 
 version help: jstool -cmd version [-major | -minor] [-pkgJsons "./package.json,../package.json"] [-extras "test/web/index.html"]
@@ -110,9 +109,9 @@ Toggles "comment tricks" in the code, useful for conditional code execution duri
 
 ---
 
-### `stripSome`
+### `replace`
 Performs generic string replacement on a set of target files using a regular expression.
-*   **Usage:** `jstool -cmd stripSome [-after <replacement>] -regex "<regex>" [-targets "<path1>,<path2>" | <file1> <file2> ...]`
+*   **Usage:** `jstool -cmd replace [-after <replacement>] -regex "<regex>" [-targets "<path1>,<path2>" | <file1> <file2> ...]`
 *   **Note:** It's often better to pass target files as direct arguments instead of using the `-targets` option.
 
 ---
@@ -138,10 +137,6 @@ Removes C-style comments from files.
 
 ---
 
-### `stripWebpack` (deprecated)
-Strips webpack-specific boilerplate from bundled files.
-*   **Usage:** `jstool -cmd stripWebpack -regex "%npm_package_defs_regex%"`
-
 
 ## 📜 License
 

package/common/index.d.ts

@@ -32,9 +32,10 @@ export function createLogStreamAndResolvePath(logPath: string): any;
 /**
  * use process.stderr stream
  *
- * @param {string} [msg] if empty string or undefined then only clear line and move cursor to head.
+ * @param {string=} msg if empty string or undefined then only clear line and move cursor to head.
+ * @param {number=} row
  */
-export function renderLine(msg?: string): void;
+export function renderLine(msg?: string, row?: number): void;
 /**
  *
  * @param {boolean} enabled

package/common/index.js

@@ -11,7 +11,6 @@
 // @ts-check
 const fs = require("fs");
 const path = require("path");
-const rl = require("readline");
 /**
  * @param {string} dest
  */
@@ -31,15 +30,16 @@ function createLogStreamAndResolvePath(logPath) {
 /**
  * use process.stderr stream
  *
- * @param {string} [msg] if empty string or undefined then only clear line and move cursor to head.
+ * @param {string=} msg if empty string or undefined then only clear line and move cursor to head.
+ * @param {number=} row
  */
-function renderLine(msg /*, del = "\x1B[?25l"*/) {
+function renderLine(msg, row) {
   const output = process.stderr || process.stdout;
-  // @ts-ignore
-  rl.clearLine(output, 0);
-  // @ts-ignore
-  rl.cursorTo(output, 0);
-  msg && output.write(msg);
+  output.cursorTo(0, row);
+  msg && (
+    output.write(msg),
+    output.clearLine(1)
+  );
 }
 /**
  *

package/extras/tiny-progress.js

@@ -43,18 +43,18 @@ const pcb = () => {
 let progress;
 /**
  * @param {number} [fps]
- * @param {() => string} [messageEmiter]
+ * @param {() => string} [messageEmitter]
  */
-const create = (fps = 30, messageEmiter) => {
+const create = (fps = 30, messageEmitter) => {
   const spinner = rndSpinners.getRandomFrame();
-  !messageEmiter && (messageEmiter = pcb);
+  !messageEmitter && (messageEmitter = pcb);
   progress = p.createProgressObject(
     spinner.frames,
     {
       fmt: "{tick} - {frameName} - {msg}",
       payload: { frameName: spinner.name },
     },
-    messageEmiter,
+    messageEmitter,
   );
   progress.setFPS(fps);
   return progress;

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "js-dev-tool",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "bin": {
-    "jstool": "./tools.js"
+    "jstool": "tools.js"
   },
   "types": "./index.d.ts",
   "main": "./index.js",
-  "repository": "git@github.com:jeffy-g/js-dev-scripts.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/jeffy-g/js-dev-scripts.git"
+  },
   "author": "jeffy-g <hirotom1107@gmail.com>",
   "license": "MIT",
   "keywords": [
@@ -37,7 +40,8 @@
     "*.d.ts"
   ],
   "peerDependencies": {
-    "archiver": "^4.0.1"
+    "archiver": "^4.0.1",
+    "webpack": "*"
   },
   "dependencies": {
     "colors.ts": "^1.0.20",
@@ -46,6 +50,6 @@
     "replace": "^1.2.2",
     "rm-cstyle-cmts": "^3.3.22",
     "terser": "^5.44.1",
-    "tin-args": "^0.0.16"
+    "tin-args": "^0.1.1"
   }
 }

package/progress/index.d.ts

@@ -71,6 +71,10 @@ export function createProgressObject(frames: string[], formatOpt: TProgressForma
      * stop timer
      */
     stop(): void;
+    /**
+     * running or not?
+     */
+    isRunning(): boolean;
 };
 declare global {
     type TWebpackProgressHandler = (percentage: number, message: string, ...args: string[]) => void;

package/progress/index.js

@@ -69,12 +69,12 @@ const createProgressSync = (frames, formatOpt) => {
  * ```
  * " {frameName} [{tick}]: {msg}" // etc
  * ```
- * @param {() => string} callback
+ * @param {() => string} messageEmitter
  */
-const createProgressObject = (frames, formatOpt, callback) => {
+const createProgressObject = (frames, formatOpt, messageEmitter) => {
   let done = false;
   const render = () => {
-    process.nextTick(progress, callback(), done);
+    progress(messageEmitter(), done);
   };
   let progress = createProgressSync(frames, formatOpt);
   /** @type {ReturnType<typeof setInterval> | undefined} */
@@ -125,7 +125,7 @@ const createProgressObject = (frames, formatOpt, callback) => {
      * this method useful when `run` method did not smooth.
      */
     renderSync() {
-      render();
+      progress(messageEmitter(), done);
     },
     /**
      * run timer (30fps)
@@ -147,6 +147,9 @@ const createProgressObject = (frames, formatOpt, callback) => {
       timer = void 0;
       lib.cursor(true);
     },
+    isRunning() {
+      return !!timer;
+    }
   };
 };
 /**
@@ -198,7 +201,7 @@ function createWebpackProgressPluginHandler(
   /** @type {TWebpackProgressHandler} */
   let wppHandler;
   {
-    const shorttenProgress = (/** @type {number} */ pct) => {
+    const shortenProgress = (/** @type {number} */ pct) => {
       renderer(formatPercentage(pct));
       pct === 1 && (console.log(), (dotted = 0));
     };
@@ -207,7 +210,7 @@ function createWebpackProgressPluginHandler(
       /** @type {((p: number) => void) | undefined} */
       let writeCallback;
       if (!disableRenderLine) {
-        writeCallback = shorttenProgress;
+        writeCallback = shortenProgress;
       }
       wppHandler = (percentage, message, ...args) => {
         wppLogger.write(
@@ -227,7 +230,7 @@ function createWebpackProgressPluginHandler(
           wppHandler = renderDot;
         } else {
           if (processType === "gitpod") {
-            wppHandler = shorttenProgress;
+            wppHandler = shortenProgress;
           } else {
             wppHandler = isWebpackV5later() ? wppHandlerV5 : wppHandlerV4;
           }

package/progress/progress-extras.js

@@ -17,11 +17,12 @@ const checkENV = () => {
 };
 /** @type {TWebpackProgressHandler} */
 const wppHandlerV4 = ((renderer, cwd) => {
+  const cwdLen = cwd.length;
   return (percentage, message, ...args) => {
     let [modules, actives, path = ""] = args;
     if (message) {
       const x = path.lastIndexOf(cwd) + 1;
-      x > 0 && (path = path.substring(x + cwd.length));
+      x > 0 && (path = path.slice(x + cwdLen));
     } else {
       message = "- done -";
     }
@@ -35,20 +36,20 @@ const wppHandlerV4 = ((renderer, cwd) => {
 })(lib.renderLine, process.cwd());
 /** @type {TWebpackProgressHandler} */
 const wppHandlerV5 = ((renderer, cwd) => {
+  const cwdLen = cwd.length;
   return (percentage, message, ...args) => {
     if (!message) {
       message = "- done -";
     }
-    let str = args[1];
-    if (str) {
-      const x = str.lastIndexOf(cwd) + 1;
+    let pathOrPluginName = args.shift() || "";
+    if (pathOrPluginName) {
+      const x = pathOrPluginName.lastIndexOf(cwd) + 1;
       if (x > 0) {
-        args[1] = str.substring(x + cwd.length);
+        pathOrPluginName = pathOrPluginName.slice(x + cwdLen);
       }
     }
-    str = args.shift() || "";
     renderer(
-      `pct: ${(percentage * 100).toFixed(4)}%, process: [${message}]${str ? `, info: [${str}]` : ""}${args.length ? " - " : ""}${args.join(", ")}`,
+      `pct: ${(percentage * 100).toFixed(4)}%, process: [${message}]${pathOrPluginName ? `, info: [${pathOrPluginName}]` : ""}${args.length ? " - " : ""}${args.join(", ")}`,
     );
     percentage === 1 && console.log();
   };
@@ -61,7 +62,7 @@ let checkedCache;
 const isWebpackV5later = () => {
   if (checkedCache === void 0) {
     try {
-      // @ts-ignore
+      // @ts-ignore TODO: 2025/11/14 20:54:23
       const webpack = require("webpack");
       checkedCache = +webpack.version[0] > 4;
     } catch (e) {

package/scripts/normalize-commit-msg.mjs

@@ -0,0 +1,22 @@
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const commitMsgPath = path.resolve(__dirname, "..", ".codex", "commit_msg.txt");
+
+if (!fs.existsSync(commitMsgPath)) {
+  process.exit(0);
+}
+
+let msg = fs.readFileSync(commitMsgPath, "utf8");
+
+msg = msg.replace(/\r\n/g, "\n");
+msg = msg
+  .split("\n")
+  .map(line => line.replace(/\s+$/u, ""))
+  .join("\n");
+msg = msg.replace(/\n+$/u, "\n");
+
+fs.writeFileSync(commitMsgPath, msg, "utf8");

package/scripts/publish-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.3"
+  "version": "1.0.7"
 }

package/tool-lib/cjbm.js

@@ -11,12 +11,14 @@
 /**
  * @file (C)onvert (J)S to (B)rowser (M)odule
  */
+const fs = require("fs");
+const path = require("path");
 /**
  * @import * as Regex from "../regex.d.ts";
  */
 const RE_TEXT = String.raw`
-# NOTE: PCRE での検証時は line comment assertion を (?<!\/\/|\/\/\s) とすること (regex101.com)
-(?<!\/\/+\s*)(?:import|export)
+# NOTE: When validating with PCRE, use line comment assertion as (?<!\/\/|\/\/\s) (regex101.com)
+(?<!\/\/\s*.+?)(?:(?<!@)import|export)
 \s*
 (?:
   "(?!https?:)(?=[.\/]+)(?:
@@ -66,6 +68,31 @@ function getReplacer(ext) {
   };
   return replacer;
 }
+/**
+ * @param {string} ext
+ */
+const emitProcessCallback = (ext) => {
+  /**
+   * @param {string[]} sourceFiles
+   */
+  return (sourceFiles) => {
+    if (sourceFiles && sourceFiles.length) {
+      for (let i = 0, sourceFilesLen = sourceFiles.length; i < sourceFilesLen;) {
+        const sourceFile = sourceFiles[i++];
+        const parsed = path.parse(sourceFile);
+        if (parsed.ext !== `.${ext}`) {
+          const afterPath = `${parsed.dir}/${parsed.name}.${ext}`;
+          fs.rename(sourceFile, afterPath, err => {
+            if (err) console.error(err);
+            else {
+              console.log(`renamed: ${sourceFile} => ${afterPath}`);
+            }
+          });
+        }
+      }
+    }
+  };
+};
 /**
  * @returns {TJSToolEntry}
  */
@@ -78,31 +105,14 @@ module.exports = () => {
     fn() {
       const bases = getBasePaths();
       const ext = params.ext || "js";
-      /** ### regex summary
-       * ```perl
-       * (?:import|export)                    # comments
-       * \s*
-       * (?:
-       *   "(?=[.\/]+)|                       # character ["] \x22 e.g - import "../global/index"
-       *   (?:
-       *     [\w_]+\s+|                       # default import, e.g - import fs from "./file";
-       *     (?:[\w_]+\s*,\s*)?\{[^}]+\}\s*|  # e.g - import View, { TitiledSphereMesh } from "./view";
-       *     \*\s*as\s+[\w_]+\s+|             # e.g - export * as OO from "./rateLimiter";
-       *     \*\s*                            # e.g - export * from "./rateLimiter";
-       *   )from\s*"(?:[.\/]+)                # Positive Lookahead (./|../|../../) ...
-       * )
-       * (?:[^"]*)
-       * (?<!\.js)                            # Negative Lookbehind not(/\.(?:c|m)?js/)
-       * (?="\s*;?)
-       * ```
-       * @see regex details see {@link https://regex101.com/r/EpuQLT/32 regex101.com}
-       */
+      /* const sourceFiles = await */
       processSources(
         /** @type {string} */ (this.taskName), (data) => {
           reImportExportDetection.lastIndex = 0;
           return data.replace(reImportExportDetection, getReplacer(ext));
         }, {
           bases,
+          cb: emitProcessCallback(ext)
         },
       );
     },

package/tool-lib/ps.js

@@ -50,7 +50,7 @@ module.exports = {
      * @param {(source: string) => Promise<string> | string} process
      * @param {TProcessSourcesOpt} [opt]
      */
-    function processSources(taskName, process, opt = {}) {
+    async function processSources(taskName, process, opt = {}) {
       const {
         root = params.root,
         base = "./build",
@@ -58,6 +58,7 @@ module.exports = {
         test = /\.js$/,
         suffix = "",
         targets,
+        cb
       } = opt;
       /**
        * 主に javascript 系 file を push する.
@@ -89,41 +90,49 @@ module.exports = {
       DEBUG && console.log("processSources::processSources:", sourceFiles);
       let count = sourceFiles.length;
       let written = 0;
+      /** @type {() => void} */
+      let psResolve;
       /** @type {(fileName?: string) => void} */
       const done = (fileName) => {
         --count === 0 && (
-          console.timeEnd(taskName), utils.log(`[${taskName}] file written: ${written}`)
+          console.timeEnd(taskName), utils.log(`[${taskName}] file written: ${written}`),
+          psResolve()
         );
         if (verbose && fileName) {
           utils.log(`[${taskName}] done: ${fileName}`);
         }
       };
-      count && console.time(taskName);
-      for (const sourceFile of sourceFiles) {
-        fs.stat(sourceFile, (statErr, stat) => {
-          if (statErr) {
-            return handleError(statErr, () => done(sourceFile));
-          }
-          if (stat.isFile()) {
-            fs.readFile(sourceFile, "utf8", async (readErr, code) => {
-              if (readErr) {
-                return handleError(readErr, () => done(sourceFile));
-              }
-              const result = await runProcess(code, process);
-              const outputPath = sourceFile.replace(/(?=\.js$)/, suffix);
-              if (result !== code) {
-                fs.writeFile(outputPath, result, () => {
-                  written++, done(outputPath);
-                });
-              } else {
-                done(outputPath);
-              }
-            });
-          } else {
-            done(sourceFile);
-          }
-        });
-      }
+      await /** @type {Promise<void>} */(new Promise(resolve => {
+        psResolve = resolve;
+        count && console.time(taskName);
+        for (const sourceFile of sourceFiles) {
+          fs.stat(sourceFile, (statErr, stat) => {
+            if (statErr) {
+              return handleError(statErr, () => done(sourceFile));
+            }
+            if (stat.isFile()) {
+              fs.readFile(sourceFile, "utf8", async (readErr, code) => {
+                if (readErr) {
+                  return handleError(readErr, () => done(sourceFile));
+                }
+                const result = await runProcess(code, process);
+                const outputPath = sourceFile.replace(/(?=\.js$)/, suffix);
+                if (result !== code) {
+                  fs.writeFile(outputPath, result, () => {
+                    written++, done(outputPath);
+                  });
+                } else {
+                  done(outputPath);
+                }
+              });
+            } else {
+              done(sourceFile);
+            }
+          });
+        }
+      }));
+      cb && cb(sourceFiles);
+      return sourceFiles;
     }
     globalThis.processSources = processSources;
   },

package/tool-lib/rws.js

@@ -150,7 +150,7 @@ module.exports = (fs, utils) => {
           msg = `${this.taskName}: webpack size record created: [%s]`;
         }
         if (needWrite) {
-          utils.writeTextUTF8(
+          utils.writeText(
             JSON.stringify(sizeRecord, null, 2),
             recordPath,
             () => {

package/tool-lib/tools.d.ts

@@ -25,13 +25,13 @@ declare global {
         taskName: string,
         process: (source: string) => Promise<string> | string,
         options?: TProcessSourcesOpt
-    ): void;
+    ): Promise<string[]>;
     /** regex replace sig */
     declare type TStringReplacer = (matchs: string, ...args: any[]) => string;
     /** use `(R)ecord(W)ebpack(S)ize` */
     declare type TRwsTags = "webpack" | "umd" | "bin";
     declare var params: ReturnType<typeof import("tin-args")<TToolArgs>>;
-    declare const isArray: typeof Array.isArray;
+    declare var isArray: typeof Array.isArray;
     /**
      * @date 2025/2/18 0:46:03
      */
@@ -68,7 +68,7 @@ declare global {
          * cjbm, minify, rmc
          */
         basePath: string | string[];
-        /** processSources, cmtTrick, stripSome, rmc */
+        /** processSources, cmtTrick, replace, rmc */
         targets: string[];
         /** minify, rmc */
         suffix: string;
@@ -84,7 +84,7 @@ declare global {
         ext: string;
         /** shared, minify, rmc */
         test: RegExp;
-        /** stripWebpack, stripSome */
+        /** replace */
         regex: RegExp;
         /** rmc */
         rmc4ts: boolean;
@@ -117,7 +117,7 @@ declare global {
         /** want help? form - "-help <cmd name>" */
         help: string;
         /**
-         * for stripSome
+         * for replace
          * @date 2024-01-05
          */
         after: string;
@@ -138,6 +138,7 @@ declare global {
         test?: RegExp;
         targets?: string[];
         suffix?: string;
+        cb?: (sourceFiles: string[]) => void
     }
     declare type TJSToolEntry = {
         fn: (mode?: string) => void;

package/tools.d.ts

@@ -1,7 +1 @@
-export type {
-  TToolArgs,
-  TJSToolEntry,
-  TZipArgs,
-  TRecordWebpackSizeArgs,
-  TCJBMArgs
-} from "./tools.js";
+import "./tool-lib/tools.js";

package/tools.js

@@ -12,11 +12,11 @@ const fs = require("fs");
 const path = require("path");
 /* utilities module by own. */
 const utils = require("./utils");
-// @ts-expect-error
+// @ts-expect- error
 global.params = require("tin-args")();
-// @ts-expect-error
+// @ts-expect- error
 global.verbose = params.verb;
-// @ts-expect-error
+// @ts-expect- error
 global.isArray = Array.isArray;
 require("./tool-lib/ps").globalize(fs, utils);
 utils.log(params);
@@ -58,25 +58,6 @@ const ToolFunctions = {
   rws: require("./tool-lib/rws")(fs, utils),
   cjbm: require("./tool-lib/cjbm")(),
   cmtTrick: require("./tool-lib/cmt-trick")(),
-  stripWebpack: {
-    taskName: "stripWebpack",
-    fn() {
-      const re =
-        params.regex ||
-        /!function\s*\((.+?)\)(?:(.+?=.\(\)\})|([^]+)(?=\(.\.restrictor\s*\|\|))/g;
-      if (re) {
-        processSources(this.taskName, (data) => data.replace(re, ""), {
-          base: "",
-          targets: [
-            "./dist/umd/index.js",
-            "./dist/webpack/index.js",
-            "./dist/webpack-esm/index.mjs",
-          ],
-        });
-      }
-    },
-    help: 'jstool -cmd stripWebpack -regex "%npm_package_defs_regex%"',
-  },
   /**
    * Performs string substitutions on various file contents
    *
@@ -84,8 +65,8 @@ const ToolFunctions = {
    *
    * @date 2020/6/11
    */
-  stripSome: {
-    taskName: "stripSome",
+  replace: {
+    taskName: "replace",
     fn() {
       const re = params.regex;
       const after = params.after || "";
@@ -96,12 +77,12 @@ const ToolFunctions = {
         });
       }
     },
-    help: `jstool -cmd stripSome [-after <replacement>] -regex \"/^\\s+<!--[\\s\\S]+?-->(?:\\r?\\n)?/gm\" [-targets "<path>,<path>,..." | <args: file, file file...>]
+    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 stripSome -after ".." -regex "re/(?<=reference path=\")(\\.)(?=\\/index.d.ts\")/" build/**/*.js
+       e.g - jstool -cmd replace -after ".." -regex "re/(?<=reference path=\")(\\.)(?=\\/index.d.ts\")/" build/**/*.js
                                                                                                          ^^^^^^^^^^^^^
 `,
   },
@@ -146,8 +127,8 @@ const ToolFunctions = {
           ? [params.extras]
           : [];
       if (paths.length) {
-        utils.fireReplace(/(v)?(\d+\.\d+\.\d+)(-\w+)?/g, /** @type {TStringReplacer} */($0, $prefix, $1, $2) => {
-            if ($1 === currentVersion && $prefix) {
+        utils.fireReplace(/(v)?(\d+\.\d+\.\d+)(?:-\w+)?/g, /** @type {TStringReplacer} */($0, $prefix, $versionStr) => {
+            if ($versionStr === currentVersion && $prefix) {
               return "v" + nextVersion;
             }
             return $0;

package/tsconfig.json

@@ -7,14 +7,19 @@
     "removeComments": false,
     "moduleResolution": "nodenext",
     "resolveJsonModule": true,
-    "baseUrl": "./",
     "declaration": true,
     "emitDeclarationOnly": true,
     "allowJs": true,
     "checkJs": true,
     "target": "es2019",
-    "module": "node18",
-    "outDir": "./build"
+    "module": "nodenext",
+    "outDir": "./build",
+    // "baseUrl": ".",
+    "paths": {
+      "*": [
+        "./*"
+      ]
+    },
   },
   "include": [
     "index.js",
@@ -25,6 +30,6 @@
     "./**/*.d.ts"
   ],
   "exclude": [
-    // "./**/npm-outdated*.js",
+    "./**/npm-outdated*.js",
   ]
 }

package/utils.d.ts

@@ -10,7 +10,7 @@
 import type {
   Dirent
 } from "fs";
-export const getExtraArgs: typeof import("tin-args");
+export const tinArgs: typeof import("tin-args");
 export type TFsCallback = (err: any, data: string) => void;
 export type TypedRecord<T> = {
   [x: string]: T;
@@ -71,12 +71,12 @@ export function removeJsonComments(source: string): string;
  * @param {string} dest content output path
  * @param {() => void} [callback] the callback function
  */
-export function writeTextUTF8(content: string | NodeJS.ReadableStream | Buffer, dest: string, callback?: () => void): void;
+export function writeText(content: string | NodeJS.ReadableStream | Buffer, dest: string, callback?: () => void): void;
 /**
  * @param {string} from file path.
  * @param [callback]
  */
-export function readTextUTF8<C extends TBD<TFsCallback>, R extends undefined extends C ? string : void>(from: string, callback?: C): R;
+export function readText<C extends TBD<TFsCallback>, R extends undefined extends C ? string : void>(from: string, callback?: C): R;
 /**
  * NOTE: when callback specified, returns undefined
  *

package/utils.js

@@ -22,7 +22,7 @@
 const fs = require("fs");
 const path = require("path");
 const lib = require("./common");
-const getExtraArgs = require("tin-args");
+const tinArgs = require("tin-args");
 const CI = !!process.env.CI;
 /**
  * Nothing is logged in a CI environment.
@@ -96,7 +96,7 @@ function walkDirSync(path, handler) {
  * @param {string} dest content output path
  * @param {() => void} [callback] the callback function
  */
-function writeTextUTF8(content, dest, callback) {
+function writeText(content, dest, callback) {
   lib.checkParentDirectory(dest);
   const ws = fs.createWriteStream(dest);
   ws.on("error", function (err) {
@@ -114,7 +114,7 @@ function writeTextUTF8(content, dest, callback) {
         ws.end();
       });
     } else {
-      callback && callback();
+      ws.end();
     }
   }
   else if ("readable" in content) {
@@ -131,7 +131,7 @@ function writeTextUTF8(content, dest, callback) {
  * @param {C} [callback]
  * @returns {R} description
  */
-function readTextUTF8(from, callback) {
+function readText(from, callback) {
   if (typeof callback === "function") {
     fs.readFile(from, "utf8", callback);
   } else {
@@ -159,11 +159,11 @@ function readTextUTF8(from, callback) {
  */
 function readJson(path, callback) {
   if (typeof callback === "function") {
-    readTextUTF8(path, (err, data) => {
+    readText(path, (err, data) => {
       callback(err, JSON.parse(data));
     });
   } else {
-    const data = readTextUTF8(path);
+    const data = readText(path);
     return JSON.parse(data);
   }
   return /** @type {R} */ (undefined);
@@ -360,7 +360,7 @@ function copyText(content, message = "text copied!", chcp65001 = true) {
  */
 function convertRelativeDir(vinyl, dest = ".") {
   let x = vinyl.cwd.length + 1;
-  let relative_dir = vinyl.base.substring(x);
+  let relative_dir = vinyl.base.slice(x);
   return `${dest}/${relative_dir}`;
 }
 /**
@@ -388,10 +388,10 @@ module.exports = {
   prependStringTo,
   extractVersion,
   dateStringForFile,
-  getExtraArgs,
+  tinArgs,
   removeJsonComments,
-  writeTextUTF8,
-  readTextUTF8,
+  writeText,
+  readText,
   readJson,
   walkDirSync,
   compressScript,