fix: templates

Author: shortcuts

generators/src/main/java/com/algolia/codegen/cts/AlgoliaCTSGenerator.java

@@ -147,6 +147,8 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 
       // We can put whatever we want in the bundle, and it will be accessible in the template
       bundle.put("mode", mode);
+      bundle.put("is" + Helpers.capitalize(client) + "Client", true);
+      bundle.put("isSearchClient", client.contains("search")); // just so algoliasearch is treated as a search client too
       bundle.put("client", Helpers.createClientName(importClientName, language) + "Client");
       bundle.put("clientPrefix", Helpers.createClientName(importClientName, language));
       bundle.put("hasRegionalHost", hasRegionalHost);

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

@@ -46,5 +46,7 @@ public void addDataToBundle(Map<String, Object> bundle) throws GeneratorExceptio
     bundle.put("utilsPackageVersion", Helpers.getPackageJsonVersion("client-common"));
     bundle.put("algoliasearchVersion", Helpers.getPackageJsonVersion("algoliasearch"));
     bundle.put("initMethod", "init" + Helpers.capitalize(Helpers.camelize(client)));
+    bundle.put("clientName", client.equals("algoliasearch") ? "liteClient" : "algoliasearch");
+    bundle.put("importPackage", client.equals("algoliasearch") ? "algoliasearch/lite" : "algoliasearch");
   }
 }

templates/javascript/clients/algoliasearch/builds/definition.mustache

