Skip to content

Commit 06fb7c0

Browse files
committed
weiver s'P
1 parent dc21ff8 commit 06fb7c0

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

scripts/cli/index.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { playground } from '../playground';
1111

1212
import type { Job, LangArg } from './utils';
1313
import {
14-
PROMPT_ALL,
14+
ALL,
1515
getClientChoices,
1616
generatorList,
1717
prompt,
@@ -127,7 +127,7 @@ buildCommand
127127
{ verbose, interactive, skipCache, outputJson }
128128
) => {
129129
const { client, clientList } = await prompt({
130-
langArg: 'all',
130+
langArg: ALL,
131131
clientArg,
132132
job: 'specs',
133133
interactive,
@@ -137,7 +137,7 @@ buildCommand
137137

138138
// ignore cache when building from cli
139139
await buildSpecs(
140-
client[0] === PROMPT_ALL ? clientList : client,
140+
client[0] === ALL ? clientList : client,
141141
outputFormat,
142142
Boolean(verbose),
143143
!skipCache
@@ -179,15 +179,12 @@ ctsCommand
179179
.action(async (langArg: LangArg, { verbose, interactive }) => {
180180
const { language } = await prompt({
181181
langArg,
182-
clientArg: [PROMPT_ALL],
182+
clientArg: [ALL],
183183
job: 'generate',
184184
interactive,
185185
});
186186

187-
await runCts(
188-
language === PROMPT_ALL ? LANGUAGES : [language],
189-
Boolean(verbose)
190-
);
187+
await runCts(language === ALL ? LANGUAGES : [language], Boolean(verbose));
191188
});
192189

193190
program

scripts/cli/utils.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ import inquirer from 'inquirer';
33
import { CLIENTS, GENERATORS, LANGUAGES } from '../common';
44
import type { Generator, Language } from '../types';
55

6-
export const PROMPT_ALL = 'all';
7-
export const PROMPT_LANGUAGES = [PROMPT_ALL, ...LANGUAGES];
8-
export const PROMPT_CLIENTS = [PROMPT_ALL, ...CLIENTS];
6+
export const ALL = 'all';
7+
export const PROMPT_LANGUAGES = [ALL, ...LANGUAGES];
8+
export const PROMPT_CLIENTS = [ALL, ...CLIENTS];
99

10-
export type LangArg = Language | typeof PROMPT_ALL | undefined;
10+
export type AllLanguage = Language | typeof ALL;
11+
export type LangArg = AllLanguage | undefined;
1112

1213
export type PromptDecision = {
13-
language: Language | 'all';
14+
language: AllLanguage;
1415
client: string[];
1516
clientList: string[];
1617
};
@@ -33,7 +34,7 @@ export function getClientChoices(job: Job, language?: LangArg): string[] {
3334
return job === 'specs' ? withoutAlgoliaSearch : PROMPT_CLIENTS;
3435
}
3536

36-
const isJavaScript = language === PROMPT_ALL || language === 'javascript';
37+
const isJavaScript = language === ALL || language === 'javascript';
3738

3839
switch (job) {
3940
// We don't need to build `lite` client as it's a subset of the `algoliasearch` one
@@ -64,12 +65,12 @@ export function generatorList({
6465
client,
6566
clientList,
6667
}: {
67-
language: Language | 'all';
68+
language: AllLanguage;
6869
client: string[];
6970
clientList: string[];
7071
}): Generator[] {
71-
const langsTodo = language === PROMPT_ALL ? LANGUAGES : [language];
72-
const clientsTodo = client[0] === PROMPT_ALL ? clientList : client;
72+
const langsTodo = language === ALL ? LANGUAGES : [language];
73+
const clientsTodo = client[0] === ALL ? clientList : client;
7374

7475
return langsTodo
7576
.flatMap((lang) => clientsTodo.map((cli) => GENERATORS[`${lang}-${cli}`]))
@@ -83,8 +84,8 @@ export async function prompt({
8384
interactive,
8485
}: Prompt): Promise<PromptDecision> {
8586
const decision: PromptDecision = {
86-
client: [PROMPT_ALL],
87-
language: PROMPT_ALL,
87+
client: [ALL],
88+
language: ALL,
8889
clientList: [],
8990
};
9091

@@ -95,7 +96,7 @@ export async function prompt({
9596
type: 'list',
9697
name: 'language',
9798
message: 'Select a language',
98-
default: PROMPT_ALL,
99+
default: ALL,
99100
choices: LANGUAGES,
100101
},
101102
]);
@@ -115,7 +116,7 @@ export async function prompt({
115116
type: 'list',
116117
name: 'client',
117118
message: 'Select a client',
118-
default: PROMPT_ALL,
119+
default: ALL,
119120
choices: decision.clientList,
120121
},
121122
]);

scripts/playground.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import type { AllLanguage } from './cli/utils';
12
import { createClientName, run } from './common';
2-
import type { Language } from './types';
33

44
export async function playground({
55
language,
66
client,
77
}: {
8-
language: Language | 'all';
8+
language: AllLanguage;
99
client: string;
1010
}): Promise<void> {
1111
const verbose = true;

0 commit comments

Comments
 (0)