Add trimChars utility and update dependencies (#9)

4746 · Jan 15, 2025 · 3b48caa · 3b48caa
2 parents 31a9baa + 528917b
commit 3b48caa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   ],
   "author": "Vadim",
   "license": "MIT",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "bugs": "https://github.com/4746/transverto/issues",
   "homepage": "https://github.com/4746/transverto",
   "repository": "4746/transverto",
@@ -43,7 +43,7 @@
     "@oclif/plugin-help": "^6.0.10",
     "chalk": "^5.3.0",
     "fs-extra": "^11.2.0",
-    "got": "14.0.0",
+    "got": "^14.4.5",
     "listr2": "^8.0.1"
   },
   "devDependencies": {
@@ -67,7 +67,7 @@
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20"
   },
   "files": [
     "/bin",

diff --git a/src/commands/label/add.ts b/src/commands/label/add.ts
@@ -9,6 +9,13 @@ import {UTIL} from "../../shared/util.js";
 /**
  * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add hello.world  -f="en"
  * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add hello.world  -f="en" -t "Hello World!"
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add "ggggg"
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add "ggggg" -fen
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add "\"ggggg\"" -fen
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add \"ggggg\" -fen
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add '"ggggg"' -fen
+ * node --loader ts-node/esm --no-warnings=ExperimentalWarning ./bin/dev label:add \&quot;ggggg\&quot; -fen
+ * "C:\Program Files\nodejs\npm.cmd" run ctv label:add "\"ggggg\"" -fen
  */
 export default class LabelAdd extends LabelBaseCommand<typeof LabelAdd> {
   static args = {

diff --git a/src/shared/label-base.command.ts b/src/shared/label-base.command.ts
@@ -31,7 +31,7 @@ export abstract class LabelBaseCommand<T extends typeof Command> extends Command
     }
 
     return input({
-      default: UTIL.isString(label) ? label : null,
+      default: UTIL.isString(label) ? UTIL.trimChars(label.trim(), '.*+?^${}()|[\\]\\\\').trim() : null,
       message: `Enter label:`,
       validate: (v: string) => {
         let isValid: boolean;

diff --git a/src/shared/util.ts b/src/shared/util.ts
@@ -178,6 +178,18 @@ const mergeDeep = (...sources: NonNullable<object>[]): NonNullable<object> => {
   return target;
 }
 
+/**
+ * Removes specified characters from the beginning and end of a given string.
+ *
+ * @param {string} str - The input string to trim.
+ * @param {string} chars - A string containing characters to be trimmed from both ends of the input string.
+ * @returns {string} - The resulting string after removing the specified characters from the start and end.
+ */
+export const trimChars = (str: string, chars: string): string => {
+  const pattern = new RegExp(`^[${chars}]+|[${chars}]+$`, 'g');
+  return str.replace(pattern, '');
+}
+
 export const UTIL = {
   deletePropertyPath,
   flattenObject,
@@ -188,4 +200,5 @@ export const UTIL = {
   replacePropertyPath,
   setNestedValue,
   sortObjByKey,
+  trimChars,
 }