chore: extract wrap function to utils

Author: 43081j

packages/core/src/index.ts

@@ -8,6 +8,6 @@ export { default as SelectPrompt } from './prompts/select.js';
 export { default as SelectKeyPrompt } from './prompts/select-key.js';
 export { default as TextPrompt } from './prompts/text.js';
 export type { ClackState as State } from './types.js';
-export { block, getColumns, getRows, isCancel } from './utils/index.js';
+export { block, getColumns, getRows, isCancel, wrapTextWithPrefix } from './utils/index.js';
 export type { ClackSettings } from './utils/settings.js';
 export { settings, updateSettings } from './utils/settings.js';

packages/core/src/utils/index.ts

@@ -3,6 +3,7 @@ import type { Key } from 'node:readline';
 import * as readline from 'node:readline';
 import type { Readable, Writable } from 'node:stream';
 import { ReadStream } from 'node:tty';
+import { wrapAnsi } from 'fast-wrap-ansi';
 import { cursor } from 'sisteransi';
 import { isActionKey } from './settings.js';
 
@@ -96,3 +97,23 @@ export const getRows = (output: Writable): number => {
 	}
 	return 20;
 };
+
+export function wrapTextWithPrefix(
+	output: Writable | undefined,
+	text: string,
+	prefix: string,
+	startPrefix: string = prefix
+): string {
+	const columns = getColumns(output ?? stdout);
+	const wrapped = wrapAnsi(text, columns - prefix.length, {
+		hard: true,
+		trim: false,
+	});
+	const lines = wrapped
+		.split('\n')
+		.map((line, index) => {
+			return `${index === 0 ? startPrefix : prefix}${line}`;
+		})
+		.join('\n');
+	return lines;
+}

packages/prompts/src/select.ts

@@ -1,6 +1,4 @@
-import type { Writable } from 'node:stream';
-import { getColumns, SelectPrompt } from '@clack/core';
-import { wrapAnsi } from 'fast-wrap-ansi';
+import { SelectPrompt, wrapTextWithPrefix } from '@clack/core';
 import color from 'picocolors';
 import {
 	type CommonOptions,
@@ -105,51 +103,33 @@ export const select = <Value>(opts: SelectOptions<Value>) => {
 		output: opts.output,
 		initialValue: opts.initialValue,
 		render() {
-			const output: Writable = opts?.output ?? process.stdout;
-			const columns = getColumns(output);
 			const titlePrefix = `${symbol(this.state)}  `;
 			const titlePrefixBar = `${symbolBar(this.state)}  `;
-			const wrappedMessage = wrapAnsi(
+			const messageLines = wrapTextWithPrefix(
+				opts.output,
 				opts.message,
-				columns - Math.max(titlePrefix.length, titlePrefixBar.length),
-				{
-					hard: true,
-					trim: false,
-				}
+				titlePrefixBar,
+				titlePrefix
 			);
-			const messageLines = wrappedMessage
-				.split('\n')
-				.map((line, index) => {
-					return `${index === 0 ? titlePrefix : titlePrefixBar}${line}`;
-				})
-				.join('\n');
 			const title = `${color.gray(S_BAR)}\n${messageLines}\n`;
 
 			switch (this.state) {
 				case 'submit': {
 					const submitPrefix = `${color.gray(S_BAR)}  `;
-					const wrappedOption = wrapAnsi(
+					const wrappedLines = wrapTextWithPrefix(
+						opts.output,
 						opt(this.options[this.cursor], 'selected'),
-						columns - submitPrefix.length,
-						{ hard: true, trim: false }
+						submitPrefix
 					);
-					const wrappedLines = wrappedOption
-						.split('\n')
-						.map((line) => `${submitPrefix}${line}`)
-						.join('\n');
 					return `${title}${wrappedLines}`;
 				}
 				case 'cancel': {
 					const cancelPrefix = `${color.gray(S_BAR)}  `;
-					const wrappedOption = wrapAnsi(
+					const wrappedLines = wrapTextWithPrefix(
+						opts.output,
 						opt(this.options[this.cursor], 'cancelled'),
-						columns - cancelPrefix.length,
-						{ hard: true, trim: false }
+						cancelPrefix
 					);
-					const wrappedLines = wrappedOption
-						.split('\n')
-						.map((line) => `${cancelPrefix}${line}`)
-						.join('\n');
 					return `${title}${wrappedLines}\n${color.gray(S_BAR)}`;
 				}
 				default: {

packages/prompts/test/select.test.ts

@@ -184,7 +184,7 @@ describe.each(['true', 'false'])('select (isCI = %s)', (isCI) => {
 
 		input.emit('keypress', '', { name: 'return' });
 
-		const value = await result;
+		await result;
 
 		expect(output.buffer).toMatchSnapshot();
 	});
@@ -207,7 +207,7 @@ describe.each(['true', 'false'])('select (isCI = %s)', (isCI) => {
 
 		input.emit('keypress', 'escape', { name: 'escape' });
 
-		const value = await result;
+		await result;
 
 		expect(output.buffer).toMatchSnapshot();
 	});