Skip to content

Commit

Permalink
Merge pull request #70 from Relewise/fix/using-non-relative-imports
Browse files Browse the repository at this point in the history
Fix/using non relative imports
  • Loading branch information
SWH-Relewise authored Jul 26, 2024
2 parents a6001be + 09ef241 commit 9f4bca0
Show file tree
Hide file tree
Showing 9 changed files with 352 additions and 580 deletions.
3 changes: 2 additions & 1 deletion packages/client/src/builders/filters/brandFilterBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BrandAssortmentFilter, BrandDataFilter, BrandDataHasKeyFilter, BrandDisabledFilter, BrandIdFilter } from 'src/models/data-contracts';
import { BrandAssortmentFilter, BrandDataFilter, BrandDataHasKeyFilter, BrandDisabledFilter, BrandIdFilter } from '../../models/data-contracts';

import { ConditionBuilder } from '../conditionBuilder';
import { EntityDataFilterOptions, FilterOptions } from './filters.types.shared';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CompanyDataFilter, CompanyDataHasKeyFilter, CompanyDisabledFilter, CompanyIdFilter } from 'src/models/data-contracts';
import { CompanyDataFilter, CompanyDataHasKeyFilter, CompanyDisabledFilter, CompanyIdFilter } from '../../models/data-contracts';
import { ConditionBuilder } from '../conditionBuilder';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
import { FilterBuilderBase } from './filterBuilderBase';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ContentAssortmentFilter, ContentCategoryAssortmentFilter, ContentCategoryHasAncestorFilter, ContentCategoryHasChildFilter, ContentCategoryHasContentsFilter, ContentCategoryHasParentFilter, ContentCategoryIdFilter, ContentCategoryLevelFilter, ContentCategoryDataFilter, ContentDataFilter, ContentIdFilter, ContentCategoryDataHasKeyFilter, ContentCategoryDisabledFilter, ContentCategoryRecentlyViewedByUserFilter, ContentDataHasKeyFilter, ContentDisabledFilter, ContentRecentlyViewedByUserFilter, ContentHasCategoriesFilter } from 'src/models/data-contracts';
import { ContentAssortmentFilter, ContentCategoryAssortmentFilter, ContentCategoryHasAncestorFilter, ContentCategoryHasChildFilter, ContentCategoryHasContentsFilter, ContentCategoryHasParentFilter, ContentCategoryIdFilter, ContentCategoryLevelFilter, ContentCategoryDataFilter, ContentDataFilter, ContentIdFilter, ContentCategoryDataHasKeyFilter, ContentCategoryDisabledFilter, ContentCategoryRecentlyViewedByUserFilter, ContentDataHasKeyFilter, ContentDisabledFilter, ContentRecentlyViewedByUserFilter, ContentHasCategoriesFilter } from '../../models/data-contracts';
import { ConditionBuilder } from '../conditionBuilder';
import { EntityDataFilterOptions, FilterOptions } from './filters.types.shared';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/builders/filters/filterBuilderBase.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { AndFilter, FilterCollection, OrFilter } from 'src/models/data-contracts';
import { AndFilter, FilterCollection, OrFilter } from '../../models/data-contracts';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
import { AllFilters, FilterOptions } from './filters.types.shared';

export type Constructor<T> = new () => T;

export abstract class FilterBuilderBase<TFilterBuilder extends FilterBuilderBase<any>> {
constructor(private TFilterBuilderCtor: Constructor<TFilterBuilder>) {}
constructor(private TFilterBuilderCtor: Constructor<TFilterBuilder>) { }

protected filters: AllFilters[] = [];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FilterCollection } from 'src/models/data-contracts';
import { FilterCollection } from '../../models/data-contracts';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';

