@shopgate/pwa-common-commerce 7.30.0-alpha.7 → 7.30.0-alpha.8

package/product/actions/fetchProductVariants.js

@@ -1,5 +1,34 @@
-import PipelineRequest from'@shopgate/pwa-core/classes/PipelineRequest';import{shouldFetchData,mutable}from'@shopgate/pwa-common/helpers/redux';import requestProductVariants from"../action-creators/requestProductVariants";import{SHOPGATE_CATALOG_GET_PRODUCT_VARIANTS}from"../constants/Pipelines";import receiveProductVariants from"../action-creators/receiveProductVariants";import errorProductVariants from"../action-creators/errorProductVariants";/**
+import PipelineRequest from '@shopgate/pwa-core/classes/PipelineRequest';
+import { shouldFetchData, mutable } from '@shopgate/pwa-common/helpers/redux';
+import requestProductVariants from "../action-creators/requestProductVariants";
+import { SHOPGATE_CATALOG_GET_PRODUCT_VARIANTS } from "../constants/Pipelines";
+import receiveProductVariants from "../action-creators/receiveProductVariants";
+import errorProductVariants from "../action-creators/errorProductVariants";
+
+/**
  * Retrieves product variants from store.
  * @param {string} productId The product ID for which the product variants are requested.
  * @return {Function} A Redux Thunk
- */function fetchProductVariants(productId){return function(dispatch,getState){var state=getState();var cachedData=state.product.variantsByProductId[productId];if(!shouldFetchData(cachedData)){return Promise.resolve(null);}dispatch(requestProductVariants(productId));var request=new PipelineRequest(SHOPGATE_CATALOG_GET_PRODUCT_VARIANTS).setInput({productId:productId}).dispatch();request.then(function(result){dispatch(receiveProductVariants(productId,result));})["catch"](function(error){dispatch(errorProductVariants(productId,error.code));});return request;};}/** @mixes {MutableFunction} */export default mutable(fetchProductVariants);
+ */
+function fetchProductVariants(productId) {
+  return (dispatch, getState) => {
+    const state = getState();
+    const cachedData = state.product.variantsByProductId[productId];
+    if (!shouldFetchData(cachedData)) {
+      return Promise.resolve(null);
+    }
+    dispatch(requestProductVariants(productId));
+    const request = new PipelineRequest(SHOPGATE_CATALOG_GET_PRODUCT_VARIANTS).setInput({
+      productId
+    }).dispatch();
+    request.then(result => {
+      dispatch(receiveProductVariants(productId, result));
+    }).catch(error => {
+      dispatch(errorProductVariants(productId, error.code));
+    });
+    return request;
+  };
+}
+
+/** @mixes {MutableFunction} */
+export default mutable(fetchProductVariants);

package/product/actions/fetchProducts.js