@@ -22,7 +22,7 @@ export * from './models';
 export type Algoliasearch = SearchClient & {
     {{#dependencies}}
     {{#withInitMethod}}
-    init{{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}: (initOptions: InitClientOptions {{#dependencyHasRegionalHosts}}& {{#lambda.titlecase}}{{{dependencyName}}}RegionOptions{{/lambda.titlecase}}{{/dependencyHasRegionalHosts}}) => {{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}Client;
+    init{{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}: (initOptions{{^dependencyHasRegionalHosts}}?{{/dependencyHasRegionalHosts}}: InitClientOptions {{#dependencyHasRegionalHosts}}& {{#lambda.titlecase}}{{{dependencyName}}}RegionOptions{{/lambda.titlecase}}{{/dependencyHasRegionalHosts}}) => {{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}Client;
     {{/withInitMethod}}
     {{/dependencies}}
 };
@@ -50,7 +50,7 @@ export function algoliasearch(appId: string, apiKey: string, options?: ClientOpt
 
     {{#dependencies}}
     {{#withInitMethod}}
-    init{{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}: (initOptions: InitClientOptions {{#dependencyHasRegionalHosts}}& {{#lambda.titlecase}}{{{dependencyName}}}RegionOptions{{/lambda.titlecase}}{{/dependencyHasRegionalHosts}}): {{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}Client => {
+    init{{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}: (initOptions: InitClientOptions {{#dependencyHasRegionalHosts}}& {{#lambda.titlecase}}{{{dependencyName}}}RegionOptions{{/lambda.titlecase}}{{/dependencyHasRegionalHosts}}{{^dependencyHasRegionalHosts}}={}{{/dependencyHasRegionalHosts}}): {{#lambda.titlecase}}{{{dependencyName}}}{{/lambda.titlecase}}Client => {
       return {{{dependencyName}}}Client(initOptions.appId || appId, initOptions.apiKey || apiKey, {{#dependencyHasRegionalHosts}}initOptions.region,{{/dependencyHasRegionalHosts}}initOptions.options);
     },
     {{/withInitMethod}}

templates/javascript/tests/client/benchmark.mustache

@@ -1,7 +1,7 @@
 // {{generationBanner}}
 import { describe, test, expect } from 'vitest';
 
-import { {{client}}, {{#lambda.titlecase}}{{client}}{{/lambda.titlecase}} } from '{{{import}}}';
+import { {{{clientName}}} } from '{{{importPackage}}}';
 
 {{#blocksBenchmark}}
 {{> tests/client/tests}}

templates/javascript/tests/client/client.mustache

@@ -3,15 +3,15 @@
 // @ts-nocheck Failing tests will have type errors, but we cannot suppress them even with @ts-expect-error because it doesn't work for a block of lines.
 import { describe, test, expect } from 'vitest';
 
-import { {{client}}, {{#lambda.titlecase}}{{client}}{{/lambda.titlecase}} } from '{{{import}}}';
+import { {{{clientName}}} } from '{{{importPackage}}}';
 import { nodeEchoRequester } from '@algolia/requester-testing';
 import type { EchoResponse } from '@algolia/requester-testing';
 
 const appId = 'test-app-id';
 const apiKey = 'test-api-key';
 
-function createClient(): {{#lambda.titlecase}}{{client}}{{/lambda.titlecase}} {
-  return {{client}}(appId, apiKey, {{#hasRegionalHost}}'{{{defaultRegion}}}', {{/hasRegionalHost}}{ requester: nodeEchoRequester() });
+function createClient() {
+  return {{{clientName}}}(appId, apiKey, { requester: nodeEchoRequester() }){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'{{{defaultRegion}}}'} {{/hasRegionalHost}}){{/isSearchClient}};
 }
 
 {{#blocksClient}}
@@ -20,14 +20,8 @@ function createClient(): {{#lambda.titlecase}}{{client}}{{/lambda.titlecase}} {
 
 describe('init', () => {
   test('sets authMode', async () => {
-    const qpClient = {{client}}('foo', 'bar', {{#hasRegionalHost}}'us',{{/hasRegionalHost}}{
-      authMode: 'WithinQueryParameters',
-      requester: nodeEchoRequester(),
-    });
-    const headerClient = {{client}}('foo', 'bar', {{#hasRegionalHost}}'us',{{/hasRegionalHost}}{
-      authMode: 'WithinHeaders',
-      requester: nodeEchoRequester(),
-    });
+    const qpClient = {{{clientName}}}('foo', 'bar', { requester: nodeEchoRequester(), authMode: 'WithinQueryParameters' }){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'us'} {{/hasRegionalHost}}){{/isSearchClient}};
+    const headerClient = {{{clientName}}}('foo', 'bar', { requester: nodeEchoRequester(), authMode: 'WithinHeaders' }){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'us'} {{/hasRegionalHost}}){{/isSearchClient}};
 
     const qpResult = (await qpClient.customGet({
       path: '1/foo',

templates/javascript/tests/client/createClient.mustache

@@ -1 +1 @@
-{{^autoCreateClient}}const client = {{/autoCreateClient}}{{client}}('{{parametersWithDataTypeMap.appId.value}}','{{parametersWithDataTypeMap.apiKey.value}}',{{#hasRegionalHost}}'{{parametersWithDataTypeMap.region.value}}',{{/hasRegionalHost}}{ {{#useEchoRequester}}requester: nodeEchoRequester(),{{/useEchoRequester}}{{#hasCustomHosts}}hosts:[{{#customHosts}}{ url: 'localhost', port: {{port}}, accept: 'readWrite', protocol: 'http' },{{/customHosts}}]{{/hasCustomHosts}} });
+{{^autoCreateClient}}const client = {{/autoCreateClient}}{{{clientName}}}('{{parametersWithDataTypeMap.appId.value}}', '{{parametersWithDataTypeMap.apiKey.value}}', { {{#useEchoRequester}}requester: nodeEchoRequester(),{{/useEchoRequester}}{{#hasCustomHosts}}hosts:[{{#customHosts}}{ url: 'localhost', port: {{port}}, accept: 'readWrite', protocol: 'http' },{{/customHosts}}]{{/hasCustomHosts}} }){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'{{{parametersWithDataTypeMap.region.value}}}'} {{/hasRegionalHost}}){{/isSearchClient}}

templates/javascript/tests/e2e/e2e.mustache

@@ -6,7 +6,7 @@ import { union } from '../helpers';
 import * as dotenv from 'dotenv';
 
 dotenv.config({path:'../../.env'});
-import { {{client}} } from '{{{import}}}';
+import { {{{clientName}}} } from '{{{importPackage}}}';
 import type { RequestOptions } from '@algolia/client-common';
 
 if (!process.env.ALGOLIA_APPLICATION_ID) {
@@ -17,8 +17,7 @@ if (!process.env.{{e2eApiKey}}) {
   throw new Error("please provide an `{{e2eApiKey}}` env var for e2e tests");
 }
 
-const client = {{client}}(process.env.ALGOLIA_APPLICATION_ID, process.env.{{e2eApiKey}}, {{#hasRegionalHost}}'{{{defaultRegion}}}'{{/hasRegionalHost}});
-
+const client = {{{clientName}}}(process.env.ALGOLIA_APPLICATION_ID, process.env.{{e2eApiKey}}){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'{{{defaultRegion}}}'} {{/hasRegionalHost}}){{/isSearchClient}};
 
 {{#blocksE2E}}
 describe('{{operationId}}', () => {

templates/javascript/tests/requests/requests.mustache

@@ -1,16 +1,15 @@
 // {{generationBanner}}
 import { describe, test, expect } from 'vitest';
 
-import { algoliasearch } from 'algoliasearch';
+import { {{{clientName}}} } from '{{{importPackage}}}';
 import { nodeEchoRequester } from '@algolia/requester-testing';
 import type { EchoResponse } from '@algolia/requester-testing';
 import type { RequestOptions } from '@algolia/client-common';
 
 const appId = process.env.ALGOLIA_APPLICATION_ID || 'test_app_id';
 const apiKey = process.env.ALGOLIA_SEARCH_KEY || 'test_api_key';
 
-const algoliasearchClient = algoliasearch(appId, apiKey);
-const client = algoliasearchClient.{{{initMethod}}}({ {{#hasRegionalHost}}region:'{{{defaultRegion}}}',{{/hasRegionalHost}} options: { requester: nodeEchoRequester() }});
+const client = {{{clientName}}}(appId, apiKey, { requester: nodeEchoRequester() }){{^isSearchClient}}.{{{initMethod}}}({{#hasRegionalHost}} {region:'{{{defaultRegion}}}'} {{/hasRegionalHost}});{{/isSearchClient}};
 
 {{#blocksRequests}}
 describe('{{operationId}}', () => {