export type FilterOptions = {
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/builders/filters/productFilterBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ProductAndVariantIdFilter, ProductAssortmentFilter, ProductCategoryAssortmentFilter, ProductCategoryHasAncestorFilter, ProductCategoryHasChildFilter, ProductCategoryHasParentFilter, ProductCategoryHasProductsFilter, ProductCategoryIdFilter, ProductCategoryLevelFilter, ProductDataFilter, ProductDisplayNameFilter, ProductHasVariantsFilter, ProductIdFilter, ProductListPriceFilter, ProductRecentlyPurchasedByUserFilter, ProductRecentlyViewedByUserFilter, ProductSalesPriceFilter, ProductAndVariantId, ProductCategoryDataFilter, ProductCategoryDataHasKeyFilter, ProductCategoryDisabledFilter, ProductCategoryRecentlyViewedByUserFilter, ProductDataHasKeyFilter, ProductDisabledFilter, ProductHasCategoriesFilter, ProductRecentlyPurchasedByCompanyFilter, ProductRecentlyPurchasedByUserCompanyFilter, ProductRecentlyPurchasedByUserParentCompanyFilter, ProductRecentlyViewedByCompanyFilter, ProductRecentlyViewedByUserCompanyFilter, ProductRecentlyViewedByUserParentCompanyFilter } from 'src/models/data-contracts';
import { ProductAndVariantIdFilter, ProductAssortmentFilter, ProductCategoryAssortmentFilter, ProductCategoryHasAncestorFilter, ProductCategoryHasChildFilter, ProductCategoryHasParentFilter, ProductCategoryHasProductsFilter, ProductCategoryIdFilter, ProductCategoryLevelFilter, ProductDataFilter, ProductDisplayNameFilter, ProductHasVariantsFilter, ProductIdFilter, ProductListPriceFilter, ProductRecentlyPurchasedByUserFilter, ProductRecentlyViewedByUserFilter, ProductSalesPriceFilter, ProductAndVariantId, ProductCategoryDataFilter, ProductCategoryDataHasKeyFilter, ProductCategoryDisabledFilter, ProductCategoryRecentlyViewedByUserFilter, ProductDataHasKeyFilter, ProductDisabledFilter, ProductHasCategoriesFilter, ProductRecentlyPurchasedByCompanyFilter, ProductRecentlyPurchasedByUserCompanyFilter, ProductRecentlyPurchasedByUserParentCompanyFilter, ProductRecentlyViewedByCompanyFilter, ProductRecentlyViewedByUserCompanyFilter, ProductRecentlyViewedByUserParentCompanyFilter } from '../../models/data-contracts';
import { ConditionBuilder } from '../conditionBuilder';
import { EntityDataFilterOptions, FilterOptions } from './filters.types.shared';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
Expand Down Expand Up @@ -655,7 +655,7 @@ export class ProductFilterBuilder extends FilterBuilderBase<ProductFilterBuilder

return this;
}

/**
* Adds a filter to only return products recently viewed by a company.
* @param sinceMinutesAgo - Time in minutes since the view.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { VariantAssortmentFilter, VariantDataFilter, VariantDataHasKeyFilter, VariantDisabledFilter, VariantIdFilter, VariantListPriceFilter, VariantSalesPriceFilter, VariantSpecificationFilter } from 'src/models/data-contracts';
import { VariantAssortmentFilter, VariantDataFilter, VariantDataHasKeyFilter, VariantDisabledFilter, VariantIdFilter, VariantListPriceFilter, VariantSalesPriceFilter, VariantSpecificationFilter } from '../../models/data-contracts';
import { ConditionBuilder } from '../conditionBuilder';
import { EntityDataFilterOptions, FilterOptions } from './filters.types.shared';
import { FilterSettingsBuilder } from '../filterSettingsBuilder';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/builders/search/getProductFacet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrandFacetResult, CategoryFacetResult, CategoryHierarchyFacetResult, PriceRangeFacetResult, PriceRangesFacetResult, ProductAssortmentFacetResult, ProductDataBooleanValueFacetResult, ProductDataDoubleRangeFacetResult, ProductDataDoubleRangesFacetResult, ProductDataDoubleValueFacetResult, ProductDataObjectFacetResult, ProductDataStringValueFacetResult, ProductFacetResult, VariantSpecificationFacetResult } from 'src/models/data-contracts';
import { BrandFacetResult, CategoryFacetResult, CategoryHierarchyFacetResult, PriceRangeFacetResult, PriceRangesFacetResult, ProductAssortmentFacetResult, ProductDataBooleanValueFacetResult, ProductDataDoubleRangeFacetResult, ProductDataDoubleRangesFacetResult, ProductDataDoubleValueFacetResult, ProductDataObjectFacetResult, ProductDataStringValueFacetResult, ProductFacetResult, VariantSpecificationFacetResult } from '../../models/data-contracts';

export type DataSelectionStrategy = ProductDataDoubleRangeFacetResult['dataSelectionStrategy'];
export type PriceSelectionStrategy = PriceRangeFacetResult['priceSelectionStrategy'];
Expand Down
Loading

0 comments on commit 9f4bca0

Please sign in to comment.