@@ -1,8 +1,29 @@
-var _excluded=["offset","limit"];function _objectWithoutProperties(source,excluded){if(source==null)return{};var target=_objectWithoutPropertiesLoose(source,excluded);var key,i;if(Object.getOwnPropertySymbols){var sourceSymbolKeys=Object.getOwnPropertySymbols(source);for(i=0;i<sourceSymbolKeys.length;i++){key=sourceSymbolKeys[i];if(excluded.indexOf(key)>=0)continue;if(!Object.prototype.propertyIsEnumerable.call(source,key))continue;target[key]=source[key];}}return target;}function _objectWithoutPropertiesLoose(source,excluded){if(source==null)return{};var target={};var sourceKeys=Object.keys(source);var key,i;for(i=0;i<sourceKeys.length;i++){key=sourceKeys[i];if(excluded.indexOf(key)>=0)continue;target[key]=source[key];}return target;}function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}import difference from'lodash/difference';import PipelineRequest from'@shopgate/pwa-core/classes/PipelineRequest';import{generateResultHash,shouldFetchData}from'@shopgate/pwa-common/helpers/redux';import{isNumber}from'@shopgate/pwa-common/helpers/validation';import configuration from'@shopgate/pwa-common/collections/Configuration';import{DEFAULT_PRODUCTS_FETCH_PARAMS}from'@shopgate/pwa-common/constants/Configuration';import{SORT_SCOPE_CATEGORY}from'@shopgate/engage/filter/constants';import{makeGetDefaultSortOrder}from'@shopgate/engage/filter/selectors';import{getFulfillmentParams}from'@shopgate/pwa-common-commerce/product/selectors/product';import{SHOPGATE_CATALOG_GET_PRODUCTS,SHOPGATE_CATALOG_GET_HIGHLIGHT_PRODUCTS,SHOPGATE_CATALOG_GET_LIVESHOPPING_PRODUCTS}from"../constants/Pipelines";import buildRequestFilters from"../../filter/actions/helpers/buildRequestFilters";import requestProducts from"../action-creators/requestProducts";import receiveProducts from"../action-creators/receiveProducts";import errorProducts from"../action-creators/errorProducts";import deleteProductsByIds from"../action-creators/deleteProductsByIds";import receiveProductsCached from"../action-creators/receiveProductsCached";import{makeGetProductResultByCustomHash}from"../selectors/product";/**
+import difference from 'lodash/difference';
+import PipelineRequest from '@shopgate/pwa-core/classes/PipelineRequest';
+import { generateResultHash, shouldFetchData } from '@shopgate/pwa-common/helpers/redux';
+import { isNumber } from '@shopgate/pwa-common/helpers/validation';
+import configuration from '@shopgate/pwa-common/collections/Configuration';
+import { DEFAULT_PRODUCTS_FETCH_PARAMS } from '@shopgate/pwa-common/constants/Configuration';
+import { SORT_SCOPE_CATEGORY } from '@shopgate/engage/filter/constants';
+import { makeGetDefaultSortOrder } from '@shopgate/engage/filter/selectors';
+import { getFulfillmentParams } from '@shopgate/pwa-common-commerce/product/selectors/product';
+import { SHOPGATE_CATALOG_GET_PRODUCTS, SHOPGATE_CATALOG_GET_HIGHLIGHT_PRODUCTS, SHOPGATE_CATALOG_GET_LIVESHOPPING_PRODUCTS } from "../constants/Pipelines";
+import buildRequestFilters from "../../filter/actions/helpers/buildRequestFilters";
+import requestProducts from "../action-creators/requestProducts";
+import receiveProducts from "../action-creators/receiveProducts";
+import errorProducts from "../action-creators/errorProducts";
+import deleteProductsByIds from "../action-creators/deleteProductsByIds";
+import receiveProductsCached from "../action-creators/receiveProductsCached";
+import { makeGetProductResultByCustomHash } from "../selectors/product";
+
+/**
  * Checks if a product ID type is a product identifiers type.
  * @param {string} productIdType The product ID type to check.
  * @returns {boolean}
- */export var isProductIdentifiersProductIdType=function isProductIdentifiersProductIdType(productIdType){return['sku','ean','upc'].includes(productIdType);};/**
+ */
+export const isProductIdentifiersProductIdType = productIdType => ['sku', 'ean', 'upc'].includes(productIdType);
+
+/**
  * Process the pipeline params to be compatible.
  * Currently the categoryId field cannot be used in combination with the filter field. In order to
  * use them together the categoryId field has to be extracted into the filter field.
@@ -12,10 +33,41 @@ var _excluded=["offset","limit"];function _objectWithoutProperties(source,exclud
  * @param {boolean} includeSort Tells if the sort parameters shall be included to the request.
  * @param {boolean} includeFilters Tells if the filter parameters shall be included to the request.
  * @returns {Object} A set of compatible params.
- */var processParams=function processParams(params,activeFilters){var includeSort=arguments.length>2&&arguments[2]!==undefined?arguments[2]:true;var includeFilters=arguments.length>3&&arguments[3]!==undefined?arguments[3]:true;var filters=buildRequestFilters(activeFilters);var newParams=_extends({},params,{},includeFilters&&filters&&Object.keys(filters).length&&{filters:filters});/**
+ */
+const processParams = (params, activeFilters, includeSort = true, includeFilters = true) => {
+  const filters = buildRequestFilters(activeFilters);
+  const newParams = {
+    ...params,
+    ...(includeFilters && filters && Object.keys(filters).length && {
+      filters
+    })
+  };
+
+  /**
    * Check if the sort parameter should be included in the request parameters,
    * and remove it if necessary.
-   */if(includeSort===false&&params&&params.sort){delete newParams.sort;}if(newParams.productIdType){if(isProductIdentifiersProductIdType(newParams.productIdType)){if(newParams.productIdType==='sku'){newParams.productSkus=newParams.productIds;}else if(newParams.productIdType==='ean'){newParams.productEans=newParams.productIds;}else if(newParams.productIdType==='upc'){newParams.productUpcs=newParams.productIds;}delete newParams.productIds;}}delete newParams.productIdType;return newParams;};var getDefaultSortOrder=makeGetDefaultSortOrder();/**
+   */
+  if (includeSort === false && params && params.sort) {
+    delete newParams.sort;
+  }
+  if (newParams.productIdType) {
+    if (isProductIdentifiersProductIdType(newParams.productIdType)) {
+      if (newParams.productIdType === 'sku') {
+        newParams.productSkus = newParams.productIds;
+      } else if (newParams.productIdType === 'ean') {
+        newParams.productEans = newParams.productIds;
+      } else if (newParams.productIdType === 'upc') {
+        newParams.productUpcs = newParams.productIds;
+      }
+      delete newParams.productIds;
+    }
+  }
+  delete newParams.productIdType;
+  return newParams;
+};
+const getDefaultSortOrder = makeGetDefaultSortOrder();
+
+/**
  * Retrieves a product from the Redux store.
  * @param {Object} options The options for the getProducts request.
  * @param {Object} options.params The params for the getProduct pipeline.
@@ -33,18 +85,138 @@ var _excluded=["offset","limit"];function _objectWithoutProperties(source,exclud
  * @param {boolean} [options.resolveCachedProducts=false] Whether to resolve with products even
  * when no actual request was done due to cached data.
  * @return {Function} A Redux Thunk
- */function fetchProducts(options){var _options$params=options.params,params=_options$params===void 0?{}:_options$params,_options$filters=options.filters,filters=_options$filters===void 0?null:_options$filters,_options$pipeline=options.pipeline,pipeline=_options$pipeline===void 0?SHOPGATE_CATALOG_GET_PRODUCTS:_options$pipeline,_options$cached=options.cached,cached=_options$cached===void 0?true:_options$cached,_options$cachedTime=options.cachedTime,cachedTime=_options$cachedTime===void 0?null:_options$cachedTime,_options$id=options.id,id=_options$id===void 0?null:_options$id,_options$includeSort=options.includeSort,includeSort=_options$includeSort===void 0?true:_options$includeSort,_options$includeFilte=options.includeFilters,includeFilters=_options$includeFilte===void 0?true:_options$includeFilte,_options$includeFulfi=options.includeFulfillment,includeFulfillment=_options$includeFulfi===void 0?true:_options$includeFulfi,_options$onBeforeDisp=options.onBeforeDispatch,onBeforeDispatch=_options$onBeforeDisp===void 0?function(){}:_options$onBeforeDisp,_options$resolveCache=options.resolveCachedProducts,resolveCachedProducts=_options$resolveCache===void 0?false:_options$resolveCache;return function(dispatch,getState){var state=getState();var offset=params.offset,limit=params.limit,hashParams=_objectWithoutProperties(params,_excluded);var defaultSort=getDefaultSortOrder(state,{scope:SORT_SCOPE_CATEGORY});var _hashParams$sort=hashParams.sort,sort=_hashParams$sort===void 0?defaultSort:_hashParams$sort;var getProductsRequestParams;if(pipeline===SHOPGATE_CATALOG_GET_PRODUCTS){getProductsRequestParams=configuration.get(DEFAULT_PRODUCTS_FETCH_PARAMS);}// Append additional global fulfillment parameters.
-var fulfillmentParams={};if(includeFulfillment&&pipeline===SHOPGATE_CATALOG_GET_PRODUCTS){fulfillmentParams=getFulfillmentParams(state);}// We need to process the params to handle edge cases in the pipeline params.
-var requestParams=_extends({},fulfillmentParams,{},getProductsRequestParams,{},processParams(params,filters,includeSort,includeFilters));var hash=generateResultHash(_extends({pipeline:pipeline,sort:sort},fulfillmentParams,{},hashParams,{},filters&&Object.keys(filters).length&&{filters:filters},{},id&&{id:id}),includeSort,includeFilters);var result=state.product.resultsByHash[hash];var requiredProductCount=null;// Only set a required number of products if both offset and limit are valid.
-if(isNumber(offset)&&isNumber(limit)){requiredProductCount=offset+limit;}// Stop if we don't need to get any data.
-if(!shouldFetchData(result,'products',requiredProductCount)){var products=result.products;if(Array.isArray(products)){/**
+ */
+function fetchProducts(options) {
+  const {
+    params = {},
+    filters = null,
+    pipeline = SHOPGATE_CATALOG_GET_PRODUCTS,
+    cached = true,
+    cachedTime = null,
+    id = null,
+    includeSort = true,
+    includeFilters = true,
+    includeFulfillment = true,
+    onBeforeDispatch = () => {},
+    resolveCachedProducts = false
+  } = options;
+  return (dispatch, getState) => {
+    const state = getState();
+    const {
+      offset,
+      limit,
+      ...hashParams
+    } = params;
+    const defaultSort = getDefaultSortOrder(state, {
+      scope: SORT_SCOPE_CATEGORY
+    });
+    const {
+      sort = defaultSort
+    } = hashParams;
+    let getProductsRequestParams;
+    if (pipeline === SHOPGATE_CATALOG_GET_PRODUCTS) {
+      getProductsRequestParams = configuration.get(DEFAULT_PRODUCTS_FETCH_PARAMS);
+    }
+
+    // Append additional global fulfillment parameters.
+    let fulfillmentParams = {};
+    if (includeFulfillment && pipeline === SHOPGATE_CATALOG_GET_PRODUCTS) {
+      fulfillmentParams = getFulfillmentParams(state);
+    }
+
+    // We need to process the params to handle edge cases in the pipeline params.
+    const requestParams = {
+      ...fulfillmentParams,
+      ...getProductsRequestParams,
+      ...processParams(params, filters, includeSort, includeFilters)
+    };
+    const hash = generateResultHash({
+      pipeline,
+      sort,
+      ...fulfillmentParams,
+      ...hashParams,
+      ...(filters && Object.keys(filters).length && {
+        filters
+      }),
+      ...(id && {
+        id
+      })
+    }, includeSort, includeFilters);
+    const result = state.product.resultsByHash[hash];
+    let requiredProductCount = null;
+
+    // Only set a required number of products if both offset and limit are valid.
+    if (isNumber(offset) && isNumber(limit)) {
+      requiredProductCount = offset + limit;
+    }
+
+    // Stop if we don't need to get any data.
+    if (!shouldFetchData(result, 'products', requiredProductCount)) {
+      const {
+        products
+      } = result;
+      if (Array.isArray(products)) {
+        /**
          * Fire the onBeforeDispatch callback to inform
          * a caller that fetchProducts will return data.
-         */onBeforeDispatch();dispatch(receiveProductsCached({hash:hash,requestParams:requestParams,products:products}));return Promise.resolve(resolveCachedProducts?makeGetProductResultByCustomHash(hash)(state):result);}return null;}// Fire the onBeforeDispatch callback to inform a caller that fetchProducts will return data.
-onBeforeDispatch();dispatch(requestProducts({hash:hash,cached:cached,cachedTime:cachedTime,requestParams:requestParams}));var request=new PipelineRequest(pipeline).setInput(requestParams).dispatch();request.then(function(response){var totalResultCount=response.totalProductCount;/**
-         * When the next check was written, getHighlightProducts and getLiveshoppingProducts
-         * didn't deliver a totalProductCount within their responses - they simply returned all
-         * available products.
-         * So we set the products count of the response as totalProductCount to decrease the
-         * amount of logic, which is necessary to deal with product related pipeline.
-         */if(typeof totalResultCount==='undefined'&&(pipeline===SHOPGATE_CATALOG_GET_HIGHLIGHT_PRODUCTS||pipeline===SHOPGATE_CATALOG_GET_LIVESHOPPING_PRODUCTS)){totalResultCount=response.products.length;}dispatch(receiveProducts({hash:hash,requestParams:requestParams,products:response.products,totalResultCount:totalResultCount,cached:cached,cachedTime:cachedTime}));if(!isProductIdentifiersProductIdType(params===null||params===void 0?void 0:params.productIdType)&&Array.isArray(params===null||params===void 0?void 0:params.productIds)){var requestIds=params===null||params===void 0?void 0:params.productIds;var responseIds=response.products.map(function(product){return product.id;});var missingResponseIds=difference(requestIds,responseIds);if(missingResponseIds.length>0){dispatch(deleteProductsByIds(missingResponseIds));}}})["catch"](function(error){dispatch(errorProducts({errorCode:error.code,hash:hash,requestParams:requestParams}));});return request;};}export default fetchProducts;
+         */
+        onBeforeDispatch();
+        dispatch(receiveProductsCached({
+          hash,
+          requestParams,
+          products
+        }));
+        return Promise.resolve(resolveCachedProducts ? makeGetProductResultByCustomHash(hash)(state) : result);
+      }
+      return null;
+    }
+
+    // Fire the onBeforeDispatch callback to inform a caller that fetchProducts will return data.
+    onBeforeDispatch();
+    dispatch(requestProducts({
+      hash,
+      cached,
+      cachedTime,
+      requestParams
+    }));
+    const request = new PipelineRequest(pipeline).setInput(requestParams).dispatch();
+    request.then(response => {
+      let totalResultCount = response.totalProductCount;
+
+      /**
+       * When the next check was written, getHighlightProducts and getLiveshoppingProducts
+       * didn't deliver a totalProductCount within their responses - they simply returned all
+       * available products.
+       * So we set the products count of the response as totalProductCount to decrease the
+       * amount of logic, which is necessary to deal with product related pipeline.
+       */
+      if (typeof totalResultCount === 'undefined' && (pipeline === SHOPGATE_CATALOG_GET_HIGHLIGHT_PRODUCTS || pipeline === SHOPGATE_CATALOG_GET_LIVESHOPPING_PRODUCTS)) {
+        totalResultCount = response.products.length;
+      }
+      dispatch(receiveProducts({
+        hash,
+        requestParams,
+        products: response.products,
+        totalResultCount,
+        cached,
+        cachedTime
+      }));
+      if (!isProductIdentifiersProductIdType(params?.productIdType) && Array.isArray(params?.productIds)) {
+        const requestIds = params?.productIds;
+        const responseIds = response.products.map(product => product.id);
+        const missingResponseIds = difference(requestIds, responseIds);
+        if (missingResponseIds.length > 0) {
+          dispatch(deleteProductsByIds(missingResponseIds));
+        }
+      }
+    }).catch(error => {
+      dispatch(errorProducts({
+        errorCode: error.code,
+        hash,
+        requestParams
+      }));
+    });
+    return request;
+  };
+}
+export default fetchProducts;

