Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(headless): fix internal resolution errors in node16 #4445

Open
wants to merge 14 commits into
base: type=module
Choose a base branch
from
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {createRelay} from '@coveo/relay';
import {createMockState} from '../../test/mock-state';
import {getAnalyticsNextApiBaseUrl} from '../platform-client';
import {getRelayInstanceFromState} from './analytics-relay-client';
import {getAnalyticsSource} from './analytics-selectors';
import {createMockState} from '../../test/mock-state.js';
import {getAnalyticsNextApiBaseUrl} from '../platform-client.js';
import {getRelayInstanceFromState} from './analytics-relay-client.js';
import {getAnalyticsSource} from './analytics-selectors.js';

jest.mock('@coveo/relay');
jest.mock('./analytics-selectors');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {createSelector} from '@reduxjs/toolkit';
import {
CommerceConfigurationSection,
ConfigurationSection,
} from '../../state/state-sections';
import {getAnalyticsNextApiBaseUrl} from '../platform-client';
import {getAnalyticsSource} from './analytics-selectors';
} from '../../state/state-sections.js';
import {getAnalyticsNextApiBaseUrl} from '../platform-client.js';
import {getAnalyticsSource} from './analytics-selectors.js';

type StateNeededByRelay = ConfigurationSection | CommerceConfigurationSection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {createMockState} from '../../test/mock-state';
import {VERSION} from '../../utils/version';
import {getAnalyticsSource} from './analytics-selectors';
import {createMockState} from '../../test/mock-state.js';
import {VERSION} from '../../utils/version.js';
import {getAnalyticsSource} from './analytics-selectors.js';

