From 8be4957ae210d1ed8831900f39b7d34584ea604f Mon Sep 17 00:00:00 2001 From: Peter Lauck Date: Mon, 11 Dec 2023 15:33:08 +0000 Subject: [PATCH] feat(search)!: move error matcher injection token to state subpackage (#2645) BREAKING CHANGE: error matcher injection token has moved to state subpackage --- libs/search-product/state/src/effects/collection.effects.ts | 2 +- libs/search/src/public_api.ts | 1 - libs/search/state/src/effects/incremental.effects.ts | 6 ++---- libs/search/state/src/effects/page.effects.ts | 6 ++---- .../{ => state}/src/injection-tokens/error-matcher.token.ts | 0 libs/search/{ => state}/src/injection-tokens/public_api.ts | 0 libs/search/state/src/public_api.ts | 1 + 7 files changed, 6 insertions(+), 10 deletions(-) rename libs/search/{ => state}/src/injection-tokens/error-matcher.token.ts (100%) rename libs/search/{ => state}/src/injection-tokens/public_api.ts (100%) diff --git a/libs/search-product/state/src/effects/collection.effects.ts b/libs/search-product/state/src/effects/collection.effects.ts index 7afef37aed..de23de0240 100644 --- a/libs/search-product/state/src/effects/collection.effects.ts +++ b/libs/search-product/state/src/effects/collection.effects.ts @@ -25,8 +25,8 @@ import { daffCollectionBuildRequestFromMetadata, } from '@daffodil/core'; import { ErrorTransformer } from '@daffodil/core/state'; -import { DAFF_SEARCH_ERROR_MATCHER } from '@daffodil/search'; import { DaffSearchDriver } from '@daffodil/search/driver'; +import { DAFF_SEARCH_ERROR_MATCHER } from '@daffodil/search/state'; import { DaffSearchPageFacade, DaffSearchLoadFailure, diff --git a/libs/search/src/public_api.ts b/libs/search/src/public_api.ts index 488d4299e8..7712cd47ed 100644 --- a/libs/search/src/public_api.ts +++ b/libs/search/src/public_api.ts @@ -1,3 +1,2 @@ export * from './models/public_api'; -export * from './injection-tokens/public_api'; export * from './transforms/public_api'; diff --git a/libs/search/state/src/effects/incremental.effects.ts b/libs/search/state/src/effects/incremental.effects.ts index 589adaffe1..3d1435c659 100644 --- a/libs/search/state/src/effects/incremental.effects.ts +++ b/libs/search/state/src/effects/incremental.effects.ts @@ -21,10 +21,7 @@ import { import { DaffError } from '@daffodil/core'; import { ErrorTransformer } from '@daffodil/core/state'; -import { - DaffSearchResult, - DAFF_SEARCH_ERROR_MATCHER, -} from '@daffodil/search'; +import { DaffSearchResult } from '@daffodil/search'; import { DaffSearchDriverInterface, DaffSearchDriver, @@ -40,6 +37,7 @@ import { DaffSearchStateConfig, DAFF_SEARCH_STATE_CONFIG, } from '../config/public_api'; +import { DAFF_SEARCH_ERROR_MATCHER } from '../injection-tokens/public_api'; @Injectable() export class DaffSearchIncrementalEffects< diff --git a/libs/search/state/src/effects/page.effects.ts b/libs/search/state/src/effects/page.effects.ts index a92eeff232..e510579909 100644 --- a/libs/search/state/src/effects/page.effects.ts +++ b/libs/search/state/src/effects/page.effects.ts @@ -16,10 +16,7 @@ import { import { DaffError } from '@daffodil/core'; import { ErrorTransformer } from '@daffodil/core/state'; -import { - DaffSearchResult, - DAFF_SEARCH_ERROR_MATCHER, -} from '@daffodil/search'; +import { DaffSearchResult } from '@daffodil/search'; import { DaffSearchDriverInterface, DaffSearchDriver, @@ -31,6 +28,7 @@ import { DaffSearchLoadSuccess, DaffSearchLoadFailure, } from '../actions/search.actions'; +import { DAFF_SEARCH_ERROR_MATCHER } from '../injection-tokens/public_api'; @Injectable() export class DaffSearchPageEffects< diff --git a/libs/search/src/injection-tokens/error-matcher.token.ts b/libs/search/state/src/injection-tokens/error-matcher.token.ts similarity index 100% rename from libs/search/src/injection-tokens/error-matcher.token.ts rename to libs/search/state/src/injection-tokens/error-matcher.token.ts diff --git a/libs/search/src/injection-tokens/public_api.ts b/libs/search/state/src/injection-tokens/public_api.ts similarity index 100% rename from libs/search/src/injection-tokens/public_api.ts rename to libs/search/state/src/injection-tokens/public_api.ts diff --git a/libs/search/state/src/public_api.ts b/libs/search/state/src/public_api.ts index de0f0608bc..a519e9a6e6 100644 --- a/libs/search/state/src/public_api.ts +++ b/libs/search/state/src/public_api.ts @@ -3,6 +3,7 @@ export * from './reducers/public_api'; export * from './selectors/public_api'; export * from './facades/public_api'; export * from './config/public_api'; +export * from './injection-tokens/public_api'; export * from './search.module'; export * from './incremental.module';