package/product/actions/fetchProductsById.js

@@ -1,4 +1,8 @@
-function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}function _typeof(obj){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(obj){return typeof obj;};}else{_typeof=function _typeof(obj){return obj&&typeof Symbol==="function"&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj;};}return _typeof(obj);}import{getProductDataById}from'@shopgate/engage/product/selectors/product';import{shouldFetchData}from'@shopgate/pwa-common/helpers/redux';import fetchProducts,{isProductIdentifiersProductIdType}from"./fetchProducts";/**
+import { getProductDataById } from '@shopgate/engage/product/selectors/product';
+import { shouldFetchData } from '@shopgate/pwa-common/helpers/redux';
+import fetchProducts, { isProductIdentifiersProductIdType } from "./fetchProducts";
+
+/**
  * Dispatches a fetch products action to retrieve products by their IDs.
  * @param {Object|string[]} optionsOrProductIds Action options or an array of product IDs
  * (deprecated)
@@ -14,10 +18,66 @@ function _extends(){_extends=Object.assign||function(target){for(var i=1;i<argum
  * @param {boolean} [includeFulfillment=true] (deprecated) Whether to include fulfillment data to
  * the request
  * @return {Function} A Redux Thunk
- */var fetchProductsById=function fetchProductsById(optionsOrProductIds){var componentId=arguments.length>1&&arguments[1]!==undefined?arguments[1]:null;var cached=arguments.length>2&&arguments[2]!==undefined?arguments[2]:true;var includeFulfillment=arguments.length>3&&arguments[3]!==undefined?arguments[3]:true;return function(dispatch,getState){var localProductIds;var localComponentId;var localCached;var localIncludeFulfillment;var productIdType;if(Array.isArray(optionsOrProductIds)){// Backwards compatibility for previous implementation where the function had a parameter list
-localProductIds=optionsOrProductIds;localComponentId=componentId||null;localCached=cached!==undefined?cached:true;localIncludeFulfillment=includeFulfillment!==undefined?includeFulfillment:true;}else if(_typeof(optionsOrProductIds)==='object'&&optionsOrProductIds!==null){// New object parameter mode
-localProductIds=optionsOrProductIds.productIds;var _optionsOrProductIds$=optionsOrProductIds.componentId;localComponentId=_optionsOrProductIds$===void 0?null:_optionsOrProductIds$;var _optionsOrProductIds$2=optionsOrProductIds.cached;localCached=_optionsOrProductIds$2===void 0?true:_optionsOrProductIds$2;var _optionsOrProductIds$3=optionsOrProductIds.includeFulfillment;localIncludeFulfillment=_optionsOrProductIds$3===void 0?true:_optionsOrProductIds$3;productIdType=optionsOrProductIds.productIdType;}var requestProductIds=localProductIds;// When the productIds are regular product IDs, we can check the Redux store for existing
-// and only request the missing ones. That certainly doesn't work for SKUs, EANs or UPCs,
-if(!isProductIdentifiersProductIdType(productIdType)){var state=getState();var products=state.product.productsById;// Filter out only the products that are not yet available in the store.
-requestProductIds=localProductIds.filter(function(id){return shouldFetchData(products[id]);});// Then only perform a pipeline request if there are products missing.
-if(!requestProductIds.length){var productsById=localProductIds.map(function(id){return getProductDataById(state,{productId:id});});var totalProductCount=productsById.length;return{products:productsById,totalProductCount:totalProductCount};}}return dispatch(fetchProducts(_extends({},localComponentId&&{id:localComponentId},{cached:localCached,params:_extends({productIds:requestProductIds},productIdType&&{productIdType:productIdType}),includeFulfillment:localIncludeFulfillment,includeFilters:false,includeSort:false})));};};export default fetchProductsById;
+ */
+const fetchProductsById = (optionsOrProductIds, componentId = null, cached = true, includeFulfillment = true) => (dispatch, getState) => {
+  let localProductIds;
+  let localComponentId;
+  let localCached;
+  let localIncludeFulfillment;
+  let productIdType;
+  if (Array.isArray(optionsOrProductIds)) {
+    // Backwards compatibility for previous implementation where the function had a parameter list
+    localProductIds = optionsOrProductIds;
+    localComponentId = componentId || null;
+    localCached = cached !== undefined ? cached : true;
+    localIncludeFulfillment = includeFulfillment !== undefined ? includeFulfillment : true;
+  } else if (typeof optionsOrProductIds === 'object' && optionsOrProductIds !== null) {
+    // New object parameter mode
+    ({
+      productIds: localProductIds,
+      componentId: localComponentId = null,
+      cached: localCached = true,
+      includeFulfillment: localIncludeFulfillment = true,
+      productIdType
+    } = optionsOrProductIds);
+  }
+  let requestProductIds = localProductIds;
+
+  // When the productIds are regular product IDs, we can check the Redux store for existing
+  // and only request the missing ones. That certainly doesn't work for SKUs, EANs or UPCs,
+  if (!isProductIdentifiersProductIdType(productIdType)) {
+    const state = getState();
+    const products = state.product.productsById;
+
+    // Filter out only the products that are not yet available in the store.
+    requestProductIds = localProductIds.filter(id => shouldFetchData(products[id]));
+
+    // Then only perform a pipeline request if there are products missing.
+    if (!requestProductIds.length) {
+      const productsById = localProductIds.map(id => getProductDataById(state, {
+        productId: id
+      }));
+      const totalProductCount = productsById.length;
+      return {
+        products: productsById,
+        totalProductCount
+      };
+    }
+  }
+  return dispatch(fetchProducts({
+    ...(localComponentId && {
+      id: localComponentId
+    }),
+    cached: localCached,
+    params: {
+      productIds: requestProductIds,
+      ...(productIdType && {
+        productIdType
+      })
+    },
+    includeFulfillment: localIncludeFulfillment,
+    includeFilters: false,
+    includeSort: false
+  }));
+};
+export default fetchProductsById;

