remove packageName

Author: shortcuts

config/openapitools.json

@@ -6,72 +6,62 @@
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-search",
         "reservedWordsMappings": "queryParameters=queryParameters,requestOptions=requestOptions",
         "additionalProperties": {
-          "packageName": "client-search",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-algoliasearch-lite": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/algoliasearch-lite",
         "reservedWordsMappings": "queryParameters=queryParameters,requestOptions=requestOptions",
         "additionalProperties": {
-          "packageName": "algoliasearch-lite",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-recommend": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/recommend",
         "reservedWordsMappings": "queryParameters=queryParameters",
         "additionalProperties": {
-          "packageName": "recommend",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-personalization": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-personalization",
         "additionalProperties": {
-          "packageName": "client-personalization",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-analytics": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-analytics",
         "additionalProperties": {
-          "packageName": "client-analytics",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-insights": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-insights",
         "additionalProperties": {
-          "packageName": "client-insights",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-abtesting": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-abtesting",
         "additionalProperties": {
-          "packageName": "client-abtesting",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-query-suggestions": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-query-suggestions",
         "additionalProperties": {
-          "packageName": "client-query-suggestions",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-sources": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-sources",
         "additionalProperties": {
-          "packageName": "client-sources",
           "packageVersion": "0.5.0"
         }
       },
       "javascript-predict": {
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-predict",
         "additionalProperties": {
-          "packageName": "client-predict",
           "packageVersion": "0.5.0"
         }
       },

generators/src/main/java/com/algolia/codegen/cts/manager/JavaScriptCTSManager.java

@@ -11,10 +11,14 @@ public class JavaScriptCTSManager implements CTSManager {
 
   private final String client;
   private final JsonNode openApiToolsConfig;
+  private final String packageName;
 
   public JavaScriptCTSManager(String client) {
     this.client = client;
     this.openApiToolsConfig = Utils.readJsonFile("config/openapitools.json").get("generator-cli").get("generators");
+
+    String output = this.openApiToolsConfig.get("javascript-" + client).get("output").asText();
+    this.packageName = Utils.getClientConfigField("javascript", "npmNamespace") + "/" + output.substring(output.lastIndexOf('/') + 1);
   }
 
   @Override
@@ -26,7 +30,7 @@ public void addSupportingFiles(List<SupportingFile> supportingFiles) {
   public void addDataToBundle(Map<String, Object> bundle) throws GeneratorException {
     bundle.put("packageDependencies", this.getPackageDependencies());
     bundle.put("utilsPackageVersion", Utils.getClientConfigField("javascript", "utilsPackageVersion"));
-    bundle.put("import", openApiToolsConfig.get("javascript-" + client).get("additionalProperties").get("packageName").asText());
+    bundle.put("import", this.packageName);
   }
 
   private List<Map<String, String>> getPackageDependencies() {
@@ -38,8 +42,9 @@ private List<Map<String, String>> getPackageDependencies() {
       }
       JsonNode generator = field.getValue();
       JsonNode additionalProperties = generator.get("additionalProperties");
-      String packageName = additionalProperties.get("packageName").asText();
+      String output = generator.get("output").asText();
       String packageVersion = additionalProperties.get("packageVersion").asText();
+      String packageName = output.substring(output.lastIndexOf('/') + 1);
 
       Map<String, String> newEntry = new HashMap<>();
       newEntry.put("packageName", packageName);

scripts/buildClients.ts

@@ -1,5 +1,5 @@
 import { CI, run } from './common';
-import { getLanguageFolder } from './config';
+import { getClientsConfigField, getLanguageFolder } from './config';
 import { createSpinner } from './oraLog';
 import type { Generator } from './types';
 
@@ -13,13 +13,18 @@ async function buildPerClient(
   verbose: boolean
 ): Promise<void> {
   const spinner = createSpinner(`building ${key}`, verbose).start();
+  const npmNamespace = getClientsConfigField(language, 'npmNamespace');
+
   switch (language) {
     case 'javascript':
-      await run(`yarn workspace ${additionalProperties?.packageName} clean`, {
-        verbose,
-      });
       await run(
-        `SKIP_UTILS=true yarn workspace algoliasearch-client-javascript build ${additionalProperties?.packageName}`,
+        `yarn workspace ${npmNamespace}/${additionalProperties.packageName} clean`,
+        {
+          verbose,
+        }
+      );
+      await run(
+        `SKIP_UTILS=true yarn workspace algoliasearch-client-javascript build ${npmNamespace}/${additionalProperties.packageName}`,
         { verbose }
       );
       break;

scripts/common.ts

@@ -35,7 +35,7 @@ export const ROOT_DIR = path.resolve(process.cwd(), '..');
 export const ROOT_ENV_PATH = path.resolve(ROOT_DIR, '.env');
 
 export const GENERATORS: Record<string, Generator> = {
-  // Default `algoliasearch` package as it's built similarly to generated clients
+  // Default `algoliasearch` package as it's an aggregation of generated clients
   'javascript-algoliasearch': {
     language: 'javascript',
     client: 'algoliasearch',
@@ -49,12 +49,23 @@ export const GENERATORS: Record<string, Generator> = {
 
 // Build `GENERATORS` from the openapitools file
 Object.entries(openapiConfig['generator-cli'].generators).forEach(
-  ([key, gen]) => {
+  ([key, { output, ...gen }]) => {
+    const language = key.slice(0, key.indexOf('-')) as Language;
+
     GENERATORS[key] = {
+      additionalProperties: {},
       ...gen,
-      output: gen.output.replace('#{cwd}/', ''),
-      ...splitGeneratorKey(key),
+      output: output.replace('#{cwd}/', ''),
+      client: key.slice(key.indexOf('-') + 1),
+      language,
+      key,
     };
+
+    if (language === 'javascript') {
+      GENERATORS[key].additionalProperties.packageName = output.substring(
+        output.lastIndexOf('/') + 1
+      );
+    }
   }
 );
 
@@ -76,17 +87,6 @@ export const CLIENTS = CLIENTS_JS.filter(
   (client) => client !== 'algoliasearch'
 );
 
-/**
- * Takes a generator key in the form 'language-client' and returns the Generator object.
- */
-export function splitGeneratorKey(
-  generatorKey: string
-): Pick<Generator, 'client' | 'key' | 'language'> {
-  const language = generatorKey.slice(0, generatorKey.indexOf('-')) as Language;
-  const client = generatorKey.slice(generatorKey.indexOf('-') + 1);
-  return { language, client, key: generatorKey };
-}
-
 export function createGeneratorKey({
   language,
   client,

scripts/types.ts

@@ -23,7 +23,7 @@ export type Generator = Record<string, any> & {
   language: Language;
   client: string;
   key: string;
-  additionalProperties?: AdditionalProperties;
+  additionalProperties: AdditionalProperties;
 };
 
 export type AdditionalProperties = Partial<{

website/docs/contributing/add-new-api-client.md

@@ -66,7 +66,6 @@ Below are the options you need to **make sure to define for your client**, other
 | Option                |         File          |        Language         | Description                                                                                                          |
 | --------------------- | :-------------------: | :---------------------: | -------------------------------------------------------------------------------------------------------------------- |
 | `output`              |  `openapitools.json`  |           All           | The output path of the client.                                                                                       |
-| `packageName`         |  `openapitools.json`  |       JavaScript        | Name of the API package, used in [CTS](/docs/contributing/testing/common-test-suite).                                |
 | `packageVersion`      |  `openapitools.json`  |       JavaScript        | The version you'd like to publish the first iteration of the generated client. It will be automatically incremented. |
 | `utilsPackageVersion` | `clients.config.json` |       JavaScript        | The version of the utils package. Every utils package should have synchronized version.                              |
 | `packageVersion`      | `clients.config.json` | All (except JavaScript) | The version you'd like to publish the first iteration of the generated client. It will be automatically incremented. |