From ff595a0f5c16d47fe42f0f22ef41dd360b15ad2d Mon Sep 17 00:00:00 2001 From: Dhaya <154633+dhayab@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:24:17 +0200 Subject: [PATCH 1/5] feat(preset-algolia): attach algolia credentials on hits --- .../src/types/AlgoliaInsightsHit.ts | 4 ++++ .../src/search/fetchAlgoliaResults.ts | 14 +++++++++++++- .../src/utils/__tests__/getAppIdAndApiKey.test.ts | 15 +++++++++++++++ .../src/utils/getAppIdAndApiKey.ts | 12 ++++++++++++ .../src/utils/index.ts | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts create mode 100644 packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts create mode 100644 packages/autocomplete-preset-algolia/src/utils/index.ts diff --git a/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts b/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts index 6b1a4f8e4..6099acfa2 100644 --- a/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts +++ b/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts @@ -2,4 +2,8 @@ export type AlgoliaInsightsHit = { objectID: string; __autocomplete_indexName: string; __autocomplete_queryID: string; + __autocomplete_algoliaResultsMetadata: { + appId: string; + apiKey: string; + }; }; diff --git a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts index 9cdadd06a..99115301e 100644 --- a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts +++ b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts @@ -10,6 +10,7 @@ import type { SearchResponse, SearchClient, } from '../types'; +import { getAppIdAndApiKey } from '../utils'; export interface SearchParams { /** @@ -43,6 +44,8 @@ export function fetchAlgoliaResults({ }); } + const [appId, apiKey] = getAppIdAndApiKey(searchClient); + return searchClient .search( queries.map((searchParameters) => { @@ -60,6 +63,15 @@ export function fetchAlgoliaResults({ }) ) .then((response) => { - return response.results; + return response.results.map((result) => ({ + ...result, + hits: result.hits?.map((hit) => ({ + ...hit, + __autocomplete_algoliaResultsMetadata: { + appId, + apiKey, + }, + })), + })); }); } diff --git a/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts b/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts new file mode 100644 index 000000000..4db8bde30 --- /dev/null +++ b/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts @@ -0,0 +1,15 @@ +import algoliasearchV4 from 'algoliasearch'; + +import { getAppIdAndApiKey } from '../getAppIdAndApiKey'; + +const APP_ID = 'myAppId'; +const API_KEY = 'myApiKey'; + +describe('getAppIdAndApiKey', () => { + it('gets appId and apiKey from searchClient', () => { + const searchClient = algoliasearchV4(APP_ID, API_KEY); + const [appId, apiKey] = getAppIdAndApiKey(searchClient); + expect(appId).toEqual(APP_ID); + expect(apiKey).toEqual(API_KEY); + }); +}); diff --git a/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts b/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts new file mode 100644 index 000000000..95308602d --- /dev/null +++ b/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts @@ -0,0 +1,12 @@ +import type { SearchClient } from '../types'; + +export function getAppIdAndApiKey( + searchClient: SearchClient +): [string, string] { + const { headers, queryParameters } = searchClient.transporter; + const APP_ID = 'x-algolia-application-id'; + const API_KEY = 'x-algolia-api-key'; + const appId = headers[APP_ID] || queryParameters[APP_ID]; + const apiKey = headers[API_KEY] || queryParameters[API_KEY]; + return [appId, apiKey]; +} diff --git a/packages/autocomplete-preset-algolia/src/utils/index.ts b/packages/autocomplete-preset-algolia/src/utils/index.ts new file mode 100644 index 000000000..4ae8e1aac --- /dev/null +++ b/packages/autocomplete-preset-algolia/src/utils/index.ts @@ -0,0 +1 @@ +export * from './getAppIdAndApiKey'; From c511d8fe7cdba1fcaced1113367534a9f0521a95 Mon Sep 17 00:00:00 2001 From: Dhaya <154633+dhayab@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:24:24 +0200 Subject: [PATCH 2/5] fix tests --- .../src/__tests__/requester.test.ts | 14 ++--- .../__tests__/fetchAlgoliaResults.test.ts | 52 +++++++++++++++++-- test/utils/createSearchClient.ts | 7 ++- 3 files changed, 61 insertions(+), 12 deletions(-) diff --git a/packages/autocomplete-js/src/__tests__/requester.test.ts b/packages/autocomplete-js/src/__tests__/requester.test.ts index 9670340f2..d439131d2 100644 --- a/packages/autocomplete-js/src/__tests__/requester.test.ts +++ b/packages/autocomplete-js/src/__tests__/requester.test.ts @@ -265,7 +265,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_id\\":0}", + "{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":0}", ] `); @@ -304,7 +304,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"7\\",\\"label\\":\\"Hit 7\\",\\"__autocomplete_id\\":4}", + "{\\"objectID\\":\\"7\\",\\"label\\":\\"Hit 7\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":4}", ] `); @@ -316,8 +316,8 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"3\\",\\"label\\":\\"Hit 3\\",\\"__autocomplete_id\\":5}", - "{\\"objectID\\":\\"4\\",\\"label\\":\\"Hit 4\\",\\"__autocomplete_id\\":6}", + "{\\"objectID\\":\\"3\\",\\"label\\":\\"Hit 3\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":5}", + "{\\"objectID\\":\\"4\\",\\"label\\":\\"Hit 4\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":6}", ] `); @@ -331,7 +331,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"5\\",\\"label\\":\\"Hit 5\\",\\"__autocomplete_id\\":7}", + "{\\"objectID\\":\\"5\\",\\"label\\":\\"Hit 5\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":7}", ] `); @@ -561,7 +561,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\"},\\"hitsPerPage\\":20,\\"__autocomplete_id\\":0}", + "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"hitsPerPage\\":20,\\"__autocomplete_id\\":0}", ] `); @@ -675,7 +675,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\"},\\"results\\":[{\\"page\\":0,\\"hitsPerPage\\":20,\\"nbHits\\":1,\\"nbPages\\":1,\\"processingTimeMS\\":0,\\"hits\\":[{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\"}],\\"query\\":\\"\\",\\"params\\":\\"\\",\\"exhaustiveNbHits\\":true,\\"exhaustiveFacetsCount\\":true}],\\"facetHits\\":[],\\"__autocomplete_id\\":0}", + "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"results\\":[{\\"page\\":0,\\"hitsPerPage\\":20,\\"nbHits\\":1,\\"nbPages\\":1,\\"processingTimeMS\\":0,\\"hits\\":[{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}}],\\"query\\":\\"\\",\\"params\\":\\"\\",\\"exhaustiveNbHits\\":true,\\"exhaustiveFacetsCount\\":true}],\\"facetHits\\":[],\\"__autocomplete_id\\":0}", ] `); diff --git a/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts b/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts index d1a9d8b3b..0e4324b11 100644 --- a/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts +++ b/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts @@ -65,8 +65,30 @@ describe('fetchAlgoliaResults', () => { }, ]); expect(results).toEqual([ - expect.objectContaining({ hits: [{ objectID: '1', label: 'Hit 1' }] }), - expect.objectContaining({ hits: [{ objectID: '2', label: 'Hit 2' }] }), + expect.objectContaining({ + hits: [ + { + objectID: '1', + label: 'Hit 1', + __autocomplete_algoliaResultsMetadata: { + appId: 'algoliaAppId', + apiKey: 'algoliaApiKey', + }, + }, + ], + }), + expect.objectContaining({ + hits: [ + { + objectID: '2', + label: 'Hit 2', + __autocomplete_algoliaResultsMetadata: { + appId: 'algoliaAppId', + apiKey: 'algoliaApiKey', + }, + }, + ], + }), ]); }); @@ -103,8 +125,30 @@ describe('fetchAlgoliaResults', () => { }, ]); expect(results).toEqual([ - expect.objectContaining({ hits: [{ objectID: '1', label: 'Hit 1' }] }), - expect.objectContaining({ hits: [{ objectID: '2', label: 'Hit 2' }] }), + expect.objectContaining({ + hits: [ + { + objectID: '1', + label: 'Hit 1', + __autocomplete_algoliaResultsMetadata: { + appId: 'algoliaAppId', + apiKey: 'algoliaApiKey', + }, + }, + ], + }), + expect.objectContaining({ + hits: [ + { + objectID: '2', + label: 'Hit 2', + __autocomplete_algoliaResultsMetadata: { + appId: 'algoliaAppId', + apiKey: 'algoliaApiKey', + }, + }, + ], + }), ]); }); diff --git a/test/utils/createSearchClient.ts b/test/utils/createSearchClient.ts index d2938d464..83f47cbbc 100644 --- a/test/utils/createSearchClient.ts +++ b/test/utils/createSearchClient.ts @@ -15,7 +15,12 @@ export function createSearchClient( addAlgoliaAgent: jest.fn(), clearCache: jest.fn(), initIndex: jest.fn(), - transporter: {} as any, + transporter: { + headers: { + 'x-algolia-application-id': 'algoliaAppId', + 'x-algolia-api-key': 'algoliaApiKey', + }, + } as any, search: jest.fn((requests) => Promise.resolve( createMultiSearchResponse( From aa60dda766e66bd84d798af7e02263447fee7206 Mon Sep 17 00:00:00 2001 From: Dhaya <154633+dhayab@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:24:52 +0200 Subject: [PATCH 3/5] return object instead of tuple --- .../src/search/fetchAlgoliaResults.ts | 2 +- .../src/utils/__tests__/getAppIdAndApiKey.test.ts | 2 +- .../src/utils/getAppIdAndApiKey.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts index 99115301e..68c86bde6 100644 --- a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts +++ b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts @@ -44,7 +44,7 @@ export function fetchAlgoliaResults({ }); } - const [appId, apiKey] = getAppIdAndApiKey(searchClient); + const { appId, apiKey } = getAppIdAndApiKey(searchClient); return searchClient .search( diff --git a/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts b/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts index 4db8bde30..d7606a08e 100644 --- a/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts +++ b/packages/autocomplete-preset-algolia/src/utils/__tests__/getAppIdAndApiKey.test.ts @@ -8,7 +8,7 @@ const API_KEY = 'myApiKey'; describe('getAppIdAndApiKey', () => { it('gets appId and apiKey from searchClient', () => { const searchClient = algoliasearchV4(APP_ID, API_KEY); - const [appId, apiKey] = getAppIdAndApiKey(searchClient); + const { appId, apiKey } = getAppIdAndApiKey(searchClient); expect(appId).toEqual(APP_ID); expect(apiKey).toEqual(API_KEY); }); diff --git a/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts b/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts index 95308602d..22955fc23 100644 --- a/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts +++ b/packages/autocomplete-preset-algolia/src/utils/getAppIdAndApiKey.ts @@ -2,11 +2,11 @@ import type { SearchClient } from '../types'; export function getAppIdAndApiKey( searchClient: SearchClient -): [string, string] { +): { appId: string; apiKey: string } { const { headers, queryParameters } = searchClient.transporter; const APP_ID = 'x-algolia-application-id'; const API_KEY = 'x-algolia-api-key'; const appId = headers[APP_ID] || queryParameters[APP_ID]; const apiKey = headers[API_KEY] || queryParameters[API_KEY]; - return [appId, apiKey]; + return { appId, apiKey }; } From ccc3c5e89a625c0ccc34ea989ef7b1945bd47e47 Mon Sep 17 00:00:00 2001 From: Dhaya <154633+dhayab@users.noreply.github.com> Date: Wed, 5 Apr 2023 14:25:53 +0200 Subject: [PATCH 4/5] bundlesize update --- bundlesize.config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundlesize.config.json b/bundlesize.config.json index 154e4dce4..a3cd0bd8f 100644 --- a/bundlesize.config.json +++ b/bundlesize.config.json @@ -6,11 +6,11 @@ }, { "path": "packages/autocomplete-js/dist/umd/index.production.js", - "maxSize": "18 kB" + "maxSize": "18.5 kB" }, { "path": "packages/autocomplete-preset-algolia/dist/umd/index.production.js", - "maxSize": "2.25 kB" + "maxSize": "2.5 kB" }, { "path": "packages/autocomplete-plugin-algolia-insights/dist/umd/index.production.js", @@ -26,7 +26,7 @@ }, { "path": "packages/autocomplete-plugin-query-suggestions/dist/umd/index.production.js", - "maxSize": "3 kB" + "maxSize": "3.25 kB" }, { "path": "packages/autocomplete-plugin-tags/dist/umd/index.production.js", From 1296bc99a9228af8b0ea36dcffa9742168766ee3 Mon Sep 17 00:00:00 2001 From: Dhaya <154633+dhayab@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:51:25 +0200 Subject: [PATCH 5/5] rename additional internal property Co-authored-by: Haroen Viaene --- .../src/__tests__/requester.test.ts | 14 +++++++------- .../src/types/AlgoliaInsightsHit.ts | 2 +- .../search/__tests__/fetchAlgoliaResults.test.ts | 8 ++++---- .../src/search/fetchAlgoliaResults.ts | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/autocomplete-js/src/__tests__/requester.test.ts b/packages/autocomplete-js/src/__tests__/requester.test.ts index d439131d2..7ff99be8d 100644 --- a/packages/autocomplete-js/src/__tests__/requester.test.ts +++ b/packages/autocomplete-js/src/__tests__/requester.test.ts @@ -265,7 +265,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":0}", + "{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":0}", ] `); @@ -304,7 +304,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"7\\",\\"label\\":\\"Hit 7\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":4}", + "{\\"objectID\\":\\"7\\",\\"label\\":\\"Hit 7\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":4}", ] `); @@ -316,8 +316,8 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"3\\",\\"label\\":\\"Hit 3\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":5}", - "{\\"objectID\\":\\"4\\",\\"label\\":\\"Hit 4\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":6}", + "{\\"objectID\\":\\"3\\",\\"label\\":\\"Hit 3\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":5}", + "{\\"objectID\\":\\"4\\",\\"label\\":\\"Hit 4\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":6}", ] `); @@ -331,7 +331,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"objectID\\":\\"5\\",\\"label\\":\\"Hit 5\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":7}", + "{\\"objectID\\":\\"5\\",\\"label\\":\\"Hit 5\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"},\\"__autocomplete_id\\":7}", ] `); @@ -561,7 +561,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"hitsPerPage\\":20,\\"__autocomplete_id\\":0}", + "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"hitsPerPage\\":20,\\"__autocomplete_id\\":0}", ] `); @@ -675,7 +675,7 @@ describe('requester', () => { .map((node) => node.textContent) ).toMatchInlineSnapshot(` Array [ - "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"results\\":[{\\"page\\":0,\\"hitsPerPage\\":20,\\"nbHits\\":1,\\"nbPages\\":1,\\"processingTimeMS\\":0,\\"hits\\":[{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaResultsMetadata\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}}],\\"query\\":\\"\\",\\"params\\":\\"\\",\\"exhaustiveNbHits\\":true,\\"exhaustiveFacetsCount\\":true}],\\"facetHits\\":[],\\"__autocomplete_id\\":0}", + "{\\"0\\":{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}},\\"results\\":[{\\"page\\":0,\\"hitsPerPage\\":20,\\"nbHits\\":1,\\"nbPages\\":1,\\"processingTimeMS\\":0,\\"hits\\":[{\\"objectID\\":\\"1\\",\\"label\\":\\"Hit 1\\",\\"__autocomplete_algoliaCredentials\\":{\\"appId\\":\\"algoliaAppId\\",\\"apiKey\\":\\"algoliaApiKey\\"}}],\\"query\\":\\"\\",\\"params\\":\\"\\",\\"exhaustiveNbHits\\":true,\\"exhaustiveFacetsCount\\":true}],\\"facetHits\\":[],\\"__autocomplete_id\\":0}", ] `); diff --git a/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts b/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts index 6099acfa2..fc5fc245b 100644 --- a/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts +++ b/packages/autocomplete-plugin-algolia-insights/src/types/AlgoliaInsightsHit.ts @@ -2,7 +2,7 @@ export type AlgoliaInsightsHit = { objectID: string; __autocomplete_indexName: string; __autocomplete_queryID: string; - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId: string; apiKey: string; }; diff --git a/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts b/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts index 0e4324b11..7c7316598 100644 --- a/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts +++ b/packages/autocomplete-preset-algolia/src/search/__tests__/fetchAlgoliaResults.test.ts @@ -70,7 +70,7 @@ describe('fetchAlgoliaResults', () => { { objectID: '1', label: 'Hit 1', - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId: 'algoliaAppId', apiKey: 'algoliaApiKey', }, @@ -82,7 +82,7 @@ describe('fetchAlgoliaResults', () => { { objectID: '2', label: 'Hit 2', - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId: 'algoliaAppId', apiKey: 'algoliaApiKey', }, @@ -130,7 +130,7 @@ describe('fetchAlgoliaResults', () => { { objectID: '1', label: 'Hit 1', - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId: 'algoliaAppId', apiKey: 'algoliaApiKey', }, @@ -142,7 +142,7 @@ describe('fetchAlgoliaResults', () => { { objectID: '2', label: 'Hit 2', - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId: 'algoliaAppId', apiKey: 'algoliaApiKey', }, diff --git a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts index 68c86bde6..d87cd7028 100644 --- a/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts +++ b/packages/autocomplete-preset-algolia/src/search/fetchAlgoliaResults.ts @@ -67,7 +67,7 @@ export function fetchAlgoliaResults({ ...result, hits: result.hits?.map((hit) => ({ ...hit, - __autocomplete_algoliaResultsMetadata: { + __autocomplete_algoliaCredentials: { appId, apiKey, },