Skip to content

Commit 72a29fb

Browse files
Fluf22Fluf22
authored
Merge branch 'main' into feat/kotlin-disjunctive-faceting
2 parents b7285d9 + 4e82751 commit 72a29fb

File tree

63 files changed

+546
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+546
-47
lines changed

‎clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/algoliasearch.browser.test.ts‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,35 @@
1-
import { test, expect } from 'vitest';
1+
/* eslint no-console: 0 */
22

3-
import { algoliasearch, apiClientVersion } from '../builds/browser';
3+
import { vi, test, expect } from 'vitest';
44

5-
const client = algoliasearch('APP_ID', 'API_KEY');
5+
import { LogLevelEnum } from '../../client-common/src/types';
6+
import { createConsoleLogger } from '../../logger-console/src/logger';
7+
import { algoliasearch, apiClientVersion } from '../builds/browser';
68

79
test('sets the ua', () => {
10+
const client = algoliasearch('APP_ID', 'API_KEY');
11+
812
expect(client.transporter.algoliaAgent).toEqual({
913
add: expect.any(Function),
1014
value: expect.stringContaining(
1115
`Algolia for JavaScript (${apiClientVersion}); Search (${apiClientVersion}); Browser`,
1216
),
1317
});
1418
});
19+
20+
test('with logger', () => {
21+
vi.spyOn(console, 'debug');
22+
vi.spyOn(console, 'info');
23+
vi.spyOn(console, 'error');
24+
25+
const client = algoliasearch('APP_ID', 'API_KEY', {
26+
logger: createConsoleLogger(LogLevelEnum.Debug),
27+
});
28+
29+
expect(async () => {
30+
await client.setSettings({ indexName: 'foo', indexSettings: {} });
31+
expect(console.debug).toHaveBeenCalledTimes(1);
32+
expect(console.info).toHaveBeenCalledTimes(1);
33+
expect(console.error).toHaveBeenCalledTimes(1);
34+
}).not.toThrow();
35+
});

