@topcli/prompts 2.2.0 → 2.4.0

package/README.md

@@ -55,7 +55,7 @@ Simple prompt, similar to `rl.question()` with an improved UI.
 
 Use `options.defaultValue` to set a default value.
 
-Use `options.secure` if you need to hide both input and answer.
+Use `options.secure` if you need to hide both input and answer. You can provide either a **boolean** or an **object** which allows to configure a `placeholder` such as `*`.
 
 Use `options.signal` to set an `AbortSignal` (throws a [AbortError](#aborterror)).
 
@@ -70,8 +70,8 @@ const packageName = await question('Package name', {
   validators: [
     {
       validate: (value) => {
-        if (!existsSync(join(process.cwd(), value))) {
-          return `Folder ${value} already exists`
+        if (fs.existsSync(path.join(process.cwd(), value))) {
+          return `Folder ${value} already exists`;
         }
       }
     }

package/dist/index.cjs

@@ -41,35 +41,14 @@ module.exports = __toCommonJS(index_exports);
 
 // src/prompts/question.ts
 var import_node_os2 = require("os");
-var import_node_util2 = require("util");
-var import_wcwidth = __toESM(require("@topcli/wcwidth"), 1);
+var import_node_util4 = require("util");
 
 // src/prompts/abstract.ts
 var import_node_os = require("os");
 var import_node_readline = __toESM(require("readline"), 1);
 var import_node_stream = require("stream");
 var import_node_events = __toESM(require("events"), 1);
-
-// src/utils.ts
-var import_node_process = __toESM(require("process"), 1);
-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 (import_node_process.default.platform !== "win32") {
-    return import_node_process.default.env.TERM !== "linux";
-  }
-  return Boolean(import_node_process.default.env.WT_SESSION) || Boolean(import_node_process.default.env.TERMINUS_SUBLIME) || import_node_process.default.env.ConEmuTask === "{cmd::Cmder}" || import_node_process.default.env.TERM_PROGRAM === "Terminus-Sublime" || import_node_process.default.env.TERM_PROGRAM === "vscode" || import_node_process.default.env.TERM === "xterm-256color" || import_node_process.default.env.TERM === "alacritty" || import_node_process.default.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
-}
+var import_node_util = require("util");
 
 // src/prompt-agent.ts
 var kPrivateInstancier = Symbol("instancier");
@@ -123,6 +102,9 @@ var AbortError = class extends Error {
 };
 
 // src/prompts/abstract.ts
+function kNoopTransformer(input) {
+  return input;
+}
 var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
   stdin;
   stdout;
@@ -131,7 +113,7 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
   skip;
   history;
   agent;
-  mute;
+  transformer = kNoopTransformer;
   rl;
   #signalHandler;
   constructor(options) {
@@ -162,7 +144,6 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
     this.skip = skip;
     this.history = [];
     this.agent = PromptAgent.agent();
-    this.mute = false;
     if (this.stdout.isTTY) {
       this.stdin.setRawMode(true);
     }
@@ -170,8 +151,13 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
       input,
       output: new import_node_stream.Writable({
         write: (chunk, encoding, callback) => {
-          if (!this.mute && chunk) {
-            this.stdout.write(chunk, encoding);
+          if (chunk) {
+            const transformed = this.transformer(
+              Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)
+            );
+            if (transformed !== null) {
+              this.stdout.write(transformed, encoding);
+            }
           }
           callback();
         }
@@ -192,8 +178,11 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
       this.signal.addEventListener("abort", this.#signalHandler, { once: true });
     }
   }
+  reset() {
+    this.transformer = kNoopTransformer;
+  }
   write(data) {
-    const formattedData = stripAnsi(data).replace(import_node_os.EOL, "");
+    const formattedData = (0, import_node_util.stripVTControlCharacters)(data).replace(import_node_os.EOL, "");
     if (formattedData) {
       this.history.push(formattedData);
     }
@@ -204,7 +193,7 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
     if (!lastLine) {
       return;
     }
-    const lastLineRows = Math.ceil(stripAnsi(lastLine).length / this.stdout.columns);
+    const lastLineRows = Math.ceil((0, import_node_util.stripVTControlCharacters)(lastLine).length / this.stdout.columns);
     this.stdout.moveCursor(-this.stdout.columns, -lastLineRows);
     this.stdout.clearScreenDown();
   }
@@ -216,8 +205,31 @@ var AbstractPrompt = class _AbstractPrompt extends import_node_events.default {
   }
 };
 
+// src/utils.ts
+var import_node_process = __toESM(require("process"), 1);
+var import_node_util2 = require("util");
+var kLenSegmenter = new Intl.Segmenter();
+function isUnicodeSupported() {
+  if (import_node_process.default.platform !== "win32") {
+    return import_node_process.default.env.TERM !== "linux";
+  }
+  return Boolean(import_node_process.default.env.WT_SESSION) || Boolean(import_node_process.default.env.TERMINUS_SUBLIME) || import_node_process.default.env.ConEmuTask === "{cmd::Cmder}" || import_node_process.default.env.TERM_PROGRAM === "Terminus-Sublime" || import_node_process.default.env.TERM_PROGRAM === "vscode" || import_node_process.default.env.TERM === "xterm-256color" || import_node_process.default.env.TERM === "alacritty" || import_node_process.default.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
+}
+function stringLength(string) {
+  if (string === "") {
+    return 0;
+  }
+  let length = 0;
+  for (const _ of kLenSegmenter.segment(
+    (0, import_node_util2.stripVTControlCharacters)(string)
+  )) {
+    length++;
+  }
+  return length;
+}
+
 // src/constants.ts
-var import_node_util = require("util");
+var import_node_util3 = require("util");
 var kMainSymbols = {
   tick: "\u2714",
   cross: "\u2716",
@@ -237,18 +249,18 @@ var kFallbackSymbols = {
   inactive: "(-)"
 };
 var kSymbols = isUnicodeSupported() || process.env.CI ? kMainSymbols : kFallbackSymbols;
-var kPointer = (0, import_node_util.styleText)("gray", kSymbols.pointer);
+var kPointer = (0, import_node_util3.styleText)("gray", kSymbols.pointer);
 var SYMBOLS = {
-  QuestionMark: (0, import_node_util.styleText)(["blue", "bold"], "?"),
-  Tick: (0, import_node_util.styleText)(["green", "bold"], kSymbols.tick),
-  Cross: (0, import_node_util.styleText)(["red", "bold"], kSymbols.cross),
+  QuestionMark: (0, import_node_util3.styleText)(["blue", "bold"], "?"),
+  Tick: (0, import_node_util3.styleText)(["green", "bold"], kSymbols.tick),
+  Cross: (0, import_node_util3.styleText)(["red", "bold"], kSymbols.cross),
   Pointer: kPointer,
   Previous: kSymbols.previous,
   Next: kSymbols.next,
   ShowCursor: "\x1B[?25h",
   HideCursor: "\x1B[?25l",
-  Active: (0, import_node_util.styleText)("cyan", kSymbols.active),
-  Inactive: (0, import_node_util.styleText)("gray", kSymbols.inactive)
+  Active: (0, import_node_util3.styleText)("cyan", kSymbols.active),
+  Inactive: (0, import_node_util3.styleText)("gray", kSymbols.inactive)
 };
 
 // src/validators.ts
@@ -285,6 +297,7 @@ var QuestionPrompt = class extends AbstractPrompt {
   answerBuffer;
   #validators;
   #secure;
+  #securePlaceholder = null;
   constructor(options) {
     const {
       defaultValue,
@@ -299,7 +312,12 @@ var QuestionPrompt = class extends AbstractPrompt {
     this.defaultValue = defaultValue;
     this.tip = this.defaultValue ? ` (${this.defaultValue})` : "";
     this.#validators = validators;
-    this.#secure = Boolean(secure);
+    if (typeof secure === "object") {
+      this.#secure = true;
+      this.#securePlaceholder = secure.placeholder;
+    } else {
+      this.#secure = Boolean(secure);
+    }
     this.questionSuffixError = "";
   }
   #question() {
@@ -308,27 +326,34 @@ var QuestionPrompt = class extends AbstractPrompt {
       this.history.push(questionQuery);
       this.rl.question(questionQuery, (answer) => {
         this.history.push(questionQuery + answer);
-        this.mute = false;
+        this.reset();
         resolve(answer);
       });
-      this.mute = this.#secure;
+      if (this.#securePlaceholder !== null) {
+        this.transformer = (input) => Buffer.from(this.#securePlaceholder.repeat(input.length), "utf-8");
+      }
     });
   }
   #getQuestionQuery() {
-    return `${(0, import_node_util2.styleText)("bold", `${SYMBOLS.QuestionMark} ${this.message}${this.tip}`)} ${this.questionSuffixError}`;
+    return `${(0, import_node_util4.styleText)("bold", `${SYMBOLS.QuestionMark} ${this.message}${this.tip}`)} ${this.questionSuffixError}`;
   }
   #setQuestionSuffixError(error) {
-    const suffix = (0, import_node_util2.styleText)("red", `[${error}] `);
+    const suffix = (0, import_node_util4.styleText)("red", `[${error}] `);
     this.questionSuffixError = suffix;
   }
   #writeAnswer() {
     const prefix = this.answer ? SYMBOLS.Tick : SYMBOLS.Cross;
-    const answer = (0, import_node_util2.styleText)("yellow", this.#secure ? "CONFIDENTIAL" : this.answer ?? "");
-    this.write(`${prefix} ${(0, import_node_util2.styleText)("bold", this.message)} ${SYMBOLS.Pointer} ${answer}${import_node_os2.EOL}`);
+    const answer = this.answer ?? "";
+    const maskedAnswer = this.#securePlaceholder ? this.#securePlaceholder.repeat(answer.length) : answer;
+    const stylizedAnswer = (0, import_node_util4.styleText)(
+      "yellow",
+      this.#secure && this.#securePlaceholder === null ? "CONFIDENTIAL" : maskedAnswer
+    );
+    this.write(`${prefix} ${(0, import_node_util4.styleText)("bold", this.message)} ${SYMBOLS.Pointer} ${stylizedAnswer}${import_node_os2.EOL}`);
   }
   #onQuestionAnswer() {
     const questionLineCount = Math.ceil(
-      (0, import_wcwidth.default)(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();
@@ -376,8 +401,7 @@ var QuestionPrompt = class extends AbstractPrompt {
 
 // src/prompts/confirm.ts
 var import_node_os3 = require("os");
-var import_node_util3 = require("util");
-var import_wcwidth2 = __toESM(require("@topcli/wcwidth"), 1);
+var import_node_util5 = require("util");
 var kToggleKeys = /* @__PURE__ */ new Set([
   "left",
   "right",
@@ -407,8 +431,8 @@ var ConfirmPrompt = class extends AbstractPrompt {
     this.selectedValue = initial;
   }
   #getHint() {
-    const Yes = (0, import_node_util3.styleText)(["cyan", "bold", "underline"], "Yes");
-    const No = (0, import_node_util3.styleText)(["cyan", "bold", "underline"], "No");
+    const Yes = (0, import_node_util5.styleText)(["cyan", "bold", "underline"], "Yes");
+    const No = (0, import_node_util5.styleText)(["cyan", "bold", "underline"], "No");
     return this.selectedValue ? `${Yes}/No` : `Yes/${No}`;
   }
   #render() {
@@ -427,7 +451,7 @@ var ConfirmPrompt = class extends AbstractPrompt {
   #onKeypress(resolve, _value, key) {
     this.stdout.moveCursor(
       -this.stdout.columns,
-      -Math.floor((0, import_wcwidth2.default)(stripAnsi(this.#getQuestionQuery())) / this.stdout.columns)
+      -Math.floor(stringLength(this.#getQuestionQuery()) / this.stdout.columns)
     );
     this.stdout.clearScreenDown();
     if (key.name === "return") {
@@ -454,17 +478,17 @@ var ConfirmPrompt = class extends AbstractPrompt {
     this.stdin.off("keypress", this.#boundKeyPressEvent);
   }
   #getQuestionQuery() {
-    const query = (0, import_node_util3.styleText)("bold", `${SYMBOLS.QuestionMark} ${this.message}`);
+    const query = (0, import_node_util5.styleText)("bold", `${SYMBOLS.QuestionMark} ${this.message}`);
     return `${query} ${this.#getHint()}`;
   }
   #onQuestionAnswer() {
     this.clearLastLine();
     this.stdout.moveCursor(
       -this.stdout.columns,
-      -Math.floor((0, import_wcwidth2.default)(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} ${(0, import_node_util3.styleText)("bold", this.message)}${import_node_os3.EOL}`);
+    this.write(`${this.selectedValue ? SYMBOLS.Tick : SYMBOLS.Cross} ${(0, import_node_util5.styleText)("bold", this.message)}${import_node_os3.EOL}`);
   }
   async confirm() {
     if (this.skip) {
@@ -500,8 +524,7 @@ var ConfirmPrompt = class extends AbstractPrompt {
 
 // src/prompts/select.ts
 var import_node_os4 = require("os");
-var import_node_util4 = require("util");
-var import_wcwidth3 = __toESM(require("@topcli/wcwidth"), 1);
+var import_node_util6 = require("util");
 var kRequiredChoiceProperties = ["label", "value"];
 var SelectPrompt = class extends AbstractPrompt {
   #boundExitEvent = () => void 0;
@@ -608,14 +631,14 @@ var SelectPrompt = class extends AbstractPrompt {
       );
       const formattedDescription = choice.description ? ` - ${choice.description}` : "";
       const styles = isChoiceSelected ? ["white", "bold"] : ["gray"];
-      const str = `${prefix}${(0, import_node_util4.styleText)(styles, `${formattedLabel}${formattedDescription}`)}${import_node_os4.EOL}`;
+      const str = `${prefix}${(0, import_node_util6.styleText)(styles, `${formattedLabel}${formattedDescription}`)}${import_node_os4.EOL}`;
       this.write(str);
     }
   }
-  #showAnsweredQuestion(choice) {
-    const symbolPrefix = choice === "" ? SYMBOLS.Cross : SYMBOLS.Tick;
-    const prefix = `${symbolPrefix} ${(0, import_node_util4.styleText)("bold", this.message)} ${SYMBOLS.Pointer}`;
-    const formattedChoice = (0, import_node_util4.styleText)("yellow", typeof choice === "string" ? choice : choice.label);
+  #showAnsweredQuestion(label) {
+    const symbolPrefix = label === "" ? SYMBOLS.Cross : SYMBOLS.Tick;
+    const prefix = `${symbolPrefix} ${(0, import_node_util6.styleText)("bold", this.message)} ${SYMBOLS.Pointer}`;
+    const formattedChoice = (0, import_node_util6.styleText)("yellow", label);
     this.write(`${prefix} ${formattedChoice}${import_node_os4.EOL}`);
   }
   #onProcessExit() {
@@ -697,7 +720,7 @@ var SelectPrompt = class extends AbstractPrompt {
           }
           if (this.options.autocomplete) {
             let linesToClear2 = Math.ceil(
-              (0, import_wcwidth3.default)(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
+              stringLength(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
             );
             while (linesToClear2 > 0) {
               this.clearLastLine();
@@ -707,14 +730,14 @@ var SelectPrompt = class extends AbstractPrompt {
         }
         if (clearRender) {
           const questionLineCount = Math.ceil(
-            (0, import_wcwidth3.default)(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((0, import_wcwidth3.default)(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);
@@ -731,17 +754,16 @@ var SelectPrompt = class extends AbstractPrompt {
   #showQuestion(error = null) {
     let hint = "";
     if (error) {
-      hint = ` ${hint.length > 0 ? " " : ""}${(0, import_node_util4.styleText)(["red", "bold"], `[${error}]`)}`;
+      hint = ` ${hint.length > 0 ? " " : ""}${(0, import_node_util6.styleText)(["red", "bold"], `[${error}]`)}`;
     }
-    this.questionMessage = `${SYMBOLS.QuestionMark} ${(0, import_node_util4.styleText)("bold", this.message)}${hint}`;
+    this.questionMessage = `${SYMBOLS.QuestionMark} ${(0, import_node_util6.styleText)("bold", this.message)}${hint}`;
     this.write(`${this.questionMessage}${import_node_os4.EOL}`);
   }
 };
 
 // src/prompts/multiselect.ts
 var import_node_os5 = require("os");
-var import_node_util5 = require("util");
-var import_wcwidth4 = __toESM(require("@topcli/wcwidth"), 1);
+var import_node_util7 = require("util");
 var kRequiredChoiceProperties2 = ["label", "value"];
 var MultiselectPrompt = class extends AbstractPrompt {
   #boundExitEvent = () => void 0;
@@ -867,14 +889,14 @@ var MultiselectPrompt = class extends AbstractPrompt {
       );
       const formattedDescription = choice.description ? ` - ${choice.description}` : "";
       const styles = isChoiceActive ? ["white", "bold"] : ["gray"];
-      const str = `${prefix} ${(0, import_node_util5.styleText)(styles, `${formattedLabel}${formattedDescription}`)}${import_node_os5.EOL}`;
+      const str = `${prefix} ${(0, import_node_util7.styleText)(styles, `${formattedLabel}${formattedDescription}`)}${import_node_os5.EOL}`;
       this.write(str);
     }
   }
   #showAnsweredQuestion(choices, isAgentAnswer = false) {
     const prefixSymbol = this.selectedIndexes.size === 0 && !isAgentAnswer ? SYMBOLS.Cross : SYMBOLS.Tick;
-    const prefix = `${prefixSymbol} ${(0, import_node_util5.styleText)("bold", this.message)} ${SYMBOLS.Pointer}`;
-    const formattedChoice = (0, import_node_util5.styleText)("yellow", choices);
+    const prefix = `${prefixSymbol} ${(0, import_node_util7.styleText)("bold", this.message)} ${SYMBOLS.Pointer}`;
+    const formattedChoice = (0, import_node_util7.styleText)("yellow", choices);
     this.write(`${prefix}${choices ? ` ${formattedChoice}` : ""}${import_node_os5.EOL}`);
   }
   #selectedChoices() {
@@ -982,7 +1004,7 @@ var MultiselectPrompt = class extends AbstractPrompt {
           }
           if (this.options.autocomplete) {
             let linesToClear2 = Math.ceil(
-              (0, import_wcwidth4.default)(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
+              stringLength(`${SYMBOLS.Pointer} ${this.autocompleteValue}`) / this.stdout.columns
             );
             while (linesToClear2 > 0) {
               this.clearLastLine();
@@ -992,14 +1014,14 @@ var MultiselectPrompt = class extends AbstractPrompt {
         }
         if (clearRender) {
           const questionLineCount = Math.ceil(
-            (0, import_wcwidth4.default)(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((0, import_wcwidth4.default)(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);
@@ -1014,15 +1036,15 @@ var MultiselectPrompt = class extends AbstractPrompt {
     });
   }
   #showQuestion(error = null) {
-    let hint = this.#showHint ? (0, import_node_util5.styleText)(
+    let hint = this.#showHint ? (0, import_node_util7.styleText)(
       "gray",
       // eslint-disable-next-line @stylistic/max-len
-      `(Press ${(0, import_node_util5.styleText)("bold", "<Ctrl+A>")} to toggle all, ${(0, import_node_util5.styleText)("bold", "<Left/Right>")} to toggle, ${(0, import_node_util5.styleText)("bold", "<Return>")} to submit)`
+      `(Press ${(0, import_node_util7.styleText)("bold", "<Ctrl+A>")} to toggle all, ${(0, import_node_util7.styleText)("bold", "<Left/Right>")} to toggle, ${(0, import_node_util7.styleText)("bold", "<Return>")} to submit)`
     ) : "";
     if (error) {
-      hint += `${hint.length > 0 ? " " : ""}${(0, import_node_util5.styleText)(["red", "bold"], `[${error}]`)}`;
+      hint += `${hint.length > 0 ? " " : ""}${(0, import_node_util7.styleText)(["red", "bold"], `[${error}]`)}`;
     }
-    this.questionMessage = `${SYMBOLS.QuestionMark} ${(0, import_node_util5.styleText)("bold", this.message)}${hint.length > 0 ? ` ${hint}` : ""}`;
+    this.questionMessage = `${SYMBOLS.QuestionMark} ${(0, import_node_util7.styleText)("bold", this.message)}${hint.length > 0 ? ` ${hint}` : ""}`;
     this.write(`${this.questionMessage}${import_node_os5.EOL}`);
   }
 };

package/dist/index.d.cts

@@ -62,28 +62,30 @@ interface Choice<T = any> {
 interface QuestionOptions extends AbstractPromptOptions {
     defaultValue?: string;
     validators?: PromptValidator[];
-    secure?: boolean;
+    secure?: boolean | {
+        placeholder: string;
+    };
 }
 
 interface ConfirmOptions extends AbstractPromptOptions {
     initial?: boolean;
 }
 
-interface MultiselectOptions<T extends string = string> extends AbstractPromptOptions {
-    choices: (Choice | T)[];
+interface MultiselectOptions<T extends string> extends AbstractPromptOptions {
+    choices: (Choice<T> | T)[];
     maxVisible?: number;
-    preSelectedChoices?: (Choice | string)[];
-    validators?: PromptValidator[];
+    preSelectedChoices?: (Choice | T)[];
+    validators?: PromptValidator<T[]>[];
     autocomplete?: boolean;
     caseSensitive?: boolean;
     showHint?: boolean;
 }
 
-interface SelectOptions<T extends string = string> extends AbstractPromptOptions {
-    choices: (Choice | T)[];
+interface SelectOptions<T extends string> extends AbstractPromptOptions {
+    choices: (Choice<T> | T)[];
     maxVisible?: number;
-    ignoreValues?: (string | number | boolean)[];
-    validators?: PromptValidator[];
+    ignoreValues?: (T | number | boolean)[];
+    validators?: PromptValidator<T>[];
     autocomplete?: boolean;
     caseSensitive?: boolean;
 }

package/dist/index.d.ts

@@ -62,28 +62,30 @@ interface Choice<T = any> {
 interface QuestionOptions extends AbstractPromptOptions {
     defaultValue?: string;
     validators?: PromptValidator[];
-    secure?: boolean;
+    secure?: boolean | {
+        placeholder: string;
+    };
 }
 
 interface ConfirmOptions extends AbstractPromptOptions {
     initial?: boolean;
 }
 
-interface MultiselectOptions<T extends string = string> extends AbstractPromptOptions {
-    choices: (Choice | T)[];
+interface MultiselectOptions<T extends string> extends AbstractPromptOptions {
+    choices: (Choice<T> | T)[];
     maxVisible?: number;
-    preSelectedChoices?: (Choice | string)[];
-    validators?: PromptValidator[];
+    preSelectedChoices?: (Choice | T)[];
+    validators?: PromptValidator<T[]>[];
     autocomplete?: boolean;
     caseSensitive?: boolean;
     showHint?: boolean;
 }
 
-interface SelectOptions<T extends string = string> extends AbstractPromptOptions {
-    choices: (Choice | T)[];
+interface SelectOptions<T extends string> extends AbstractPromptOptions {
+    choices: (Choice<T> | T)[];
     maxVisible?: number;
-    ignoreValues?: (string | number | boolean)[];
-    validators?: PromptValidator[];
+    ignoreValues?: (T | number | boolean)[];
+    validators?: PromptValidator<T>[];
     autocomplete?: boolean;
     caseSensitive?: boolean;
 }

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 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");
@@ -82,6 +61,9 @@ var AbortError = class extends Error {
 };
 
 // src/prompts/abstract.ts
+function kNoopTransformer(input) {
+  return input;
+}
 var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
   stdin;
   stdout;
@@ -90,7 +72,7 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
   skip;
   history;
   agent;
-  mute;
+  transformer = kNoopTransformer;
   rl;
   #signalHandler;
   constructor(options) {
@@ -121,7 +103,6 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
     this.skip = skip;
     this.history = [];
     this.agent = PromptAgent.agent();
-    this.mute = false;
     if (this.stdout.isTTY) {
       this.stdin.setRawMode(true);
     }
@@ -129,8 +110,13 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
       input,
       output: new Writable({
         write: (chunk, encoding, callback) => {
-          if (!this.mute && chunk) {
-            this.stdout.write(chunk, encoding);
+          if (chunk) {
+            const transformed = this.transformer(
+              Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)
+            );
+            if (transformed !== null) {
+              this.stdout.write(transformed, encoding);
+            }
           }
           callback();
         }
@@ -151,8 +137,11 @@ var AbstractPrompt = class _AbstractPrompt extends EventEmitter {
       this.signal.addEventListener("abort", this.#signalHandler, { once: true });
     }
   }
+  reset() {
+    this.transformer = kNoopTransformer;
+  }
   write(data) {
-    const formattedData = stripAnsi(data).replace(EOL, "");
+    const formattedData = stripVTControlCharacters(data).replace(EOL, "");
     if (formattedData) {
       this.history.push(formattedData);
     }
@@ -163,7 +152,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 +164,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 = {
@@ -244,6 +256,7 @@ var QuestionPrompt = class extends AbstractPrompt {
   answerBuffer;
   #validators;
   #secure;
+  #securePlaceholder = null;
   constructor(options) {
     const {
       defaultValue,
@@ -258,7 +271,12 @@ var QuestionPrompt = class extends AbstractPrompt {
     this.defaultValue = defaultValue;
     this.tip = this.defaultValue ? ` (${this.defaultValue})` : "";
     this.#validators = validators;
-    this.#secure = Boolean(secure);
+    if (typeof secure === "object") {
+      this.#secure = true;
+      this.#securePlaceholder = secure.placeholder;
+    } else {
+      this.#secure = Boolean(secure);
+    }
     this.questionSuffixError = "";
   }
   #question() {
@@ -267,10 +285,12 @@ var QuestionPrompt = class extends AbstractPrompt {
       this.history.push(questionQuery);
       this.rl.question(questionQuery, (answer) => {
         this.history.push(questionQuery + answer);
-        this.mute = false;
+        this.reset();
         resolve(answer);
       });
-      this.mute = this.#secure;
+      if (this.#securePlaceholder !== null) {
+        this.transformer = (input) => Buffer.from(this.#securePlaceholder.repeat(input.length), "utf-8");
+      }
     });
   }
   #getQuestionQuery() {
@@ -282,12 +302,17 @@ var QuestionPrompt = class extends AbstractPrompt {
   }
   #writeAnswer() {
     const prefix = this.answer ? SYMBOLS.Tick : SYMBOLS.Cross;
-    const answer = styleText2("yellow", this.#secure ? "CONFIDENTIAL" : this.answer ?? "");
-    this.write(`${prefix} ${styleText2("bold", this.message)} ${SYMBOLS.Pointer} ${answer}${EOL2}`);
+    const answer = this.answer ?? "";
+    const maskedAnswer = this.#securePlaceholder ? this.#securePlaceholder.repeat(answer.length) : answer;
+    const stylizedAnswer = styleText2(
+      "yellow",
+      this.#secure && this.#securePlaceholder === null ? "CONFIDENTIAL" : maskedAnswer
+    );
+    this.write(`${prefix} ${styleText2("bold", this.message)} ${SYMBOLS.Pointer} ${stylizedAnswer}${EOL2}`);
   }
   #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 +361,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 +410,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 +444,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 +484,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 +594,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 +679,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 +689,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 +723,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 +963,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 +973,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topcli/prompts",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Node.js user input library for command-line interfaces.",
   "scripts": {
     "build": "tsup index.ts --format cjs,esm --dts --clean",
@@ -33,16 +33,13 @@
   "devDependencies": {
     "@openally/config.eslint": "^2.0.0",
     "@openally/config.typescript": "^1.0.3",
-    "@types/node": "^22.10.5",
+    "@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"
   },
-  "dependencies": {
-    "@topcli/wcwidth": "^1.0.1"
-  },
   "engines": {
     "node": "^20.12.0 || >=21.7.0"
   },