describe('#getAnalyticsSources', () => {
it('without a source, returns an array only with `@coveo/headless`', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/headless/src/api/analytics/analytics-selectors.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {createSelector} from '@reduxjs/toolkit';
import {CoreAnalyticsState} from '../../features/configuration/configuration-state';
import {VERSION} from '../../utils/version';
import {CoreAnalyticsState} from '../../features/configuration/configuration-state.js';
import {VERSION} from '../../utils/version.js';

export const getAnalyticsSource = createSelector(
(state: CoreAnalyticsState) => state.source,
Expand Down
10 changes: 5 additions & 5 deletions packages/headless/src/api/analytics/base-analytics.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state';
import {buildMockAnalyticsState} from '../../test/mock-analytics-state';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events.js';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state.js';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state.js';
import {buildMockAnalyticsState} from '../../test/mock-analytics-state.js';
import {
BaseAnalyticsProvider,
StateNeededByBaseAnalyticsProvider,
} from './base-analytics';
} from './base-analytics.js';

class TestProvider extends BaseAnalyticsProvider<StateNeededByBaseAnalyticsProvider> {
public getPipeline(): string {
Expand Down
8 changes: 4 additions & 4 deletions packages/headless/src/api/analytics/base-analytics.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {SearchPageClientProvider} from 'coveo.analytics';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events.js';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state.js';
import {
ConfigurationSection,
ContextSection,
PipelineSection,
QuerySection,
SearchHubSection,
} from '../../state/state-sections';
import {VERSION} from '../../utils/version';
} from '../../state/state-sections.js';
import {VERSION} from '../../utils/version.js';

export const getLanguage = (state: ConfigurationSection) => {
const langKey = state.configuration.search.locale.split('-')[0];
Expand Down
10 changes: 5 additions & 5 deletions packages/headless/src/api/analytics/case-assist-analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import {
CaseAssistClientProvider,
} from 'coveo.analytics';
import {Logger} from 'pino';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state';
import {getSearchHubInitialState} from '../../features/search-hub/search-hub-state.js';
import {
CaseAssistConfigurationSection,
CaseFieldSection,
CaseInputSection,
ConfigurationSection,
DocumentSuggestionSection,
SearchHubSection,
} from '../../state/state-sections';
import {getOrganizationEndpoint} from '../platform-client';
import {PreprocessRequest} from '../preprocess-request';
} from '../../state/state-sections.js';
import {getOrganizationEndpoint} from '../platform-client.js';
import {PreprocessRequest} from '../preprocess-request.js';
import {
wrapAnalyticsClientSendEventHook,
wrapPreprocessRequest,
} from './coveo-analytics-utils';
} from './coveo-analytics-utils.js';

export type StateNeededByCaseAssistAnalytics = ConfigurationSection &
Partial<CaseAssistConfigurationSection> &
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import {AnalyticsClientSendEventHook} from 'coveo.analytics';
import {pino} from 'pino';
import {PlatformRequestOptions, PreprocessRequest} from '../preprocess-request';
import {
PlatformRequestOptions,
PreprocessRequest,
} from '../preprocess-request.js';
import {
wrapAnalyticsClientSendEventHook,
wrapPreprocessRequest,
} from './coveo-analytics-utils';
} from './coveo-analytics-utils.js';

describe('coveo-analytics-utils', () => {
it('should properly wrap preprocessRequest', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
history,
} from 'coveo.analytics';
import {Logger} from 'pino';
import {clone} from '../../utils/utils';
import {PreprocessRequest} from '../preprocess-request';
import {clone} from '../../utils/utils.js';
import {PreprocessRequest} from '../preprocess-request.js';

export const getVisitorID = (options: {
runtimeEnvironment?: IRuntimeEnvironment;
Expand Down
26 changes: 13 additions & 13 deletions packages/headless/src/api/analytics/insight-analytics.test.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import {CoveoAnalyticsClient} from 'coveo.analytics';
import pino from 'pino';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state';
import {getGeneratedAnswerInitialState} from '../../features/generated-answer/generated-answer-state';
import {buildMockFacetRequest} from '../../test/mock-facet-request';
import {buildMockFacetResponse} from '../../test/mock-facet-response';
import {buildMockFacetSlice} from '../../test/mock-facet-slice';
import {buildMockFacetValue} from '../../test/mock-facet-value';
import {buildMockFacetValueRequest} from '../../test/mock-facet-value-request';
import {buildMockInsightState} from '../../test/mock-insight-state';
import {buildMockQueryState} from '../../test/mock-query-state';
import {buildMockResult} from '../../test/mock-result';
import {buildMockSearchState} from '../../test/mock-search-state';
import {pino} from 'pino';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state.js';
import {getGeneratedAnswerInitialState} from '../../features/generated-answer/generated-answer-state.js';
import {buildMockFacetRequest} from '../../test/mock-facet-request.js';
import {buildMockFacetResponse} from '../../test/mock-facet-response.js';
import {buildMockFacetSlice} from '../../test/mock-facet-slice.js';
import {buildMockFacetValueRequest} from '../../test/mock-facet-value-request.js';
import {buildMockFacetValue} from '../../test/mock-facet-value.js';
import {buildMockInsightState} from '../../test/mock-insight-state.js';
import {buildMockQueryState} from '../../test/mock-query-state.js';
import {buildMockResult} from '../../test/mock-result.js';
import {buildMockSearchState} from '../../test/mock-search-state.js';
import {
configureInsightAnalytics,
InsightAnalyticsProvider,
StateNeededByInsightAnalyticsProvider,
} from './insight-analytics';
} from './insight-analytics.js';

describe('insight analytics', () => {
const logger = pino({level: 'silent'});
Expand Down
20 changes: 10 additions & 10 deletions packages/headless/src/api/analytics/insight-analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ import {
InsightClientProvider,
CoveoInsightClient,
} from 'coveo.analytics';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events.js';
import {Logger} from 'pino';
import {
buildFacetStateMetadata,
getStateNeededForFacetMetadata,
SectionNeededForFacetMetadata,
} from '../../features/facets/facet-set/facet-set-analytics-actions-utils';
import {getQueryInitialState} from '../../features/query/query-state';
import {getSearchInitialState} from '../../features/search/search-state';
import {InsightAppState} from '../../state/insight-app-state';
} from '../../features/facets/facet-set/facet-set-analytics-actions-utils.js';
import {getQueryInitialState} from '../../features/query/query-state.js';
import {getSearchInitialState} from '../../features/search/search-state.js';
import {InsightAppState} from '../../state/insight-app-state.js';
import {
ConfigurationSection,
GeneratedAnswerSection,
PipelineSection,
QuerySection,
SearchHubSection,
SearchSection,
} from '../../state/state-sections';
import {getOrganizationEndpoint} from '../platform-client';
import {PreprocessRequest} from '../preprocess-request';
import {BaseAnalyticsProvider} from './base-analytics';
} from '../../state/state-sections.js';
import {getOrganizationEndpoint} from '../platform-client.js';
import {PreprocessRequest} from '../preprocess-request.js';
import {BaseAnalyticsProvider} from './base-analytics.js';
import {
wrapAnalyticsClientSendEventHook,
wrapPreprocessRequest,
} from './coveo-analytics-utils';
} from './coveo-analytics-utils.js';

export type StateNeededByInsightAnalyticsProvider = ConfigurationSection &
Partial<InsightAppState> &
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {getQueryInitialState} from '../../features/query/query-state';
import {getSearchInitialState} from '../../features/search/search-state';
import {InstantResultSection} from '../../state/state-sections';
import {getQueryInitialState} from '../../features/query/query-state.js';
import {getSearchInitialState} from '../../features/search/search-state.js';
import {InstantResultSection} from '../../state/state-sections.js';
import {
SearchAnalyticsProvider,
StateNeededBySearchAnalyticsProvider,
} from './search-analytics';
} from './search-analytics.js';

export type StateNeededByInstantResultsAnalyticsProvider =
StateNeededBySearchAnalyticsProvider & InstantResultSection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {getConfigurationInitialState} from '../../features/configuration/configuration-state';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state.js';
import {
getInstantResultsInitialState,
InstantResultCache,
} from '../../features/instant-results/instant-results-state';
import {buildMockResult} from '../../test/mock-result';
import {getObjectHash} from '../../utils/utils';
} from '../../features/instant-results/instant-results-state.js';
import {buildMockResult} from '../../test/mock-result.js';
import {getObjectHash} from '../../utils/utils.js';
import {
InstantResultsAnalyticsProvider,
StateNeededByInstantResultsAnalyticsProvider,
} from './instant-result-analytics';
} from './instant-result-analytics.js';

describe('instant results analytics provider', () => {
const getBaseState = (): StateNeededByInstantResultsAnalyticsProvider => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {createMockRecommendationState} from '../../test/mock-recommendation-state';
import {buildMockResult} from '../../test/mock-result';
import {createMockRecommendationState} from '../../test/mock-recommendation-state.js';
import {buildMockResult} from '../../test/mock-result.js';
import {
RecommendationAnalyticsProvider,
StateNeededByRecommendationAnalyticsProvider,
} from './recommendations-analytics';
} from './recommendations-analytics.js';

describe('recommendations analytics', () => {
const getBaseState = (): StateNeededByRecommendationAnalyticsProvider =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import {SearchPageClientProvider} from 'coveo.analytics';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
import {getQueryInitialState} from '../../features/query/query-state';
import {getRecommendationInitialState} from '../../features/recommendation/recommendation-state';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events.js';
import {getQueryInitialState} from '../../features/query/query-state.js';
import {getRecommendationInitialState} from '../../features/recommendation/recommendation-state.js';
import {
ConfigurationSection,
ContextSection,
PipelineSection,
RecommendationSection,
SearchHubSection,
} from '../../state/state-sections';
import {BaseAnalyticsProvider} from './base-analytics';
} from '../../state/state-sections.js';
import {BaseAnalyticsProvider} from './base-analytics.js';

export type StateNeededByRecommendationAnalyticsProvider =
ConfigurationSection &
Expand Down
46 changes: 23 additions & 23 deletions packages/headless/src/api/analytics/search-analytics.test.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import {CoveoAnalyticsClient} from 'coveo.analytics';
import pino from 'pino';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state';
import {getCategoryFacetSetInitialState} from '../../features/facets/category-facet-set/category-facet-set-state';
import {getFacetSetInitialState} from '../../features/facets/facet-set/facet-set-state';
import {FacetSortCriterion} from '../../features/facets/facet-set/interfaces/request';
import {DateFacetValue} from '../../features/facets/range-facets/date-facet-set/interfaces/response';
import {getGeneratedAnswerInitialState} from '../../features/generated-answer/generated-answer-state';
import {OmniboxSuggestionMetadata} from '../../features/query-suggest/query-suggest-analytics-actions';
import {getQuerySuggestSetInitialState} from '../../features/query-suggest/query-suggest-state';
import {StaticFilterValueMetadata} from '../../features/static-filter-set/static-filter-set-actions';
import {buildMockCategoryFacetSlice} from '../../test/mock-category-facet-slice';
import {buildMockFacetRequest} from '../../test/mock-facet-request';
import {buildMockFacetResponse} from '../../test/mock-facet-response';
import {buildMockFacetSlice} from '../../test/mock-facet-slice';
import {buildMockFacetValue} from '../../test/mock-facet-value';
import {buildMockFacetValueRequest} from '../../test/mock-facet-value-request';
import {buildMockQueryState} from '../../test/mock-query-state';
import {buildMockQuerySuggestSet} from '../../test/mock-query-suggest-slice';
import {buildMockResult} from '../../test/mock-result';
import {buildMockSearchState} from '../../test/mock-search-state';
import {createMockState} from '../../test/mock-state';
import {QuerySuggestCompletion} from '../search/query-suggest/query-suggest-response';
import {pino} from 'pino';
import {getConfigurationInitialState} from '../../features/configuration/configuration-state.js';
import {getCategoryFacetSetInitialState} from '../../features/facets/category-facet-set/category-facet-set-state.js';
import {getFacetSetInitialState} from '../../features/facets/facet-set/facet-set-state.js';
import {FacetSortCriterion} from '../../features/facets/facet-set/interfaces/request.js';
import {DateFacetValue} from '../../features/facets/range-facets/date-facet-set/interfaces/response.js';
import {getGeneratedAnswerInitialState} from '../../features/generated-answer/generated-answer-state.js';
import {OmniboxSuggestionMetadata} from '../../features/query-suggest/query-suggest-analytics-actions.js';
import {getQuerySuggestSetInitialState} from '../../features/query-suggest/query-suggest-state.js';
import {StaticFilterValueMetadata} from '../../features/static-filter-set/static-filter-set-actions.js';
import {buildMockCategoryFacetSlice} from '../../test/mock-category-facet-slice.js';
import {buildMockFacetRequest} from '../../test/mock-facet-request.js';
import {buildMockFacetResponse} from '../../test/mock-facet-response.js';
import {buildMockFacetSlice} from '../../test/mock-facet-slice.js';
import {buildMockFacetValueRequest} from '../../test/mock-facet-value-request.js';
import {buildMockFacetValue} from '../../test/mock-facet-value.js';
import {buildMockQueryState} from '../../test/mock-query-state.js';
import {buildMockQuerySuggestSet} from '../../test/mock-query-suggest-slice.js';
import {buildMockResult} from '../../test/mock-result.js';
import {buildMockSearchState} from '../../test/mock-search-state.js';
import {createMockState} from '../../test/mock-state.js';
import {QuerySuggestCompletion} from '../search/query-suggest/query-suggest-response.js';
import {
configureLegacyAnalytics,
getPageID,
SearchAnalyticsProvider,
StateNeededBySearchAnalyticsProvider,
} from './search-analytics';
} from './search-analytics.js';

jest.mock('@coveo/relay');

Expand Down
34 changes: 17 additions & 17 deletions packages/headless/src/api/analytics/search-analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@ import {
SearchPageClientProvider,
AnalyticsClientSendEventHook,
} from 'coveo.analytics';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events';
import {SearchEventRequest} from 'coveo.analytics/dist/definitions/events.js';
import {Logger} from 'pino';
import {
buildFacetStateMetadata,
getStateNeededForFacetMetadata,
} from '../../features/facets/facet-set/facet-set-analytics-actions-utils';
import {FacetSortCriterion} from '../../features/facets/facet-set/interfaces/request';
import {DateFacetValue} from '../../features/facets/range-facets/date-facet-set/interfaces/response';
import {RangeFacetSortCriterion} from '../../features/facets/range-facets/generic/interfaces/request';
import {NumericFacetValue} from '../../features/facets/range-facets/numeric-facet-set/interfaces/response';
import {OmniboxSuggestionMetadata} from '../../features/query-suggest/query-suggest-analytics-actions';
import {getQueryInitialState} from '../../features/query/query-state';
import {getSearchInitialState} from '../../features/search/search-state';
import {getSortCriteriaInitialState} from '../../features/sort-criteria/sort-criteria-state';
import {StaticFilterValueMetadata} from '../../features/static-filter-set/static-filter-set-actions';
import {SearchAppState} from '../../state/search-app-state';
import {ConfigurationSection} from '../../state/state-sections';
import {getOrganizationEndpoint} from '../platform-client';
import {PreprocessRequest} from '../preprocess-request';
import {BaseAnalyticsProvider} from './base-analytics';
} from '../../features/facets/facet-set/facet-set-analytics-actions-utils.js';
import {FacetSortCriterion} from '../../features/facets/facet-set/interfaces/request.js';
import {DateFacetValue} from '../../features/facets/range-facets/date-facet-set/interfaces/response.js';
import {RangeFacetSortCriterion} from '../../features/facets/range-facets/generic/interfaces/request.js';
import {NumericFacetValue} from '../../features/facets/range-facets/numeric-facet-set/interfaces/response.js';
import {OmniboxSuggestionMetadata} from '../../features/query-suggest/query-suggest-analytics-actions.js';
import {getQueryInitialState} from '../../features/query/query-state.js';
import {getSearchInitialState} from '../../features/search/search-state.js';
import {getSortCriteriaInitialState} from '../../features/sort-criteria/sort-criteria-state.js';
import {StaticFilterValueMetadata} from '../../features/static-filter-set/static-filter-set-actions.js';
import {SearchAppState} from '../../state/search-app-state.js';
import {ConfigurationSection} from '../../state/state-sections.js';
import {getOrganizationEndpoint} from '../platform-client.js';
import {PreprocessRequest} from '../preprocess-request.js';
import {BaseAnalyticsProvider} from './base-analytics.js';
import {
historyStore,
wrapAnalyticsClientSendEventHook,
wrapPreprocessRequest,
} from './coveo-analytics-utils';
} from './coveo-analytics-utils.js';

export type StateNeededBySearchAnalyticsProvider = ConfigurationSection &
Partial<Omit<SearchAppState, 'configuration'>>;
Expand Down
Loading
Loading