‎clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/algoliasearch.common.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ describe('api', () => {
103103
url: 'APP_ID-2.algolianet.com',
104104
},
105105
]),
106+
logger: {
107+
debug: expect.any(Function),
108+
error: expect.any(Function),
109+
info: expect.any(Function),
110+
},
106111
hostsCache: {
107112
clear: expect.any(Function),
108113
delete: expect.any(Function),

‎clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/algoliasearch.fetch.test.ts‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,42 @@
1-
import { test, expect } from 'vitest';
1+
/* eslint no-console: 0 */
22

3-
import { algoliasearch, apiClientVersion } from '../builds/fetch';
3+
import { vi, test, expect } from 'vitest';
44

5-
const client = algoliasearch('APP_ID', 'API_KEY');
5+
import { LogLevelEnum } from '../../client-common/src/types';
6+
import { createConsoleLogger } from '../../logger-console/src/logger';
7+
import { algoliasearch, apiClientVersion } from '../builds/fetch';
68

79
test('sets the ua', () => {
10+
const client = algoliasearch('APP_ID', 'API_KEY');
811
expect(client.transporter.algoliaAgent).toEqual({
912
add: expect.any(Function),
1013
value: expect.stringContaining(`Algolia for JavaScript (${apiClientVersion}); Search (${apiClientVersion}); Fetch`),
1114
});
1215
});
1316

1417
test('forwards node search helpers', () => {
18+
const client = algoliasearch('APP_ID', 'API_KEY');
1519
expect(client.generateSecuredApiKey).not.toBeUndefined();
1620
expect(client.getSecuredApiKeyRemainingValidity).not.toBeUndefined();
1721
expect(() => {
1822
const resp = client.generateSecuredApiKey({ parentApiKey: 'foo', restrictions: { validUntil: 200 } });
1923
client.getSecuredApiKeyRemainingValidity({ securedApiKey: resp });
2024
}).not.toThrow();
2125
});
26+
27+
test('with logger', () => {
28+
vi.spyOn(console, 'debug');
29+
vi.spyOn(console, 'info');
30+
vi.spyOn(console, 'error');
31+
32+
const client = algoliasearch('APP_ID', 'API_KEY', {
33+
logger: createConsoleLogger(LogLevelEnum.Debug),
34+
});
35+
36+
expect(async () => {
37+
await client.setSettings({ indexName: 'foo', indexSettings: {} });
38+
expect(console.debug).toHaveBeenCalledTimes(1);
39+
expect(console.info).toHaveBeenCalledTimes(1);
40+
expect(console.error).toHaveBeenCalledTimes(1);
41+
}).not.toThrow();
42+
});

‎clients/algoliasearch-client-javascript/packages/algoliasearch/__tests__/algoliasearch.node.test.ts‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
import { test, expect } from 'vitest';
1+
/* eslint no-console: 0 */
22

3-
import { algoliasearch, apiClientVersion } from '../builds/node';
3+
import { vi, test, expect } from 'vitest';
44

5-
const client = algoliasearch('APP_ID', 'API_KEY');
5+
import { LogLevelEnum } from '../../client-common/src/types';
6+
import { createConsoleLogger } from '../../logger-console/src/logger';
7+
import { algoliasearch, apiClientVersion } from '../builds/node';
68

79
test('sets the ua', () => {
10+
const client = algoliasearch('APP_ID', 'API_KEY');
811
expect(client.transporter.algoliaAgent).toEqual({
912
add: expect.any(Function),
1013
value: expect.stringContaining(
@@ -14,10 +17,28 @@ test('sets the ua', () => {
1417
});
1518

1619
test('forwards node search helpers', () => {
20+
const client = algoliasearch('APP_ID', 'API_KEY');
1721
expect(client.generateSecuredApiKey).not.toBeUndefined();
1822
expect(client.getSecuredApiKeyRemainingValidity).not.toBeUndefined();
1923
expect(() => {
2024
const resp = client.generateSecuredApiKey({ parentApiKey: 'foo', restrictions: { validUntil: 200 } });
2125
client.getSecuredApiKeyRemainingValidity({ securedApiKey: resp });
2226
}).not.toThrow();
2327
});
28+
29+
test('with logger', () => {
30+
vi.spyOn(console, 'debug');
31+
vi.spyOn(console, 'info');
32+
vi.spyOn(console, 'error');
33+
34+
const client = algoliasearch('APP_ID', 'API_KEY', {
35+
logger: createConsoleLogger(LogLevelEnum.Debug),
36+
});
37+
38+
expect(async () => {
39+
await client.setSettings({ indexName: 'foo', indexSettings: {} });
40+
expect(console.debug).toHaveBeenCalledTimes(1);
41+
expect(console.info).toHaveBeenCalledTimes(1);
42+
expect(console.error).toHaveBeenCalledTimes(1);
43+
}).not.toThrow();
44+
});

‎clients/algoliasearch-client-javascript/packages/algoliasearch/lite/builds/browser.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import type { ClientOptions } from '@algolia/client-common';
44
import {
5+
createNullLogger,
56
createMemoryCache,
67
createFallbackableCache,
78
createBrowserLocalStorageCache,
@@ -35,6 +36,7 @@ export function liteClient(appId: string, apiKey: string, options?: ClientOption
3536
read: DEFAULT_READ_TIMEOUT_BROWSER,
3637
write: DEFAULT_WRITE_TIMEOUT_BROWSER,
3738
},
39+
logger: createNullLogger(),
3840
requester: createXhrRequester(),
3941
algoliaAgents: [{ segment: 'Browser' }],
4042
authMode: 'WithinQueryParameters',

‎clients/algoliasearch-client-javascript/packages/algoliasearch/lite/builds/node.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import type { ClientOptions } from '@algolia/client-common';
44
import {
5+
createNullLogger,
56
createMemoryCache,
67
createNullCache,
78
DEFAULT_CONNECT_TIMEOUT_NODE,
@@ -34,6 +35,7 @@ export function liteClient(appId: string, apiKey: string, options?: ClientOption
3435
read: DEFAULT_READ_TIMEOUT_NODE,
3536
write: DEFAULT_WRITE_TIMEOUT_NODE,
3637
},
38+
logger: createNullLogger(),
3739
requester: createHttpRequester(),
3840
algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
3941
responsesCache: createNullCache(),

‎clients/algoliasearch-client-javascript/packages/client-abtesting/builds/browser.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import type { ClientOptions } from '@algolia/client-common';
44
import {
5+
createNullLogger,
56
createMemoryCache,
67
createFallbackableCache,
78
createBrowserLocalStorageCache,
@@ -46,6 +47,7 @@ export function abtestingClient(
4647
read: DEFAULT_READ_TIMEOUT_BROWSER,
4748
write: DEFAULT_WRITE_TIMEOUT_BROWSER,
4849
},
50+
logger: createNullLogger(),
4951
requester: createXhrRequester(),
5052
algoliaAgents: [{ segment: 'Browser' }],
5153
authMode: 'WithinQueryParameters',

‎clients/algoliasearch-client-javascript/packages/client-abtesting/builds/fetch.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import type { ClientOptions } from '@algolia/client-common';
44
import {
5+
createNullLogger,
56
createMemoryCache,
67
createNullCache,
78
DEFAULT_CONNECT_TIMEOUT_NODE,
@@ -46,6 +47,7 @@ export function abtestingClient(
4647
read: DEFAULT_READ_TIMEOUT_NODE,
4748
write: DEFAULT_WRITE_TIMEOUT_NODE,
4849
},
50+
logger: createNullLogger(),
4951
algoliaAgents: [{ segment: 'Fetch' }],
5052
requester: createFetchRequester(),
5153
responsesCache: createNullCache(),

‎clients/algoliasearch-client-javascript/packages/client-abtesting/builds/node.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import type { ClientOptions } from '@algolia/client-common';
44
import {
5+
createNullLogger,
56
createMemoryCache,
67
createNullCache,
78
DEFAULT_CONNECT_TIMEOUT_NODE,
@@ -46,6 +47,7 @@ export function abtestingClient(
4647
read: DEFAULT_READ_TIMEOUT_NODE,
4748
write: DEFAULT_WRITE_TIMEOUT_NODE,
4849
},
50+
logger: createNullLogger(),
4951
requester: createHttpRequester(),
5052
algoliaAgents: [{ segment: 'Node.js', version: process.versions.node }],
5153
responsesCache: createNullCache(),

‎clients/algoliasearch-client-javascript/packages/client-abtesting/src/abtestingClient.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,13 @@ export function createAbtestingClient({
351351
const requestPath = '/2/abtests';
352352
const headers: Headers = {};
353353
const queryParameters: QueryParameters = {};
354-
355354
if (offset !== undefined) {
356355
queryParameters.offset = offset.toString();
357356
}
357+
358358
if (limit !== undefined) {
359359
queryParameters.limit = limit.toString();
360360
}
361-
362361
if (indexPrefix !== undefined) {
363362
queryParameters.indexPrefix = indexPrefix.toString();
364363
}

0 commit comments

Comments
 (0)