package/product/actions/fetchProductsByQuery.js

@@ -1,26 +1,110 @@
-var _excluded=["useDefaultRequestForProductIds","productIdType"];function _extends(){_extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};return _extends.apply(this,arguments);}function _objectWithoutProperties(source,excluded){if(source==null)return{};var target=_objectWithoutPropertiesLoose(source,excluded);var key,i;if(Object.getOwnPropertySymbols){var sourceSymbolKeys=Object.getOwnPropertySymbols(source);for(i=0;i<sourceSymbolKeys.length;i++){key=sourceSymbolKeys[i];if(excluded.indexOf(key)>=0)continue;if(!Object.prototype.propertyIsEnumerable.call(source,key))continue;target[key]=source[key];}}return target;}function _objectWithoutPropertiesLoose(source,excluded){if(source==null)return{};var target={};var sourceKeys=Object.keys(source);var key,i;for(i=0;i<sourceKeys.length;i++){key=sourceKeys[i];if(excluded.indexOf(key)>=0)continue;target[key]=source[key];}return target;}import fetchHighlightProducts from"./fetchHighlightProducts";import fetchProducts from"./fetchProducts";import fetchProductsById from"./fetchProductsById";/**
+import fetchHighlightProducts from "./fetchHighlightProducts";
+import fetchProducts from "./fetchProducts";
+import fetchProductsById from "./fetchProductsById";
+
+/**
  * Dispatches other actions based on the query type.
  * @param {number|string} type The query type.
  * @param {string} value The value to use with the query.
  * @param {Object} options Any additional options for requesting products.
  * @param {string} [id=null] A unique id for the component that is using this action.
  * @return {Function} A Redux Thunk
- */var fetchProductsByQuery=function fetchProductsByQuery(type,value){var options=arguments.length>2&&arguments[2]!==undefined?arguments[2]:{};var id=arguments.length>3&&arguments[3]!==undefined?arguments[3]:null;return function(dispatch){/**
+ */
+const fetchProductsByQuery = (type, value, options = {}, id = null) => dispatch => {
+  /**
    * Remove all properties from the options which are just intended to be used inside this function
    * and not supposed to be used for the actual products request.
-   */var _options$useDefaultRe=options.useDefaultRequestForProductIds,useDefaultRequestForProductIds=_options$useDefaultRe===void 0?false:_options$useDefaultRe,_options$productIdTyp=options.productIdType,productIdType=_options$productIdTyp===void 0?undefined:_options$productIdTyp,sanitizedOptions=_objectWithoutProperties(options,_excluded);switch(type){// Product highlights
-case 1:{var params=_extends({},sanitizedOptions);return dispatch(fetchHighlightProducts(_extends({params:params},id&&{id:id})));}// Search phrase
-case 2:case 3:{var _params=_extends({searchPhrase:value},sanitizedOptions);return dispatch(fetchProducts(_extends({params:_params},id&&{id:id},{includeFilters:false})));}// Product ID's
-case 4:{/**
-       * By default the productIds query type bypasses the regular product request logic. It will
-       * just request the products that are not available in Redux yet.
-       * This can cause update issues in the UI, since selectors might not return fresh data when
-       * Redux changes.
-       * So when the "useDefaultRequestForProductIds" flag is active, the regular request system is
-       * used and whenever the fetch params change, new product data fill be fetched.
-       *
-       * ATTENTION: To make the system work completely, also the "getProductsResult" selector helper
-       * needs to be called with this parameter.
-       */if(useDefaultRequestForProductIds){var _params2=_extends({productIds:value,productIdType:productIdType},sanitizedOptions);// Limit and offset are not fully supported for product requests with productId list
-delete _params2.limit;delete _params2.offset;return dispatch(fetchProducts(_extends({params:_params2},id&&{id:id},{includeFilters:false,includeSort:false})));}return dispatch(fetchProductsById(value,id));}// Category
-case 5:{var _params3=_extends({categoryId:value},sanitizedOptions);return dispatch(fetchProducts(_extends({params:_params3},id&&{id:id},{includeFilters:false})));}default:}return null;};};export default fetchProductsByQuery;
+   */
+  const {
+    useDefaultRequestForProductIds = false,
+    productIdType = undefined,
+    ...sanitizedOptions
+  } = options;
+  switch (type) {
+    // Product highlights
+    case 1:
+      {
+        const params = {
+          ...sanitizedOptions
+        };
+        return dispatch(fetchHighlightProducts({
+          params,
+          ...(id && {
+            id
+          })
+        }));
+      }
+
+    // Search phrase
+    case 2:
+    case 3:
+      {
+        const params = {
+          searchPhrase: value,
+          ...sanitizedOptions
+        };
+        return dispatch(fetchProducts({
+          params,
+          ...(id && {
+            id
+          }),
+          includeFilters: false
+        }));
+      }
+
+    // Product ID's
+    case 4:
+      {
+        /**
+         * By default the productIds query type bypasses the regular product request logic. It will
+         * just request the products that are not available in Redux yet.
+         * This can cause update issues in the UI, since selectors might not return fresh data when
+         * Redux changes.
+         * So when the "useDefaultRequestForProductIds" flag is active, the regular request system is
+         * used and whenever the fetch params change, new product data fill be fetched.
+         *
+         * ATTENTION: To make the system work completely, also the "getProductsResult" selector helper
+         * needs to be called with this parameter.
+         */
+        if (useDefaultRequestForProductIds) {
+          const params = {
+            productIds: value,
+            productIdType,
+            ...sanitizedOptions
+          };
+
+          // Limit and offset are not fully supported for product requests with productId list
+          delete params.limit;
+          delete params.offset;
+          return dispatch(fetchProducts({
+            params,
+            ...(id && {
+              id
+            }),
+            includeFilters: false,
+            includeSort: false
+          }));
+        }
+        return dispatch(fetchProductsById(value, id));
+      }
+
+    // Category
+    case 5:
+      {
+        const params = {
+          categoryId: value,
+          ...sanitizedOptions
+        };
+        return dispatch(fetchProducts({
+          params,
+          ...(id && {
+            id
+          }),
+          includeFilters: false
+        }));
+      }
+    default:
+  }
+  return null;
+};
+export default fetchProductsByQuery;

