Skip to content

Commit d3f6eb6

Browse files
committed
replace rm -rf by fsp.rm
1 parent 40be86c commit d3f6eb6

File tree

3 files changed

+29
-42
lines changed

3 files changed

+29
-42
lines changed

scripts/generate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { createSpinner } from './oraLog';
66
import { generateOpenapitools, removeExistingCodegen } from './pre-gen';
77
import type { Generator } from './types';
88

9-
async function preGen(gen: Generator, verbose?: boolean): Promise<void> {
10-
await removeExistingCodegen(gen, verbose);
9+
async function preGen(gen: Generator): Promise<void> {
10+
await removeExistingCodegen(gen);
1111
}
1212

1313
async function generateClient(
@@ -48,7 +48,7 @@ export async function generate(
4848

4949
for (const gen of generators) {
5050
const spinner = createSpinner(`pre-gen ${gen.key}`, verbose).start();
51-
await preGen(gen, verbose);
51+
await preGen(gen);
5252

5353
spinner.text = `generating ${gen.key}`;
5454
await generateClient(gen, verbose);
Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
import fsp from 'fs/promises';
12
import path from 'path';
23

3-
import { createClientName, run, toAbsolutePath } from '../common';
4+
import { createClientName, toAbsolutePath } from '../common';
45
import { getLanguageApiFolder, getLanguageModelFolder } from '../config';
56
import type { Generator } from '../types';
67

78
/**
89
* Remove `model` folder for the current language and client.
910
*/
10-
export async function removeExistingCodegen(
11-
{ language, client, output }: Generator,
12-
verbose?: boolean
13-
): Promise<void> {
11+
export async function removeExistingCodegen({
12+
language,
13+
client,
14+
output,
15+
}: Generator): Promise<void> {
1416
const baseModelFolder = getLanguageModelFolder(language);
1517
const baseApiFolder = getLanguageApiFolder(language);
1618
const clientName = createClientName(client, language);
@@ -23,13 +25,11 @@ export async function removeExistingCodegen(
2325
if (client === 'query-suggestions') {
2426
// eslint-disable-next-line no-warning-comments
2527
// TODO: temporary solution, remove in next PR
26-
await run(
27-
`rm -rf ${toAbsolutePath(
28+
await fsp.rm(
29+
toAbsolutePath(
2830
path.resolve('..', output, baseModelFolder, 'querySuggestions')
29-
)}`,
30-
{
31-
verbose,
32-
}
31+
),
32+
{ force: true, recursive: true }
3333
);
3434
}
3535
clientModel = client.replace('-', '');
@@ -42,44 +42,31 @@ export async function removeExistingCodegen(
4242
case 'javascript':
4343
// We want to also delete the nested `lite` client or folders that only exists in JS
4444
if (clientName === 'algoliasearch') {
45-
await run(
46-
`rm -rf ${toAbsolutePath(path.resolve('..', output, 'lite'))}`,
47-
{
48-
verbose,
49-
}
50-
);
45+
await fsp.rm(toAbsolutePath(path.resolve('..', output, 'lite')), {
46+
force: true,
47+
recursive: true,
48+
});
5149
}
5250

5351
// Delete `builds` folder
54-
await run(
55-
`rm -rf ${toAbsolutePath(path.resolve('..', output, 'builds'))}`,
56-
{
57-
verbose,
58-
}
59-
);
60-
52+
await fsp.rm(toAbsolutePath(path.resolve('..', output, 'builds')), {
53+
force: true,
54+
recursive: true,
55+
});
6156
break;
6257
default:
6358
break;
6459
}
6560

6661
// Delete client model folder/file
67-
await run(
68-
`rm -rf ${toAbsolutePath(
69-
path.resolve('..', output, baseModelFolder, clientModel)
70-
)}`,
71-
{
72-
verbose,
73-
}
62+
await fsp.rm(
63+
toAbsolutePath(path.resolve('..', output, baseModelFolder, clientModel)),
64+
{ force: true, recursive: true }
7465
);
7566

7667
// Delete client api folder/file
77-
await run(
78-
`rm -rf ${toAbsolutePath(
79-
path.resolve('..', output, baseApiFolder, clientApi)
80-
)}`,
81-
{
82-
verbose,
83-
}
68+
await fsp.rm(
69+
toAbsolutePath(path.resolve('..', output, baseApiFolder, clientApi)),
70+
{ force: true, recursive: true }
8471
);
8572
}

scripts/release/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export async function cloneRepository({
3737

3838
const gitHubUrl = getGitHubUrl(lang, { token: githubToken });
3939
const tempGitDir = path.resolve(tempDir, lang);
40-
await run(`rm -rf ${tempGitDir}`);
40+
await fsp.rm(tempGitDir, { force: true, recursive: true });
4141
await run(
4242
`git clone --depth 1 --branch ${targetBranch} ${gitHubUrl} ${tempGitDir}`
4343
);

0 commit comments

Comments
 (0)