@topcli/prompts 2.1.0 → 2.3.0

package/dist/index.js

@@ -1,34 +1,13 @@
 // src/prompts/question.ts
 import { EOL as EOL2 } from "node:os";
 import { styleText as styleText2 } from "node:util";
-import wcwidth from "@topcli/wcwidth";
 
 // src/prompts/abstract.ts
 import { EOL } from "node:os";
-import { createInterface } from "node:readline";
+import readline from "node:readline";
 import { Writable } from "node:stream";
 import EventEmitter from "node:events";
-
-// src/utils.ts
-import process2 from "node:process";
-var kAnsiRegex = ansiRegex();
-function ansiRegex({ onlyFirst = false } = {}) {
-  const pattern = [
-    // eslint-disable-next-line @stylistic/max-len
-    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))"
-  ].join("|");
-  return new RegExp(pattern, onlyFirst ? void 0 : "g");
-}
-function stripAnsi(string) {
-  return string.replace(kAnsiRegex, "");
-}
-function isUnicodeSupported() {
-  if (process2.platform !== "win32") {
-    return process2.env.TERM !== "linux";
-  }
-  return Boolean(process2.env.WT_SESSION) || Boolean(process2.env.TERMINUS_SUBLIME) || process2.env.ConEmuTask === "{cmd::Cmder}" || process2.env.TERM_PROGRAM === "Terminus-Sublime" || process2.env.TERM_PROGRAM === "vscode" || process2.env.TERM === "xterm-256color" || process2.env.TERM === "alacritty" || process2.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
-}
+import { stripVTControlCharacters } from "node:util";
 
 // src/prompt-agent.ts
 var kPrivateInstancier = Symbol("instancier");
@@ -125,7 +104,7 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
     if (this.stdout.isTTY) {
       this.stdin.setRawMode(true);
     }
