refactor: apply review fixes — theme usage, remove yoctocolors, unify skip logic

Author: Sakthieswaran-tech

README.md

@@ -1 +1 @@
-packages/prompts/README.md
+packages/prompts/README.md

packages/inquirer/package.json

@@ -79,9 +79,8 @@
     "@inquirer/prompts": "^7.9.0",
     "@inquirer/type": "^3.0.9",
     "mute-stream": "^2.0.0",
-    "run-async": "^4.0.5",
-    "rxjs": "^7.8.2",
-    "yoctocolors-cjs": "^2.1.3"
+    "run-async": "^4.0.6",
+    "rxjs": "^7.8.2"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",

packages/inquirer/src/ui/prompt.ts

@@ -232,29 +232,17 @@ export default class PromptsRunner<A extends Answers> {
         of(question).pipe(
           concatMap((question) =>
             from(this.shouldRun(question)).pipe(
-              concatMap((result) => {
-                let ask = true;
-                let display = true;
-                if (typeof result === 'object') {
-                  display = result.display;
-                  ask = result.ask;
-                } else {
-                  ask = result;
+              concatMap(({ display, ask }) => {
+                if (ask) {
+                  return defer(() => from(this.fetchAnswer(question)));
                 }
-                if (ask || display) {
-                  return of({ question, ask });
+                if (display) {
+                  this.displaySkippedQuestion(question);
                 }
                 return EMPTY;
               }),
             ),
           ),
-          concatMap(({ question, ask }) => {
-            if (ask) {
-              return defer(() => from(this.fetchAnswer(question)));
-            }
-            this.displaySkippedQuestion(question);
-            return EMPTY;
-          }),
         ),
       ),
     );
@@ -420,14 +408,12 @@ export default class PromptsRunner<A extends Answers> {
     this.abortController.abort();
   };
 
-  private shouldRun = async (
-    question: Question<A>,
-  ): Promise<boolean | CustomWhenResult> => {
+  private shouldRun = async (question: Question<A>): Promise<CustomWhenResult> => {
     if (
       question.askAnswered !== true &&
       _.get(this.answers, question.name) !== undefined
     ) {
-      return false;
+      return { display: false, ask: false };
     }
 
     const { when } = question;
@@ -438,9 +424,11 @@ export default class PromptsRunner<A extends Answers> {
         const ask = shouldRun.ask;
         return { display, ask };
       }
-      return Boolean(shouldRun);
+      const ask = Boolean(shouldRun);
+      return { display: ask, ask };
     }
 
-    return when !== false;
+    const ask = when !== false;
+    return { display: ask, ask };
   };
 }

packages/inquirer/src/ui/skipped-renderer.ts

@@ -1,5 +1,5 @@
-import colors from 'yoctocolors-cjs';
 import { Answers, Question } from '../types.ts';
+import { makeTheme } from '@inquirer/core';
 
 type RendererFunction<A extends Answers = Answers> = (question: Question<A>) => string;
 
@@ -22,33 +22,29 @@ type SkippedRendererType<A extends Answers = Answers> = {
   password: RendererFunction<A>;
   default: RendererFunction<A>;
 };
+const theme = makeTheme();
+const prefix = typeof theme.prefix === 'string' ? theme.prefix : theme.prefix.idle;
 
 const SkippedRenderer: SkippedRendererType = {
   confirm: (question: TypedQuestion) => {
     const defaultVal = question.default;
     const answerText = defaultVal === true ? 'Yes' : defaultVal === false ? 'No' : '';
-    const prefix = '?';
-    const line = `${prefix} ${question.message} ${answerText}`;
-    return colors.dim(line);
+    return renderLine(question.message.toString(), answerText);
   },
 
   select: (question: TypedQuestion) => {
     const defaultVal = question.default;
-    const prefix = '?';
     let answerText = String(defaultVal);
 
     if (question.choices && defaultVal !== undefined) {
       const selectedChoice = question.choices.find((c) => c.value === defaultVal);
       answerText = selectedChoice ? selectedChoice.name : String(defaultVal);
     }
-
-    const line = `${prefix} ${question.message} ${answerText}`;
-    return colors.dim(line);
+    return renderLine(question.message.toString(), answerText);
   },
 
   checkbox: (question: TypedQuestion) => {
     const defaultVal = question.default;
-    const prefix = '?';
     let answerText = '';
 
     if (Array.isArray(defaultVal) && question.choices) {
@@ -60,40 +56,36 @@ const SkippedRenderer: SkippedRendererType = {
       answerText = String(defaultVal);
     }
 
-    const line = `${prefix} ${question.message} ${answerText}`;
-    return colors.dim(line);
+    return renderLine(question.message.toString(), answerText);
   },
 
   editor: (question: TypedQuestion) => {
-    const prefix = '?';
     const answerText = question.default !== undefined ? '[Default Content]' : '';
-    const line = `${prefix} ${question.message} ${answerText}`;
-    return colors.dim(line);
+    return renderLine(question.message.toString(), answerText);
   },
 
   password: (question: TypedQuestion) => {
     const defaultVal = question.default;
-    const prefix = '?';
     let answerText = '';
 
     if (defaultVal !== undefined) {
       answerText = '[PASSWORD SET]';
     }
-
-    const line = `${prefix} ${question.message} ${answerText}`;
-    return colors.dim(line);
+    return renderLine(question.message.toString(), answerText);
   },
 
   default: (question: TypedQuestion) => {
-    const prefix = '?';
-    const answer = question.default !== undefined ? String(question.default) : '';
-    const line = `${prefix} ${question.message} ${answer}`;
-    return colors.dim(line);
+    const answerText = question.default !== undefined ? String(question.default) : '';
+    return renderLine(question.message.toString(), answerText);
   },
   list: (question: TypedQuestion) => SkippedRenderer.select(question),
   rawlist: (question: TypedQuestion) => SkippedRenderer.select(question),
   input: (question: TypedQuestion) => SkippedRenderer.default(question),
   number: (question: TypedQuestion) => SkippedRenderer.default(question),
 };
 
+function renderLine(message: string, answerText: string) {
+  return theme.style.help(`${prefix} ${message} ${answerText}`);
+}
+
 export default SkippedRenderer;

yarn.lock

@@ -4719,8 +4719,7 @@ __metadata:
     mute-stream: "npm:^2.0.0"
     run-async: "npm:^4.0.5"
     rxjs: "npm:^7.8.2"
-    tshy: "npm:^3.0.2"
-    yoctocolors-cjs: "npm:^2.1.3"
+    tshy: "npm:^3.0.3"
   peerDependencies:
     "@types/node": ">=18"
   peerDependenciesMeta:
@@ -8664,7 +8663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yoctocolors-cjs@npm:^2.1.2, yoctocolors-cjs@npm:^2.1.3":
+"yoctocolors-cjs@npm:^2.1.3":
   version: 2.1.3
   resolution: "yoctocolors-cjs@npm:2.1.3"
   checksum: 10/b2144b38807673a4254dae06fe1a212729550609e606289c305e45c585b36fab1dbba44fe6cde90db9b28be465ec63f4c2a50867aeec6672f6bc36b6c9a361a0