@sentecacommerce-theme/lib 0.13.5-alpha.9 → 0.13.7-alpha.7

package/dist/esm/listing/hooks/useListingBreadcrumbs.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { useRouter } from 'next/router';
 import { usePredicate } from '../api';
 import { useListingConfig } from './';
-import { useConfigState, useListingAlias } from '../../index';
+import { useListingAlias } from '../../index';
 import { typeToSuffix } from '../../utils/typeToSuffix';
 import { getTranslatableField } from '../../utils/getTranslatableField';
 import { ListingTypesEnum } from '..';
@@ -25,16 +25,16 @@ function _toConsumableArray(arr) {
 }
 var _instance;
 export var useListingBreadcrumbs = function() {
-    var ref = usePredicate(), data = ref.data, isLoading = ref.isLoading;
+    var ref1 = usePredicate(), data = ref1.data, isLoading = ref1.isLoading;
     var config = useListingConfig();
     var router = useRouter();
-    var mainConfig = useConfigState();
-    var slug = useListingAlias().slug;
+    var slug = useListingAlias(config.meta).slug;
     var result = React.useMemo(function() {
         if (config.type === ListingTypesEnum.AttrPage) {
+            var ref;
             return [
                 {
-                    name: mainConfig.listing.titleAliases[slug],
+                    name: (ref = config.meta) === null || ref === void 0 ? void 0 : ref.titleAliases[slug],
                     id: '',
                     link: "/".concat(router.query.slug, "/c")
                 }, 

package/dist/esm/listing/hooks/useListingCategories.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useRouter } from 'next/router';
 import { useListingConfig } from './useListingConfig';
-import { useListingAlias, useConfigState } from '../../index';
+import { useListingAlias } from '../../index';
 import { getTranslatableField, typeToSuffix } from '../../utils';
 import { useAggregateQuery, AggregateRequestEnum } from '../api';
 import { processCategoriesResponse, getAggregateTypeAndTerm } from './utils';
@@ -28,19 +28,18 @@ var ListingCategoriesStateContext = /*#__PURE__*/ React.createContext(undefined)
 export function ListingCategoriesProvider(param) {
     var children = param.children;
     var router = useRouter();
-    var categoryTreeConfig = useListingConfig().categoryTreeConfig;
-    var slug = useListingAlias().slug;
-    var config = useConfigState();
-    var ref = useAggregateQuery([
+    var ref = useListingConfig(), categoryTreeConfig = ref.categoryTreeConfig, meta = ref.meta;
+    var slug = useListingAlias(meta).slug;
+    var ref1 = useAggregateQuery([
         categoryTreeConfig
-    ], AggregateRequestEnum.Categories), aggData = ref.data, isLoading = ref.isLoading;
-    var currentCategory = generateCurrentUrl(router, slug, config);
-    var ref1 = getAggregateTypeAndTerm(categoryTreeConfig), type = ref1.type, term = ref1.term;
+    ], AggregateRequestEnum.Categories), aggData = ref1.data, isLoading = ref1.isLoading;
+    var currentCategory = generateCurrentUrl(router, slug, meta);
+    var ref2 = getAggregateTypeAndTerm(categoryTreeConfig), type = ref2.type, term = ref2.term;
     var data = React.useMemo(function() {
         if (aggData) {
             var response = processCategoriesResponse(aggData, type, term);
             var nodes = response.map(function(current) {
-                return buildNodes(current, router, slug, config);
+                return buildNodes(current, router, slug, meta);
             });
             var categoryTree = buildCategories(nodes);
             return categoryTree;

package/dist/esm/listing/hooks/useListingConfig.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { useRouter } from 'next/router';
 import { ListingFiltersProvider } from './useListingFilters';
 import { ListingCategoriesProvider } from './useListingCategories';
-import { useListingAlias, useConfigState } from '../../index';
+import { useListingAlias } from '../../index';
 import { getListingPageType } from '../utils';
 function _defineProperty(obj, key, value) {
     if (key in obj) {
@@ -37,22 +37,20 @@ var ListingPageContext = /*#__PURE__*/ React.createContext(undefined);
 export function ListingPageProvider(param) {
     var config = param.config, children = param.children;
     var router = useRouter();
-    var slug = useListingAlias().slug;
-    var mainConfig = useConfigState();
+    var slug = useListingAlias(config.meta).slug;
     var data = React.useMemo(function() {
         return _objectSpread({
         }, config, {
-            type: getListingPageType(router, slug, mainConfig)
+            type: getListingPageType(router, slug, config.meta)
         });
     }, [
         router.pathname,
         config.aggregates,
         config.categoryTreeConfig,
         config.defaultSortKey,
-        config.productsPerPage,
         config.seoAggregates,
         config.sortOptions,
-        config.filterExtension,
+        config.meta,
         config.attributeSortType, 
     ]);
     return(/*#__PURE__*/ React.createElement(ListingPageContext.Provider, {

package/dist/esm/listing/hooks/useListingFilters.js

@@ -7,7 +7,6 @@ import { useListingSlug } from './useListingSlug';
 import { stripQueryProps } from '../../utils/generateQueryFromRouter';
 import { typeToSuffix } from '../../utils/typeToSuffix';
 import { getSelectedFilters } from '../../utils';
-import { useConfigState } from '../../index';
 function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
@@ -71,19 +70,19 @@ function _slicedToArray(arr, i) {
 var ListingFiltersStateContext = /*#__PURE__*/ React.createContext(undefined);
 export function ListingFiltersProvider(param) {
     var children = param.children;
-    var ref = useListingConfig(), aggregates = ref.aggregates, pageType = ref.type, attributeSortType = ref.attributeSortType;
+    var ref3 = useListingConfig(), aggregates = ref3.aggregates, pageType = ref3.type, attributeSortType = ref3.attributeSortType, meta = ref3.meta;
     var ref1 = useAggregateQuery(aggregates, AggregateRequestEnum.Filters, attributeSortType), aggData = ref1.data, isLoading = ref1.isLoading, isFetching = ref1.isFetching;
-    var config = useConfigState();
     var router = useRouter();
     var slug = useListingSlug();
     var data = React.useMemo(function() {
         if (!isLoading && aggData) {
             var result = aggregates === null || aggregates === void 0 ? void 0 : aggregates.sort(function(a, b) {
-                return a.order - b.order;
+                return Number(a.order) - Number(b.order);
             }).map(function(currentAggregate) {
-                var type = currentAggregate.aggregationType.toString();
-                var term = currentAggregate.aggregationDefinition.split(':')[0];
-                var filter = currentAggregate.filterDefinition;
+                var ref, ref2;
+                var type = (currentAggregate === null || currentAggregate === void 0 ? void 0 : (ref = currentAggregate.aggregationType) === null || ref === void 0 ? void 0 : ref.toString()) || '';
+                var term = (currentAggregate === null || currentAggregate === void 0 ? void 0 : (ref2 = currentAggregate.aggregationDefinition) === null || ref2 === void 0 ? void 0 : ref2.split(':')[0]) || '';
+                var filter = (currentAggregate === null || currentAggregate === void 0 ? void 0 : currentAggregate.filterDefinition) || '';
                 var current = aggData[type].find(function(agg) {
                     return agg.name === term;
                 });
@@ -135,7 +134,7 @@ export function ListingFiltersProvider(param) {
         });
     };
     var selectedFilters = React.useMemo(function() {
-        return getSelectedFilters(router, slug, data, config);
+        return getSelectedFilters(router, slug, data, meta);
     }, [
         router,
         data
@@ -159,10 +158,10 @@ export function useListingFilters() {
 }
 function generateFilters(param) {
     var rawFilters = param.rawFilters, type = param.type, filter = param.filter, slug = param.slug, router = param.router, pageType = param.pageType;
-    var ref, ref2;
-    return (ref2 = (ref = rawFilters.results) === null || ref === void 0 ? void 0 : ref.filter(function(res) {
+    var ref, ref4;
+    return (ref4 = (ref = rawFilters.results) === null || ref === void 0 ? void 0 : ref.filter(function(res) {
         return res.count > 0;
-    })) === null || ref2 === void 0 ? void 0 : ref2.map(function(currentTerm) {
+    })) === null || ref4 === void 0 ? void 0 : ref4.map(function(currentTerm) {
         var filterKey = mapKey(currentTerm, type);
         var selected = isFilterSelected(router, filter, filterKey, filtersOperatorsMap[type]);
         return {
@@ -180,11 +179,11 @@ function generateFilters(param) {
     });
 }
 var isFilterSelected = function(router, filter, filterKey, type) {
-    var ref, ref3, ref4, ref5, ref6;
+    var ref, ref5, ref6, ref7, ref8;
     var areFiltersArray = Array.isArray((ref = router.query) === null || ref === void 0 ? void 0 : ref.filter);
-    return areFiltersArray ? !!((ref4 = (ref3 = router.query.filter) === null || ref3 === void 0 ? void 0 : ref3.find(function(sel) {
+    return areFiltersArray ? !!((ref6 = (ref5 = router.query.filter) === null || ref5 === void 0 ? void 0 : ref5.find(function(sel) {
         return sel.includes("".concat(filter, ";").concat(type));
-    })) === null || ref4 === void 0 ? void 0 : ref4.includes(filterKey)) : ((ref5 = router.query.filter) === null || ref5 === void 0 ? void 0 : ref5.includes("".concat(filter, ";").concat(type))) && ((ref6 = router.query.filter) === null || ref6 === void 0 ? void 0 : ref6.includes(filterKey));
+    })) === null || ref6 === void 0 ? void 0 : ref6.includes(filterKey)) : ((ref7 = router.query.filter) === null || ref7 === void 0 ? void 0 : ref7.includes("".concat(filter, ";").concat(type))) && ((ref8 = router.query.filter) === null || ref8 === void 0 ? void 0 : ref8.includes(filterKey));
 };
 export var filtersOperatorsMap = {
     ranges: 'range',
@@ -213,12 +212,12 @@ var generateQueryString = function(query, pair, remove) {
     var extractFilter = function(param) {
         var _str = param.str, str = _str === void 0 ? '' : _str, aggPair = param.aggPair;
         var ref = _slicedToArray(str.split(';'), 3), type = ref[0], operator = ref[1], val = ref[2];
-        var ref7;
-        var filterType = (ref7 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggType) !== null && ref7 !== void 0 ? ref7 : type;
-        var ref8;
-        var filterVal = (ref8 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggKey) !== null && ref8 !== void 0 ? ref8 : val;
         var ref9;
-        var filterOperator = (ref9 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggOperator) !== null && ref9 !== void 0 ? ref9 : operator;
+        var filterType = (ref9 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggType) !== null && ref9 !== void 0 ? ref9 : type;
+        var ref10;
+        var filterVal = (ref10 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggKey) !== null && ref10 !== void 0 ? ref10 : val;
+        var ref11;
+        var filterOperator = (ref11 = aggPair === null || aggPair === void 0 ? void 0 : aggPair.aggOperator) !== null && ref11 !== void 0 ? ref11 : operator;
         if (activeFilters[filterType]) {
             activeFilters[filterType] += ",".concat(filterVal);
         } else {

package/dist/esm/listing/hooks/useListingItems.js

@@ -5,7 +5,7 @@ export var useListingItems = function() {
     var config = useListingConfig();
     var ref1 = useListingQuery(), data = ref1.data, isLoading = ref1.isLoading, isFetching = ref1.isFetching;
     var generatePlaceholders = function(products) {
-        return new Array(products !== null && products !== void 0 ? products : 24).fill(null).map(function(_, i) {
+        return new Array(products || 24).fill(null).map(function(_, i) {
             return {
                 _id: "".concat(i),
                 isPlaceholder: true
@@ -15,7 +15,7 @@ export var useListingItems = function() {
     var result = React.useMemo(function() {
         var ref;
         return {
-            items: !(data === null || data === void 0 ? void 0 : data.results) ? generatePlaceholders(config.productsPerPage) : data === null || data === void 0 ? void 0 : data.results,
+            items: !(data === null || data === void 0 ? void 0 : data.results) ? generatePlaceholders(config.meta.limit || 24) : data === null || data === void 0 ? void 0 : data.results,
             total: (ref = data === null || data === void 0 ? void 0 : data.total) !== null && ref !== void 0 ? ref : 0,
             didYouMean: data === null || data === void 0 ? void 0 : data.didYouMean,
             isLoading: isLoading,

package/dist/esm/listing/hooks/useListingMeta.js

@@ -5,9 +5,10 @@ import { assetsFieldsToMap } from '../../utils/assetsToMap';
 import { useRouter } from 'next/router';
 import { getListingPageType } from '../utils';
 import { ListingTypesEnum } from '../types';
-import { useListingAlias, useConfigState } from '../../index';
+import { useListingAlias } from '../../index';
 import { useListingFilters } from './useListingFilters';
 import { useListingCategories } from './useListingCategories';
+import { useListingConfig } from '.';
 function _arrayWithoutHoles(arr) {
     if (Array.isArray(arr)) {
         for(var i = 0, arr2 = new Array(arr.length); i < arr.length; i++){
@@ -31,14 +32,14 @@ export var useListingMeta = function() {
     var ref1 = useListingQuery(), listingQuery = ref1.data;
     var ref2 = useListingCategories(), categoriesData = ref2.data;
     var ref3 = useListingFilters(), filtersData = ref3.data;
-    var slug = useListingAlias().slug;
-    var config = useConfigState();
+    var meta = useListingConfig().meta;
+    var slug = useListingAlias(meta).slug;
     var result = React.useMemo(function() {
         var ref;
         var customFields = customFieldsToMap(predicate === null || predicate === void 0 ? void 0 : predicate.custom);
         var assets = assetsFieldsToMap(predicate === null || predicate === void 0 ? void 0 : predicate.assets);
         var description = ((ref = getTranslatableField(predicate === null || predicate === void 0 ? void 0 : predicate.description)) === null || ref === void 0 ? void 0 : ref.trim()) || '';
-        var displayName = processDisplayName(slug, config, predicate === null || predicate === void 0 ? void 0 : predicate.name, predicate === null || predicate === void 0 ? void 0 : predicate.breadcrumb, router, filtersData, categoriesData);
+        var displayName = processDisplayName(slug, meta, predicate === null || predicate === void 0 ? void 0 : predicate.name, predicate === null || predicate === void 0 ? void 0 : predicate.breadcrumb, router, filtersData, categoriesData);
         return {
             displayName: displayName,
             description: description,
@@ -76,7 +77,7 @@ function processDisplayName(slug, config, name, breadcrumb, router, aggData, cat
     var categoryName = getCategoryName(router, categoriesData);
     var type = getListingPageType(router, slug, config);
     if (type === ListingTypesEnum.AttrPage) {
-        return "Всичко за ".concat(config.listing.titleAliases[slug]);
+        return "Всичко за ".concat(config.titleAliases[slug]);
     }
     if (router === null || router === void 0 ? void 0 : router.query.cat) {
         var attribute = getTranslatableField(breadcrumb === null || breadcrumb === void 0 ? void 0 : breadcrumb.label);

package/dist/esm/listing/hooks/useListingPagination.js

@@ -39,17 +39,16 @@ export var useListingPagination = function() {
     var slug = useListingSlug();
     var ref = useListingQuery(), data = ref.data, isLoading = ref.isLoading;
     var result = React.useMemo(function() {
-        var _productsPerPage;
         return {
             pagination: getPagination(data === null || data === void 0 ? void 0 : data.total, generateQueryFromRouter(_objectSpread({
-                limit: (_productsPerPage = config.productsPerPage) !== null && _productsPerPage !== void 0 ? _productsPerPage : 24,
+                limit: config.meta.limit || 24,
                 sort: router.query.sort
-            }, router.query)), config.defaultSortKey),
+            }, router.query)), config.defaultSortKey || 'defaultSort'),
             query: generateQuery(router, slug)
         };
     }, [
         config.defaultSortKey,
-        config.productsPerPage,
+        config.meta.limit,
         data === null || data === void 0 ? void 0 : data.total,
         router,
         slug

package/dist/esm/listing/hooks/useListingSlug.js

@@ -1,9 +1,11 @@
 import { useRouter } from 'next/router';
+import { useListingConfig } from '.';
 import { useListingAlias } from '../index';
 import { getSlug } from '../utils';
 export var useListingSlug = function() {
     var router = useRouter();
-    var ref = useListingAlias(), aliasedSlug = ref.slug;
+    var meta = useListingConfig().meta;
+    var ref = useListingAlias(meta), aliasedSlug = ref.slug;
     var slug = getSlug(router, aliasedSlug);
     return slug;
 };

package/dist/esm/listing/hooks/useSlideFilter.js

@@ -3,7 +3,8 @@ import { useRouter } from 'next/router';
 import { createAggregateQuery } from '../../utils';
 import { getListingPageType } from '../utils';
 import { filtersOperatorsMap } from './useListingFilters';
-import { useListingAlias, useConfigState } from '../../index';
+import { useListingAlias } from '../../index';
+import { useListingConfig } from '.';
 function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
@@ -38,8 +39,8 @@ function _slicedToArray(arr, i) {
 export var useSlideFilter = function(filterName, min, max) {
     var ref;
     var router = useRouter();
-    var slug = useListingAlias().slug;
-    var config = useConfigState();
+    var meta = useListingConfig().meta;
+    var slug = useListingAlias(meta).slug;
     var allFilters = router.query.filter;
     var filterQuery = "".concat(filterName, ";range;");
     var getFilter = function() {
@@ -66,7 +67,7 @@ export var useSlideFilter = function(filterName, min, max) {
         var formattedTo = Math.max(data.from, Math.min(data.to, max));
         clearTimeout(timeoutRef.current);
         timeoutRef.current = setTimeout(function() {
-            router.push(createAggregateQuery(getListingPageType(router, slug, config), router.query.slug, {
+            router.push(createAggregateQuery(getListingPageType(router, slug, meta), router.query.slug, {
                 aggType: filterName,
                 aggKey: "".concat(formattedFrom, ",").concat(formattedTo),
                 aggOperator: filtersOperatorsMap.stats

package/dist/esm/listing/hooks/useSort.js

@@ -1,38 +1,69 @@
 import { useRouter } from 'next/router';
 import { useCallback, useMemo } from 'react';
-export var useSort = function(param) {
-    var onSelect = param.onSelect, sorts = param.sorts, defaultSortKey = param.defaultSortKey;
-    var ref1;
-    // Not ready yet
-    // const { sortOptions: sorts, defaultSortKey } = useListingConfig()
+import { useListingConfig } from '.';
+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 useSort = function(props) {
+    var ref2;
+    var ref1 = useListingConfig(), sorts = ref1.sortOptions, defaultSortRaw = ref1.defaultSortKey;
+    var defaultSortKey = defaultSortRaw || 'defaultSort';
     var router = useRouter();
-    var currentSortQuery = (router === null || router === void 0 ? void 0 : (ref1 = router.query) === null || ref1 === void 0 ? void 0 : ref1.sort) || defaultSortKey;
+    var currentSortQuery = (router === null || router === void 0 ? void 0 : (ref2 = router.query) === null || ref2 === void 0 ? void 0 : ref2.sort) || defaultSortKey;
     var changeSort = useCallback(function(value) {
         return function() {
-            var ref;
-            var query = router.query.filter ? {
-                sort: value,
-                filter: (ref = router.query) === null || ref === void 0 ? void 0 : ref.filter
-            } : {
+            if (!value) return;
+            var query = _objectSpread({
+            }, router.query, {
                 sort: value
-            };
+            });
             if (defaultSortKey === value) {
                 delete query.sort;
             }
             setTimeout(function() {
-                onSelect === null || onSelect === void 0 ? void 0 : onSelect();
+                var ref;
+                props === null || props === void 0 ? void 0 : (ref = props.onSelect) === null || ref === void 0 ? void 0 : ref.call(props);
             });
             return router.push({
                 href: router.pathname,
                 query: query
+            }, undefined, {
+                shallow: true
             });
         };
     }, [
         defaultSortKey,
         router,
-        onSelect
+        props === null || props === void 0 ? void 0 : props.onSelect
     ]);
     var result = useMemo(function() {
+        var ref;
         var selectedSort = {
             key: defaultSortKey,
             label: '',
@@ -40,10 +71,10 @@ export var useSort = function(param) {
             select: function() {
             }
         };
-        var sortOptions = sorts.map(function(sort) {
+        var sortOptions = (ref = sorts || []) === null || ref === void 0 ? void 0 : ref.map(function(sort) {
             var data = {
-                key: sort.key,
-                label: sort.label,
+                key: sort.key || 'defaultSort',
+                label: sort.label || '',
                 select: changeSort(sort.key),
                 isDefault: sort.key === defaultSortKey
             };

package/dist/esm/listing/hooks/utils.js

@@ -6,7 +6,8 @@ export function processCategoriesResponse(response, type, term) {
     return result;
 }
 export function getAggregateTypeAndTerm(aggregates) {
-    var type = aggregates === null || aggregates === void 0 ? void 0 : aggregates.aggregationType.toString();
+    var ref;
+    var type = (aggregates === null || aggregates === void 0 ? void 0 : (ref = aggregates.aggregationType) === null || ref === void 0 ? void 0 : ref.toString()) || '';
     var term = aggregates === null || aggregates === void 0 ? void 0 : aggregates.aggregationDefinition;
     return {
         type: type,

package/dist/esm/listing/ssr/prefetchCategories.js

@@ -1,6 +1,6 @@
 import regeneratorRuntime from "regenerator-runtime";
 import { CatalogAggregate } from '@sentecacommerce/sdk';
-import { getSlug, getListingAlias } from '../utils';
+import { getSlug, getListingAlias, getPostFilters } from '../utils';
 import { prepareAggregateQuery, AggregateRequestEnum, generateAggregateKey } from '../api';
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -63,7 +63,7 @@ function _prefetchCategories() {
                         AggregateRequestEnum.Categories,
                         aggregateKeys,
                         aliasedSlug,
-                        null
+                        getPostFilters(router), 
                     ], response, {
                         staleTime: 30000
                     });

package/dist/esm/listing/ssr/prefetchListing.js

@@ -36,11 +36,11 @@ export function prefetchListing(_) {
 }
 function _prefetchListing() {
     _prefetchListing = _asyncToGenerator(regeneratorRuntime.mark(function _callee(param) {
-        var queryCache, router, predicate, config, ref, aliasedSlug, type, postFilter, ref1, ref2, sort, _limit, limit, offset, queryKeys, data;
+        var queryCache, router, predicate, config, defaultSortKey, ref, aliasedSlug, type, postFilter, ref1, ref2, sort, limit, offset, queryKeys, data;
         return regeneratorRuntime.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    queryCache = param.queryCache, router = param.router, predicate = param.predicate, config = param.config;
+                    queryCache = param.queryCache, router = param.router, predicate = param.predicate, config = param.config, defaultSortKey = param.defaultSortKey;
                     ;
                     aliasedSlug = getListingAlias({
                         router: router,
@@ -49,9 +49,8 @@ function _prefetchListing() {
                     type = getListingPageType(router, aliasedSlug, config);
                     postFilter = getPostFilters(router);
                     ;
-                    sort = (ref2 = (ref1 = router.query.sort) !== null && ref1 !== void 0 ? ref1 : config === null || config === void 0 ? void 0 : config.listing.defaultSortKey) !== null && ref2 !== void 0 ? ref2 : 'defaultSort';
-                    ;
-                    limit = !!router.query.limit ? Number(router.query.limit) : (_limit = config === null || config === void 0 ? void 0 : config.listing.limit) !== null && _limit !== void 0 ? _limit : 24;
+                    sort = (ref2 = (ref1 = router.query.sort) !== null && ref1 !== void 0 ? ref1 : defaultSortKey) !== null && ref2 !== void 0 ? ref2 : 'defaultSort';
+                    limit = !!router.query.limit ? Number(router.query.limit) : (config === null || config === void 0 ? void 0 : config.limit) || 24;
                     offset = calculateOffset((ref = router.query) === null || ref === void 0 ? void 0 : ref.page, limit);
                     queryKeys = getListingQueryKeys({
                         type: type,
@@ -61,7 +60,7 @@ function _prefetchListing() {
                         slug: aliasedSlug,
                         offset: offset
                     });
-                    _ctx.next = 13;
+                    _ctx.next = 12;
                     return processListingQuery({
                         router: router,
                         predicate: predicate,
@@ -72,13 +71,13 @@ function _prefetchListing() {
                         config: config,
                         slug: aliasedSlug
                     });
-                case 13:
+                case 12:
                     data = _ctx.sent;
                     queryCache.setQueryData(queryKeys, data, {
                         staleTime: 30000
                     });
                     return _ctx.abrupt("return", data);
-                case 16:
+                case 15:
                 case "end":
                     return _ctx.stop();
             }

package/dist/esm/listing/utils/buildCategoryQuery.js

@@ -33,13 +33,12 @@ var _obj;
 export var buildCategoryQuery = function(param) {
     var aggregates = param.aggregates, predicate = param.predicate, postFilter = param.postFilter, pageType = param.pageType, config = param.config, router = param.router, slug = param.slug;
     var ref2, ref1;
-    var type = aggregates === null || aggregates === void 0 ? void 0 : (ref2 = aggregates[0]) === null || ref2 === void 0 ? void 0 : ref2.aggregationType;
-    var term = aggregates === null || aggregates === void 0 ? void 0 : (ref1 = aggregates[0]) === null || ref1 === void 0 ? void 0 : ref1.aggregationDefinition;
+    var type = (aggregates === null || aggregates === void 0 ? void 0 : (ref2 = aggregates[0]) === null || ref2 === void 0 ? void 0 : ref2.aggregationType) || '';
+    var term = (aggregates === null || aggregates === void 0 ? void 0 : (ref1 = aggregates[0]) === null || ref1 === void 0 ? void 0 : ref1.aggregationDefinition) || '';
     var aggValue = getAggValue({
         id: predicate === null || predicate === void 0 ? void 0 : predicate._id,
         term: term
     });
-    var listingConfig = config === null || config === void 0 ? void 0 : config.listing;
     var getFilters = function() {
         var filter = '';
         switch(pageType){
@@ -49,18 +48,18 @@ export var buildCategoryQuery = function(param) {
                 }));
                 if (router.query.cat) filter += extendFilter({
                     slug: slug,
-                    filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                    filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                 });
                 break;
             case ListingTypesEnum.Category:
                 if (router.query.cat) {
                     filter += extendFilter({
                         slug: slug,
-                        filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                        filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                     });
                 } else {
                     var ref;
-                    filter += (ref = listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension) !== null && ref !== void 0 ? ref : '';
+                    filter += (ref = config === null || config === void 0 ? void 0 : config.filterExtension) !== null && ref !== void 0 ? ref : '';
                 }
                 if (postFilter) {
                     if (router.query.cat) filter += '&';
@@ -70,7 +69,7 @@ export var buildCategoryQuery = function(param) {
             case ListingTypesEnum.AttrPage:
                 filter += extendFilter({
                     slug: slug,
-                    filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                    filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                 });
                 if (postFilter) filter += "&".concat(postFilter);
                 break;
@@ -81,14 +80,14 @@ export var buildCategoryQuery = function(param) {
                 if (postFilter) filter += "&".concat(postFilter);
                 break;
             default:
-                return "".concat((listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension) + "".concat(postFilter !== null && postFilter !== void 0 ? postFilter : ''));
+                return "".concat((config === null || config === void 0 ? void 0 : config.filterExtension) + "".concat(postFilter !== null && postFilter !== void 0 ? postFilter : ''));
         }
         return filter;
     };
     var query = (_obj = {
     }, _defineProperty(_obj, type, aggValue), _defineProperty(_obj, "filter", getFilters()), _obj);
     if (pageType === ListingTypesEnum.Collection) {
-        var collapseMode = listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.collapseMode;
+        var collapseMode = config === null || config === void 0 ? void 0 : config.collapseMode;
         query = _objectSpread({
         }, query, {
             collapseMode: collapseMode

package/dist/esm/listing/utils/buildFilterQuery.js

@@ -66,20 +66,17 @@ export var buildFilterQuery = function(param) {
     var ref;
     var query = (predicate === null || predicate === void 0 ? void 0 : predicate.filters) || (predicate === null || predicate === void 0 ? void 0 : predicate._id) || slug;
     var queryType = pageType === ListingTypesEnum.Search ? 'text' : pageType;
-    var filterExtension, collapseMode;
-    if (config.listing) {
-        filterExtension = config.listing.filterExtension;
-        collapseMode = config.listing.collapseMode;
-    }
+    var ref1 = config || {
+    }, filterExtension = ref1.filterExtension, collapseMode = ref1.collapseMode;
     var filter = '';
     if (pageType === ListingTypesEnum.AttrPage) {
-        var ref1 = _slicedToArray(getAttributePageType(router, slug), 2), type = ref1[0], val = ref1[1];
+        var ref2 = _slicedToArray(getAttributePageType(router, slug), 2), type = ref2[0], val = ref2[1];
         filter = "attr.".concat(type, ";eq;\"").concat(val, "\"");
     } else {
         filter = "".concat(queryType, ";eq;\"").concat(query, "\"");
     }
     if (router.query.cat) {
-        var ref2 = _slicedToArray(getAttributePageType(router, slug), 2), type1 = ref2[0], val1 = ref2[1];
+        var ref3 = _slicedToArray(getAttributePageType(router, slug), 2), type1 = ref3[0], val1 = ref3[1];
         filter += "&attr.".concat(type1, ";eq;").concat(val1);
     }
     if (pageType === ListingTypesEnum.View) {
@@ -93,6 +90,7 @@ export var buildFilterQuery = function(param) {
     var aggregatesMap = aggregates === null || aggregates === void 0 ? void 0 : aggregates.reduce(function(map, agg) {
         var aggregateType = agg.aggregationType;
         var aggregationTerm = agg.aggregationDefinition;
+        if (!aggregateType) return map;
         if (map[aggregateType]) {
             return _objectSpread({
             }, map, _defineProperty({

package/dist/esm/listing/utils/calculateOffset.js

@@ -1,5 +1,5 @@
 export function calculateOffset(page, limit) {
     var currentPage = Number(page || 0);
     if (currentPage < 1) return 0;
-    return (currentPage - 1) * limit;
+    return (currentPage - 1) * Number(limit);
 }

package/dist/esm/listing/utils/getListingAlias.js

@@ -31,15 +31,15 @@ function _slicedToArray(arr, i) {
 }
 export var getListingAlias = function(param) {
     var router = param.router, config = param.config;
-    var ref;
     var query = router.query;
-    if (!(config === null || config === void 0 ? void 0 : (ref = config.listing) === null || ref === void 0 ? void 0 : ref.slugAliases)) return query.slug;
-    var _listing = config.listing, aliases = _listing.slugAliases;
+    if (!(config === null || config === void 0 ? void 0 : config.slugAliases)) return query.slug;
+    var aliases = config.slugAliases;
     var slugMap = {
     };
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
-        for(var _iterator = Object.entries(aliases)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+        for(var _iterator = Object.entries(aliases || {
+        })[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var _value = _slicedToArray(_step.value, 2), path = _value[0], alias = _value[1];
             slugMap[alias] = path;
         }
@@ -57,6 +57,5 @@ export var getListingAlias = function(param) {
             }
         }
     }
-    var ref1;
-    return (ref1 = slugMap[query === null || query === void 0 ? void 0 : query.slug]) !== null && ref1 !== void 0 ? ref1 : query.slug;
+    return slugMap[query === null || query === void 0 ? void 0 : query.slug] || query.slug;
 };