-    this.rl = createInterface({
+    this.rl = readline.createInterface({
       input,
       output: new Writable({
         write: (chunk, encoding, callback) => {
@@ -152,7 +131,7 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
     }
   }
   write(data) {
-    const formattedData = stripAnsi(data).replace(EOL, "");
+    const formattedData = stripVTControlCharacters(data).replace(EOL, "");
     if (formattedData) {
       this.history.push(formattedData);
     }
@@ -163,7 +142,7 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
     if (!lastLine) {
       return;
     }
-    const lastLineRows = Math.ceil(stripAnsi(lastLine).length / this.stdout.columns);
+    const lastLineRows = Math.ceil(stripVTControlCharacters(lastLine).length / this.stdout.columns);
     this.stdout.moveCursor(-this.stdout.columns, -lastLineRows);
     this.stdout.clearScreenDown();
   }
@@ -175,6 +154,29 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
   }
 };
 
+// src/utils.ts
+import process2 from "node:process";
+import { stripVTControlCharacters as stripVTControlCharacters2 } from "node:util";
+var kLenSegmenter = new Intl.Segmenter();
+function isUnicodeSupported() {
+  if (process2.platform !== "win32") {
+    return process2.env.TERM !== "linux";
+  }
+  return Boolean(process2.env.WT_SESSION) || Boolean(process2.env.TERMINUS_SUBLIME) || process2.env.ConEmuTask === "{cmd::Cmder}" || process2.env.TERM_PROGRAM === "Terminus-Sublime" || process2.env.TERM_PROGRAM === "vscode" || process2.env.TERM === "xterm-256color" || process2.env.TERM === "alacritty" || process2.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
+}
+function stringLength(string) {
+  if (string === "") {
+    return 0;
+  }
+  let length = 0;
+  for (const _ of kLenSegmenter.segment(
+    stripVTControlCharacters2(string)
+  )) {
+    length++;
+  }
+  return length;
+}
+
 // src/constants.ts
 import { styleText } from "node:util";
 var kMainSymbols = {
@@ -287,7 +289,7 @@ var QuestionPrompt = class extends AbstractPrompt {
   }
   #onQuestionAnswer() {
     const questionLineCount = Math.ceil(
-      wcwidth(stripAnsi(this.#getQuestionQuery() + this.answer)) / this.stdout.columns
+      stringLength(this.#getQuestionQuery() + this.answer) / this.stdout.columns
     );
     this.stdout.moveCursor(-this.stdout.columns, -questionLineCount);
     this.stdout.clearScreenDown();
@@ -336,7 +338,6 @@ var QuestionPrompt = class extends AbstractPrompt {
 // src/prompts/confirm.ts
 import { EOL as EOL3 } from "node:os";
 import { styleText as styleText3 } from "node:util";
-import wcwidth2 from "@topcli/wcwidth";
 var kToggleKeys = /* @__PURE__ */ new Set([
   "left",
   "right",
@@ -386,7 +387,7 @@ var ConfirmPrompt = class extends AbstractPrompt {
   #onKeypress(resolve, _value, key) {
     this.stdout.moveCursor(
       -this.stdout.columns,
-      -Math.floor(wcwidth2(stripAnsi(this.#getQuestionQuery())) / this.stdout.columns)
+      -Math.floor(stringLength(this.#getQuestionQuery()) / this.stdout.columns)
     );
     this.stdout.clearScreenDown();
     if (key.name === "return") {
@@ -420,7 +421,7 @@ var ConfirmPrompt = class extends AbstractPrompt {
     this.clearLastLine();
     this.stdout.moveCursor(
       -this.stdout.columns,
-      -Math.floor(wcwidth2(stripAnsi(this.#getQuestionQuery())) / this.stdout.columns)
+      -Math.floor(stringLength(this.#getQuestionQuery()) / this.stdout.columns)
     );
     this.stdout.clearScreenDown();
     this.write(`${this.selectedValue ? SYMBOLS.Tick : SYMBOLS.Cross} ${styleText3("bold", this.message)}${EOL3}`);
@@ -460,7 +461,6 @@ var ConfirmPrompt = class extends AbstractPrompt {
 // src/prompts/select.ts
 import { EOL as EOL4 } from "node:os";
 import { styleText as styleText4 } from "node:util";
-import wcwidth3 from "@topcli/wcwidth";
 var kRequiredChoiceProperties = ["label", "value"];
 var SelectPrompt = class extends AbstractPrompt {
   #boundExitEvent = () => void 0;
@@ -571,10 +571,10 @@ var SelectPrompt = class extends AbstractPrompt {
       this.write(str);
     }
   }
-  #showAnsweredQuestion(choice) {
-    const symbolPrefix = choice === "" ? SYMBOLS.Cross : SYMBOLS.Tick;
+  #showAnsweredQuestion(label) {
+    const symbolPrefix = label === "" ? SYMBOLS.Cross : SYMBOLS.Tick;
     const prefix = `${symbolPrefix} ${styleText4("bold", this.message)} ${SYMBOLS.Pointer}`;
-    const formattedChoice = styleText4("yellow", typeof choice === "string" ? choice : choice.label);
+    const formattedChoice = styleText4("yellow", label);
     this.write(`${prefix} ${formattedChoice}${EOL4}`);
   }
   #onProcessExit() {
@@ -656,7 +656,7 @@ var SelectPrompt = class extends AbstractPrompt {
           }
           if (this.options.autocomplete) {
             let linesToClear2 = Math.ceil(
-              wcwidth3(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
+              stringLength(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
             );
             while (linesToClear2 > 0) {
               this.clearLastLine();
@@ -666,14 +666,14 @@ var SelectPrompt = class extends AbstractPrompt {
         }
         if (clearRender) {
           const questionLineCount = Math.ceil(
-            wcwidth3(stripAnsi(this.questionMessage)) / this.stdout.columns
+            stringLength(this.questionMessage) / this.stdout.columns
           );
           this.stdout.moveCursor(-this.stdout.columns, -(1 + questionLineCount));
           this.stdout.clearScreenDown();
           return;
         }
         if (error) {
-          const linesToClear = Math.ceil(wcwidth3(this.questionMessage) / this.stdout.columns) + 1;
+          const linesToClear = Math.ceil(stringLength(this.questionMessage) / this.stdout.columns) + 1;
           this.stdout.moveCursor(0, -linesToClear);
           this.stdout.clearScreenDown();
           this.#showQuestion(error);
@@ -700,7 +700,6 @@ var SelectPrompt = class extends AbstractPrompt {
 // src/prompts/multiselect.ts
 import { EOL as EOL5 } from "node:os";
 import { styleText as styleText5 } from "node:util";
-import wcwidth4 from "@topcli/wcwidth";
 var kRequiredChoiceProperties2 = ["label", "value"];
 var MultiselectPrompt = class extends AbstractPrompt {
   #boundExitEvent = () => void 0;
@@ -941,7 +940,7 @@ var MultiselectPrompt = class extends AbstractPrompt {
           }
           if (this.options.autocomplete) {
             let linesToClear2 = Math.ceil(
-              wcwidth4(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
+              stringLength(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
             );
             while (linesToClear2 > 0) {
               this.clearLastLine();
@@ -951,14 +950,14 @@ var MultiselectPrompt = class extends AbstractPrompt {
         }
         if (clearRender) {
           const questionLineCount = Math.ceil(
-            wcwidth4(stripAnsi(this.questionMessage)) / this.stdout.columns
+            stringLength(this.questionMessage) / this.stdout.columns
           );
           this.stdout.moveCursor(-this.stdout.columns, -(1 + questionLineCount));
           this.stdout.clearScreenDown();
           return;
         }
         if (error) {
-          const linesToClear = Math.ceil(wcwidth4(this.questionMessage) / this.stdout.columns) + 1;
+          const linesToClear = Math.ceil(stringLength(this.questionMessage) / this.stdout.columns) + 1;
           this.stdout.moveCursor(0, -linesToClear);
           this.stdout.clearScreenDown();
           this.#showQuestion(error);
@@ -987,18 +986,18 @@ var MultiselectPrompt = class extends AbstractPrompt {
 };
 
 // index.ts
-async function question(message, options = {}) {
+function question(message, options = {}) {
   return new QuestionPrompt({ ...options, message }).question();
 }
-async function select(message, options) {
+function select(message, options) {
   const selectPrompt = new SelectPrompt({ ...options, message });
   return selectPrompt.select();
 }
-async function confirm(message, options = {}) {
+function confirm(message, options = {}) {
   const confirmPrompt = new ConfirmPrompt({ ...options, message });
   return confirmPrompt.confirm();
 }
-async function multiselect(message, options) {
+function multiselect(message, options) {
   const multiselectPrompt = new MultiselectPrompt({ ...options, message });
   return multiselectPrompt.multiselect();
 }

package/package.json

@@ -1,54 +1,50 @@
-{
-  "name": "@topcli/prompts",
-  "version": "2.1.0",
-  "description": "Node.js user input library for command-line interfaces.",
-  "scripts": {
-    "build": "tsup index.ts --format cjs,esm --dts --clean",
-    "prepublishOnly": "npm run build",
-    "test": "glob -c \"tsx --no-warnings=ExperimentalWarning --loader=esmock --test\" \"./test/**/*.test.ts\"",
-    "coverage": "c8 -r html npm run test",
-    "lint": "eslint src test",
-    "lint:fix": "eslint . --fix"
-  },
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
-    }
-  },
-  "keywords": [
-    "node.js",
-    "cli",
-    "prompt"
-  ],
-  "files": [
-    "dist"
-  ],
-  "author": "PierreDemailly <pierredemailly.pro@gmail.com>",
-  "license": "ISC",
-  "type": "module",
-  "devDependencies": {
-    "@openally/config.eslint": "^1.3.0",
-    "@openally/config.typescript": "^1.0.3",
-    "@types/node": "^22.10.5",
-    "c8": "^10.1.3",
-    "esmock": "^2.6.9",
-    "glob": "^11.0.0",
-    "tsup": "^8.3.5",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.2"
-  },
-  "dependencies": {
-    "@topcli/wcwidth": "^1.0.1"
-  },
-  "engines": {
-    "node": "^20.12.0 || >=21.7.0"
-  },
-  "bugs": {
-    "url": "https://github.com/TopCli/prompts/issues"
-  },
-  "homepage": "https://github.com/TopCli/prompts#readme"
-}
+{
+  "name": "@topcli/prompts",
+  "version": "2.3.0",
+  "description": "Node.js user input library for command-line interfaces.",
+  "scripts": {
+    "build": "tsup index.ts --format cjs,esm --dts --clean",
+    "prepublishOnly": "npm run build",
+    "test": "glob -c \"tsx --test\" \"./test/**/*.test.ts\"",
+    "coverage": "c8 -r html npm run test",
+    "lint": "eslint src test",
+    "lint:fix": "eslint . --fix"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
+  "keywords": [
+    "node.js",
+    "cli",
+    "prompt"
+  ],
+  "files": [
+    "dist"
+  ],
+  "author": "PierreDemailly <pierredemailly.pro@gmail.com>",
+  "license": "ISC",
+  "type": "module",
+  "devDependencies": {
+    "@openally/config.eslint": "^2.0.0",
+    "@openally/config.typescript": "^1.0.3",
+    "@types/node": "^24.0.3",
+    "c8": "^10.1.3",
+    "glob": "^11.0.0",
+    "tsup": "^8.3.5",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.2"
+  },
+  "engines": {
+    "node": "^20.12.0 || >=21.7.0"
+  },
+  "bugs": {
+    "url": "https://github.com/TopCli/prompts/issues"
+  },
+  "homepage": "https://github.com/TopCli/prompts#readme"
+}