@inquirer/select 1.2.10 → 1.2.12

package/dist/cjs/index.js

@@ -1,78 +1,75 @@
 "use strict";
+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 = require("chalk");
-const figures_1 = require("figures");
-const ansi_escapes_1 = require("ansi-escapes");
-function isSelectableChoice(choice) {
-    return choice != null && !core_1.Separator.isSeparator(choice) && !choice.disabled;
+const chalk_1 = __importDefault(require("chalk"));
+const figures_1 = __importDefault(require("figures"));
+const ansi_escapes_1 = __importDefault(require("ansi-escapes"));
+function isSelectable(item) {
+    return !core_1.Separator.isSeparator(item) && !item.disabled;
+}
+function renderItem({ item, isActive }) {
+    if (core_1.Separator.isSeparator(item)) {
+        return ` ${item.separator}`;
+    }
+    const line = item.name || item.value;
+    if (item.disabled) {
+        const disabledLabel = typeof item.disabled === 'string' ? item.disabled : '(disabled)';
+        return chalk_1.default.dim(`- ${line} ${disabledLabel}`);
+    }
+    const color = isActive ? chalk_1.default.cyan : (x) => x;
+    const prefix = isActive ? figures_1.default.pointer : ` `;
+    return color(`${prefix} ${line}`);
 }
 exports.default = (0, core_1.createPrompt)((config, done) => {
-    const { choices } = config;
+    const { choices: items, pageSize } = config;
     const firstRender = (0, core_1.useRef)(true);
     const prefix = (0, core_1.usePrefix)();
     const [status, setStatus] = (0, core_1.useState)('pending');
-    const [cursorPosition, setCursorPos] = (0, core_1.useState)(() => {
-        const startIndex = choices.findIndex(isSelectableChoice);
-        if (startIndex < 0) {
+    const [active, setActive] = (0, core_1.useState)(() => {
+        const selected = items.findIndex(isSelectable);
+        if (selected < 0)
             throw new Error('[select prompt] No selectable choices. All choices are disabled.');
-        }
-        return startIndex;
+        return selected;
     });
     // Safe to assume the cursor position always point to a Choice.
-    const selectedChoice = choices[cursorPosition];
+    const selectedChoice = items[active];
     (0, core_1.useKeypress)((key) => {
         if ((0, core_1.isEnterKey)(key)) {
             setStatus('done');
             done(selectedChoice.value);
         }
         else if ((0, core_1.isUpKey)(key) || (0, core_1.isDownKey)(key)) {
-            let newCursorPosition = cursorPosition;
             const offset = (0, core_1.isUpKey)(key) ? -1 : 1;
-            let selectedOption;
-            while (!isSelectableChoice(selectedOption)) {
-                newCursorPosition =
-                    (newCursorPosition + offset + choices.length) % choices.length;
-                selectedOption = choices[newCursorPosition];
-            }
-            setCursorPos(newCursorPosition);
+            let next = active;
+            do {
+                next = (next + offset + items.length) % items.length;
+            } while (!isSelectable(items[next]));
+            setActive(next);
         }
         else if ((0, core_1.isNumberKey)(key)) {
-            // Adjust index to start at 1
-            const newCursorPosition = Number(key.name) - 1;
-            // Abort if the choice doesn't exists or if disabled
-            if (!isSelectableChoice(choices[newCursorPosition])) {
+            const position = Number(key.name) - 1;
+            const item = items[position];
+            if (item == null || !isSelectable(item))
                 return;
-            }
-            setCursorPos(newCursorPosition);
+            setActive(position);
         }
     });
     let message = chalk_1.default.bold(config.message);
     if (firstRender.current) {
-        message += chalk_1.default.dim(' (Use arrow keys)');
         firstRender.current = false;
+        message += chalk_1.default.dim(' (Use arrow keys)');
     }
-    const allChoices = choices
-        .map((choice, index) => {
-        if (core_1.Separator.isSeparator(choice)) {
-            return ` ${choice.separator}`;
-        }
-        const line = choice.name || choice.value;
-        if (choice.disabled) {
-            const disabledLabel = typeof choice.disabled === 'string' ? choice.disabled : '(disabled)';
-            return chalk_1.default.dim(`- ${line} ${disabledLabel}`);
-        }
-        if (index === cursorPosition) {
-            return chalk_1.default.cyan(`${figures_1.default.pointer} ${line}`);
-        }
-        return `  ${line}`;
-    })
+    const lines = items
+        .map((item, index) => renderItem({ item, isActive: index === active }))
         .join('\n');
-    const windowedChoices = (0, core_1.usePagination)(allChoices, {
-        active: cursorPosition,
-        pageSize: config.pageSize,
+    const page = (0, core_1.usePagination)(lines, {
+        active,
+        pageSize,
     });
     if (status === 'done') {
         return `${prefix} ${message} ${chalk_1.default.cyan(selectedChoice.name || selectedChoice.value)}`;
@@ -80,5 +77,5 @@ exports.default = (0, core_1.createPrompt)((config, done) => {
     const choiceDescription = selectedChoice.description
         ? `\n${selectedChoice.description}`
         : ``;
-    return `${prefix} ${message}\n${windowedChoices}${choiceDescription}${ansi_escapes_1.default.cursorHide}`;
+    return `${prefix} ${message}\n${page}${choiceDescription}${ansi_escapes_1.default.cursorHide}`;
 });

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

@@ -1,4 +1,4 @@
-import { Separator, AsyncPromptConfig } from '@inquirer/core';
+import { Separator } from '@inquirer/core';
 type Choice<Value> = {
     value: Value;
     name?: string;
@@ -6,7 +6,8 @@ type Choice<Value> = {
     disabled?: boolean | string;
     type?: never;
 };
-declare const _default: <Value extends unknown>(config: AsyncPromptConfig & {
+declare const _default: <Value extends unknown>(config: {
+    message: string | Promise<string> | (() => Promise<string>);
     choices: readonly (Separator | Choice<Value>)[];
     pageSize?: number | undefined;
 }, context?: import("@inquirer/type").Context | undefined) => import("@inquirer/type").CancelablePromise<Value>;

package/dist/esm/index.mjs

@@ -2,73 +2,67 @@ import { createPrompt, useState, useKeypress, usePrefix, usePagination, useRef,
 import chalk from 'chalk';
 import figures from 'figures';
 import ansiEscapes from 'ansi-escapes';
-function isSelectableChoice(choice) {
-    return choice != null && !Separator.isSeparator(choice) && !choice.disabled;
+function isSelectable(item) {
+    return !Separator.isSeparator(item) && !item.disabled;
+}
+function renderItem({ item, isActive }) {
+    if (Separator.isSeparator(item)) {
+        return ` ${item.separator}`;
+    }
+    const line = item.name || item.value;
+    if (item.disabled) {
+        const disabledLabel = typeof item.disabled === 'string' ? item.disabled : '(disabled)';
+        return chalk.dim(`- ${line} ${disabledLabel}`);
+    }
+    const color = isActive ? chalk.cyan : (x) => x;
+    const prefix = isActive ? figures.pointer : ` `;
+    return color(`${prefix} ${line}`);
 }
 export default createPrompt((config, done) => {
-    const { choices } = config;
+    const { choices: items, pageSize } = config;
     const firstRender = useRef(true);
     const prefix = usePrefix();
     const [status, setStatus] = useState('pending');
-    const [cursorPosition, setCursorPos] = useState(() => {
-        const startIndex = choices.findIndex(isSelectableChoice);
-        if (startIndex < 0) {
+    const [active, setActive] = useState(() => {
+        const selected = items.findIndex(isSelectable);
+        if (selected < 0)
             throw new Error('[select prompt] No selectable choices. All choices are disabled.');
-        }
-        return startIndex;
+        return selected;
     });
     // Safe to assume the cursor position always point to a Choice.
-    const selectedChoice = choices[cursorPosition];
+    const selectedChoice = items[active];
     useKeypress((key) => {
         if (isEnterKey(key)) {
             setStatus('done');
             done(selectedChoice.value);
         }
         else if (isUpKey(key) || isDownKey(key)) {
-            let newCursorPosition = cursorPosition;
             const offset = isUpKey(key) ? -1 : 1;
-            let selectedOption;
-            while (!isSelectableChoice(selectedOption)) {
-                newCursorPosition =
-                    (newCursorPosition + offset + choices.length) % choices.length;
-                selectedOption = choices[newCursorPosition];
-            }
-            setCursorPos(newCursorPosition);
+            let next = active;
+            do {
+                next = (next + offset + items.length) % items.length;
+            } while (!isSelectable(items[next]));
+            setActive(next);
         }
         else if (isNumberKey(key)) {
-            // Adjust index to start at 1
-            const newCursorPosition = Number(key.name) - 1;
-            // Abort if the choice doesn't exists or if disabled
-            if (!isSelectableChoice(choices[newCursorPosition])) {
+            const position = Number(key.name) - 1;
+            const item = items[position];
+            if (item == null || !isSelectable(item))
                 return;
-            }
-            setCursorPos(newCursorPosition);
+            setActive(position);
         }
     });
     let message = chalk.bold(config.message);
     if (firstRender.current) {
-        message += chalk.dim(' (Use arrow keys)');
         firstRender.current = false;
+        message += chalk.dim(' (Use arrow keys)');
     }
-    const allChoices = choices
-        .map((choice, index) => {
-        if (Separator.isSeparator(choice)) {
-            return ` ${choice.separator}`;
-        }
-        const line = choice.name || choice.value;
-        if (choice.disabled) {
-            const disabledLabel = typeof choice.disabled === 'string' ? choice.disabled : '(disabled)';
-            return chalk.dim(`- ${line} ${disabledLabel}`);
-        }
-        if (index === cursorPosition) {
-            return chalk.cyan(`${figures.pointer} ${line}`);
-        }
-        return `  ${line}`;
-    })
+    const lines = items
+        .map((item, index) => renderItem({ item, isActive: index === active }))
         .join('\n');
-    const windowedChoices = usePagination(allChoices, {
-        active: cursorPosition,
-        pageSize: config.pageSize,
+    const page = usePagination(lines, {
+        active,
+        pageSize,
     });
     if (status === 'done') {
         return `${prefix} ${message} ${chalk.cyan(selectedChoice.name || selectedChoice.value)}`;
@@ -76,6 +70,6 @@ export default createPrompt((config, done) => {
     const choiceDescription = selectedChoice.description
         ? `\n${selectedChoice.description}`
         : ``;
-    return `${prefix} ${message}\n${windowedChoices}${choiceDescription}${ansiEscapes.cursorHide}`;
+    return `${prefix} ${message}\n${page}${choiceDescription}${ansiEscapes.cursorHide}`;
 });
 export { Separator };

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

@@ -1,4 +1,4 @@
-import { Separator, AsyncPromptConfig } from '@inquirer/core';
+import { Separator } from '@inquirer/core';
 type Choice<Value> = {
     value: Value;
     name?: string;
@@ -6,7 +6,8 @@ type Choice<Value> = {
     disabled?: boolean | string;
     type?: never;
 };
-declare const _default: <Value extends unknown>(config: AsyncPromptConfig & {
+declare const _default: <Value extends unknown>(config: {
+    message: string | Promise<string> | (() => Promise<string>);
     choices: readonly (Separator | Choice<Value>)[];
     pageSize?: number | undefined;
 }, context?: import("@inquirer/type").Context | undefined) => import("@inquirer/type").CancelablePromise<Value>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inquirer/select",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "Inquirer select/list prompt",
   "main": "./dist/cjs/index.js",
   "typings": "./dist/cjs/types/index.d.ts",
@@ -54,14 +54,14 @@
   "license": "MIT",
   "homepage": "https://github.com/SBoudrias/Inquirer.js/blob/master/packages/select/README.md",
   "dependencies": {
-    "@inquirer/core": "^4.1.0",
-    "@inquirer/type": "^1.1.3",
+    "@inquirer/core": "^5.0.1",
+    "@inquirer/type": "^1.1.5",
     "ansi-escapes": "^4.3.2",
     "chalk": "^4.1.2",
     "figures": "^3.2.0"
   },
   "devDependencies": {
-    "@inquirer/testing": "^2.1.5"
+    "@inquirer/testing": "^2.1.7"
   },
   "scripts": {
     "tsc": "yarn run tsc:esm && yarn run tsc:cjs",
@@ -86,5 +86,5 @@
       }
     }
   },
-  "gitHead": "f5c544a8ded1c7dfb6ac8364759955e8f2ecfb0c"
+  "gitHead": "85784061d702778bc9dd48ca08f09ee9976b06ee"
 }