Skip to content

Commit f7841d5

Browse files
algolia-botshortcuts
algolia-bot
and
shortcuts
committed
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]>
1 parent 1fecbf3 commit f7841d5

File tree

18 files changed

+153
-175
lines changed

18 files changed

+153
-175
lines changed

‎base.rollup.config.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import babel from '@rollup/plugin-babel';
22
import { nodeResolve } from '@rollup/plugin-node-resolve';
3-
import globals from 'rollup-plugin-node-globals';
43
import terser from '@rollup/plugin-terser';
54
import ts from 'rollup-plugin-typescript2';
65

@@ -271,11 +270,9 @@ export function buildConfigs(pkg) {
271270
input: baseConfig.input,
272271
external: [...baseConfig.external, ...baseConfig.dependencies],
273272
plugins: [
274-
globals({
275-
global: true,
276-
}),
277273
nodeResolve({
278274
preferBuiltins: true,
275+
exportConditions: [isUmdBuild || isEsmBrowserBuild ? 'browser' : 'node'],
279276
}),
280277
ts({
281278
check: checkForTypes,

‎packages/algoliasearch/__tests__/algoliasearch.browser.test.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,11 @@ describe('api', () => {
145145
});
146146

147147
it('default `init` clients to the root `algoliasearch` credentials', async () => {
148-
const abtestingClient = client.initAbtesting();
149-
const analyticsClient = client.initAnalytics();
148+
const abtestingClient = client.initAbtesting({ options: { requester: echoRequester() } });
149+
const analyticsClient = client.initAnalytics({ options: { requester: echoRequester() } });
150150
const personalizationClient = client.initPersonalization({
151151
region: 'eu',
152+
options: { requester: echoRequester() },
152153
});
153154

154155
const res1 = (await abtestingClient.customGet({
@@ -185,15 +186,18 @@ describe('api', () => {
185186
const abtestingClient = client.initAbtesting({
186187
appId: 'appId1',
187188
apiKey: 'apiKey1',
189+
options: { requester: echoRequester() },
188190
});
189191
const analyticsClient = client.initAnalytics({
190192
appId: 'appId2',
191193
apiKey: 'apiKey2',
194+
options: { requester: echoRequester() },
192195
});
193196
const personalizationClient = client.initPersonalization({
194197
appId: 'appId3',
195198
apiKey: 'apiKey3',
196199
region: 'eu',
200+
options: { requester: echoRequester() },
197201
});
198202

199203
const res1 = (await abtestingClient.customGet({

‎packages/algoliasearch/__tests__/algoliasearch.node.test.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,11 @@ describe('api', () => {
144144
});
145145

146146
it('default `init` clients to the root `algoliasearch` credentials', async () => {
147-
const abtestingClient = client.initAbtesting();
148-
const analyticsClient = client.initAnalytics();
147+
const abtestingClient = client.initAbtesting({ options: { requester: echoRequester() } });
148+
const analyticsClient = client.initAnalytics({ options: { requester: echoRequester() } });
149149
const personalizationClient = client.initPersonalization({
150150
region: 'eu',
151+
options: { requester: echoRequester() },
151152
});
152153

153154
const res1 = (await abtestingClient.customGet({
@@ -184,15 +185,18 @@ describe('api', () => {
184185
const abtestingClient = client.initAbtesting({
185186
appId: 'appId1',
186187
apiKey: 'apiKey1',
188+
options: { requester: echoRequester() },
187189
});
188190
const analyticsClient = client.initAnalytics({
189191
appId: 'appId2',
190192
apiKey: 'apiKey2',
193+
options: { requester: echoRequester() },
191194
});
192195
const personalizationClient = client.initPersonalization({
193196
appId: 'appId3',
194197
apiKey: 'apiKey3',
195198
region: 'eu',
199+
options: { requester: echoRequester() },
196200
});
197201

198202
const res1 = (await abtestingClient.customGet({

‎packages/algoliasearch/builds/browser.ts‎

Lines changed: 44 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// 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.
22

3-
import type { AbtestingClient } from '@algolia/client-abtesting';
4-
import type { Region as AbtestingRegion } from '@algolia/client-abtesting/src/abtestingClient';
5-
import { createAbtestingClient, REGIONS as abtestingRegions } from '@algolia/client-abtesting/src/abtestingClient';
6-
import type { AnalyticsClient } from '@algolia/client-analytics';
7-
import { createAnalyticsClient, REGIONS as analyticsRegions } from '@algolia/client-analytics/src/analyticsClient';
8-
import type { Region as AnalyticsRegion } from '@algolia/client-analytics/src/analyticsClient';
3+
import type { AbtestingClient, Region as AbtestingRegion } from '@algolia/client-abtesting';
4+
import { abtestingClient } from '@algolia/client-abtesting';
5+
import type { AnalyticsClient, Region as AnalyticsRegion } from '@algolia/client-analytics';
6+
import { analyticsClient } from '@algolia/client-analytics';
7+
import type { ClientOptions } from '@algolia/client-common';
98
import {
109
DEFAULT_CONNECT_TIMEOUT_BROWSER,
1110
DEFAULT_READ_TIMEOUT_BROWSER,
@@ -14,16 +13,11 @@ import {
1413
createFallbackableCache,
1514
createMemoryCache,
1615
} from '@algolia/client-common';
17-
import type { ClientOptions, CreateClientOptions } from '@algolia/client-common';
18-
import type { PersonalizationClient } from '@algolia/client-personalization';
19-
import type { Region as PersonalizationRegion } from '@algolia/client-personalization/src/personalizationClient';
20-
import {
21-
createPersonalizationClient,
22-
REGIONS as personalizationRegions,
23-
} from '@algolia/client-personalization/src/personalizationClient';
24-
import { createSearchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search/src/searchClient';
16+
import type { PersonalizationClient, Region as PersonalizationRegion } from '@algolia/client-personalization';
17+
import { personalizationClient } from '@algolia/client-personalization';
18+
import { searchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search';
2519
import type { RecommendClient } from '@algolia/recommend';
26-
import { createRecommendClient } from '@algolia/recommend/src/recommendClient';
20+
import { recommendClient } from '@algolia/recommend';
2721
import { createXhrRequester } from '@algolia/requester-browser-xhr';
2822

2923
import type { InitClientOptions, InitClientRegion } from './models';
@@ -46,83 +40,57 @@ export function algoliasearch(appId: string, apiKey: string, options?: ClientOpt
4640
if (!apiKey || typeof apiKey !== 'string') {
4741
throw new Error('`apiKey` is missing.');
4842
}
49-
const commonOptions: CreateClientOptions = {
50-
apiKey,
51-
appId,
52-
timeouts: {
53-
connect: DEFAULT_CONNECT_TIMEOUT_BROWSER,
54-
read: DEFAULT_READ_TIMEOUT_BROWSER,
55-
write: DEFAULT_WRITE_TIMEOUT_BROWSER,
56-
},
57-
requester: createXhrRequester(),
58-
algoliaAgents: [{ segment: 'Browser' }],
59-
authMode: 'WithinQueryParameters',
60-
responsesCache: createMemoryCache(),
61-
requestsCache: createMemoryCache({ serializable: false }),
62-
hostsCache: createFallbackableCache({
63-
caches: [createBrowserLocalStorageCache({ key: `${apiClientVersion}-${appId}` }), createMemoryCache()],
64-
}),
65-
...options,
66-
};
6743

6844
function initRecommend(initOptions: InitClientOptions = {}): RecommendClient {
69-
return createRecommendClient({
70-
...commonOptions,
71-
...initOptions.options,
72-
...initOptions,
73-
});
45+
return recommendClient(initOptions.appId || appId, initOptions.apiKey || apiKey, initOptions.options);
7446
}
7547

7648
function initAnalytics(initOptions: InitClientOptions & InitClientRegion<AnalyticsRegion> = {}): AnalyticsClient {
77-
if (
78-
initOptions.region &&
79-
(typeof initOptions.region !== 'string' || !analyticsRegions.includes(initOptions.region))
80-
) {
81-
throw new Error(`\`region\` must be one of the following: ${analyticsRegions.join(', ')}`);
82-
}
83-
84-
return createAnalyticsClient({
85-
...commonOptions,
86-
...initOptions.options,
87-
...initOptions,
88-
});
49+
return analyticsClient(
50+
initOptions.appId || appId,
51+
initOptions.apiKey || apiKey,
52+
initOptions.region,
53+
initOptions.options,
54+
);
8955
}
9056

9157
function initAbtesting(initOptions: InitClientOptions & InitClientRegion<AbtestingRegion> = {}): AbtestingClient {
92-
if (
93-
initOptions.region &&
94-
(typeof initOptions.region !== 'string' || !abtestingRegions.includes(initOptions.region))
95-
) {
96-
throw new Error(`\`region\` must be one of the following: ${abtestingRegions.join(', ')}`);
97-
}
98-
99-
return createAbtestingClient({
100-
...commonOptions,
101-
...initOptions.options,
102-
...initOptions,
103-
});
58+
return abtestingClient(
59+
initOptions.appId || appId,
60+
initOptions.apiKey || apiKey,
61+
initOptions.region,
62+
initOptions.options,
63+
);
10464
}
10565

10666
function initPersonalization(
10767
initOptions: InitClientOptions & Required<InitClientRegion<PersonalizationRegion>>,
10868
): PersonalizationClient {
109-
if (
110-
!initOptions.region ||
111-
(initOptions.region &&
112-
(typeof initOptions.region !== 'string' || !personalizationRegions.includes(initOptions.region)))
113-
) {
114-
throw new Error(`\`region\` is required and must be one of the following: ${personalizationRegions.join(', ')}`);
115-
}
116-
117-
return createPersonalizationClient({
118-
...commonOptions,
119-
...initOptions.options,
120-
...initOptions,
121-
});
69+
return personalizationClient(
70+
initOptions.appId || appId,
71+
initOptions.apiKey || apiKey,
72+
initOptions.region,
73+
initOptions.options,
74+
);
12275
}
12376

12477
return {
125-
...createSearchClient(commonOptions),
78+
...searchClient(appId, apiKey, {
79+
timeouts: {
80+
connect: DEFAULT_CONNECT_TIMEOUT_BROWSER,
81+
read: DEFAULT_READ_TIMEOUT_BROWSER,
82+
write: DEFAULT_WRITE_TIMEOUT_BROWSER,
83+
},
84+
requester: createXhrRequester(),
85+
algoliaAgents: [{ segment: 'Browser' }],
86+
authMode: 'WithinQueryParameters',
87+
responsesCache: createMemoryCache(),
88+
requestsCache: createMemoryCache({ serializable: false }),
89+
hostsCache: createFallbackableCache({
90+
caches: [createBrowserLocalStorageCache({ key: `${apiClientVersion}-${appId}` }), createMemoryCache()],
91+
}),
92+
...options,
93+
}),
12694
/**
12795
* Get the value of the `algoliaAgent`, used by our libraries internally and telemetry system.
12896
*/

‎packages/algoliasearch/builds/node.ts‎

Lines changed: 41 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import { createHmac } from 'node:crypto';
44

5-
import type { AbtestingClient } from '@algolia/client-abtesting';
6-
import type { Region as AbtestingRegion } from '@algolia/client-abtesting/src/abtestingClient';
7-
import { createAbtestingClient, REGIONS as abtestingRegions } from '@algolia/client-abtesting/src/abtestingClient';
8-
import type { AnalyticsClient } from '@algolia/client-analytics';
9-
import { createAnalyticsClient, REGIONS as analyticsRegions } from '@algolia/client-analytics/src/analyticsClient';
10-
import type { Region as AnalyticsRegion } from '@algolia/client-analytics/src/analyticsClient';
5+
import type { AbtestingClient, Region as AbtestingRegion } from '@algolia/client-abtesting';
6+
import { abtestingClient } from '@algolia/client-abtesting';
7+
import type { AnalyticsClient, Region as AnalyticsRegion } from '@algolia/client-analytics';
8+
import { analyticsClient } from '@algolia/client-analytics';
9+
import type { ClientOptions } from '@algolia/client-common';
1110
import {
1211
DEFAULT_CONNECT_TIMEOUT_NODE,
1312
DEFAULT_READ_TIMEOUT_NODE,
@@ -16,16 +15,11 @@ import {
1615
createNullCache,
1716
serializeQueryParameters,
1817
} from '@algolia/client-common';
19-
import type { ClientOptions, CreateClientOptions } from '@algolia/client-common';
20-
import type { PersonalizationClient } from '@algolia/client-personalization';
21-
import type { Region as PersonalizationRegion } from '@algolia/client-personalization/src/personalizationClient';
22-
import {
23-
createPersonalizationClient,
24-
REGIONS as personalizationRegions,
25-
} from '@algolia/client-personalization/src/personalizationClient';
26-
import { createSearchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search/src/searchClient';
18+
import type { PersonalizationClient, Region as PersonalizationRegion } from '@algolia/client-personalization';
19+
import { personalizationClient } from '@algolia/client-personalization';
20+
import { searchClient, apiClientVersion as searchClientVersion } from '@algolia/client-search';
2721
import type { RecommendClient } from '@algolia/recommend';
28-
import { createRecommendClient } from '@algolia/recommend/src/recommendClient';
22+
import { recommendClient } from '@algolia/recommend';
2923
import { createHttpRequester } from '@algolia/requester-node-http';
3024

3125
import type {
@@ -53,80 +47,54 @@ export function algoliasearch(appId: string, apiKey: string, options?: ClientOpt
5347
if (!apiKey || typeof apiKey !== 'string') {
5448
throw new Error('`apiKey` is missing.');
5549
}
56-
const commonOptions: CreateClientOptions = {
57-
apiKey,
58-
appId,
59-
timeouts: {
60-
connect: DEFAULT_CONNECT_TIMEOUT_NODE,
61-
read: DEFAULT_READ_TIMEOUT_NODE,
62-
write: DEFAULT_WRITE_TIMEOUT_NODE,
63-
},
64-
requester: createHttpRequester(),
65-
algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
66-
responsesCache: createNullCache(),
67-
requestsCache: createNullCache(),
68-
hostsCache: createMemoryCache(),
69-
...options,
70-
};
7150

7251
function initRecommend(initOptions: InitClientOptions = {}): RecommendClient {
73-
return createRecommendClient({
74-
...commonOptions,
75-
...initOptions.options,
76-
...initOptions,
77-
});
52+
return recommendClient(initOptions.appId || appId, initOptions.apiKey || apiKey, initOptions.options);
7853
}
7954

8055
function initAnalytics(initOptions: InitClientOptions & InitClientRegion<AnalyticsRegion> = {}): AnalyticsClient {
81-
if (
82-
initOptions.region &&
83-
(typeof initOptions.region !== 'string' || !analyticsRegions.includes(initOptions.region))
84-
) {
85-
throw new Error(`\`region\` must be one of the following: ${analyticsRegions.join(', ')}`);
86-
}
87-
88-
return createAnalyticsClient({
89-
...commonOptions,
90-
...initOptions.options,
91-
...initOptions,
92-
});
56+
return analyticsClient(
57+
initOptions.appId || appId,
58+
initOptions.apiKey || apiKey,
59+
initOptions.region,
60+
initOptions.options,
61+
);
9362
}
9463

9564
function initAbtesting(initOptions: InitClientOptions & InitClientRegion<AbtestingRegion> = {}): AbtestingClient {
96-
if (
97-
initOptions.region &&
98-
(typeof initOptions.region !== 'string' || !abtestingRegions.includes(initOptions.region))
99-
) {
100-
throw new Error(`\`region\` must be one of the following: ${abtestingRegions.join(', ')}`);
101-
}
102-
103-
return createAbtestingClient({
104-
...commonOptions,
105-
...initOptions.options,
106-
...initOptions,
107-
});
65+
return abtestingClient(
66+
initOptions.appId || appId,
67+
initOptions.apiKey || apiKey,
68+
initOptions.region,
69+
initOptions.options,
70+
);
10871
}
10972

11073
function initPersonalization(
11174
initOptions: InitClientOptions & Required<InitClientRegion<PersonalizationRegion>>,
11275
): PersonalizationClient {
113-
if (
114-
!initOptions.region ||
115-
(initOptions.region &&
116-
(typeof initOptions.region !== 'string' || !personalizationRegions.includes(initOptions.region)))
117-
) {
118-
throw new Error(`\`region\` is required and must be one of the following: ${personalizationRegions.join(', ')}`);
119-
}
120-
121-
return createPersonalizationClient({
122-
...commonOptions,
123-
...initOptions.options,
124-
...initOptions,
125-
});
76+
return personalizationClient(
77+
initOptions.appId || appId,
78+
initOptions.apiKey || apiKey,
79+
initOptions.region,
80+
initOptions.options,
81+
);
12682
}
12783

12884
return {
129-
...createSearchClient(commonOptions),
85+
...searchClient(appId, apiKey, {
86+
timeouts: {
87+
connect: DEFAULT_CONNECT_TIMEOUT_NODE,
88+
read: DEFAULT_READ_TIMEOUT_NODE,
89+
write: DEFAULT_WRITE_TIMEOUT_NODE,
90+
},
91+
requester: createHttpRequester(),
92+
algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
93+
responsesCache: createNullCache(),
94+
requestsCache: createNullCache(),
95+
hostsCache: createMemoryCache(),
96+
...options,
97+
}),
13098
/**
13199
* Get the value of the `algoliaAgent`, used by our libraries internally and telemetry system.
132100
*/

0 commit comments

Comments
 (0)