feat: use single cursor function

Author: 43081j

packages/core/src/prompts/multi-select.ts

@@ -1,35 +1,42 @@
-import { findNextCursor, findPrevCursor } from '../utils/cursor.js';
+import { findCursor } from '../utils/cursor.js';
 import Prompt, { type PromptOptions } from './prompt.js';
 
-interface MultiSelectOptions<T extends { value: any; disabled?: boolean }>
+interface OptionLike {
+	value: any;
+	disabled?: boolean;
+}
+
+interface MultiSelectOptions<T extends OptionLike>
 	extends PromptOptions<T['value'][], MultiSelectPrompt<T>> {
 	options: T[];
 	initialValues?: T['value'][];
 	required?: boolean;
 	cursorAt?: T['value'];
 }
-export default class MultiSelectPrompt<T extends { value: any; disabled?: boolean }> extends Prompt<
-	T['value'][]
-> {
+export default class MultiSelectPrompt<T extends OptionLike> extends Prompt<T['value'][]> {
 	options: T[];
 	cursor = 0;
-	#enabledOptions: T[] = [];
 
 	private get _value(): T['value'] {
 		return this.options[this.cursor].value;
 	}
 
+	private get _enabledOptions(): T[] {
+		return this.options.filter((option) => option.disabled !== true);
+	}
+
 	private toggleAll() {
-		const allSelected = this.value !== undefined && this.value.length === this.#enabledOptions.length;
-		this.value = allSelected ? [] : this.#enabledOptions.map((v) => v.value);
+		const enabledOptions = this._enabledOptions;
+		const allSelected = this.value !== undefined && this.value.length === enabledOptions.length;
+		this.value = allSelected ? [] : enabledOptions.map((v) => v.value);
 	}
 
 	private toggleInvert() {
 		const value = this.value;
 		if (!value) {
 			return;
 		}
-		const notSelected = this.#enabledOptions.filter((v) => !value.includes(v.value));
+		const notSelected = this._enabledOptions.filter((v) => !value.includes(v.value));
 		this.value = notSelected.map((v) => v.value);
 	}
 
@@ -47,17 +54,12 @@ export default class MultiSelectPrompt<T extends { value: any; disabled?: boolea
 		super(opts, false);
 
 		this.options = opts.options;
-		this.#enabledOptions = this.options.filter((option) => !option.disabled);
-		if (this.#enabledOptions.length === 0) return;
 		this.value = [...(opts.initialValues ?? [])];
 		const cursor = Math.max(
 			this.options.findIndex(({ value }) => value === opts.cursorAt),
 			0
 		);
-		this.cursor = this.options[cursor].disabled ? findNextCursor<T>(
-			cursor,
-			this.options
-		) : cursor;
+		this.cursor = this.options[cursor].disabled ? findCursor<T>(cursor, 1, this.options) : cursor;
 		this.on('key', (char) => {
 			if (char === 'a') {
 				this.toggleAll();
@@ -71,11 +73,11 @@ export default class MultiSelectPrompt<T extends { value: any; disabled?: boolea
 			switch (key) {
 				case 'left':
 				case 'up':
-					this.cursor = findPrevCursor<T>(this.cursor, this.options);
+					this.cursor = findCursor<T>(this.cursor, -1, this.options);
 					break;
 				case 'down':
 				case 'right':
-					this.cursor = findNextCursor<T>(this.cursor, this.options);
+					this.cursor = findCursor<T>(this.cursor, 1, this.options);
 					break;
 				case 'space':
 					this.toggleValue();

packages/core/src/prompts/select.ts

@@ -1,4 +1,4 @@
-import { findNextCursor, findPrevCursor } from '../utils/cursor.js';
+import { findCursor } from '../utils/cursor.js';
 import Prompt, { type PromptOptions } from './prompt.js';
 
 interface SelectOptions<T extends { value: any; disabled?: boolean }>
@@ -11,7 +11,6 @@ export default class SelectPrompt<T extends { value: any; disabled?: boolean }>
 > {
 	options: T[];
 	cursor = 0;
-	#enabledOptions: T[] = [];
 
 	private get _selectedValue() {
 		return this.options[this.cursor];
@@ -25,23 +24,21 @@ export default class SelectPrompt<T extends { value: any; disabled?: boolean }>
 		super(opts, false);
 
 		this.options = opts.options;
-		this.#enabledOptions = this.options.filter((option) => !option.disabled);
-		if (this.#enabledOptions.length === 0) return;
 
 		const initialCursor = this.options.findIndex(({ value }) => value === opts.initialValue);
-		const cursor = initialCursor === -1 ? 0 : initialCursor
-		this.cursor = this.options[cursor].disabled ? findNextCursor<T>(cursor, this.options) : cursor;
+		const cursor = initialCursor === -1 ? 0 : initialCursor;
+		this.cursor = this.options[cursor].disabled ? findCursor<T>(cursor, 1, this.options) : cursor;
 		this.changeValue();
 
 		this.on('cursor', (key) => {
 			switch (key) {
 				case 'left':
 				case 'up':
-					this.cursor = findPrevCursor<T>(this.cursor, this.options);
+					this.cursor = findCursor<T>(this.cursor, -1, this.options);
 					break;
 				case 'down':
 				case 'right':
-					this.cursor = findNextCursor<T>(this.cursor, this.options);
+					this.cursor = findCursor<T>(this.cursor, 1, this.options);
 					break;
 			}
 			this.changeValue();

packages/core/src/utils/cursor.ts

@@ -1,17 +1,14 @@
-export function findPrevCursor<T extends { disabled?: boolean }>(cursor: number, options: T[]) {
-	const prevCursor = cursor === 0 ? options.length - 1 : cursor - 1;
-	const prevOption = options[prevCursor];
-	if (prevOption.disabled) {
-		return findPrevCursor(prevCursor, options);
+export function findCursor<T extends { disabled?: boolean }>(
+	cursor: number,
+	delta: number,
+	options: T[]
+) {
+	const newCursor = cursor + delta;
+	const maxCursor = Math.max(options.length - 1, 0);
+	const clampedCursor = newCursor < 0 ? maxCursor : newCursor > maxCursor ? 0 : newCursor;
+	const newOption = options[clampedCursor];
+	if (newOption.disabled) {
+		return findCursor(clampedCursor, delta + (delta < 0 ? -1 : 1), options);
 	}
-	return prevCursor;
-}
-
-export function findNextCursor<T extends { disabled?: boolean }>(cursor: number, options: T[]) {
-	const nextCursor = cursor === options.length - 1 ? 0 : cursor + 1;
-	const nextOption = options[nextCursor];
-	if (nextOption.disabled) {
-		return findNextCursor(nextCursor, options);
-	}
-	return nextCursor;
+	return clampedCursor;
 }