@sentecacommerce-theme/lib 0.13.5-alpha.5 → 0.13.5

package/dist/esm/hooks/wishlist-hooks/useWishlistItem/index.js

@@ -1,18 +1,25 @@
-import React from 'react';
-import { wishlistApi } from '../../../';
+import React, { useEffect } from 'react';
+import { useBoolean, wishlistApi } from '../../../';
 import { usePrefetchProduct, getTranslatableField } from '../../../';
-import { getTimeStamp, createMappedAttributes } from '../../basket-hooks/useBasketLineItem/utils';
+import { createMappedAttributes } from '../../basket-hooks/useBasketLineItem/utils';
 import { customFieldsToMap } from '../../../utils';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
 function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
 function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
     var _arr = [];
     var _n = true;
     var _d = false;
-    var _e = undefined;
+    var _s, _e;
     try {
-        for(var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true){
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
             _arr.push(_s.value);
             if (i && _arr.length === i) break;
         }
@@ -29,25 +36,36 @@ function _iterableToArrayLimit(arr, i) {
     return _arr;
 }
 function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 export var useWishlistItem = function(props) {
     var ref16;
-    var ref1 = _slicedToArray(React.useState(false), 2), isExpired = ref1[0], setIsExpired = ref1[1];
+    var item = props.item, expiry = props.expiry;
+    var ref1 = _slicedToArray(useBoolean(false), 2), isExpired = ref1[0], setIsExpired = ref1[1];
     var ref2 = _slicedToArray(wishlistApi.useSync(), 1), syncWishlist = ref2[0];
     var ref3 = usePrefetchProduct(getTranslatableField(props === null || props === void 0 ? void 0 : (ref16 = props.item) === null || ref16 === void 0 ? void 0 : ref16.productSlug)), onMouseDown = ref3.onMouseDown, onMouseEnter = ref3.onMouseEnter, onMouseLeave = ref3.onMouseLeave;
+    useEffect(function() {
+        if (expiry) {
+            if (Date.now() > expiry + (item === null || item === void 0 ? void 0 : item.snapshotFrom)) {
+                setIsExpired.on();
+            }
+        }
+    }, []);
     var data = React.useMemo(function() {
         var ref, ref4, ref5, ref6, ref7, ref8, ref9, ref10, ref11, ref12, ref13, ref14, ref15;
-        var item = props.item;
-        if (props.expiry && getTimeStamp(props.expiry) < (item === null || item === void 0 ? void 0 : item.snapshotFrom)) {
-            setIsExpired(true);
-        }
         var offer = item === null || item === void 0 ? void 0 : (ref = item.productVariant) === null || ref === void 0 ? void 0 : ref.offer;
-        var mappedAttributes = createMappedAttributes(item === null || item === void 0 ? void 0 : (ref4 = item.productVariant) === null || ref4 === void 0 ? void 0 : ref4.attributes) || {
-        };
+        var mappedAttributes = createMappedAttributes(item === null || item === void 0 ? void 0 : (ref4 = item.productVariant) === null || ref4 === void 0 ? void 0 : ref4.attributes) || {};
         var mappedCustomField = customFieldsToMap(item.custom);
         return {
             productId: item === null || item === void 0 ? void 0 : item.productId,
@@ -85,11 +103,15 @@ export var useWishlistItem = function(props) {
             }
         };
     }, [
-        props.item
+        item
+    ]);
+    useEffect(function() {
+        if (isExpired) {
+            syncWishlist();
+            setIsExpired.off();
+        }
+    }, [
+        isExpired
     ]);
-    if (isExpired) {
-        syncWishlist();
-        setIsExpired(false);
-    }
     return data;
 };

package/dist/esm/index.js

@@ -1,4 +1,3 @@
-export * from './dto';
 // API
 // export * from './api/myCart'
 export * from './api/productsApi';
@@ -93,6 +92,7 @@ export * from './hooks/useRouterRedirect';
 export * from './hooks/useProgressBar';
 export * from './hooks/useCatalogDiscounts';
 export * from './hooks/useLocalRating';
+export * from './hooks/useProductVariants/types';
 // Utils
 export * from './utils';
 export * from './types';
@@ -120,6 +120,8 @@ export * from './navigation';
 export * from './GDPR';
 // User
 export * from './user';
+// Basket
+export * from './basket';
 // UI Components and hooks
 export * from './ui';
 export * from './wishlist';

package/dist/esm/listing/api/keys.js

@@ -1,17 +1,15 @@
 import { getTranslatableField } from '../..';
-var ListingQueryKeysEnum1;
-export { ListingQueryKeysEnum1 as ListingQueryKeysEnum,  };
+export var ListingQueryKeysEnum;
 (function(ListingQueryKeysEnum) {
     ListingQueryKeysEnum["usePredicate"] = 'predicate';
     ListingQueryKeysEnum["useListingQuery"] = 'listing';
     ListingQueryKeysEnum["useAggregateQuery"] = 'agg-query';
     ListingQueryKeysEnum["useLabelsQuery"] = 'get-labels';
-})(ListingQueryKeysEnum1 || (ListingQueryKeysEnum1 = {
-}));
+})(ListingQueryKeysEnum || (ListingQueryKeysEnum = {}));
 export var getListingQueryKeys = function(param) {
     var predicate = param.predicate, type = param.type, sort = param.sort, postFilter = param.postFilter, offset = param.offset, slug = param.slug;
     return [
-        ListingQueryKeysEnum1.useListingQuery,
+        ListingQueryKeysEnum.useListingQuery,
         type,
         predicate ? "[".concat(getTranslatableField(predicate.name), "]: ").concat(predicate._id) : slug,
         sort,

package/dist/esm/listing/api/queries/useAggregateQuery.js

@@ -7,7 +7,7 @@ import { useListingAlias } from '../../hooks';
 import { ListingTypesEnum } from '../../types';
 import { getListingPageType, buildCategoryQuery, buildFilterQuery } from '../../utils';
 import { canUseDOM } from '../../../utils';
-import { useConfigState } from '../../../index';
+import { useListingConfig } from '../..';
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -37,21 +37,47 @@ function _asyncToGenerator(fn) {
         });
     };
 }
