update packageName logic

Author: shortcuts

config/openapitools.json

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

scripts/common.ts

@@ -41,8 +41,7 @@ export const GENERATORS: Record<string, Generator> = {
     client: 'algoliasearch',
     key: 'javascript-algoliasearch',
     additionalProperties: {
-      buildFile: 'algoliasearch',
-      packageName: '@experimental-api-clients-automation/algoliasearch',
+      packageName: 'algoliasearch',
       packageVersion: getPackageVersionDefault('javascript'),
     },
   },

scripts/release/updateAPIVersions.ts

@@ -65,7 +65,7 @@ async function updateVersionForJavascript(
   );
 
   if (!nodePgPackageFile || !browserPgPackageFile) {
-    throw new Error('Failed to bump playground package files');
+    throw new Error('Failed to read playground package files');
   }
 
   // Sets the new version of the JavaScript client

scripts/types.ts

@@ -28,7 +28,6 @@ export type Generator = Record<string, any> & {
 
 export type AdditionalProperties = Partial<{
   packageName: string;
-  hasRegionalHost: boolean;
 }> &
   Record<string, any>;
 

templates/javascript/index.mustache

@@ -1,2 +1,2 @@
 // eslint-disable-next-line import/no-commonjs,import/extensions
-module.exports = require('./dist/{{buildFile}}.cjs.node.js');
+module.exports = require('./dist/{{packageName}}.cjs.node.js');

templates/javascript/package.mustache

@@ -1,15 +1,15 @@
 {
-  "name": "{{packageName}}",
+  "name": "{{{npmNamespace}}}/{{packageName}}",
   "version": "{{packageVersion}}",
   "description": "JavaScript client for {{packageName}}",
   "repository": "{{gitUserId}}/{{gitRepoId}}",
   "license": "MIT",
   "author": "Algolia",
   "main": "index.js",
-  "jsdelivr": "dist/{{buildFile}}.umd.browser.js",
-  "unpkg": "dist/{{buildFile}}.umd.browser.js",
-  "module": "dist/{{buildFile}}.esm.node.js",
-  "browser": "dist/{{buildFile}}.cjs.browser.js",
+  "jsdelivr": "dist/{{packageName}}.umd.browser.js",
+  "unpkg": "dist/{{packageName}}.umd.browser.js",
+  "module": "dist/{{packageName}}.esm.node.js",
+  "browser": "dist/{{packageName}}.cjs.browser.js",
   "types": "index.d.ts",
   "files": [
     "dist",

templates/javascript/tests/package.mustache

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     {{#packageDependencies}}
-    "{{{packageName}}}": "{{packageVersion}}",
+    "{{{npmNamespace}}}/{{{packageName}}}": "{{packageVersion}}",
     {{/packageDependencies}}
     "{{{npmNamespace}}}/client-common": "{{utilsPackageVersion}}",
     "{{{npmNamespace}}}/requester-node-http": "{{utilsPackageVersion}}"