package/product/actions/getHighlightProducts.js

@@ -1,8 +1,12 @@
-import fetchHighlightProducts from"./fetchHighlightProducts";/**
+import fetchHighlightProducts from "./fetchHighlightProducts";
+
+/**
  * Maybe requests highlight products from server.
  * @param {Object} options The options for the fetchProducts request.
  * @param {Object} options.params The params for the getHighlightProducts pipeline.
  * @param {string} [options.id=null] A unique id for the component that is using this action.
  * @return {Function} The dispatched action.
  * @deprecated
- */var getHighlightProducts=fetchHighlightProducts;export default getHighlightProducts;
+ */
+const getHighlightProducts = fetchHighlightProducts;
+export default getHighlightProducts;

package/product/actions/getLiveshoppingProducts.js

@@ -1,5 +1,9 @@
-import fetchLiveshoppingProducts from"./fetchLiveshoppingProducts";/**
+import fetchLiveshoppingProducts from "./fetchLiveshoppingProducts";
+
+/**
  * Retrieves the information for the liveshopping products widget.
  * @return {Function} A redux thunk.
  * @deprecated
- */var getLiveshoppingProducts=fetchLiveshoppingProducts;export default getLiveshoppingProducts;
+ */
+const getLiveshoppingProducts = fetchLiveshoppingProducts;
+export default getLiveshoppingProducts;