-var AggregateRequestEnum1;
-export { AggregateRequestEnum1 as AggregateRequestEnum,  };
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+export var AggregateRequestEnum;
 (function(AggregateRequestEnum) {
     AggregateRequestEnum["Filters"] = 'filters';
     AggregateRequestEnum["Categories"] = 'categories';
-})(AggregateRequestEnum1 || (AggregateRequestEnum1 = {
-}));
-export var useAggregateQuery = function(aggregates, request) {
+})(AggregateRequestEnum || (AggregateRequestEnum = {}));
+export var useAggregateQuery = function(aggregates, request, sort) {
     var router = useRouter();
     var ref = usePredicate(), predicate = ref.data;
-    var defaultConfig = useConfigState();
+    var meta = useListingConfig().meta;
     var postFilter = getPostFilters(router);
     var aggregateKeys = generateAggregateKey(aggregates);
     var predicateId = predicate === null || predicate === void 0 ? void 0 : predicate._id;
-    var ref1 = useListingAlias(), aliasedSlug = ref1.slug;
+    var ref1 = useListingAlias(meta), aliasedSlug = ref1.slug;
     var queryKeys = [
         request.toString(),
         aggregateKeys,
@@ -76,14 +102,19 @@ export var useAggregateQuery = function(aggregates, request) {
                         router: router,
                         postFilter: postFilter,
                         slug: aliasedSlug,
-                        config: defaultConfig
+                        config: meta
                     });
-                    _ctx.next = 5;
+                    if (sort) {
+                        query = _objectSpread({}, query, {
+                            attributeSortType: sort
+                        });
+                    }
+                    _ctx.next = 6;
                     return CatalogAggregate(query);
-                case 5:
+                case 6:
                     response = _ctx.sent;
                     return _ctx.abrupt("return", response);
-                case 7:
+                case 8:
                 case "end":
                     return _ctx.stop();
             }
