pass Answers to PromptSession

mshima · Sep 3, 2024 · c44cc2d · c44cc2d
1 parent dec6a98
commit c44cc2d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/packages/inquirer/src/index.mts b/packages/inquirer/src/index.mts
@@ -29,6 +29,7 @@ import type {
   BuiltInQuestion,
   StreamOptions,
   QuestionMap,
+  PromptSession,
 } from './types.mjs';
 import { Observable } from 'rxjs';
 
@@ -98,11 +99,7 @@ export function createPromptModule<
     opts?: { signal?: AbortSignal },
   ): PromptReturnType<PrefilledAnswers & A>;
   function promptModule<A extends Answers>(
-    questions:
-      | NamedQuestion<A>[]
-      | Record<keyof A, Question<A>>
-      | Observable<NamedQuestion<A>>
-      | NamedQuestion<A>,
+    questions: PromptSession<A>,
     answers?: Partial<A>,
     opts: { signal?: AbortSignal } = {},
   ): PromptReturnType<A> {

diff --git a/packages/inquirer/src/types.mts b/packages/inquirer/src/types.mts
@@ -92,10 +92,10 @@ export type CustomQuestion<
   [key in Extract<keyof Q, string>]: Readonly<QuestionWithGetters<key, Q[key], A>>;
 }[Extract<keyof Q, string>];
 
-export type PromptSession<Q extends AnyQuestion<any>> =
-  | Q[]
-  | Record<string, Omit<Q, 'name'>>
-  | Observable<Q>
-  | Q;
+export type PromptSession<A extends Answers> =
+  | AnyQuestion<A>[]
+  | Record<string, Omit<AnyQuestion<A>, 'name'>>
+  | Observable<AnyQuestion<A>>
+  | AnyQuestion<A>;
 
 export type StreamOptions = Prettify<Context & { skipTTYChecks?: boolean }>;
diff --git a/packages/inquirer/src/ui/prompt.mts b/packages/inquirer/src/ui/prompt.mts
@@ -155,13 +155,13 @@ function setupReadlineOptions(opt: StreamOptions) {
 }
 
 function isQuestionArray<A extends Answers>(
-  questions: PromptSession<AnyQuestion<A>>,
+  questions: PromptSession<A>,
 ): questions is AnyQuestion<A>[] {
   return Array.isArray(questions);
 }
 
 function isQuestionMap<A extends Answers>(
-  questions: PromptSession<AnyQuestion<A>>,
+  questions: PromptSession<A>,
 ): questions is Record<string, Omit<AnyQuestion<A>, 'name'>> {
   return Object.values(questions).every(
     (maybeQuestion) =>
@@ -199,7 +199,7 @@ export default class PromptsRunner<A extends Answers> {
   }
 
   async run(
-    questions: PromptSession<AnyQuestion<A>>,
+    questions: PromptSession<A>,
     answers?: Partial<A>,
     opts: { signal?: AbortSignal } = {},
   ): Promise<A> {