js-dev-tool 1.2.23 → 1.2.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/tool-lib/cmt-trick.js +11 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "js-dev-tool",
3
- "version": "1.2.23",
3
+ "version": "1.2.24",
4
4
  "type": "commonjs",
5
5
  "bin": {
6
6
  "jstool": "tools.js",
package/tool-lib/cmt-trick.js CHANGED
@@ -11,16 +11,16 @@
11
11
  /**
12
12
  * @file comment trick toggle
13
13
  */
14
+ const rmc = require("rm-cstyle-cmts");
14
15
  /**
15
16
  * @param {string} code
16
17
  * @param {NsJsTool.TDevConsole} logger
17
18
  */
18
19
  function cleanup(code, logger) {
19
- const reCleanUp = new RegExp(
20
- "\s*\/(?:\s*\/+\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)([\s\S]+?)(?:\s+)\/\*\/[\s\S]+|\s*\*\s+(?:ctt|comment-toggle-trick|https:\/\/coderwall)[\s\S]+\/\*\/([\s\S]+?))\s*\/{2,}\*\/", "g"
21
- );
20
+ const reCleanUp = /(?<=[\x20\t]*?)\/\/?\*\s+(?:ctt)[\s\S]+?\/\/\*\//gm;
22
21
  return code.replace(
23
- reCleanUp, ($0, $1, $2) => $1 || $2 || $0,
22
+ reCleanUp,
23
+ $0 => rmc($0),
24
24
  );
25
25
  }
26
26
  /**
@@ -53,21 +53,22 @@ module.exports = () => {
53
53
  /** @type {string} */ (this.taskName), (code) => {
54
54
  return mode === "clean" ? cleanup(code, logger) : doIt(code, logger);
55
55
  }, {
56
- ...params,
56
+ // @ts-expect-error force
57
+ base: params.basePath
57
58
  },
58
59
  );
59
60
  },
60
61
  get help() {
61
62
  const level = 16;
62
- return `jstool -cmd cmtTrick[:clean] (-basePath "<source dir>" | -basePath "<source dir>,<source dir>,...") [-test "re/\\\\.js$/"]
63
+ return `jstool -cmd cmtTrick[:clean] (-base "<source dir>" | -base "<source dir>,<source dir>,...") [-test "r/\\\\.js$/"]
63
64
 
64
65
  ${" Example:".red}
65
- ${"jstool".yellow} ${"-cmd".green} ${"cmtTrick:clean".cyan} ${"-basePath".green} ${"src,examples".gray(level)} ${"-test".green} ${"re/\\\\.js$/".gray(level)}
66
+ ${"jstool".yellow} ${"-cmd".green} ${"cmtTrick:clean".cyan} ${"-base".green} ${"src,examples".gray(level)} ${"-test".green} ${"re/\\\\.js$/".gray(level)}
66
67
 
67
68
  ${" Options:".red}
68
- ${" :clean".cyan} ${`: Remove comment tokens and leave the currently enabled code.`.gray(level)}
69
- ${" basePath".cyan} ${`: Source directory path(s). Comma-separated or array type arg is accepted.`.gray(level)}
70
- ${" test".cyan} ${`: Target file matcher. default is /\\\\.js$/.`.gray(level)}
69
+ ${" :clean".cyan} ${`: Remove comment tokens and leave the currently enabled code.`.gray(level)}
70
+ ${" base".cyan} ${`: Source directory path(s). Comma-separated or array type arg is accepted.`.gray(level)}
71
+ ${" test".cyan} ${`: Target file matcher. default is /\\\\.js$/.`.gray(level)}
71
72
 
72
73
  ${" Note:".magenta} ${`Recognized markers: ctt | comment-toggle-trick | https://coderwall`.gray(level)}
73
74
  `;