@inquirer/rawlist 1.0.6 → 1.1.0

package/dist/cjs/index.js

@@ -3,9 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Separator = void 0;
 const core_1 = require("@inquirer/core");
+Object.defineProperty(exports, "Separator", { enumerable: true, get: function () { return core_1.Separator; } });
 const chalk_1 = __importDefault(require("chalk"));
 const numberRegex = /[0-9]+/;
+function isSelectableChoice(choice) {
+    return choice != null && !core_1.Separator.isSeparator(choice);
+}
 exports.default = (0, core_1.createPrompt)((config, done) => {
     const { choices } = config;
     const [status, setStatus] = (0, core_1.useState)('pending');
@@ -17,17 +22,16 @@ exports.default = (0, core_1.createPrompt)((config, done) => {
             let selectedChoice;
             if (numberRegex.test(value)) {
                 const answer = parseInt(value, 10) - 1;
-                selectedChoice = choices[answer];
+                selectedChoice = choices.filter(isSelectableChoice)[answer];
             }
             else {
                 const answer = value.toLowerCase();
-                selectedChoice = choices.find(({ key }) => key === answer);
+                selectedChoice = choices.find((choice) => isSelectableChoice(choice) && choice.key === answer);
             }
-            if (selectedChoice) {
-                const finalValue = selectedChoice.value || selectedChoice.name;
-                setValue(finalValue);
+            if (isSelectableChoice(selectedChoice)) {
+                setValue(selectedChoice.name || String(selectedChoice.value));
                 setStatus('done');
-                done(finalValue);
+                done(selectedChoice.value);
             }
             else if (value === '') {
                 setError('Please input a value');
@@ -45,11 +49,15 @@ exports.default = (0, core_1.createPrompt)((config, done) => {
     if (status === 'done') {
         return `${prefix} ${message} ${chalk_1.default.cyan(value)}`;
     }
+    let index = 0;
     const choicesStr = choices
-        .map((choice, index) => {
-        const humanIndex = index + 1;
-        const line = `  ${choice.key || humanIndex}) ${choice.name || choice.value}`;
-        if (choice.key === value.toLowerCase() || String(humanIndex) === value) {
+        .map((choice) => {
+        if (core_1.Separator.isSeparator(choice)) {
+            return ` ${choice.separator}`;
+        }
+        index += 1;
+        const line = `  ${choice.key || index}) ${choice.name || choice.value}`;
+        if (choice.key === value.toLowerCase() || String(index) === value) {
             return chalk_1.default.cyan(line);
         }
         return line;

package/dist/cjs/types/index.d.mts

@@ -1,10 +1,12 @@
-import { AsyncPromptConfig } from '@inquirer/core';
-type RawlistConfig = AsyncPromptConfig & {
-    choices: {
-        value: string;
-        name?: string;
-        key?: string;
-    }[];
+import { AsyncPromptConfig, Separator } from '@inquirer/core';
+type Choice<Value> = {
+    value: Value;
+    name?: string;
+    key?: string;
+    type?: never;
 };
-declare const _default: import("@inquirer/type").Prompt<string, RawlistConfig>;
+declare const _default: <Value extends unknown>(config: AsyncPromptConfig & {
+    choices: readonly (Separator | Choice<Value>)[];
+}, context?: import("@inquirer/type").Context | undefined) => Promise<Value>;
 export default _default;
+export { Separator };

package/dist/esm/index.mjs

@@ -1,6 +1,9 @@
-import { createPrompt, useState, useKeypress, usePrefix, isEnterKey, } from '@inquirer/core';
+import { createPrompt, useState, useKeypress, usePrefix, isEnterKey, Separator, } from '@inquirer/core';
 import chalk from 'chalk';
 const numberRegex = /[0-9]+/;
+function isSelectableChoice(choice) {
+    return choice != null && !Separator.isSeparator(choice);
+}
 export default createPrompt((config, done) => {
     const { choices } = config;
     const [status, setStatus] = useState('pending');
@@ -12,17 +15,16 @@ export default createPrompt((config, done) => {
             let selectedChoice;
             if (numberRegex.test(value)) {
                 const answer = parseInt(value, 10) - 1;
-                selectedChoice = choices[answer];
+                selectedChoice = choices.filter(isSelectableChoice)[answer];
             }
             else {
                 const answer = value.toLowerCase();
-                selectedChoice = choices.find(({ key }) => key === answer);
+                selectedChoice = choices.find((choice) => isSelectableChoice(choice) && choice.key === answer);
             }
-            if (selectedChoice) {
-                const finalValue = selectedChoice.value || selectedChoice.name;
-                setValue(finalValue);
+            if (isSelectableChoice(selectedChoice)) {
+                setValue(selectedChoice.name || String(selectedChoice.value));
                 setStatus('done');
-                done(finalValue);
+                done(selectedChoice.value);
             }
             else if (value === '') {
                 setError('Please input a value');
@@ -40,11 +42,15 @@ export default createPrompt((config, done) => {
     if (status === 'done') {
         return `${prefix} ${message} ${chalk.cyan(value)}`;
     }
+    let index = 0;
     const choicesStr = choices
-        .map((choice, index) => {
-        const humanIndex = index + 1;
-        const line = `  ${choice.key || humanIndex}) ${choice.name || choice.value}`;
-        if (choice.key === value.toLowerCase() || String(humanIndex) === value) {
+        .map((choice) => {
+        if (Separator.isSeparator(choice)) {
+            return ` ${choice.separator}`;
+        }
+        index += 1;
+        const line = `  ${choice.key || index}) ${choice.name || choice.value}`;
+        if (choice.key === value.toLowerCase() || String(index) === value) {
             return chalk.cyan(line);
         }
         return line;
@@ -59,3 +65,4 @@ export default createPrompt((config, done) => {
         [choicesStr, error].filter(Boolean).join('\n'),
     ];
 });
+export { Separator };

package/dist/esm/types/index.d.mts

@@ -1,10 +1,12 @@
-import { AsyncPromptConfig } from '@inquirer/core';
-type RawlistConfig = AsyncPromptConfig & {
-    choices: {
-        value: string;
-        name?: string;
-        key?: string;
-    }[];
+import { AsyncPromptConfig, Separator } from '@inquirer/core';
+type Choice<Value> = {
+    value: Value;
+    name?: string;
+    key?: string;
+    type?: never;
 };
-declare const _default: import("@inquirer/type").Prompt<string, RawlistConfig>;
+declare const _default: <Value extends unknown>(config: AsyncPromptConfig & {
+    choices: readonly (Separator | Choice<Value>)[];
+}, context?: import("@inquirer/type").Context | undefined) => Promise<Value>;
 export default _default;
+export { Separator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inquirer/rawlist",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Inquirer rawlist prompt",
   "main": "./dist/cjs/index.js",
   "typings": "./dist/cjs/types/index.d.mts",
@@ -54,7 +54,7 @@
   "license": "MIT",
   "homepage": "https://github.com/SBoudrias/Inquirer.js/blob/master/packages/rawlist/README.md",
   "dependencies": {
-    "@inquirer/core": "^1.1.2",
+    "@inquirer/core": "^1.2.0",
     "@inquirer/type": "^1.0.3",
     "chalk": "^4.1.2"
   },
@@ -83,5 +83,5 @@
       }
     }
   },
-  "gitHead": "fbeb06c92f1e64a88bb77028c7a038768c4291b2"
+  "gitHead": "f3a176d916fe26038c9fb57f1ab485aa79c053ce"
 }