chore(cts): update dependencies on cts generation for javascript #490
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package com.algolia.codegen.cts.manager; | ||
|
|
||
| import com.algolia.codegen.Utils; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import java.util.*; | ||
| import org.openapitools.codegen.SupportingFile; | ||
|
|
||
| public abstract class CtsManager { | ||
|
|
||
| public abstract void addSupportingFiles(List<SupportingFile> supportingFiles); | ||
|
|
||
| public List<Object> getPackageDependencies() { | ||
| return null; | ||
| } | ||
|
|
||
| protected void addExtraToBundle(Map<String, Object> bundle) {} | ||
|
|
||
| public void addDataToBundle(Map<String, Object> bundle) { | ||
| bundle.put("packageDependencies", this.getPackageDependencies()); | ||
| this.addExtraToBundle(bundle); | ||
| } | ||
|
|
||
| protected Object[] getFilteredPackageVersions(List<String> packages) { | ||
| HashMap<String, String> result = new HashMap<>(); | ||
|
|
||
| // Read config/openapitools.js for JavaScript | ||
| JsonNode openApiToolsConfig = Utils.readJsonFile( | ||
| "config/openapitools.json" | ||
| ); | ||
| Iterator<JsonNode> generatorIterator = openApiToolsConfig | ||
| .get("generator-cli") | ||
| .get("generators") | ||
| .elements(); | ||
| while (generatorIterator.hasNext()) { | ||
| JsonNode generator = generatorIterator.next(); | ||
| JsonNode additionalProperties = generator.get("additionalProperties"); | ||
| if (!additionalProperties.has("packageVersion")) { | ||
| continue; | ||
| } | ||
| String packageName = additionalProperties.get("packageName").asText(); | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. And have this code that his specific to JS in the JavascriptCtsManager There was a problem hiding this comment. Bonne idée 2d04ade |
||
| String packageVersion = additionalProperties | ||
| .get("packageVersion") | ||
| .asText(); | ||
| if (packages.contains(packageName)) { | ||
| result.put(packageName, packageVersion); | ||
| } | ||
| } | ||
|
|
||
| JsonNode clientsConfig = Utils.readJsonFile("config/clients.config.json"); | ||
| Iterator<JsonNode> clientsIterator = clientsConfig.elements(); | ||
| while (clientsIterator.hasNext()) { | ||
| JsonNode client = clientsIterator.next(); | ||
|
|
||
| if (!client.has("packageVersion")) { | ||
| continue; | ||
| } | ||
| String packageName = client.get("packageName").asText(); | ||
| String packageVersion = client.get("packageVersion").asText(); | ||
| if (packages.contains(packageName)) { | ||
| result.put(packageName, packageVersion); | ||
| } | ||
| } | ||
|
|
||
| return result | ||
| .entrySet() | ||
| .stream() | ||
| .map(entry -> { | ||
| Map<String, String> newEntry = new HashMap<>(); | ||
| newEntry.put("packageName", entry.getKey()); | ||
| newEntry.put("packageVersion", entry.getValue()); | ||
| return newEntry; | ||
| }) | ||
| .toArray(Object[]::new); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.algolia.codegen.cts.manager; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| public class CtsManagerFactory { | ||
|
|
||
| public static CtsManager getManager(String language) { | ||
| switch (language) { | ||
| case "javascript": | ||
| return new JavaScriptCtsManager(); | ||
| case "java": | ||
| return new JavaCtsManager(); | ||
| case "php": | ||
| return new PhpCtsManager(); | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.algolia.codegen.cts.manager; | ||
|
|
||
| import java.util.*; | ||
| import org.openapitools.codegen.SupportingFile; | ||
|
|
||
| public class JavaCtsManager extends CtsManager { | ||
|
|
||
| public void addSupportingFiles(List<SupportingFile> supportingFiles) {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package com.algolia.codegen.cts.manager; | ||
|
|
||
| import com.algolia.codegen.Utils; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import java.util.*; | ||
| import org.openapitools.codegen.SupportingFile; | ||
|
|
||
| public class JavaScriptCtsManager extends CtsManager { | ||
|
|
||
| public void addSupportingFiles(List<SupportingFile> supportingFiles) { | ||
| supportingFiles.add( | ||
| new SupportingFile("package.mustache", ".", "package.json") | ||
| ); | ||
| } | ||
|
|
||
| public List<Object> getPackageDependencies() { | ||
| List<Object> result = new ArrayList<Object>(); | ||
|
|
||
| JsonNode openApiToolsConfig = Utils.readJsonFile( | ||
| "config/openapitools.json" | ||
| ); | ||
| Iterator<Map.Entry<String, JsonNode>> fieldIterator = openApiToolsConfig | ||
| .get("generator-cli") | ||
| .get("generators") | ||
| .fields(); | ||
|
|
||
| while (fieldIterator.hasNext()) { | ||
| Map.Entry<String, JsonNode> field = fieldIterator.next(); | ||
| if (!field.getKey().startsWith("javascript-")) { | ||
| continue; | ||
| } | ||
| JsonNode generator = field.getValue(); | ||
| JsonNode additionalProperties = generator.get("additionalProperties"); | ||
| String packageName = additionalProperties.get("packageName").asText(); | ||
| String packageVersion = additionalProperties | ||
| .get("packageVersion") | ||
| .asText(); | ||
|
|
||
| Map<String, String> newEntry = new HashMap<>(); | ||
| newEntry.put("packageName", packageName); | ||
| newEntry.put("packageVersion", packageVersion); | ||
| result.add(newEntry); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| protected void addExtraToBundle(Map<String, Object> bundle) { | ||
| bundle.put("utilsPackageVersion", this.getUtilsPackageVersion()); | ||
| } | ||
|
|
||
| private String getUtilsPackageVersion() { | ||
| JsonNode openApiToolsConfig = Utils.readJsonFile( | ||
| "config/openapitools.json" | ||
| ); | ||
|
|
||
| String utilsPackageVersion = openApiToolsConfig | ||
| .get("generator-cli") | ||
| .get("generators") | ||
| .get("javascript-search") | ||
| .get("additionalProperties") | ||
| .get("utilsPackageVersion") | ||
| .asText(); | ||
|
|
||
| return utilsPackageVersion; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.algolia.codegen.cts.manager; | ||
|
|
||
| import java.util.*; | ||
| import org.openapitools.codegen.SupportingFile; | ||
|
|
||
| public class PhpCtsManager extends CtsManager { | ||
|
|
||
| public void addSupportingFiles(List<SupportingFile> supportingFiles) {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "name": "javascript-tests", | ||
| "version": "1.0.0", | ||
| "scripts": { | ||
| "test": "jest" | ||
| }, | ||
| "dependencies": { | ||
| {{#packageDependencies}} | ||
| "{{{packageName}}}": "{{packageVersion}}", | ||
| {{/packageDependencies}} | ||
| "@experimental-api-clients-automation/client-common": "{{utilsPackageVersion}}", | ||
| "@experimental-api-clients-automation/requester-node-http": "{{utilsPackageVersion}}" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/jest": "27.4.1", | ||
| "@types/node": "16.11.26", | ||
| "jest": "27.5.1", | ||
| "ts-jest": "27.1.4", | ||
| "ts-node": "10.7.0", | ||
| "typescript": "4.6.3" | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very cool ! can you replace other instance of the code where we load a json by this method ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
de0c770