package/product/actions/getProduct.js

@@ -1,8 +1,12 @@
-import fetchProduct from"./fetchProduct";/**
+import fetchProduct from "./fetchProduct";
+
+/**
  * Retrieves a product from the Redux store.
  * @param {string} productId The product ID.
  * @param {boolean} [forceFetch=false] Skips shouldFetchData check. Always fetches.
  * @param {boolean} [shouldProcessProductFlags=true] Skips processProductFlags()
  * @return {Function} A redux thunk.
  * @deprecated
- */var getProduct=fetchProduct;export default getProduct;
+ */
+const getProduct = fetchProduct;
+export default getProduct;

package/product/actions/getProductDescription.js

@@ -1,6 +1,10 @@
-import fetchProductDescription from"./fetchProductDescription";/**
+import fetchProductDescription from "./fetchProductDescription";
+
+/**
  * Maybe requests a product description from server.
  * @param {string} productId The product ID.
  * @return {Function} The dispatched action.
  * @deprecated
- */var getProductDescription=fetchProductDescription;export default getProductDescription;
+ */
+const getProductDescription = fetchProductDescription;
+export default getProductDescription;

package/product/actions/getProductImages.js

@@ -1,7 +1,11 @@
-import fetchProductImages from"./fetchProductImages";/**
+import fetchProductImages from "./fetchProductImages";
+
+/**
  * Maybe requests images for a product from server.
  * @param {string} productId The product ID.
  * @param {Array} [formats] The requested formats.
  * @return {Function} The dispatched action.
  * @deprecated
- */var getProductImages=fetchProductImages;export default getProductImages;
+ */
+const getProductImages = fetchProductImages;
+export default getProductImages;

