fix(javascript): dependency imports and low-level init (generated)

algolia/api-clients-automation#3596 Co-authored-by: algolia-bot <[email protected]> Co-authored-by: Clément Vannicatte <[email protected]>
algolia · Aug 28, 2024 · f7841d5 · f7841d5
1 parent 1fecbf3
commit f7841d5
Show file tree

Hide file tree

Showing 18 changed files with 153 additions and 175 deletions.
diff --git a/base.rollup.config.js b/base.rollup.config.js
@@ -1,6 +1,5 @@
 import babel from '@rollup/plugin-babel';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
-import globals from 'rollup-plugin-node-globals';
 import terser from '@rollup/plugin-terser';
 import ts from 'rollup-plugin-typescript2';
 
@@ -271,11 +270,9 @@ export function buildConfigs(pkg) {
         input: baseConfig.input,
         external: [...baseConfig.external, ...baseConfig.dependencies],
         plugins: [
-          globals({
-            global: true,
-          }),
           nodeResolve({
             preferBuiltins: true,
+            exportConditions: [isUmdBuild || isEsmBrowserBuild ? 'browser' : 'node'],
           }),
           ts({
             check: checkForTypes,

diff --git a/packages/algoliasearch/__tests__/algoliasearch.browser.test.ts b/packages/algoliasearch/__tests__/algoliasearch.browser.test.ts
@@ -145,10 +145,11 @@ describe('api', () => {
     });
 
     it('default `init` clients to the root `algoliasearch` credentials', async () => {
-      const abtestingClient = client.initAbtesting();
-      const analyticsClient = client.initAnalytics();
+      const abtestingClient = client.initAbtesting({ options: { requester: echoRequester() } });
+      const analyticsClient = client.initAnalytics({ options: { requester: echoRequester() } });
       const personalizationClient = client.initPersonalization({
         region: 'eu',
+        options: { requester: echoRequester() },
       });
 
       const res1 = (await abtestingClient.customGet({
@@ -185,15 +186,18 @@ describe('api', () => {
       const abtestingClient = client.initAbtesting({
         appId: 'appId1',
         apiKey: 'apiKey1',
+        options: { requester: echoRequester() },
       });
       const analyticsClient = client.initAnalytics({
         appId: 'appId2',
         apiKey: 'apiKey2',
+        options: { requester: echoRequester() },
       });
       const personalizationClient = client.initPersonalization({
         appId: 'appId3',
         apiKey: 'apiKey3',
         region: 'eu',
+        options: { requester: echoRequester() },
       });
 
       const res1 = (await abtestingClient.customGet({

diff --git a/packages/algoliasearch/__tests__/algoliasearch.node.test.ts b/packages/algoliasearch/__tests__/algoliasearch.node.test.ts
@@ -144,10 +144,11 @@ describe('api', () => {
     });
 
     it('default `init` clients to the root `algoliasearch` credentials', async () => {
-      const abtestingClient = client.initAbtesting();
-      const analyticsClient = client.initAnalytics();
+      const abtestingClient = client.initAbtesting({ options: { requester: echoRequester() } });
+      const analyticsClient = client.initAnalytics({ options: { requester: echoRequester() } });
       const personalizationClient = client.initPersonalization({
         region: 'eu',
+        options: { requester: echoRequester() },
       });
 
       const res1 = (await abtestingClient.customGet({
@@ -184,15 +185,18 @@ describe('api', () => {
       const abtestingClient = client.initAbtesting({
         appId: 'appId1',
         apiKey: 'apiKey1',
+        options: { requester: echoRequester() },
       });
       const analyticsClient = client.initAnalytics({
         appId: 'appId2',
         apiKey: 'apiKey2',
+        options: { requester: echoRequester() },
       });
       const personalizationClient = client.initPersonalization({
         appId: 'appId3',
         apiKey: 'apiKey3',
         region: 'eu',
+        options: { requester: echoRequester() },
       });
 
       const res1 = (await abtestingClient.customGet({

diff --git a/packages/algoliasearch/builds/browser.ts b/packages/algoliasearch/builds/browser.ts
@@ -1,11 +1,10 @@
 // Code generated by OpenAPI Generator (https://openapi-generator.tech), manual changes will be lost - read more on https://github.com/algolia/api-clients-automation. DO NOT EDIT.
 
-import type { AbtestingClient } from '@algolia/client-abtesting';
-import type { Region as AbtestingRegion } from '@algolia/client-abtesting/src/abtestingClient';
-import { createAbtestingClient, REGIONS as abtestingRegions } from '@algolia/client-abtesting/src/abtestingClient';
-import type { AnalyticsClient } from '@algolia/client-analytics';
-import { createAnalyticsClient, REGIONS as analyticsRegions } from '@algolia/client-analytics/src/analyticsClient';
-import type { Region as AnalyticsRegion } from '@algolia/client-analytics/src/analyticsClient';
+import type { AbtestingClient, Region as AbtestingRegion } from '@algolia/client-abtesting';
+import { abtestingClient } from '@algolia/client-abtesting';
+import type { AnalyticsClient, Region as AnalyticsRegion } from '@algolia/client-analytics';
+import { analyticsClient } from '@algolia/client-analytics';
+import type { ClientOptions } from '@algolia/client-common';
 import {
   DEFAULT_CONNECT_TIMEOUT_BROWSER,
   DEFAULT_READ_TIMEOUT_BROWSER,
@@ -14,16 +13,11 @@ import {
   createFallbackableCache,
   createMemoryCache,
 } from '@algolia/client-common';
-import type { ClientOptions, CreateClientOptions } from '@algolia/client-common';
-import type { PersonalizationClient } from '@algolia/client-personalization';
-import type { Region as PersonalizationRegion } from '@algolia/client-personalization/src/personalizationClient';
-import {
-  createPersonalizationClient,
-  REGIONS as personalizationRegions,
-} from '@algolia/client-personalization/src/personalizationClient';
-import { createSearchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search/src/searchClient';
+import type { PersonalizationClient, Region as PersonalizationRegion } from '@algolia/client-personalization';
+import { personalizationClient } from '@algolia/client-personalization';
+import { searchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search';
 import type { RecommendClient } from '@algolia/recommend';
-import { createRecommendClient } from '@algolia/recommend/src/recommendClient';
+import { recommendClient } from '@algolia/recommend';
 import { createXhrRequester } from '@algolia/requester-browser-xhr';
 
 import type { InitClientOptions, InitClientRegion } from './models';
@@ -46,83 +40,57 @@ export function algoliasearch(appId: string, apiKey: string, options?: ClientOpt
   if (!apiKey || typeof apiKey !== 'string') {
     throw new Error('`apiKey` is missing.');
   }
-  const commonOptions: CreateClientOptions = {
-    apiKey,
-    appId,
-    timeouts: {
-      connect: DEFAULT_CONNECT_TIMEOUT_BROWSER,
-      read: DEFAULT_READ_TIMEOUT_BROWSER,
-      write: DEFAULT_WRITE_TIMEOUT_BROWSER,
-    },
-    requester: createXhrRequester(),
-    algoliaAgents: [{ segment: 'Browser' }],
-    authMode: 'WithinQueryParameters',
-    responsesCache: createMemoryCache(),
-    requestsCache: createMemoryCache({ serializable: false }),
-    hostsCache: createFallbackableCache({
-      caches: [createBrowserLocalStorageCache({ key: `${apiClientVersion}-${appId}` }), createMemoryCache()],
-    }),
-    ...options,
-  };
 
   function initRecommend(initOptions: InitClientOptions = {}): RecommendClient {
-    return createRecommendClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return recommendClient(initOptions.appId || appId, initOptions.apiKey || apiKey, initOptions.options);
   }
 
   function initAnalytics(initOptions: InitClientOptions & InitClientRegion<AnalyticsRegion> = {}): AnalyticsClient {
-    if (
-      initOptions.region &&
-      (typeof initOptions.region !== 'string' || !analyticsRegions.includes(initOptions.region))
-    ) {
-      throw new Error(`\`region\` must be one of the following: ${analyticsRegions.join(', ')}`);
-    }
-
-    return createAnalyticsClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return analyticsClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   function initAbtesting(initOptions: InitClientOptions & InitClientRegion<AbtestingRegion> = {}): AbtestingClient {
-    if (
-      initOptions.region &&
-      (typeof initOptions.region !== 'string' || !abtestingRegions.includes(initOptions.region))
-    ) {
-      throw new Error(`\`region\` must be one of the following: ${abtestingRegions.join(', ')}`);
-    }
-
-    return createAbtestingClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return abtestingClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   function initPersonalization(
     initOptions: InitClientOptions & Required<InitClientRegion<PersonalizationRegion>>,
   ): PersonalizationClient {
-    if (
-      !initOptions.region ||
-      (initOptions.region &&
-        (typeof initOptions.region !== 'string' || !personalizationRegions.includes(initOptions.region)))
-    ) {
-      throw new Error(`\`region\` is required and must be one of the following: ${personalizationRegions.join(', ')}`);
-    }
-
-    return createPersonalizationClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return personalizationClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   return {
-    ...createSearchClient(commonOptions),
+    ...searchClient(appId, apiKey, {
+      timeouts: {
+        connect: DEFAULT_CONNECT_TIMEOUT_BROWSER,
+        read: DEFAULT_READ_TIMEOUT_BROWSER,
+        write: DEFAULT_WRITE_TIMEOUT_BROWSER,
+      },
+      requester: createXhrRequester(),
+      algoliaAgents: [{ segment: 'Browser' }],
+      authMode: 'WithinQueryParameters',
+      responsesCache: createMemoryCache(),
+      requestsCache: createMemoryCache({ serializable: false }),
+      hostsCache: createFallbackableCache({
+        caches: [createBrowserLocalStorageCache({ key: `${apiClientVersion}-${appId}` }), createMemoryCache()],
+      }),
+      ...options,
+    }),
     /**
      * Get the value of the `algoliaAgent`, used by our libraries internally and telemetry system.
      */

diff --git a/packages/algoliasearch/builds/node.ts b/packages/algoliasearch/builds/node.ts
@@ -2,12 +2,11 @@
 
 import { createHmac } from 'node:crypto';
 
-import type { AbtestingClient } from '@algolia/client-abtesting';
-import type { Region as AbtestingRegion } from '@algolia/client-abtesting/src/abtestingClient';
-import { createAbtestingClient, REGIONS as abtestingRegions } from '@algolia/client-abtesting/src/abtestingClient';
-import type { AnalyticsClient } from '@algolia/client-analytics';
-import { createAnalyticsClient, REGIONS as analyticsRegions } from '@algolia/client-analytics/src/analyticsClient';
-import type { Region as AnalyticsRegion } from '@algolia/client-analytics/src/analyticsClient';
+import type { AbtestingClient, Region as AbtestingRegion } from '@algolia/client-abtesting';
+import { abtestingClient } from '@algolia/client-abtesting';
+import type { AnalyticsClient, Region as AnalyticsRegion } from '@algolia/client-analytics';
+import { analyticsClient } from '@algolia/client-analytics';
+import type { ClientOptions } from '@algolia/client-common';
 import {
   DEFAULT_CONNECT_TIMEOUT_NODE,
   DEFAULT_READ_TIMEOUT_NODE,
@@ -16,16 +15,11 @@ import {
   createNullCache,
   serializeQueryParameters,
 } from '@algolia/client-common';
-import type { ClientOptions, CreateClientOptions } from '@algolia/client-common';
-import type { PersonalizationClient } from '@algolia/client-personalization';
-import type { Region as PersonalizationRegion } from '@algolia/client-personalization/src/personalizationClient';
-import {
-  createPersonalizationClient,
-  REGIONS as personalizationRegions,
-} from '@algolia/client-personalization/src/personalizationClient';
-import { createSearchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search/src/searchClient';
+import type { PersonalizationClient, Region as PersonalizationRegion } from '@algolia/client-personalization';
+import { personalizationClient } from '@algolia/client-personalization';
+import { searchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search';
 import type { RecommendClient } from '@algolia/recommend';
-import { createRecommendClient } from '@algolia/recommend/src/recommendClient';
+import { recommendClient } from '@algolia/recommend';
 import { createHttpRequester } from '@algolia/requester-node-http';
 
 import type {
@@ -53,80 +47,54 @@ export function algoliasearch(appId: string, apiKey: string, options?: ClientOpt
   if (!apiKey || typeof apiKey !== 'string') {
     throw new Error('`apiKey` is missing.');
   }
-  const commonOptions: CreateClientOptions = {
-    apiKey,
-    appId,
-    timeouts: {
-      connect: DEFAULT_CONNECT_TIMEOUT_NODE,
-      read: DEFAULT_READ_TIMEOUT_NODE,
-      write: DEFAULT_WRITE_TIMEOUT_NODE,
-    },
-    requester: createHttpRequester(),
-    algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
-    responsesCache: createNullCache(),
-    requestsCache: createNullCache(),
-    hostsCache: createMemoryCache(),
-    ...options,
-  };
 
   function initRecommend(initOptions: InitClientOptions = {}): RecommendClient {
-    return createRecommendClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return recommendClient(initOptions.appId || appId, initOptions.apiKey || apiKey, initOptions.options);
   }
 
   function initAnalytics(initOptions: InitClientOptions & InitClientRegion<AnalyticsRegion> = {}): AnalyticsClient {
-    if (
-      initOptions.region &&
-      (typeof initOptions.region !== 'string' || !analyticsRegions.includes(initOptions.region))
-    ) {
-      throw new Error(`\`region\` must be one of the following: ${analyticsRegions.join(', ')}`);
-    }
-
-    return createAnalyticsClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return analyticsClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   function initAbtesting(initOptions: InitClientOptions & InitClientRegion<AbtestingRegion> = {}): AbtestingClient {
-    if (
-      initOptions.region &&
-      (typeof initOptions.region !== 'string' || !abtestingRegions.includes(initOptions.region))
-    ) {
-      throw new Error(`\`region\` must be one of the following: ${abtestingRegions.join(', ')}`);
-    }
-
-    return createAbtestingClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return abtestingClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   function initPersonalization(
     initOptions: InitClientOptions & Required<InitClientRegion<PersonalizationRegion>>,
   ): PersonalizationClient {
-    if (
-      !initOptions.region ||
-      (initOptions.region &&
-        (typeof initOptions.region !== 'string' || !personalizationRegions.includes(initOptions.region)))
-    ) {
-      throw new Error(`\`region\` is required and must be one of the following: ${personalizationRegions.join(', ')}`);
-    }
-
-    return createPersonalizationClient({
-      ...commonOptions,
-      ...initOptions.options,
-      ...initOptions,
-    });
+    return personalizationClient(
+      initOptions.appId || appId,
+      initOptions.apiKey || apiKey,
+      initOptions.region,
+      initOptions.options,
+    );
   }
 
   return {
-    ...createSearchClient(commonOptions),
+    ...searchClient(appId, apiKey, {
+      timeouts: {
+        connect: DEFAULT_CONNECT_TIMEOUT_NODE,
+        read: DEFAULT_READ_TIMEOUT_NODE,
+        write: DEFAULT_WRITE_TIMEOUT_NODE,
+      },
+      requester: createHttpRequester(),
+      algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
+      responsesCache: createNullCache(),
+      requestsCache: createNullCache(),
+      hostsCache: createMemoryCache(),
+      ...options,
+    }),
     /**
      * Get the value of the `algoliaAgent`, used by our libraries internally and telemetry system.
      */