Skip to content

Commit eb108de

Browse files
authored
fix(javascript): provide more options to algoliasearch (#877)
1 parent 7c26c5e commit eb108de

File tree

9 files changed

+18
-16
lines changed

9 files changed

+18
-16
lines changed

clients/algoliasearch-client-javascript/packages/client-common/src/types/CreateClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export type CreateClientOptions = Omit<
1818
algoliaAgents: AlgoliaAgentOptions[];
1919
};
2020

21-
export type InitClientOptions = Partial<
21+
export type ClientOptions = Partial<
2222
Omit<CreateClientOptions, 'apiKey' | 'appId'>
2323
>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { createXhrRequester } from '{{{npmNamespace}}}/requester-browser-xhr';
1717
export function algoliasearch(
1818
appId: string,
1919
apiKey: string,
20-
options?: CommonClientOptions
20+
options?: ClientOptions
2121
) {
2222
{{> algoliasearch/builds/checkParameters}}
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { createPersonalizationClient, REGIONS as personalizationRegions } from '
99

1010
import { createSearchClient, apiClientVersion as searchClientVersion } from '{{{npmNamespace}}}/client-search/src/searchClient';
1111

12-
import type { CreateClientOptions } from '{{{npmNamespace}}}/client-common';
13-
import { CommonInitOptions, InitRegion, CommonClientOptions } from "./models"
12+
import type { CreateClientOptions, ClientOptions } from '{{{npmNamespace}}}/client-common';
13+
import { InitClientOptions, InitClientRegion } from "./models"
1414

1515
export * from './models';
1616

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function initAnalytics(initOptions: CommonInitOptions & InitRegion<AnalyticsRegion> = {}): AnalyticsClient {
1+
function initAnalytics(initOptions: InitClientOptions & InitClientRegion<AnalyticsRegion> = {}): AnalyticsClient {
22
if (
33
initOptions.region &&
44
(typeof initOptions.region !== 'string' ||
@@ -16,7 +16,7 @@ function initAnalytics(initOptions: CommonInitOptions & InitRegion<AnalyticsRegi
1616
});
1717
}
1818

19-
function initAbtesting(initOptions: CommonInitOptions & InitRegion<AbtestingRegion> = {}): AbtestingClient {
19+
function initAbtesting(initOptions: InitClientOptions & InitClientRegion<AbtestingRegion> = {}): AbtestingClient {
2020
if (
2121
initOptions.region &&
2222
(typeof initOptions.region !== 'string' ||
@@ -34,7 +34,7 @@ function initAbtesting(initOptions: CommonInitOptions & InitRegion<AbtestingRegi
3434
});
3535
}
3636

37-
function initPersonalization(initOptions: CommonInitOptions & Required<InitRegion<PersonalizationRegion>>): PersonalizationClient {
37+
function initPersonalization(initOptions: InitClientOptions & Required<InitClientRegion<PersonalizationRegion>>): PersonalizationClient {
3838
if (!initOptions.region) {
3939
throw new Error('`region` is missing.');
4040
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import type {
44
Host,
55
Requester,
6+
ClientOptions,
67
} from '{{{npmNamespace}}}/client-common';
78
import {
89
ErrorBase,
@@ -24,9 +25,10 @@ export { AbtestingClient } from '{{{npmNamespace}}}/client-abtesting';
2425

2526
export { ErrorBase, PutProps, PostProps, DelProps, GetProps };
2627

27-
export type CommonClientOptions = { requester?: Requester; hosts?: Host[] };
28-
29-
export type CommonInitOptions = Partial<{
28+
/**
29+
* Options forwarded to the client initialized via the `init` method.
30+
*/
31+
export type InitClientOptions = Partial<{
3032
/**
3133
* App to target with the initialized client, defaults to the `algoliasearch` appId.
3234
*/
@@ -35,10 +37,10 @@ export type CommonInitOptions = Partial<{
3537
* API key of the targeted app ID, defaults to the `algoliasearch` apiKey.
3638
*/
3739
apiKey: string;
38-
options: CommonClientOptions;
40+
options: ClientOptions;
3941
}>;
4042

41-
export type InitRegion<TRegion> = Partial<{
43+
export type InitClientRegion<TRegion> = Partial<{
4244
/**
4345
* Available regions of the initialized client.
4446
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { createHttpRequester } from '{{{npmNamespace}}}/requester-node-http';
1616
export function algoliasearch(
1717
appId: string,
1818
apiKey: string,
19-
options?: CommonClientOptions
19+
options?: ClientOptions
2020
) {
2121
{{> algoliasearch/builds/checkParameters}}
2222

templates/javascript/clients/client/builds/browser.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { DEFAULT_CONNECT_TIMEOUT_BROWSER, DEFAULT_READ_TIMEOUT_BROWSER, DEFAULT_
77
export function {{apiName}}(
88
appId: string,
99
apiKey: string,{{#hasRegionalHost}}region{{#fallbackToAliasHost}}?{{/fallbackToAliasHost}}: Region,{{/hasRegionalHost}}
10-
options?: InitClientOptions
10+
options?: ClientOptions
1111
): {{capitalizedApiName}} {
1212
{{> client/builds/checkParameters}}
1313

templates/javascript/clients/client/builds/imports.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { InitClientOptions } from '{{{npmNamespace}}}/client-common';
1+
import type { ClientOptions } from '{{{npmNamespace}}}/client-common';
22
import { createMemoryCache, createFallbackableCache, createBrowserLocalStorageCache, createNullCache } from '{{{npmNamespace}}}/client-common';
33

44
import { create{{capitalizedApiName}}, apiClientVersion } from '../src/{{apiName}}';

templates/javascript/clients/client/builds/node.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { DEFAULT_CONNECT_TIMEOUT_NODE, DEFAULT_READ_TIMEOUT_NODE, DEFAULT_WRITE_
77
export function {{apiName}}(
88
appId: string,
99
apiKey: string,{{#hasRegionalHost}}region{{#fallbackToAliasHost}}?{{/fallbackToAliasHost}}: Region,{{/hasRegionalHost}}
10-
options?: InitClientOptions
10+
options?: ClientOptions
1111
): {{capitalizedApiName}} {
1212
{{> client/builds/checkParameters}}
1313

0 commit comments

Comments
 (0)