package/product/actions/getProductOptions.js

@@ -1,6 +1,10 @@
-import fetchProductOptions from"./fetchProductOptions";/**
+import fetchProductOptions from "./fetchProductOptions";
+
+/**
  * Retrieves product options from store.
  * @param {string} productId The product ID for which the product options are requested.
  * @return {Function} A Redux Thunk
  * @deprecated
- */var getProductOptions=fetchProductOptions;export default getProductOptions;
+ */
+const getProductOptions = fetchProductOptions;
+export default getProductOptions;

package/product/actions/getProductProperties.js

@@ -1,6 +1,10 @@
-import fetchProductProperties from"./fetchProductProperties";/**
+import fetchProductProperties from "./fetchProductProperties";
+
+/**
  * Maybe requests a product description from server.
  * @param {string} productId The product ID.
  * @return {Function} The dispatched action.
  * @deprecated
- */var getProductProperties=fetchProductProperties;export default getProductProperties;
+ */
+const getProductProperties = fetchProductProperties;
+export default getProductProperties;

package/product/actions/getProductRelations.js

@@ -1,4 +1,6 @@
-import fetchProductRelations from"./fetchProductRelations";/**
+import fetchProductRelations from "./fetchProductRelations";
+
+/**
  * Action starts product relation fetching process.
  * Returns early if product relation cache is still valid.
  * @param {Object} params Params.
@@ -7,4 +9,6 @@ import fetchProductRelations from"./fetchProductRelations";/**
  * @param {number} params.limit Query limit.
  * @returns {Function}
  * @deprecated
- */var getProductRelations=fetchProductRelations;export default getProductRelations;
+ */
+const getProductRelations = fetchProductRelations;
+export default getProductRelations;

package/product/actions/getProductShipping.js

@@ -1,6 +1,10 @@
-import fetchProductShipping from"./fetchProductShipping";/**
+import fetchProductShipping from "./fetchProductShipping";
+
+/**
  * Retrieves product shipping from the store.
  * @param {string} productId The product ID for which the product shipping is requested.
  * @return {Function} A Redux Thunk
  * @deprecated
- */var getProductShipping=fetchProductShipping;export default getProductShipping;
+ */
+const getProductShipping = fetchProductShipping;
+export default getProductShipping;

package/product/actions/getProductVariants.js

@@ -1,6 +1,10 @@
-import fetchProductVariants from"./fetchProductVariants";/**
+import fetchProductVariants from "./fetchProductVariants";
+
+/**
  * Retrieves product variants from store.
  * @param {string} productId The product ID for which the product variants are requested.
  * @return {Function} A Redux Thunk
  * @deprecated
- */var getProductVariants=fetchProductVariants;export default getProductVariants;
+ */
+const getProductVariants = fetchProductVariants;
+export default getProductVariants;