From cc98717a1b4041c861e3c173b77800d691a4f0d9 Mon Sep 17 00:00:00 2001 From: Nicholas Labarre Date: Wed, 24 Jan 2024 08:17:17 -0500 Subject: [PATCH] feat(commerce): isolate core commerce controllers (#3540) isolate core commerce controllers --- packages/headless/src/commerce.index.ts | 14 +++++++------- .../date/headless-commerce-date-facet.test.ts | 0 .../facets}/date/headless-commerce-date-facet.ts | 0 .../headless-commerce-facet-generator.test.ts | 0 .../generator/headless-commerce-facet-generator.ts | 0 .../facets}/headless-core-commerce-facet.test.ts | 0 .../facets}/headless-core-commerce-facet.ts | 0 .../headless-commerce-numeric-facet.test.ts | 0 .../numeric/headless-commerce-numeric-facet.ts | 0 .../headless-commerce-regular-facet.test.ts | 0 .../regular/headless-commerce-regular-facet.ts | 0 .../headless-core-commerce-pagination.test.ts | 0 .../headless-core-commerce-pagination.ts | 0 .../sort}/headless-core-commerce-sort.test.ts | 0 .../sort}/headless-core-commerce-sort.ts | 0 .../headless-product-listing-date-facet.test.ts | 4 ++-- .../facets/headless-product-listing-date-facet.ts | 4 ++-- .../headless-product-listing-facet-generator.ts | 2 +- .../headless-product-listing-facet-options.ts | 2 +- .../headless-product-listing-numeric-facet.test.ts | 4 ++-- .../headless-product-listing-numeric-facet.ts | 4 ++-- .../headless-product-listing-regular-facet.test.ts | 2 +- .../headless-product-listing-regular-facet.ts | 4 ++-- .../headless-product-listing-pagination.test.ts | 2 +- .../headless-product-listing-pagination.ts | 2 +- .../sort/headless-product-listing-sort.test.ts | 2 +- .../sort/headless-product-listing-sort.ts | 2 +- .../facets/headless-search-date-facet.test.ts | 4 ++-- .../search/facets/headless-search-date-facet.ts | 4 ++-- .../facets/headless-search-facet-generator.ts | 2 +- .../search/facets/headless-search-facet-options.ts | 2 +- .../facets/headless-search-numeric-facet.test.ts | 4 ++-- .../search/facets/headless-search-numeric-facet.ts | 4 ++-- .../facets/headless-search-regular-facet.test.ts | 2 +- .../search/facets/headless-search-regular-facet.ts | 4 ++-- .../pagination/headless-search-pagination.test.ts | 2 +- .../pagination/headless-search-pagination.ts | 2 +- .../search/sort/headless-search-sort.test.ts | 2 +- .../commerce/search/sort/headless-search-sort.ts | 2 +- .../facets/facet-set/facet-set-slice.test.ts | 2 +- .../commerce/facets/facet-set/facet-set-slice.ts | 2 +- 41 files changed, 43 insertions(+), 43 deletions(-) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/date/headless-commerce-date-facet.test.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/date/headless-commerce-date-facet.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/generator/headless-commerce-facet-generator.test.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/generator/headless-commerce-facet-generator.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/headless-core-commerce-facet.test.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/headless-core-commerce-facet.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/numeric/headless-commerce-numeric-facet.test.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/numeric/headless-commerce-numeric-facet.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/regular/headless-commerce-regular-facet.test.ts (100%) rename packages/headless/src/controllers/commerce/{facets/core => core/facets}/regular/headless-commerce-regular-facet.ts (100%) rename packages/headless/src/controllers/commerce/{pagination/core => core/pagination}/headless-core-commerce-pagination.test.ts (100%) rename packages/headless/src/controllers/commerce/{pagination/core => core/pagination}/headless-core-commerce-pagination.ts (100%) rename packages/headless/src/controllers/commerce/{sort/core => core/sort}/headless-core-commerce-sort.test.ts (100%) rename packages/headless/src/controllers/commerce/{sort/core => core/sort}/headless-core-commerce-sort.ts (100%) diff --git a/packages/headless/src/commerce.index.ts b/packages/headless/src/commerce.index.ts index 9ac9d90731f..57a2f5b5da2 100644 --- a/packages/headless/src/commerce.index.ts +++ b/packages/headless/src/commerce.index.ts @@ -54,7 +54,7 @@ export type { Pagination, PaginationState, PaginationControllerState, -} from './controllers/commerce/pagination/core/headless-core-commerce-pagination'; +} from './controllers/commerce/core/pagination/headless-core-commerce-pagination'; export {buildProductListingPagination} from './controllers/commerce/product-listing/pagination/headless-product-listing-pagination'; export {buildSearchPagination} from './controllers/commerce/search/pagination/headless-search-pagination'; @@ -84,20 +84,20 @@ export type { SortInitialState, Sort, SortState, -} from './controllers/commerce/sort/core/headless-core-commerce-sort'; +} from './controllers/commerce/core/sort/headless-core-commerce-sort'; export { buildRelevanceSortCriterion, buildFieldsSortCriterion, SortBy, SortDirection, -} from './controllers/commerce/sort/core/headless-core-commerce-sort'; +} from './controllers/commerce/core/sort/headless-core-commerce-sort'; export {buildProductListingSort} from './controllers/commerce/product-listing/sort/headless-product-listing-sort'; export {buildSearchSort} from './controllers/commerce/search/sort/headless-search-sort'; -export type {CommerceRegularFacet} from './controllers/commerce/facets/core/regular/headless-commerce-regular-facet'; -export type {CommerceNumericFacet} from './controllers/commerce/facets/core/numeric/headless-commerce-numeric-facet'; -export type {CommerceDateFacet} from './controllers/commerce/facets/core/date/headless-commerce-date-facet'; +export type {CommerceRegularFacet} from './controllers/commerce/core/facets/regular/headless-commerce-regular-facet'; +export type {CommerceNumericFacet} from './controllers/commerce/core/facets/numeric/headless-commerce-numeric-facet'; +export type {CommerceDateFacet} from './controllers/commerce/core/facets/date/headless-commerce-date-facet'; export type { FacetType, FacetValueRequest, @@ -106,7 +106,7 @@ export type { NumericFacetValue, DateRangeRequest, DateFacetValue, -} from './controllers/commerce/facets/core/headless-core-commerce-facet'; +} from './controllers/commerce/core/facets/headless-core-commerce-facet'; export type {ProductListingFacetGenerator} from './controllers/commerce/product-listing/facets/headless-product-listing-facet-generator'; export {buildProductListingFacetGenerator} from './controllers/commerce/product-listing/facets/headless-product-listing-facet-generator'; export type {SearchFacetGenerator} from './controllers/commerce/search/facets/headless-search-facet-generator'; diff --git a/packages/headless/src/controllers/commerce/facets/core/date/headless-commerce-date-facet.test.ts b/packages/headless/src/controllers/commerce/core/facets/date/headless-commerce-date-facet.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/date/headless-commerce-date-facet.test.ts rename to packages/headless/src/controllers/commerce/core/facets/date/headless-commerce-date-facet.test.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/date/headless-commerce-date-facet.ts b/packages/headless/src/controllers/commerce/core/facets/date/headless-commerce-date-facet.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/date/headless-commerce-date-facet.ts rename to packages/headless/src/controllers/commerce/core/facets/date/headless-commerce-date-facet.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/generator/headless-commerce-facet-generator.test.ts b/packages/headless/src/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/generator/headless-commerce-facet-generator.test.ts rename to packages/headless/src/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.test.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/generator/headless-commerce-facet-generator.ts b/packages/headless/src/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/generator/headless-commerce-facet-generator.ts rename to packages/headless/src/controllers/commerce/core/facets/generator/headless-commerce-facet-generator.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/headless-core-commerce-facet.test.ts b/packages/headless/src/controllers/commerce/core/facets/headless-core-commerce-facet.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/headless-core-commerce-facet.test.ts rename to packages/headless/src/controllers/commerce/core/facets/headless-core-commerce-facet.test.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/headless-core-commerce-facet.ts b/packages/headless/src/controllers/commerce/core/facets/headless-core-commerce-facet.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/headless-core-commerce-facet.ts rename to packages/headless/src/controllers/commerce/core/facets/headless-core-commerce-facet.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/numeric/headless-commerce-numeric-facet.test.ts b/packages/headless/src/controllers/commerce/core/facets/numeric/headless-commerce-numeric-facet.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/numeric/headless-commerce-numeric-facet.test.ts rename to packages/headless/src/controllers/commerce/core/facets/numeric/headless-commerce-numeric-facet.test.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/numeric/headless-commerce-numeric-facet.ts b/packages/headless/src/controllers/commerce/core/facets/numeric/headless-commerce-numeric-facet.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/numeric/headless-commerce-numeric-facet.ts rename to packages/headless/src/controllers/commerce/core/facets/numeric/headless-commerce-numeric-facet.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/regular/headless-commerce-regular-facet.test.ts b/packages/headless/src/controllers/commerce/core/facets/regular/headless-commerce-regular-facet.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/regular/headless-commerce-regular-facet.test.ts rename to packages/headless/src/controllers/commerce/core/facets/regular/headless-commerce-regular-facet.test.ts diff --git a/packages/headless/src/controllers/commerce/facets/core/regular/headless-commerce-regular-facet.ts b/packages/headless/src/controllers/commerce/core/facets/regular/headless-commerce-regular-facet.ts similarity index 100% rename from packages/headless/src/controllers/commerce/facets/core/regular/headless-commerce-regular-facet.ts rename to packages/headless/src/controllers/commerce/core/facets/regular/headless-commerce-regular-facet.ts diff --git a/packages/headless/src/controllers/commerce/pagination/core/headless-core-commerce-pagination.test.ts b/packages/headless/src/controllers/commerce/core/pagination/headless-core-commerce-pagination.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/pagination/core/headless-core-commerce-pagination.test.ts rename to packages/headless/src/controllers/commerce/core/pagination/headless-core-commerce-pagination.test.ts diff --git a/packages/headless/src/controllers/commerce/pagination/core/headless-core-commerce-pagination.ts b/packages/headless/src/controllers/commerce/core/pagination/headless-core-commerce-pagination.ts similarity index 100% rename from packages/headless/src/controllers/commerce/pagination/core/headless-core-commerce-pagination.ts rename to packages/headless/src/controllers/commerce/core/pagination/headless-core-commerce-pagination.ts diff --git a/packages/headless/src/controllers/commerce/sort/core/headless-core-commerce-sort.test.ts b/packages/headless/src/controllers/commerce/core/sort/headless-core-commerce-sort.test.ts similarity index 100% rename from packages/headless/src/controllers/commerce/sort/core/headless-core-commerce-sort.test.ts rename to packages/headless/src/controllers/commerce/core/sort/headless-core-commerce-sort.test.ts diff --git a/packages/headless/src/controllers/commerce/sort/core/headless-core-commerce-sort.ts b/packages/headless/src/controllers/commerce/core/sort/headless-core-commerce-sort.ts similarity index 100% rename from packages/headless/src/controllers/commerce/sort/core/headless-core-commerce-sort.ts rename to packages/headless/src/controllers/commerce/core/sort/headless-core-commerce-sort.ts diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.test.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.test.ts index a8e164e68e6..9a65f7a7f2e 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.test.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.test.ts @@ -9,8 +9,8 @@ import {buildMockCommerceDateFacetResponse} from '../../../../test/mock-commerce import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceDateFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceDateFacet} from '../../facets/core/date/headless-commerce-date-facet'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceDateFacet} from '../../core/facets/date/headless-commerce-date-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {buildProductListingDateFacet} from './headless-product-listing-date-facet'; describe('ProductListingDateFacet', () => { diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.ts index bd21d2f7c37..f597f94c894 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-date-facet.ts @@ -3,8 +3,8 @@ import {loadReducerError} from '../../../../utils/errors'; import { CommerceDateFacet, buildCommerceDateFacet, -} from '../../facets/core/date/headless-commerce-date-facet'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +} from '../../core/facets/date/headless-commerce-date-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {loadProductListingReducer} from '../utils/load-product-listing-reducers'; import {commonOptions} from './headless-product-listing-facet-options'; diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-generator.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-generator.ts index 60c80ef7b63..4921adb4728 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-generator.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-generator.ts @@ -2,7 +2,7 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import { buildCommerceFacetGenerator, CommerceFacetGenerator, -} from '../../facets/core/generator/headless-commerce-facet-generator'; +} from '../../core/facets/generator/headless-commerce-facet-generator'; import {buildProductListingDateFacet} from './headless-product-listing-date-facet'; import {buildProductListingNumericFacet} from './headless-product-listing-numeric-facet'; import {buildProductListingRegularFacet} from './headless-product-listing-regular-facet'; diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-options.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-options.ts index fa68a234f83..77c205f5668 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-options.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-facet-options.ts @@ -4,7 +4,7 @@ import { CommerceFacetSetSection, ProductListingV2Section, } from '../../../../state/state-sections'; -import {CoreCommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CoreCommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; const facetResponseSelector = ( state: ProductListingV2Section & CommerceFacetSetSection, diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.test.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.test.ts index f9a531d7e0e..f4173c3572e 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.test.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.test.ts @@ -9,8 +9,8 @@ import {buildMockCommerceNumericFacetResponse} from '../../../../test/mock-comme import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceNumericFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; -import {CommerceNumericFacet} from '../../facets/core/numeric/headless-commerce-numeric-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; +import {CommerceNumericFacet} from '../../core/facets/numeric/headless-commerce-numeric-facet'; import {buildProductListingNumericFacet} from './headless-product-listing-numeric-facet'; describe('ProductListingNumericFacet', () => { diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.ts index 68bd0f13ebc..b00ae33d7a8 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-numeric-facet.ts @@ -1,10 +1,10 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import {loadReducerError} from '../../../../utils/errors'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import { CommerceNumericFacet, buildCommerceNumericFacet, -} from '../../facets/core/numeric/headless-commerce-numeric-facet'; +} from '../../core/facets/numeric/headless-commerce-numeric-facet'; import {loadProductListingReducer} from '../utils/load-product-listing-reducers'; import {commonOptions} from './headless-product-listing-facet-options'; diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.test.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.test.ts index e19b0cf9878..ce10809c3bb 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.test.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.test.ts @@ -10,7 +10,7 @@ import {buildMockCommerceRegularFacetResponse} from '../../../../test/mock-comme import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceRegularFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {buildProductListingRegularFacet} from './headless-product-listing-regular-facet'; describe('ProductListingRegularFacet', () => { diff --git a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.ts b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.ts index 4300a7d6fc6..46b7d9c9048 100644 --- a/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.ts +++ b/packages/headless/src/controllers/commerce/product-listing/facets/headless-product-listing-regular-facet.ts @@ -1,10 +1,10 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import {loadReducerError} from '../../../../utils/errors'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import { CommerceRegularFacet, buildCommerceRegularFacet, -} from '../../facets/core/regular/headless-commerce-regular-facet'; +} from '../../core/facets/regular/headless-commerce-regular-facet'; import {loadProductListingReducer} from '../utils/load-product-listing-reducers'; import {commonOptions} from './headless-product-listing-facet-options'; diff --git a/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.test.ts b/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.test.ts index c22961975cf..0e31df5d07c 100644 --- a/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.test.ts +++ b/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.test.ts @@ -1,7 +1,7 @@ import {fetchProductListing} from '../../../../features/commerce/product-listing/product-listing-actions'; import {productListingV2Reducer as productListing} from '../../../../features/commerce/product-listing/product-listing-slice'; import {buildMockCommerceEngine, MockCommerceEngine} from '../../../../test'; -import {Pagination} from '../../pagination/core/headless-core-commerce-pagination'; +import {Pagination} from '../../core/pagination/headless-core-commerce-pagination'; import {buildProductListingPagination} from './headless-product-listing-pagination'; describe('product listing pagination', () => { diff --git a/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.ts b/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.ts index 355fedadc78..6bfcb437f64 100644 --- a/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.ts +++ b/packages/headless/src/controllers/commerce/product-listing/pagination/headless-product-listing-pagination.ts @@ -4,7 +4,7 @@ import {loadReducerError} from '../../../../utils/errors'; import { buildCorePagination, Pagination, -} from '../../pagination/core/headless-core-commerce-pagination'; +} from '../../core/pagination/headless-core-commerce-pagination'; import {loadProductListingReducer} from '../utils/load-product-listing-reducers'; /** diff --git a/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.test.ts b/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.test.ts index c5458166fad..773186715ac 100644 --- a/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.test.ts +++ b/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.test.ts @@ -4,7 +4,7 @@ import {buildMockCommerceEngine, MockCommerceEngine} from '../../../../test'; import { buildRelevanceSortCriterion, Sort, -} from '../../sort/core/headless-core-commerce-sort'; +} from '../../core/sort/headless-core-commerce-sort'; import {buildProductListingSort} from './headless-product-listing-sort'; describe('headless product listing sort', () => { diff --git a/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.ts b/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.ts index 80780109c1e..a3f27469afd 100644 --- a/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.ts +++ b/packages/headless/src/controllers/commerce/product-listing/sort/headless-product-listing-sort.ts @@ -5,7 +5,7 @@ import { Sort, buildCoreSort, SortProps, -} from '../../sort/core/headless-core-commerce-sort'; +} from '../../core/sort/headless-core-commerce-sort'; import {loadProductListingReducer} from '../utils/load-product-listing-reducers'; /** diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.test.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.test.ts index 53c463d275b..26e2f6a5195 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.test.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.test.ts @@ -9,8 +9,8 @@ import {buildMockCommerceDateFacetResponse} from '../../../../test/mock-commerce import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceDateFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceDateFacet} from '../../facets/core/date/headless-commerce-date-facet'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceDateFacet} from '../../core/facets/date/headless-commerce-date-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {buildSearchDateFacet} from './headless-search-date-facet'; describe('SearchDateFacet', () => { diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.ts index a727231425c..987be94c940 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-date-facet.ts @@ -3,8 +3,8 @@ import {loadReducerError} from '../../../../utils/errors'; import { CommerceDateFacet, buildCommerceDateFacet, -} from '../../facets/core/date/headless-commerce-date-facet'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +} from '../../core/facets/date/headless-commerce-date-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {loadSearchReducer} from '../utils/load-search-reducers'; import {commonOptions} from './headless-search-facet-options'; diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-generator.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-generator.ts index 50a0cbace7e..e6a59d1382b 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-generator.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-generator.ts @@ -2,7 +2,7 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import { buildCommerceFacetGenerator, CommerceFacetGenerator, -} from '../../facets/core/generator/headless-commerce-facet-generator'; +} from '../../core/facets/generator/headless-commerce-facet-generator'; import {buildSearchDateFacet} from './headless-search-date-facet'; import {buildSearchNumericFacet} from './headless-search-numeric-facet'; import {buildSearchRegularFacet} from './headless-search-regular-facet'; diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-options.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-options.ts index aa5219c3f55..4c090e4537a 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-options.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-facet-options.ts @@ -4,7 +4,7 @@ import { CommerceFacetSetSection, CommerceSearchSection, } from '../../../../state/state-sections'; -import {CoreCommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CoreCommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; const facetResponseSelector = ( state: CommerceSearchSection & CommerceFacetSetSection, diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.test.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.test.ts index 5bf409123f3..b4d54b1cd06 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.test.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.test.ts @@ -9,8 +9,8 @@ import {buildMockCommerceNumericFacetResponse} from '../../../../test/mock-comme import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceNumericFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; -import {CommerceNumericFacet} from '../../facets/core/numeric/headless-commerce-numeric-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; +import {CommerceNumericFacet} from '../../core/facets/numeric/headless-commerce-numeric-facet'; import {buildSearchNumericFacet} from './headless-search-numeric-facet'; describe('SearchNumericFacet', () => { diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.ts index ff3cf5d45df..999ade42d9a 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-numeric-facet.ts @@ -1,10 +1,10 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import {loadReducerError} from '../../../../utils/errors'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import { CommerceNumericFacet, buildCommerceNumericFacet, -} from '../../facets/core/numeric/headless-commerce-numeric-facet'; +} from '../../core/facets/numeric/headless-commerce-numeric-facet'; import {loadSearchReducer} from '../utils/load-search-reducers'; import {commonOptions} from './headless-search-facet-options'; diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.test.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.test.ts index db967d40666..749ec73e767 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.test.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.test.ts @@ -10,7 +10,7 @@ import {buildMockCommerceRegularFacetResponse} from '../../../../test/mock-comme import {buildMockCommerceFacetSlice} from '../../../../test/mock-commerce-facet-slice'; import {buildMockCommerceRegularFacetValue} from '../../../../test/mock-commerce-facet-value'; import {buildMockCommerceState} from '../../../../test/mock-commerce-state'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import {buildSearchRegularFacet} from './headless-search-regular-facet'; describe('SearchRegularFacet', () => { diff --git a/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.ts b/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.ts index 01fe8164fc8..0d7b73f175f 100644 --- a/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.ts +++ b/packages/headless/src/controllers/commerce/search/facets/headless-search-regular-facet.ts @@ -1,10 +1,10 @@ import {CommerceEngine} from '../../../../app/commerce-engine/commerce-engine'; import {loadReducerError} from '../../../../utils/errors'; -import {CommerceFacetOptions} from '../../facets/core/headless-core-commerce-facet'; +import {CommerceFacetOptions} from '../../core/facets/headless-core-commerce-facet'; import { CommerceRegularFacet, buildCommerceRegularFacet, -} from '../../facets/core/regular/headless-commerce-regular-facet'; +} from '../../core/facets/regular/headless-commerce-regular-facet'; import {loadSearchReducer} from '../utils/load-search-reducers'; import {commonOptions} from './headless-search-facet-options'; diff --git a/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.test.ts b/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.test.ts index 72f4ea873ed..e39a08add27 100644 --- a/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.test.ts +++ b/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.test.ts @@ -1,7 +1,7 @@ import {executeSearch} from '../../../../features/commerce/search/search-actions'; import {commerceSearchReducer as commerceSearch} from '../../../../features/commerce/search/search-slice'; import {buildMockCommerceEngine, MockCommerceEngine} from '../../../../test'; -import {Pagination} from '../../pagination/core/headless-core-commerce-pagination'; +import {Pagination} from '../../core/pagination/headless-core-commerce-pagination'; import {buildSearchPagination} from './headless-search-pagination'; describe('search pagination', () => { diff --git a/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.ts b/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.ts index 2d7ba210207..88809cafcce 100644 --- a/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.ts +++ b/packages/headless/src/controllers/commerce/search/pagination/headless-search-pagination.ts @@ -4,7 +4,7 @@ import {loadReducerError} from '../../../../utils/errors'; import { buildCorePagination, Pagination, -} from '../../pagination/core/headless-core-commerce-pagination'; +} from '../../core/pagination/headless-core-commerce-pagination'; import {loadSearchReducer} from '../utils/load-search-reducers'; /** diff --git a/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.test.ts b/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.test.ts index 70882a109a6..6b0adafa481 100644 --- a/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.test.ts +++ b/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.test.ts @@ -4,7 +4,7 @@ import {buildMockCommerceEngine, MockCommerceEngine} from '../../../../test'; import { buildRelevanceSortCriterion, Sort, -} from '../../sort/core/headless-core-commerce-sort'; +} from '../../core/sort/headless-core-commerce-sort'; import {buildSearchSort} from './headless-search-sort'; describe('commerce search sort', () => { diff --git a/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.ts b/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.ts index ff3bfc08479..db6b2b20b1d 100644 --- a/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.ts +++ b/packages/headless/src/controllers/commerce/search/sort/headless-search-sort.ts @@ -5,7 +5,7 @@ import { Sort, buildCoreSort, SortProps, -} from '../../sort/core/headless-core-commerce-sort'; +} from '../../core/sort/headless-core-commerce-sort'; import {loadSearchReducer} from '../utils/load-search-reducers'; /** diff --git a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts index de27d832be6..f2f5884b835 100644 --- a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts +++ b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.test.ts @@ -2,7 +2,7 @@ import { DateRangeRequest, FacetValueRequest, NumericRangeRequest, -} from '../../../../controllers/commerce/facets/core/headless-core-commerce-facet'; +} from '../../../../controllers/commerce/core/facets/headless-core-commerce-facet'; import {buildMockCommerceFacetRequest} from '../../../../test/mock-commerce-facet-request'; import { buildMockCommerceDateFacetResponse, diff --git a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts index 3aa99f3ca88..dcf202e1270 100644 --- a/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts +++ b/packages/headless/src/features/commerce/facets/facet-set/facet-set-slice.ts @@ -7,7 +7,7 @@ import { DateRangeRequest, FacetValueRequest, NumericRangeRequest, -} from '../../../../controllers/commerce/facets/core/headless-core-commerce-facet'; +} from '../../../../controllers/commerce/core/facets/headless-core-commerce-facet'; import {deselectAllBreadcrumbs} from '../../../breadcrumb/breadcrumb-actions'; import { toggleExcludeFacetValue,