Skip to content

Commit c7eff09

Browse files
committed
codegen deletion for JS
1 parent 1bd2c75 commit c7eff09

File tree

3 files changed

+36
-7
lines changed

3 files changed

+36
-7
lines changed

generators/src/main/java/com/algolia/codegen/AlgoliaJavaScriptGenerator.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,30 @@ public void processOpts() {
4747

4848
// `client` related files, `algoliasearch` have it's own logic below
4949
if (!isAlgoliasearchClient) {
50-
// builds
51-
supportingFiles.add(new SupportingFile("client/builds/browser.mustache", "builds", "browser.ts"));
52-
supportingFiles.add(new SupportingFile("client/builds/node.mustache", "builds", "node.ts"));
53-
5450
// models
5551
supportingFiles.add(new SupportingFile("client/model/clientMethodProps.mustache", "model", "clientMethodProps.ts"));
5652
supportingFiles.add(new SupportingFile("client/model/modelBarrel.mustache", "model", "index.ts"));
53+
54+
// builds
55+
supportingFiles.add(new SupportingFile("client/builds/browser.mustache", "builds", "browser.ts"));
56+
supportingFiles.add(new SupportingFile("client/builds/node.mustache", "builds", "node.ts"));
5757
}
5858
// `algoliasearch` related files
5959
else {
60-
// builds
60+
// `algoliasearch` builds
6161
supportingFiles.add(new SupportingFile("algoliasearch/builds/browser.mustache", "builds", "browser.ts"));
6262
supportingFiles.add(new SupportingFile("algoliasearch/builds/node.mustache", "builds", "node.ts"));
6363
supportingFiles.add(new SupportingFile("algoliasearch/builds/models.mustache", "builds", "models.ts"));
6464

65-
// root `lite` export files
65+
// `lite` builds
66+
supportingFiles.add(new SupportingFile("client/builds/browser.mustache", "lite/builds", "browser.ts"));
67+
supportingFiles.add(new SupportingFile("client/builds/node.mustache", "lite/builds", "node.ts"));
68+
69+
// `lite` models
70+
supportingFiles.add(new SupportingFile("client/model/clientMethodProps.mustache", "lite/model", "clientMethodProps.ts"));
71+
supportingFiles.add(new SupportingFile("client/model/modelBarrel.mustache", "lite/model", "index.ts"));
72+
73+
// `lite root export files
6674
supportingFiles.add(new SupportingFile("algoliasearch/lite.mustache", "", "lite.js"));
6775
supportingFiles.add(new SupportingFile("algoliasearch/lite.d.mustache", "", "lite.d.ts"));
6876
}

scripts/pre-gen/removeExistingCodegen.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export async function removeExistingCodegen(
1717

1818
let clientModel = '';
1919
let clientApi = '';
20+
2021
switch (language) {
2122
case 'java':
2223
clientModel = client;
@@ -25,6 +26,26 @@ export async function removeExistingCodegen(
2526
case 'php':
2627
clientModel = clientName;
2728
clientApi = `${clientName}*.php`;
29+
break;
30+
case 'javascript':
31+
// We want to also delete the nested `lite` client or folders that only exists in JS
32+
if (clientName === 'algoliasearch') {
33+
await run(
34+
`rm -rf ${toAbsolutePath(path.resolve('..', output, 'lite'))}`,
35+
{
36+
verbose,
37+
}
38+
);
39+
}
40+
41+
// Delete `builds` folder
42+
await run(
43+
`rm -rf ${toAbsolutePath(path.resolve('..', output, 'builds'))}`,
44+
{
45+
verbose,
46+
}
47+
);
48+
2849
break;
2950
default:
3051
break;

scripts/release/updateAPIVersions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export async function updateAPIVersions(
197197
/*
198198
About bumping versions of JS clients:
199199
200-
There are generated clients in JS repo, and non-generated clients like `algoliasearch`, `client-common`, etc.
200+
There are generated clients in JS repo, and non-generated clients like `client-common`, `requester-*`
201201
Now that the versions of generated clients are updated in `openapitools.json`,
202202
the generation output will have correct new versions.
203203

0 commit comments

Comments
 (0)