@@ -91,16 +122,16 @@ export var useAggregateQuery = function(aggregates, request) {
     })), {
         refetchOnMount: false,
         refetchOnWindowFocus: false,
-        enabled: isQueryEnabled(router, aliasedSlug, predicateId, defaultConfig),
+        enabled: isQueryEnabled(router, aliasedSlug, predicateId, meta),
         keepPreviousData: true,
         staleTime: 30000
     });
 };
 export function prepareAggregateQuery(param) {
-    var request = param.request, predicate = param.predicate, aggregates = param.aggregates, router = param.router, postFilter = param.postFilter, slug = param.slug, config = param.config;
+    var request = param.request, predicate = param.predicate, aggregates = param.aggregates, router = param.router, postFilter = param.postFilter, slug = param.slug, config = param.config, attributeSortType = param.attributeSortType;
     var pageType = getListingPageType(router, slug, config);
     switch(request){
-        case AggregateRequestEnum1.Categories:
+        case AggregateRequestEnum.Categories:
             return buildCategoryQuery({
                 aggregates: aggregates,
                 predicate: predicate,
@@ -110,7 +141,7 @@ export function prepareAggregateQuery(param) {
                 router: router,
                 slug: slug
             });
-        case AggregateRequestEnum1.Filters:
+        case AggregateRequestEnum.Filters:
             return buildFilterQuery({
                 predicate: predicate,
                 slug: slug,
@@ -133,8 +164,8 @@ function getPostFilters(router) {
     var query = router.query;
     return query && Array.isArray(query.filter) ? query === null || query === void 0 ? void 0 : (ref = query.filter) === null || ref === void 0 ? void 0 : ref.join('&') : query === null || query === void 0 ? void 0 : query.filter;
 }
-function isQueryEnabled(router, slug, predicate, config) {
-    var pageType = getListingPageType(router, slug, config);
+function isQueryEnabled(router, slug, predicate, meta) {
+    var pageType = getListingPageType(router, slug, meta);
     if (pageType === ListingTypesEnum.Search) {
         return canUseDOM();
     }

package/dist/esm/listing/api/queries/useInfiniteListing.js

@@ -51,8 +51,7 @@ function _defineProperty(obj, key, value) {
 }
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {
-        };
+        var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
         if (typeof Object.getOwnPropertySymbols === "function") {
             ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
@@ -71,8 +70,8 @@ export var useInfiniteListing = function() {
     var config = useListingConfig();
     var ref3 = usePredicate(), predicate = ref3.data;
     var query = router.query;
-    var ref1 = useListingAlias(), aliasedSlug = ref1.slug;
-    var limit = config.productsPerPage || 24;
+    var ref1 = useListingAlias(config.meta), aliasedSlug = ref1.slug;
+    var limit = config.meta.limit || 24;
     var postFilter = getPostFilters(router);
     var ref2;
     var queryKeys = getListingQueryKeys({
@@ -95,11 +94,11 @@ export var useInfiniteListing = function() {
                     data = processListingQuery({
                         predicate: predicate,
                         limit: limit,
-                        sort: config === null || config === void 0 ? void 0 : config.defaultSortKey,
+                        sort: (config === null || config === void 0 ? void 0 : config.defaultSortKey) || 'defaultSort',
                         router: router,
                         postFilter: postFilter,
                         offset: offset,
-                        config: config,
+                        config: config.meta,
                         slug: aliasedSlug
                     });
                     return _ctx.abrupt("return", data);
@@ -126,8 +125,7 @@ export var useInfiniteListing = function() {
      */ var flatResults = (ref = infiniteQuery.data) === null || ref === void 0 ? void 0 : ref.map(function(data) {
             return data.results;
         }).flat();
-        return _objectSpread({
-        }, infiniteQuery, {
+        return _objectSpread({}, infiniteQuery, {
             showPlaceholders: Boolean(!isEnabled || infiniteQuery.isFetching || !flatResults),
             results: flatResults
         });

package/dist/esm/listing/api/queries/useLabelsQuery.js

@@ -3,13 +3,13 @@ import React from 'react';
 import { LabelsFilter } from '@sentecacommerce/sdk';
 import { useQuery } from 'react-query';
 import { ListingQueryKeysEnum } from '../keys';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
 function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) {
-        for(var i = 0, arr2 = new Array(arr.length); i < arr.length; i++){
-            arr2[i] = arr[i];
-        }
-        return arr2;
-    }
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -41,13 +41,21 @@ function _asyncToGenerator(fn) {
     };
 }
 function _iterableToArray(iter) {
-    if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
 function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance");
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 export var useLabelsQuery = function(param) {
     var _labels = param.labels, labels = _labels === void 0 ? [] : _labels;
@@ -71,6 +79,7 @@ export var useLabelsQuery = function(param) {
             }
         }, _callee);
     })), {
-        cacheTime: 0
+        cacheTime: 0,
+        refetchOnWindowFocus: false
     });
 };

package/dist/esm/listing/api/queries/useListingQuery.js

@@ -6,7 +6,11 @@ import { useListingConfig, useListingSlug, useListingAlias } from '../../hooks';
 import { getListingQueryKeys, usePredicate } from '..';
 import { ListingTypesEnum } from '../../types';
 import { calculateOffset, getListingPageType, getPostFilters, extendFilter } from '../../utils';
-import { useConfigState } from '../../..';
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
 function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
@@ -53,12 +57,14 @@ function _defineProperty(obj, key, value) {
     return obj;
 }
 function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
     var _arr = [];
     var _n = true;
     var _d = false;
-    var _e = undefined;
+    var _s, _e;
     try {
-        for(var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true){
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
             _arr.push(_s.value);
             if (i && _arr.length === i) break;
         }
@@ -75,12 +81,11 @@ function _iterableToArrayLimit(arr, i) {
     return _arr;
 }
 function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {
-        };
+        var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
         if (typeof Object.getOwnPropertySymbols === "function") {
             ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
@@ -94,30 +99,34 @@ function _objectSpread(target) {
     return target;
 }
 function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 export var useListingQuery = function() {
-    var ref, ref1, ref2;
+    var ref;
     var router = useRouter();
     var slug = useListingSlug();
     var config = useListingConfig();
-    var globalConfig = useConfigState();
-    var ref3 = usePredicate(), predicate = ref3.data;
-    var ref4 = useListingAlias(), aliasedSlug = ref4.slug;
+    var ref1 = usePredicate(), predicate = ref1.data;
+    var ref2 = useListingAlias(config.meta), aliasedSlug = ref2.slug;
     var query = router.query;
     var postFilter = getPostFilters(router);
-    var ref5, ref6;
-    var limit = (ref6 = (ref5 = (ref = router.query) === null || ref === void 0 ? void 0 : ref.limit) !== null && ref5 !== void 0 ? ref5 : globalConfig === null || globalConfig === void 0 ? void 0 : (ref1 = globalConfig.listing) === null || ref1 === void 0 ? void 0 : ref1.limit) !== null && ref6 !== void 0 ? ref6 : 24;
-    var _sort, ref7;
-    var sort = (ref7 = (_sort = query.sort) !== null && _sort !== void 0 ? _sort : globalConfig === null || globalConfig === void 0 ? void 0 : (ref2 = globalConfig.listing) === null || ref2 === void 0 ? void 0 : ref2.defaultSortKey) !== null && ref7 !== void 0 ? ref7 : 'defaultSort';
+    var limit = !!router.query.limit ? Number(router.query.limit) : (config === null || config === void 0 ? void 0 : (ref = config.meta) === null || ref === void 0 ? void 0 : ref.limit) || 24;
+    var sort = query.sort || (config === null || config === void 0 ? void 0 : config.defaultSortKey) || 'defaultSort';
     var offset = calculateOffset(query === null || query === void 0 ? void 0 : query.page, limit);
-    var _sort1, ref8;
     var queryKeys = getListingQueryKeys({
         type: config.type,
         predicate: predicate,
-        sort: (ref8 = (_sort1 = query.sort) !== null && _sort1 !== void 0 ? _sort1 : globalConfig.defaultSortKey) !== null && ref8 !== void 0 ? ref8 : sort,
+        sort: sort,
         postFilter: postFilter,
-        slug: slug,
+        slug: aliasedSlug,
         offset: offset
     });
     return useQuery(queryKeys, _asyncToGenerator(regeneratorRuntime.mark(function _callee() {
@@ -125,18 +134,22 @@ export var useListingQuery = function() {
         return regeneratorRuntime.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    data = processListingQuery({
+                    _ctx.next = 2;
+                    return processListingQuery({
                         predicate: predicate,
                         limit: limit,
                         sort: sort,
                         router: router,
                         postFilter: postFilter,
                         offset: offset,
-                        config: globalConfig,
+                        config: config.meta,
+                        includeVariants: config.includeVariants,
                         slug: aliasedSlug
                     });
-                    return _ctx.abrupt("return", data);
                 case 2:
+                    data = _ctx.sent;
+                    return _ctx.abrupt("return", data);
+                case 4:
                 case "end":
                     return _ctx.stop();
             }
@@ -155,12 +168,11 @@ export function processListingQuery(_) {
 }
 function _processListingQuery() {
     _processListingQuery = _asyncToGenerator(regeneratorRuntime.mark(function _callee(param) {
-        var predicate, router, limit, sort, postFilter, offset, config, slug, ref, query, type, filter, _sort;
+        var predicate, router, limit, sort, postFilter, offset, config, slug, _includeVariants, includeVariants, query, type, filter, _sort;
         return regeneratorRuntime.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    predicate = param.predicate, router = param.router, limit = param.limit, sort = param.sort, postFilter = param.postFilter, offset = param.offset, config = param.config, slug = param.slug;
-                    ;
+                    predicate = param.predicate, router = param.router, limit = param.limit, sort = param.sort, postFilter = param.postFilter, offset = param.offset, config = param.config, slug = param.slug, _includeVariants = param.includeVariants, includeVariants = _includeVariants === void 0 ? false : _includeVariants;
                     query = router.query;
                     type = getListingPageType(router, slug, config);
                     filter = generateFilter(type, query, slug, predicate);
@@ -170,16 +182,18 @@ function _processListingQuery() {
                         offset: offset || 0,
                         filter: extendFilter({
                             slug: filter,
-                            filterExtension: config === null || config === void 0 ? void 0 : (ref = config.listing) === null || ref === void 0 ? void 0 : ref.filterExtension,
+                            filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension,
                             noSplit: true
                         }),
                         sort: (_sort = query.sort) !== null && _sort !== void 0 ? _sort : sort
                     }, (query === null || query === void 0 ? void 0 : query.filter) && {
                         postFilter: postFilter
-                    }, (config === null || config === void 0 ? void 0 : config.listing.collapseMode) && type !== ListingTypesEnum.Collection && {
-                        collapseMode: config === null || config === void 0 ? void 0 : config.listing.collapseMode
+                    }, (config === null || config === void 0 ? void 0 : config.collapseMode) && type !== ListingTypesEnum.Collection && {
+                        collapseMode: config === null || config === void 0 ? void 0 : config.collapseMode
+                    }, {
+                        includeVariants: includeVariants
                     })));
-                case 7:
+                case 6:
                 case "end":
                     return _ctx.stop();
             }
@@ -212,6 +226,6 @@ export function isListingQueryEnabled(type, predicate) {
     return false;
 }
 function parseAttribute(slug) {
-    var ref = _slicedToArray(slug.split('-'), 2), type = ref[0], val = ref[1];
+    var ref = _slicedToArray((slug === null || slug === void 0 ? void 0 : slug.split('-')) || [], 2), type = ref[0], val = ref[1];
     return "attr.".concat(type, ";eq;\"").concat(val, "\"");
 }