fix(tasks): prefix stdout for progress, prompt, select

rafamel · Apr 15, 2021 · 0e25098 · 0e25098
1 parent d6a30d3
commit 0e25098
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/src/tasks/stdio/progress.ts b/src/tasks/stdio/progress.ts
@@ -1,7 +1,8 @@
-import { TypeGuard } from 'type-core';
+import { Empty, TypeGuard } from 'type-core';
 import isUnicodeSupported from 'is-unicode-supported';
 import ora from 'ora';
 import { Task } from '../../definitions';
+import { addPrefix } from '../../helpers/prefix';
 import { stringifyPrintRoute } from '../../helpers/stringify';
 import { getLogLevelPrefix, isLogLevelActive } from '../../helpers/logging';
 import { isInteractive } from '../../utils/is-interactive';
@@ -26,7 +27,10 @@ export interface ProgressOptions {
  * while maintaining the context's stdout and stderr.
  * @returns Task
  */
-export function progress(task: Task, options?: ProgressOptions): Task.Async {
+export function progress(
+  options: ProgressOptions | Empty,
+  task: Task
+): Task.Async {
   return create(async (ctx) => {
     const opts = options || {};
     const silent = silence(task);
@@ -40,12 +44,19 @@ export function progress(task: Task, options?: ProgressOptions): Task.Async {
     }
 
     const spinner = ora({
-      color: 'cyan',
+      color: undefined,
       indent: 0,
       stream: ctx.stdio[1],
       isEnabled: true,
       discardStdin: false,
-      hideCursor: true
+      hideCursor: true,
+      spinner: {
+        frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'].map(
+          (str) => {
+            return addPrefix(style(str, { color: 'cyan' }), null, 'print', ctx);
+          }
+        )
+      }
     });
 
     spinner.start(isUnicodeSupported() ? ' ' + message : message);
@@ -56,13 +67,18 @@ export function progress(task: Task, options?: ProgressOptions): Task.Async {
     } catch (err) {
       spinner.stopAndPersist({
         text: message,
-        symbol: getLogLevelPrefix('info')
+        symbol: addPrefix(getLogLevelPrefix('info'), null, 'print', ctx)
       });
       throw err;
     }
     spinner.stopAndPersist({
       text: message,
-      symbol: getLogLevelPrefix(wasCancelled ? 'info' : 'success')
+      symbol: addPrefix(
+        getLogLevelPrefix(wasCancelled ? 'info' : 'success'),
+        null,
+        'print',
+        ctx
+      )
     });
   });
 }
diff --git a/src/tasks/stdio/prompt.ts b/src/tasks/stdio/prompt.ts
@@ -4,6 +4,7 @@ import { createInterface } from 'readline';
 import { into } from 'pipettes';
 import { Task } from '../../definitions';
 import { getBadge } from '../../helpers/badges';
+import { addPrefix } from '../../helpers/prefix';
 import { stringifyError } from '../../helpers/stringify';
 import { isInteractive } from '../../utils/is-interactive';
 import { isCancelled } from '../../utils/is-cancelled';
@@ -94,7 +95,7 @@ export function prompt(options: PromptOptions | Empty, task: Task): Task.Async {
       }),
       into(null, function read() {
         return new Promise<string | null>((resolve, reject) => {
-          readline.question(message, (res) => {
+          readline.question(addPrefix(message, null, 'print', ctx), (res) => {
             let valid = false;
             let error: [Error] | null = null;
             const response =

diff --git a/src/tasks/stdio/select.ts b/src/tasks/stdio/select.ts
@@ -12,6 +12,7 @@ import { raises } from '../exception/raises';
 import { create } from '../creation/create';
 import { print } from './print';
 import { log } from './log';
+import { addPrefix } from '~/helpers/prefix';
 
 export interface SelectOptions {
   /**
@@ -98,9 +99,14 @@ export function select(
       cleanup: true,
       values: names,
       ...(fallback >= 0 ? { defaultValue: fallback } : {}),
-      selected: getBadge('selected'),
-      unselected: getBadge('unselected'),
-      indentation: 4,
+      selected: addPrefix(getBadge('selected'), ' '.repeat(3), 'print', ctx),
+      unselected: addPrefix(
+        getBadge('unselected'),
+        ' '.repeat(3),
+        'print',
+        ctx
+      ),
+      indentation: 0,
       outputStream: ctx.stdio[1],
       inputStream: Object.create(stdin, {
         setRawMode: {