@zengenti/contensis-react-base 4.0.0-beta.8 → 4.0.0

package/cjs/{sagas-CbZhaRNd.js → sagas-BCy9u6zA.js}

@@ -5,11 +5,17 @@ var reactRedux = require('react-redux');
 var reselect = require('reselect');
 var log = require('loglevel');
 var effects = require('@redux-saga/core/effects');
+var version = require('./version-rFG9Y6_B.js');
+var ContensisDeliveryApi = require('./ContensisDeliveryApi-MfcvdfDR.js');
 var contensisDeliveryApi = require('contensis-delivery-api');
-var queryString = require('query-string');
+var util = require('./util-eOjxDjxF.js');
+var selectors$1 = require('./selectors-DAQR0uZa.js');
+require('./slice-5xJMH24n.js');
 var mapJson = require('jsonpath-mapper');
 var contensisCoreApi = require('contensis-core-api');
 var merge = require('deepmerge');
+var queryString = require('query-string');
+var selectors$2 = require('./selectors-BrxJ8-F8.js');
 var _commonjsHelpers = require('./_commonjsHelpers-BJu3ubxk.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -135,10 +141,12 @@ const navigate = (path, state) => {
     state
   };
 };
-const clearFilters$1 = filterKey => {
+const clearFilters$1 = filterKeyOrOptions => {
   return {
     type: CLEAR_FILTERS,
-    filterKey
+    clear: typeof filterKeyOrOptions === 'string' ? {
+      keys: [filterKeyOrOptions]
+    } : filterKeyOrOptions
   };
 };
 const updatePageIndex$1 = (pageIndex, scrollToElement) => {
@@ -239,12 +247,67 @@ const getImmutableOrJS = (state, stateKey, fallbackValue, returnType = globalThi
 };
 
 const getSearchContext = state => getImmutableOrJS(state, ['search', 'context'], Context.facets);
-const getCurrent$2 = (state, context = Context.facets) => context === Context.facets ? getCurrentFacet(state) : getCurrentListing(state);
+const getCurrent$2 = (state, context = getSearchContext(state)) => context === Context.facets ? getCurrentFacet(state) : getCurrentListing(state);
 const getCurrentFacet = state => getImmutableOrJS(state, ['search', 'currentFacet']);
 const getCurrentListing = state => getImmutableOrJS(state, ['search', 'currentListing']);
 const getCurrentTab$1 = state => getImmutableOrJS(state, ['search', Context.facets, getCurrentFacet(state), 'tabId'], 0);
+const getCurrentComposition = state => getImmutableOrJS(state, ['search', 'currentComposition']);
+
+/** A localised version of `getCurrent` selector */
+const getLocalisedCurrent$2 = (state, language = selectors$1.selectCurrentLanguage(state), context = getSearchContext(state)) => {
+  var _facet$i18n;
+  const currentFacet = getCurrent$2(state, context);
+  const facet = getFacet$1(state, currentFacet, context, 'js');
+  const i18n = (_facet$i18n = facet.i18n) === null || _facet$i18n === void 0 ? void 0 : _facet$i18n[language];
+  return i18n || currentFacet;
+};
+const getLocalisedFacetKey = (state, facet = getCurrent$2(state), language = selectors$1.selectCurrentLanguage(state), context = getSearchContext(state)) => {
+  var _getFacet;
+  return (_getFacet = getFacet$1(state, facet, context, 'js')) === null || _getFacet === void 0 || (_getFacet = _getFacet.i18n) === null || _getFacet === void 0 ? void 0 : _getFacet[language];
+};
+const getCurrentFromLocalised = (state, alias, language, context = getSearchContext(state)) => {
+  var _state$search;
+  const facets = ((_state$search = state.search) === null || _state$search === void 0 ? void 0 : _state$search[context]) || {};
+  for (const [facetKey, facet] of Object.entries(facets)) {
+    if (language) {
+      var _facet$i18n2;
+      const languageAlias = (_facet$i18n2 = facet.i18n) === null || _facet$i18n2 === void 0 ? void 0 : _facet$i18n2[language];
+      if (languageAlias === alias) {
+        return {
+          facet: facetKey,
+          language
+        };
+      }
+    } else {
+      // Fallback to check for any language
+      for (const lang in facet.i18n) {
+        if (facet.i18n[lang] === alias) {
+          return {
+            facet: facetKey,
+            language: lang
+          };
+        }
+      }
+    }
+  }
+  return null;
+  // // Default to returning the inputs
+  // return { facet: alias, language };
+};
 const getFacets = (state, returnType) => getImmutableOrJS(state, ['search', Context.facets], {}, returnType);
 const getTabFacets$1 = state => Object.fromEntries(Object.entries(getFacets(state, 'js')).filter(([key]) => getImmutableOrJS(getFacets(state), [key, 'tabId'], 0) === getCurrentTab$1(state)));
+const getCompositionFacets = (state, composition) => {
+  const currentComposition = composition || getCurrentComposition(state);
+  if (!currentComposition) return {};
+  const compositionConfig = getSearchCompositions(state)[currentComposition];
+  const context = getSearchContext(state);
+  if (!compositionConfig[context]) return {};
+  const facets = {};
+  for (const facet of compositionConfig[context]) {
+    facets[facet] = getFacet$1(state, facet, context);
+  }
+  return facets;
+};
 const getFacetTitles$1 = state => Object.entries(getFacets(state, 'js')).map(([key, facet = {}]) => {
   var _facet$pagingInfo;
   return {
@@ -262,9 +325,42 @@ const getListing$1 = (state, listing = '') => {
   const currentListing = listing || getCurrentListing(state);
   return getImmutableOrJS(state, ['search', Context.listings, currentListing], {});
 };
+const getComposition = (state, composition = '') => {
+  const currentComposition = composition || getCurrentComposition(state);
+  const context = getSearchContext(state);
+  const compositionConfig = getSearchCompositions(state)[currentComposition];
+  if (!compositionConfig) return {};
+  const facets = getCompositionFacets(state, currentComposition);
+  return {
+    ...compositionConfig,
+    [context]: facets
+  };
+};
+
+/** Return filter state for the current (or provided) facet */
 const getFilters = (state, facet, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent$2(state, context), 'filters'], {}, returnType);
 };
+const getLocalisedFilterKey = (state, key, language = selectors$1.selectCurrentLanguage(state), facet, context = getSearchContext(state)) => {
+  var _filter$i18n;
+  const filter = getFilters(state, facet, context, 'js')[key];
+  if (filter !== null && filter !== void 0 && (_filter$i18n = filter.i18n) !== null && _filter$i18n !== void 0 && _filter$i18n[language]) {
+    return filter.i18n[language];
+  }
+  return key;
+};
+const getFilterKeyFromLocalised = (state, key, language = selectors$1.selectCurrentLanguage(state), facet, context = getSearchContext(state)) => {
+  const filters = getFilters(state, facet, context, 'js');
+  for (const [filterKey, filter] of Object.entries(filters)) {
+    var _filter$i18n2;
+    if (((_filter$i18n2 = filter.i18n) === null || _filter$i18n2 === void 0 ? void 0 : _filter$i18n2[language]) === key) {
+      return filterKey;
+    }
+  }
+  return key;
+};
+
+/** Return filter state for the current (or provided) facet, excluding filters configured as `renderable: false` */
 const getRenderableFilters$2 = (state, facet = '', context = Context.facets) => Object.fromEntries(Object.entries(getFilters(state, facet, context, 'js')).filter(([, f = {}]) => typeof f.renderable !== 'boolean' ? true : f.renderable));
 const getFiltersToLoad = (state, facet, context = Context.facets, returnType) => {
   const filters = getFilters(state, facet, context, returnType);
@@ -275,19 +371,62 @@ const getFiltersToLoad = (state, facet, context = Context.facets, returnType) =>
   return loadedFilters.map(([filterKey, isLoaded]) => !isLoaded ? filterKey : null).filter(f => !!f);
 };
 
-// We lowercase the filter key unless it's an ISO date string where the T must be uppercase
-const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
-  const filters = getFilters(state, facet, context, 'js');
+/** Iterate the selected filters and update their keys to their localized equivalents */
+const localiseSelectedFilterKeys = (selectedFilters, state) => {
+  const language = selectors$1.selectCurrentLanguage(state);
+  const filters = getFilters(state, getCurrentFacet(state), getSearchContext(state), 'js');
+  const localisedSelectedFilters = {};
+  for (const [filterKey, selectedValues] of Object.entries(selectedFilters)) {
+    var _filter$i18n3;
+    const filter = filters[filterKey];
+    if (filter !== null && filter !== void 0 && (_filter$i18n3 = filter.i18n) !== null && _filter$i18n3 !== void 0 && _filter$i18n3[language]) {
+      const localisedKey = filter.i18n[language];
+      localisedSelectedFilters[localisedKey] = selectedValues;
+    } else {
+      localisedSelectedFilters[filterKey] = selectedValues;
+    }
+  }
+  return localisedSelectedFilters;
+};
+
+/** Reduce filters state to a simple object containing all filter keys and the selected values */
+const reduceSelectedFilters = filters => {
   const selectedFilters = Object.fromEntries(Object.entries(filters).map(([key, filter = {}]) => [key, (filter.items || []).filter(item => !!(item.isSelected || false)).map(item => {
     const key = (item === null || item === void 0 ? void 0 : item.key) || '';
     return key;
   })]));
+  return selectedFilters;
+};
+
+/** Return keyed object for all filters in the current facet with all selected values for each filter */
+const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
+  const filters = getFilters(state, facet, context, 'js');
+  const selectedFilters = reduceSelectedFilters(filters);
   const fromJS = makeFromJS(returnType);
   return fromJS(selectedFilters);
 };
+
+/** Return keyed object for all _renderable_ filters in the current facet with all selected values for each filter */
+const getRenderableSelectedFilters = (state, facet = '', context = Context.facets) => {
+  const filters = getRenderableFilters$2(state, facet, context);
+
+  // new in CRB4: intended no support for immutable state type
+  const selectedFilters = reduceSelectedFilters(filters);
+  return selectedFilters;
+};
+
+/** A localised version of `getRenderableSelectedFilters` selector */
+const getLocalisedRenderableSelectedFilters = (state, facet = '', context = Context.facets) => {
+  const filters = getRenderableSelectedFilters(state, facet, context);
+  const localisedFilters = localiseSelectedFilterKeys(filters, state);
+  return localisedFilters;
+};
 const getResults = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'results'], [], returnType);
 };
+const getResultsInfo = (state, current = '', context = getSearchContext(state)) => {
+  return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'resultsInfo'], {}, 'js');
+};
 const getIsInternalPaging = (state, current, context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'queryParams', 'internalPaging'], false);
 };
@@ -325,6 +464,7 @@ const getTotalCount$1 = (state, current = '', context = Context.facets) => {
 };
 const getSearchTerm$2 = state => getImmutableOrJS(state, ['search', 'term']);
 const getSearchTabs = (state, returnType) => getImmutableOrJS(state, ['search', 'tabs'], [], returnType);
+const getSearchCompositions = state => getImmutableOrJS(state, ['search', 'compositions'], {}, 'js');
 const getQueryParams = (state, current = '', context = Context.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'queryParams'], {}, 'js');
 };
@@ -338,9 +478,6 @@ const getQueryParameter$2 = ({
 const getCustomApi = (state, current, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'customApi'], null, returnType);
 };
-const getCustomEnv = (state, current, context = Context.facets) => {
-  return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'env']);
-};
 const getTabsAndFacets$1 = (state, returnType) => {
   const tabs = getSearchTabs(state, 'js');
   const facets = getFacets(state, 'js');
@@ -381,7 +518,6 @@ const selectFacets = {
   getCurrent: getCurrentFacet,
   getCurrentTab: getCurrentTab$1,
   getCustomApi,
-  getCustomEnv,
   getFacet: getFacet$1,
   getFacetTitles: getFacetTitles$1,
   getFacets,
@@ -391,6 +527,8 @@ const selectFacets = {
   getFiltersToLoad,
   getIsLoaded,
   getIsLoading: getIsLoading$2,
+  /* Localised version of getCurrent */
+  getLocalisedCurrent: state => getLocalisedCurrent$2(state, undefined, Context.facets),
   getPageIndex: getPageIndex$2,
   getPageIsLoading: getPageIsLoading$2,
   getPagesLoaded,
@@ -422,6 +560,8 @@ const selectListing = {
   getFilters: (state, listing = '') => getFilters(state, listing, Context.listings, 'js'),
   getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, Context.listings),
   getListing: getListing$1,
+  /* Localised version of getCurrent */
+  getLocalisedCurrent: state => getLocalisedCurrent$2(state, undefined, Context.listings),
   getIsLoaded: state => getIsLoaded(state, Context.listings),
   getIsLoading: state => getIsLoading$2(state, Context.listings),
   getPageIndex: (state, listing = '') => getPageIndex$2(state, listing, Context.listings),
@@ -443,23 +583,24 @@ const selectListing = {
   getTotalCount: (state, listing = '') => getTotalCount$1(state, listing, Context.listings),
   getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context.listings, 'js')
 };
-const selectCurrentPath = state => getImmutableOrJS(state, ['routing', 'currentPath']);
-const selectCurrentProject = state => getImmutableOrJS(state, ['routing', 'currentProject']);
-const selectVersionStatus = state => getImmutableOrJS(state, ['version', 'contensisVersionStatus']);
 
 var selectors = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  getComposition: getComposition,
+  getCompositionFacets: getCompositionFacets,
   getCurrent: getCurrent$2,
+  getCurrentComposition: getCurrentComposition,
   getCurrentFacet: getCurrentFacet,
+  getCurrentFromLocalised: getCurrentFromLocalised,
   getCurrentListing: getCurrentListing,
   getCurrentTab: getCurrentTab$1,
   getCustomApi: getCustomApi,
-  getCustomEnv: getCustomEnv,
   getFacet: getFacet$1,
   getFacetTitles: getFacetTitles$1,
   getFacets: getFacets,
   getFacetsTotalCount: getFacetsTotalCount$1,
   getFeaturedResults: getFeaturedResults$2,
+  getFilterKeyFromLocalised: getFilterKeyFromLocalised,
   getFilters: getFilters,
   getFiltersToLoad: getFiltersToLoad,
   getIsInternalPaging: getIsInternalPaging,
@@ -467,6 +608,10 @@ var selectors = /*#__PURE__*/Object.freeze({
   getIsLoading: getIsLoading$2,
   getIsSsr: getIsSsr,
   getListing: getListing$1,
+  getLocalisedCurrent: getLocalisedCurrent$2,
+  getLocalisedFacetKey: getLocalisedFacetKey,
+  getLocalisedFilterKey: getLocalisedFilterKey,
+  getLocalisedRenderableSelectedFilters: getLocalisedRenderableSelectedFilters,
   getPageIndex: getPageIndex$2,
   getPageIsLoading: getPageIsLoading$2,
   getPageSize: getPageSize,
@@ -476,7 +621,10 @@ var selectors = /*#__PURE__*/Object.freeze({
   getQueryParameter: getQueryParameter$2,
   getQueryParams: getQueryParams,
   getRenderableFilters: getRenderableFilters$2,
+  getRenderableSelectedFilters: getRenderableSelectedFilters,
   getResults: getResults,
+  getResultsInfo: getResultsInfo,
+  getSearchCompositions: getSearchCompositions,
   getSearchContext: getSearchContext,
   getSearchTabs: getSearchTabs,
   getSearchTerm: getSearchTerm$2,
@@ -485,275 +633,29 @@ var selectors = /*#__PURE__*/Object.freeze({
   getTabFacets: getTabFacets$1,
   getTabsAndFacets: getTabsAndFacets$1,
   getTotalCount: getTotalCount$1,
-  selectCurrentPath: selectCurrentPath,
-  selectCurrentProject: selectCurrentProject,
   selectFacets: selectFacets,
-  selectListing: selectListing,
-  selectVersionStatus: selectVersionStatus
+  selectListing: selectListing
 });
 
-const now = () => {
-  if (typeof window == 'undefined') {
-    return Date.now();
-  }
-  return window.performance.now();
-};
-
-const getClientConfig = (project, env) => {
-  let config = DELIVERY_API_CONFIG; /* global DELIVERY_API_CONFIG */
-  if (project) {
-    config.projectId = project;
-  }
-  if (typeof window != 'undefined' && PROXY_DELIVERY_API /* global PROXY_DELIVERY_API */) {
-    // ensure a relative url is used to bypass the need for CORS (separate OPTIONS calls)
-    config.rootUrl = env || '';
-    config.responseHandler = {
-      404: () => null
-    };
-  }
-  return config;
-};
-class CacheNode {
-  constructor(key, value) {
-    this.key = key;
-    this.value = value;
-    this.next = null;
-    this.prev = null;
-  }
-}
-class LruCache {
-  constructor(limit = 100) {
-    this.map = {};
-    this.head = null;
-    this.tail = null;
-    this.limit = limit || 100;
-    this.size = 0;
-  }
-  get(key) {
-    if (this.map[key]) {
-      let value = this.map[key].value;
-      let node = new CacheNode(key, value);
-      this.remove(key);
-      this.setHead(node);
-      return value;
-    }
-  }
-  set(key, value) {
-    let node = new CacheNode(key, value);
-    if (this.map[key]) {
-      this.remove(key);
-    } else {
-      if (this.size >= this.limit) {
-        delete this.map[this.tail.key];
-        this.size--;
-        this.tail = this.tail.prev;
-        this.tail.next = null;
-      }
-    }
-    this.setHead(node);
-  }
-  setHead(node) {
-    node.next = this.head;
-    node.prev = null;
-    if (this.head) {
-      this.head.prev = node;
-    }
-    this.head = node;
-    if (!this.tail) {
-      this.tail = node;
-    }
-    this.size++;
-    this.map[node.key] = node;
-  }
-  remove(key) {
-    let node = this.map[key];
-    if (node.prev) {
-      node.prev.next = node.next;
-    } else {
-      this.head = node.next;
-    }
-    if (node.next) {
-      node.next.prev = node.prev;
-    } else {
-      this.tail = node.prev;
-    }
-    delete this.map[key];
-    this.size--;
-  }
-}
-class CachedSearch {
-  constructor() {
-    this.cache = new LruCache();
-    this.taxonomyLookup = {};
-  }
-  search(query, linkDepth, project, env) {
-    const client = contensisDeliveryApi.Client.create(getClientConfig(project, env));
-    return this.request(project + JSON.stringify(query) + linkDepth.toString(), () => client.entries.search(query, linkDepth));
-  }
-  getTaxonomyNodeByPath(path, project, env) {
-    const client = contensisDeliveryApi.Client.create(getClientConfig(project, env));
-    return this.request(`[TAXONOMY NODE] ${path}`, () => client.taxonomy.getNodeByPath({
-      path: path,
-      order: 'defined',
-      childDepth: 2
-    }).then(node => this.extendTaxonomyNode(node)));
-  }
-  request(key, execute) {
-    if (!this.cache.get(key) || typeof window == 'undefined') {
-      let promise = execute();
-      this.cache.set(key, promise);
-      promise.catch(() => {
-        this.cache.remove(key);
-      });
-    }
-    return this.cache.get(key);
-  }
-  extendTaxonomyNode(node) {
-    let id = this.getTaxonomyId(node);
-    this.taxonomyLookup[id] = node.key;
-    return {
-      ...node,
-      id,
-      children: node.children ? node.children.map(n => this.extendTaxonomyNode(n)) : null
-    };
-  }
-  getTaxonomyId(node) {
-    if (node.key) {
-      let parts = node.key.split('/');
-      return parts[parts.length - 1];
-    }
-    return '';
-  }
-  fetch(uri, opts = {}) {
-    return this.request(`[FETCH] ${uri} ${JSON.stringify(opts)}`, () => fetch(uri, opts));
-  }
-}
-const cachedSearch = new CachedSearch();
-
-function fixFreeTextForElastic(s) {
-  const illegalChars = ['>', '<', '=', '|', '!', '{', '}', '[', ']', '^', '~', '*', '?', ':', '\\', '/'];
-  const illegalRegEx = new RegExp(illegalChars.map(c => '\\' + c).join('|'), 'g');
-  s = s.replace(illegalRegEx, '');
-  // s = s.replace(encodedRegEx, ''); // (m) => '\\\\' + m);
-
-  return s;
-}
-/** `convertKeyForAggregation` and `parseKeyForAggregation` exists to prevent an
- *  auto-generated aggregation using a reserved keyword because Elasticsearch has a list of
- *  reserved keywords when it parses the response:
- *  `'location' is one of the reserved aggregation keywords we use a heuristics based
- *  response parser and using these reserved keywords could throw its heuristics off
- *  course. We are working on a solution in Elasticsearch itself to make the response
- *  parseable. For now these are all the reserved keywords: after_key, _as_string,
- *  bg_count, bottom_right, bounds, buckets, count, doc_count, doc_count_error_upper_bound,
- *  fields, from, top, type, from_as_string, hits, key, key_as_string, keys, location,
- *  max_score, meta, min, min_length, score, sum_other_doc_count, to, to_as_string, top_left,
- *  total, value, value_as_string, values, geometry, properties`
- */
-const convertKeyForAggregation = key => `sf_${key}`;
-const convertFieldIdForAggregation = fieldId => fieldId.replaceAll('[]', '');
-const timedSearch = async (query, linkDepth = 0, projectId, env) => {
-  if (!query) return null;
-  let duration = 0;
-  const start = now();
-  const payload = await cachedSearch.search(query, linkDepth, projectId, env);
-  const end = now();
-  duration = Number((end - start).toFixed(2));
-  return {
-    duration,
-    payload
-  };
-};
-const getItemsFromResult = result => {
-  const {
-    payload
-  } = result || {};
-  if (payload) {
-    if (Array.isArray(payload)) return payload;
-    if (Array.isArray(payload.items)) return payload.items;
-    return payload;
-  }
-  return [];
-};
-const extractQuotedPhrases = searchTerm => {
-  const pattern = new RegExp(/(?=["'])(?:"[^"\\]*(?:\\[\s\S][^"\\]*)*"|'[^'\\]*(?:\\[\s\S][^'\\]*)*')/gm);
-  return (searchTerm.match(pattern) || []).map(match => match.replace(/"/g, ''));
-};
-const buildUrl = (route, params) => {
-  const qs = queryString.stringify(params);
-  const path = qs ? `${route}${route.includes('?') ? '&' : '?'}${qs}` : route;
-  return path;
-};
-
-/**
- * Returns all params from the current route query string or static route
- * Supply static route argument if reading parameters from the route path
- * Supply location argument for the params to be read in SSR
- * @param staticRoute Matched static route from react-router 5 or 6
- * @param location location object containing at least pathname and search
- * @returns Keyed params object
- */
-const routeParams = (staticRoute, location) => {
-  var _staticRoute$match;
-  // match.params is react-router-config/react-router@5 style
-  // params is supplied with RouteObject in react-router@6
-  const pathParams = (staticRoute === null || staticRoute === void 0 || (_staticRoute$match = staticRoute.match) === null || _staticRoute$match === void 0 ? void 0 : _staticRoute$match.params) || (staticRoute === null || staticRoute === void 0 ? void 0 : staticRoute.params) || {};
-  const queryParams = queryString.parse(typeof window !== 'undefined' ? window.location.search : (location === null || location === void 0 ? void 0 : location.search) || '');
-  return {
-    ...pathParams,
-    ...queryParams
-  };
-};
-const callCustomApi = async (customApi, filters) => {
-  const apiUri = customApi.uri || '';
-  let uri = buildUrl(apiUri, filters);
-  if (!uri) throw new Error('uri is required to use customApi');
-  if (typeof window == 'undefined') {
-    if (!uri.startsWith('http')) uri = `http://localhost:3001${uri}`;
-    const response = await fetch(uri);
-    return await response.json();
-  }
-  const response = await cachedSearch.fetch(uri);
-  return await response.clone().json();
-};
-const removeEmptyAttributes = obj => {
-  Object.entries(obj).forEach(([key, val]) => val && typeof val === 'object' && removeEmptyAttributes(val) || (typeof val === 'undefined' || val === null || val === '') && delete obj[key]);
-  return obj;
-};
-const toArray = (obj, seperator = ',') => typeof obj === 'undefined' || obj === null ? obj : Array.isArray(obj) ? obj : obj.split(seperator);
-
-// assumes array elements are primitive types
-const areArraysEqualSets = (a1, a2) => {
-  const superSet = {};
-  for (const ai of a1) {
-    const e = ai + typeof ai;
-    superSet[e] = 1;
-  }
-  for (const ai of a2) {
-    const e = ai + typeof ai;
-    if (!superSet[e]) {
-      return false;
-    }
-    superSet[e] = 2;
-  }
-  for (const e in superSet) {
-    if (superSet[e] === 1) {
-      return false;
-    }
-  }
-  return true;
-};
-
 const searchUriTemplate = {
   path: ({
     state,
     facet
   }) => {
+    var _staticRoute$route;
     const context = getSearchContext(state);
-    const currentPath = selectCurrentPath(state) || '/search';
-    if (context !== 'listings') {
-      const currentFacet = facet || getCurrentFacet(state);
+    const currentPath = selectors$2.selectCurrentPath(state) || '/search';
+    const staticRoute = selectors$2.selectStaticRoute(state);
+    const hasFacetRouteParam = staticRoute === null || staticRoute === void 0 || (_staticRoute$route = staticRoute.route) === null || _staticRoute$route === void 0 || (_staticRoute$route = _staticRoute$route.path) === null || _staticRoute$route === void 0 ? void 0 : _staticRoute$route.includes(`/:${context === 'facets' ? 'facet' : 'listingType'}`);
+
+    // if (context !== 'listings') {
+    if (hasFacetRouteParam) {
+      const currentFacet = getLocalisedFacetKey(state, facet) || facet || getLocalisedCurrent$2(state);
       const filters = getSelectedFilters(state, facet, context);
+      // TODO: This only looking for a filter called contentTypeId
+      // feels a bit useless and only really serves as an example.
+      // We could expand this in future to be configured with the filter or the route
+      // e.g. look for a route param matching the filter key in the static route
       const currentFilter = filters.contentTypeId;
 
       // Check if we have a filter first
@@ -771,17 +673,33 @@ const searchUriTemplate = {
     pageIndex,
     pageSize
   }) => {
-    const searchContext = getSearchContext(state);
+    var _staticRoute$route2;
+    const context = getSearchContext(state);
+    const staticRoute = selectors$2.selectStaticRoute(state);
+    // Some listing routes may not have the listingType or facet as a route param
+    // include it as a query param to ensure the correct listing/facet is set or updated
+    const hasFacetRouteParam = staticRoute === null || staticRoute === void 0 || (_staticRoute$route2 = staticRoute.route) === null || _staticRoute$route2 === void 0 || (_staticRoute$route2 = _staticRoute$route2.path) === null || _staticRoute$route2 === void 0 ? void 0 : _staticRoute$route2.includes(`/:${context === 'facets' ? 'facet' : 'listingType'}`);
+    const currentFacet = getLocalisedFacetKey(state, facet) || facet || getLocalisedCurrent$2(state);
+    const facetQuery = !hasFacetRouteParam && currentFacet ? {
+      [context === 'listings' ? 'listingType' : 'facet']: currentFacet
+    } : {};
+
     // Lose stateFilters and currentSearch if a new
     // term is passed via an argument
-    const stateFilters = term ? {} : Object.fromEntries(Object.entries(getSelectedFilters(state, facet, searchContext, 'js')).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
+    const stateFilters = term ? {} : Object.fromEntries(Object.entries(getLocalisedRenderableSelectedFilters(state, facet, context)).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
     const currentSearch = !term && getImmutableOrJS(state, ['routing', 'location', 'search']);
-    const currentQs = removeEmptyAttributes(queryString.parse(currentSearch));
-    if (orderBy) currentQs.orderBy = orderBy;
+    const currentQs = util.removeEmptyAttributes(queryString.parse(currentSearch));
+
+    // An argument is provided with the updated value
+    // when the relevant action has been triggered
+    if (typeof orderBy !== 'undefined') currentQs.orderBy = orderBy;
     const searchTerm = getSearchTerm$2(state);
     // Use Immutable's merge to merge the stateFilters with any current Qs
     // to build the new Qs.
-    const mergedSearch = removeEmptyAttributes(merge__default.default(currentQs, stateFilters));
+    const mergedSearch = util.removeEmptyAttributes(merge__default.default(currentQs, {
+      ...facetQuery,
+      ...stateFilters
+    }));
 
     // We must handle term === '' separately, because this means the user has cleared the search term
     // If this is true, we don't want to fall back to the existing search term. We only want to do that if the
@@ -817,6 +735,7 @@ const {
   getFacetTitles,
   getFeaturedResults: getFeaturedResults$1,
   getIsLoading: getIsLoading$1,
+  getLocalisedCurrent: getLocalisedCurrent$1,
   getPageIndex: getPageIndex$1,
   getPageIsLoading: getPageIsLoading$1,
   getQueryParameter: getQueryParameter$1,
@@ -828,6 +747,8 @@ const {
   getTotalCount
 } = selectFacets;
 const makeSelectFacetsProps = () => reselect.createSelector(state => state, (_, mappers) => mappers, (state, mappers) => ({
+  composition: getComposition(state),
+  currentComposition: getCurrentComposition(state),
   currentFacet: getCurrent$1(state),
   currentPageIndex: getPageIndex$1(state),
   currentTabIndex: getCurrentTab(state),
@@ -838,10 +759,11 @@ const makeSelectFacetsProps = () => reselect.createSelector(state => state, (_,
   featured: getFeaturedResults$1(state),
   filters: getRenderableFilters$1(state),
   isLoading: getIsLoading$1(state),
+  localisedCurrent: getLocalisedCurrent$1(state),
   pageIsLoading: getPageIsLoading$1(state),
   paging: getPaging(state, '', Context.facets, 'js'),
   results: getResults(state, '', Context.facets, 'js'),
-  resultsInfo: mappers && typeof mappers.resultsInfo === 'function' && mappers.resultsInfo(state),
+  resultsInfo: typeof (mappers === null || mappers === void 0 ? void 0 : mappers.resultsInfo) === 'function' && mappers.resultsInfo(state) || getResultsInfo(state),
   searchTerm: getSearchTerm$1(state),
   searchTotalCount: getSearchTotalCount(state),
   selectedFilters: getSelectedFilters(state, '', Context.facets, 'js'),
@@ -870,6 +792,8 @@ const useFacets = ({
     updateSortOrder: orderBy => dispatch(withMappers(updateSortOrder$1(orderBy), m))
   };
   const {
+    composition,
+    currentComposition,
     currentFacet,
     currentPageIndex,
     currentTabIndex,
@@ -880,6 +804,7 @@ const useFacets = ({
     featured,
     filters,
     isLoading,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -892,6 +817,8 @@ const useFacets = ({
     totalCount
   } = reactRedux.useSelector(state => selectListingProps(state, m));
   return {
+    composition,
+    currentComposition,
     currentFacet,
     currentPageIndex,
     currentTabIndex,
@@ -902,6 +829,7 @@ const useFacets = ({
     featured,
     filters,
     isLoading,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -921,6 +849,7 @@ const {
   getFeaturedResults,
   getIsLoading,
   getListing,
+  getLocalisedCurrent,
   getPageIndex,
   getPageIsLoading,
   getQueryParameter,
@@ -928,16 +857,19 @@ const {
   getSearchTerm
 } = selectListing;
 const makeSelectListingProps = () => reselect.createSelector(state => state, (_, mappers) => mappers, (state, mappers) => ({
+  composition: getComposition(state),
+  currentComposition: getCurrentComposition(state),
   currentListing: getCurrent(state),
   currentPageIndex: getPageIndex(state),
-  listing: getListing(state),
   featured: getFeaturedResults(state),
   filters: getRenderableFilters(state),
   isLoading: getIsLoading(state),
+  listing: getListing(state),
+  localisedCurrent: getLocalisedCurrent(state),
   pageIsLoading: getPageIsLoading(state),
   paging: getPaging(state, '', Context.listings, 'js'),
   results: getResults(state, '', Context.listings, 'js'),
-  resultsInfo: mappers && typeof mappers.resultsInfo === 'function' && mappers.resultsInfo(state),
+  resultsInfo: typeof mappers.resultsInfo === 'function' && mappers.resultsInfo(state) || getResultsInfo(state),
   searchTerm: getSearchTerm(state),
   selectedFilters: getSelectedFilters(state, '', Context.listings, 'js'),
   sortOrder: getQueryParameter({
@@ -962,12 +894,15 @@ const useListing = ({
     updateSortOrder: orderBy => dispatch(withMappers(updateSortOrder$1(orderBy), m))
   };
   const {
+    composition,
+    currentComposition,
     currentListing,
     currentPageIndex,
     featured,
     filters,
     isLoading,
     listing,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -977,12 +912,15 @@ const useListing = ({
     sortOrder
   } = reactRedux.useSelector(state => selectListingProps(state, m));
   return {
+    composition,
+    currentComposition,
     currentListing,
     currentPageIndex,
     featured,
     filters,
     isLoading,
     listing,
+    localisedCurrent,
     pageIsLoading,
     paging,
     results,
@@ -995,11 +933,53 @@ const useListing = ({
   };
 };
 
+class CachedTaxonomyLookup {
+  constructor() {
+    this.cache = new ContensisDeliveryApi.LruCache();
+    this.taxonomyLookup = {};
+  }
+  getTaxonomyNodeByPath(path, project, env) {
+    const client = contensisDeliveryApi.Client.create(ContensisDeliveryApi.getClientConfig(project, env));
+    return this.request(`[TAXONOMY] ${path}`, () => client.taxonomy.getNodeByPath({
+      path: path,
+      order: 'defined',
+      childDepth: 2
+    }).then(node => this.extendTaxonomyNode(node)));
+  }
+  request(key, execute) {
+    if (!this.cache.get(key) || typeof window == 'undefined') {
+      let promise = execute();
+      this.cache.set(key, promise);
+      promise.catch(() => {
+        this.cache.remove(key);
+      });
+    }
+    return this.cache.get(key);
+  }
+  extendTaxonomyNode(node) {
+    let id = this.getTaxonomyId(node);
+    this.taxonomyLookup[id] = node.key;
+    return {
+      ...node,
+      id,
+      children: node.children ? node.children.map(n => this.extendTaxonomyNode(n)) : null
+    };
+  }
+  getTaxonomyId(node) {
+    if (node.key) {
+      let parts = node.key.split('/');
+      return parts[parts.length - 1];
+    }
+    return '';
+  }
+}
+
+/** @deprecated Taxonomy is deprecated in Contensis, code remains
+ * to support any legacy implementations using Taxonomy in their search */
+const cachedTaxonomyLookup = new CachedTaxonomyLookup();
+
 const DataFormats = {
-  asset: 'asset',
-  entry: 'entry',
-  webpage: 'webpage'
-};
+  entry: 'entry'};
 const FilterExpressionTypes = {
   contentType: 'contentType',
   field: 'field'
@@ -1034,16 +1014,20 @@ const fieldExpression = (field, value, operator = 'equalTo', weight, fuzzySearch
 const contentTypeIdExpression = (contentTypeIds, webpageTemplates, assetTypes) => {
   const expressions = [];
   if (!contentTypeIds && !webpageTemplates && !assetTypes) return expressions;
-  if (contentTypeIds && contentTypeIds.length > 0) {
-    expressions.push(...dataFormatExpression(contentTypeIds, DataFormats.entry));
-  }
-  if (webpageTemplates && webpageTemplates.length > 0) {
-    expressions.push(...dataFormatExpression(webpageTemplates, DataFormats.webpage));
+  const ids = [...new Set([...(contentTypeIds || []), ...(webpageTemplates || []), ...(assetTypes || [])])];
+
+  /**
+   * We have an array of contentTypeIds some may be prefixed with a "!"
+   * to indicate this is a "not" expression
+   */
+  const withContentTypeIds = ids.filter(c => !c.startsWith('!'));
+  const notContentTypeIds = ids.filter(c => c.startsWith('!')).map(id => id.substring(1));
+  if (withContentTypeIds.length > 0) {
+    expressions.push(...fieldExpression(Fields.sys.contentTypeId, withContentTypeIds));
   }
-  if (assetTypes && assetTypes.length > 0) {
-    expressions.push(...dataFormatExpression(assetTypes, DataFormats.asset));
+  if (notContentTypeIds.length > 0) {
+    expressions.push(contensisCoreApi.Op.not(fieldExpression(Fields.sys.contentTypeId, notContentTypeIds)[0]));
   }
-  if (expressions.length > 1) return [contensisCoreApi.Op.or(...expressions)];
   return expressions;
 };
 const filterExpressions = (filters, isOptional = false) => {
@@ -1066,6 +1050,9 @@ const filterExpressions = (filters, isOptional = false) => {
   });
   return expressions;
 };
+
+/** @deprecated since v4 - contentTypeIdExpression produces a simpler more efficient query
+ * now and negates the need for supplying `sys.dataFormat` with `sys.contentTypeId` */
 const dataFormatExpression = (contentTypeIds, dataFormat = DataFormats.entry) => {
   if (contentTypeIds && contentTypeIds.length > 0) {
     /**
@@ -1176,7 +1163,6 @@ const between = (field, value) => {
       const [minimum, maximum] = valArr;
       return contensisCoreApi.Op.between(field, minimum, maximum);
     } else {
-      // eslint-disable-next-line no-console
       console.log(`[search] You have supplied only one value to a "between" operator which must have two values. Your supplied value "${valArr.length && valArr[0]}" has been discarded.`);
       return false;
     }
@@ -1193,7 +1179,6 @@ const distanceWithin = (field, value) => {
       const [lat, lon] = valArr;
       return contensisCoreApi.Op.distanceWithin(field, Number(lat), Number(lon), (valArr === null || valArr === void 0 ? void 0 : valArr[2]) || '10mi');
     } else {
-      // eslint-disable-next-line no-console
       console.log(`[search] You have supplied only one value to a "distanceWithin" operator which must be made up of "lat,lon,distance". Your supplied value "${valArr.length && valArr[0]}" has been discarded.`);
       return false;
     }
@@ -1260,7 +1245,7 @@ const makeJsExpression = (operator, field, value) => operator === 'freeText' ||
 const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch, omitSearchFields = []) => {
   if (searchTerm && weightedSearchFields && weightedSearchFields.length > 0) {
     // Extract any phrases in quotes to array
-    const quotedPhrases = extractQuotedPhrases(searchTerm);
+    const quotedPhrases = util.extractQuotedPhrases(searchTerm);
 
     // Modify the search term to remove any quoted phrases to leave any remaining terms
     let modifiedSearchTerm = searchTerm;
@@ -1270,8 +1255,8 @@ const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch, omitSear
     const operators = [];
 
     // Helper functions to generate Op expressions
-    const containsOp = (f, term) => fieldExpression(f.fieldId, fixFreeTextForElastic(term), 'contains', f.weight);
-    const freeTextOp = (f, term) => fieldExpression(f.fieldId, fixFreeTextForElastic(term), 'freeText', f.weight, fuzzySearch);
+    const containsOp = (f, term) => fieldExpression(f.fieldId, util.fixFreeTextForElastic(term), 'contains', f.weight);
+    const freeTextOp = (f, term) => fieldExpression(f.fieldId, util.fixFreeTextForElastic(term), 'freeText', f.weight, fuzzySearch);
 
     // For each weighted search field
     weightedSearchFields.forEach(wsf => {
@@ -1346,10 +1331,10 @@ var expressions = /*#__PURE__*/Object.freeze({
   termExpressions: termExpressions
 });
 
-const filterQuery = (contentTypeIds, versionStatus, customWhere) => {
-  const query = new contensisCoreApi.Query(...[...contentTypeIdExpression(contentTypeIds), ...defaultExpressions(versionStatus), ...customWhereExpressions(customWhere)]);
+const filterQuery = (contentTypeIds, languages, versionStatus, customWhere, pageSize = 100) => {
+  const query = new contensisCoreApi.Query(...[...contentTypeIdExpression(contentTypeIds), ...languagesExpression(languages), ...defaultExpressions(versionStatus), ...customWhereExpressions(customWhere)]);
   query.orderBy = contensisCoreApi.OrderBy.asc(Fields.entryTitle);
-  query.pageSize = 100;
+  query.pageSize = pageSize;
   return query;
 };
 const searchQuery = ({
@@ -5075,19 +5060,65 @@ const facetTemplate = {
       action,
       featuredResult,
       state
-    }) => mapEntriesToSearchResults(action, getItemsFromResult(featuredResult), state),
+    }) => mapEntriesToSearchResults(action, util.getItemsFromResult(featuredResult), state),
     filters: ({
       result,
       state,
       action
     }) => {
-      const aggregations = 'aggregations' in result.payload ? result.payload.aggregations : undefined;
+      const aggregations = result.payload && 'aggregations' in result.payload ? result.payload.aggregations : undefined;
       if (!aggregations) return {};
 
-      // Handle aggregations client-side where the filter items have loaded before the results containing the aggregations
+      // Handle aggregations client-side where the filter items have loaded
+      // before the results containing the aggregations
       const filters = cloneDeep(getFilters(state, action.facet, action.context, 'js'));
-      for (const [filterKey, filter] of Object.entries(filters)) {
-        const aggregation = aggregations[convertKeyForAggregation(filterKey)];
+      for (const filter of Object.values(filters)) {
+        let aggregation = {};
+        if (typeof filter.fieldId === 'string') {
+          aggregation = aggregations[util.convertKeyForAggregation(filter.fieldId)] || {};
+        } else if (Array.isArray(filter.fieldId)) {
+          for (const fieldId of filter.fieldId) {
+            aggregation = merge__default.default(aggregation, aggregations[util.convertKeyForAggregation(fieldId)] || {});
+          }
+        }
+        // Populate filter items from aggregations for example tag fields
+        if (filter.aggregations) {
+          // Use supplied aggregations instead of field aggregations
+          if (typeof filter.aggregations === 'string') {
+            aggregation = aggregations[util.convertKeyForAggregation(filter.aggregations)] || {};
+          } else if (Array.isArray(filter.aggregations)) {
+            aggregation = {};
+            for (const fieldId of filter.aggregations) {
+              aggregation = merge__default.default(aggregation, aggregations[util.convertKeyForAggregation(fieldId)] || {});
+            }
+          }
+          // Start with existing items that are not in the aggregation
+          const existingItemsNotInAggregation = (filter.items || []).filter(item => !(item.key in (aggregation || {}))).map(item => {
+            delete item.aggregate;
+            return item;
+          });
+
+          // Map aggregation entries to filter items
+          const aggregationItems = Object.entries(aggregation || {}).map(([key, aggregate]) => {
+            var _filter$items;
+            const existing = ((_filter$items = filter.items) === null || _filter$items === void 0 ? void 0 : _filter$items.find(item => item.key === key)) || {};
+            return {
+              key,
+              title: (existing === null || existing === void 0 ? void 0 : existing.title) || `${key[0].toUpperCase()}${key.slice(1)}`,
+              isSelected: !!(existing !== null && existing !== void 0 && existing.isSelected),
+              aggregate
+            };
+          });
+
+          // Combine existing items not in aggregation with aggregation items
+          filter.items = [...existingItemsNotInAggregation, ...aggregationItems].sort((a, b) => (a.title || a.key).localeCompare(b.title || b.key));
+          continue;
+        }
+
+        // Update aggregation counts on existing filter items
+        // In the context of a pre-loaded facet, the filter items will
+        // not have been loaded yet, so we need to check again when
+        // the filter items load and populate the aggregate counts then as well
         for (const filterItem of filter.items || []) {
           if (!aggregation) delete filterItem.aggregate;else {
             const aggregate = aggregation[filterItem.key.toLowerCase()];
@@ -5144,7 +5175,7 @@ const facetTemplate = {
         pagesLoaded,
         prevPageIndex
       } = action.queryParams;
-      const results = mapEntriesToSearchResults(action, getItemsFromResult(result), state);
+      const results = mapEntriesToSearchResults(action, util.getItemsFromResult(result), state);
       if (!loadMorePaging) return results;
 
       // add a _pageIndex property to the returned results to help us later
@@ -5168,6 +5199,7 @@ const facetTemplate = {
   },
   preload: 'action.preload',
   ogState: 'action.ogState',
+  state: 'state',
   debug: 'action.debug'
 };
 const filterTemplate = {
@@ -5187,7 +5219,7 @@ const filterTemplate = {
       selectedKeys,
       mapper,
       facet,
-      filterKey
+      filter
     }) => {
       // Handle taxonomy filter items
       if (payload && 'children' in payload) {
@@ -5200,10 +5232,18 @@ const filterTemplate = {
       }
 
       // Handle entries-based filter items
-      if (payload && 'items' in payload) {
-        var _facet$aggregations;
+      if (payload && 'items' in payload && filter.fieldId) {
+        var _facet$aggregations2;
         // Handle aggregations from SSR where the results containing the aggregations have loaded before the filter items
-        const aggregation = (_facet$aggregations = facet.aggregations) === null || _facet$aggregations === void 0 ? void 0 : _facet$aggregations[convertKeyForAggregation(filterKey)];
+        const aggregation = Array.isArray(filter.fieldId) ? filter.fieldId.reduce((agg, fieldId) => {
+          var _facet$aggregations;
+          const fieldAggregations = ((_facet$aggregations = facet.aggregations) === null || _facet$aggregations === void 0 ? void 0 : _facet$aggregations[util.convertKeyForAggregation(fieldId)]) || {};
+          // Accumulate numeric values for matching keys from previous counted fields
+          for (const [key, value] of Object.entries(fieldAggregations)) {
+            agg[key] = (agg[key] || 0) + value;
+          }
+          return agg;
+        }, {}) : (_facet$aggregations2 = facet.aggregations) === null || _facet$aggregations2 === void 0 ? void 0 : _facet$aggregations2[util.convertKeyForAggregation(filter.fieldId)];
         const items = payload.items.map(item => {
           var _item$sys, _item$sys2;
           item.isSelected = selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys.includes(item === null || item === void 0 || (_item$sys = item.sys) === null || _item$sys === void 0 ? void 0 : _item$sys.id);
@@ -5211,7 +5251,7 @@ const filterTemplate = {
           if (typeof aggregate === 'number') item.aggregate = aggregate;
           return item;
         });
-        return mapper === null || mapper === void 0 ? void 0 : mapper(items);
+        return (mapper === null || mapper === void 0 ? void 0 : mapper(items)) || [];
       }
       return [];
     }
@@ -5268,10 +5308,22 @@ const queryParamsTemplate = {
     } = root;
     const stateFilters = getFilters(state, facet, context, 'js');
     const aggregations = {};
-    for (const [filterKey, filter] of Object.entries(stateFilters)) {
-      if (filter.fieldId && !Array.isArray(filter.fieldId)) {
-        aggregations[convertKeyForAggregation(filterKey)] = {
-          field: convertFieldIdForAggregation(filter.fieldId),
+    for (const filter of Object.values(stateFilters)) {
+      if (Array.isArray(filter.fieldId)) {
+        for (const id of filter.fieldId) {
+          const field = util.cleanseFieldIdForAggregation(id);
+          const aggregationKey = util.convertKeyForAggregation(field);
+          if (!aggregations[aggregationKey]) {
+            aggregations[aggregationKey] = {
+              field,
+              size: 100
+            };
+          }
+        }
+      } else if (filter.fieldId) {
+        const field = util.cleanseFieldIdForAggregation(filter.fieldId);
+        aggregations[util.convertKeyForAggregation(field)] = {
+          field,
           size: 100
         };
       }
@@ -5285,11 +5337,6 @@ const queryParamsTemplate = {
   contentTypeIds: root => getQueryParameter$2(root, 'contentTypeIds', []),
   customWhere: root => getQueryParameter$2(root, 'customWhere', []),
   dynamicOrderBy: root => getQueryParameter$2(root, 'dynamicOrderBy', []),
-  env: ({
-    state,
-    facet,
-    context
-  }) => getCustomEnv(state, facet, context),
   excludeIds: ({
     action: {
       excludeIds
@@ -5320,9 +5367,7 @@ const queryParamsTemplate = {
     state
   }) => getPageIndex$2(state, '', action.context),
   internalPaging: root => getQueryParameter$2(root, 'internalPaging', false),
-  languages: ({
-    action
-  }) => action.defaultLang ? [action.defaultLang] : [],
+  languages: root => getQueryParameter$2(root, 'languages', []),
   linkDepth: root => getQueryParameter$2(root, 'linkDepth', 0),
   loadMorePaging: root => getQueryParameter$2(root, 'loadMorePaging', false),
   omitDefaultSearchFields: root => getQueryParameter$2(root, 'omitDefaultSearchFields', []),
@@ -5359,7 +5404,7 @@ const queryParamsTemplate = {
     context
   }) => {
     var _getFacet;
-    return ((_getFacet = getFacet$1(state, facet, context, 'js')) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
+    return ((_getFacet = getFacet$1(state, facet, context, 'js')) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectors$2.selectCurrentProject(state);
   },
   searchTerm: root => root.context !== Context.minilist || getQueryParameter$2(root, 'useSearchTerm', false) ? getSearchTerm$2(root.state) : '',
   selectedFilters: ({
@@ -5369,7 +5414,7 @@ const queryParamsTemplate = {
   }) => Object.fromEntries(Object.entries(getSelectedFilters(state, facet, context, 'js')).map(([key, f]) => [key, f === null || f === void 0 ? void 0 : f.join(',')])),
   versionStatus: root => {
     const versionStatusOverride = getQueryParameter$2(root, 'versionStatus');
-    return versionStatusOverride || selectVersionStatus(root.state);
+    return versionStatusOverride || version.selectVersionStatus(root.state);
   },
   weightedSearchFields: root => {
     const wsf = getQueryParameter$2(root, 'weightedSearchFields', []);
@@ -5412,23 +5457,30 @@ const generateQueryParams = (action, state) => {
 const runSearch = (action, state, queryParams) => {
   const {
     context,
-    defaultLang,
+    // defaultLang,
     facet,
     ogState = state,
     preload,
-    ssr
+    isSSR
   } = action;
   let willRun = false;
-  const facetIsLoaded = defaultLang ? false : getIsLoaded(state, context, facet);
+
+  // const facetIsLoaded = defaultLang
+  //   ? false
+  //   : getIsLoaded(state, context, facet);
+  const facetIsLoaded = getIsLoaded(state, context, facet);
   const stateParams = {
     ...getQueryParams(ogState, facet, context)
   };
   stateParams.pageIndex = getPageIndex$2(ogState, facet, context);
   stateParams.searchTerm = getSearchTerm$2(ogState);
   stateParams.pageSize = getPageSize(ogState, facet, context);
-  if (context === Context.facets && ssr ||
+  if (isSSR ||
+  // (context === Context.facets && isSSR) ||
   // context === Context.minilist ||
-  preload || !facetIsLoaded || filterParamsChanged(action) || defaultLang) {
+  preload || !facetIsLoaded || filterParamsChanged(action) ||
+  // || defaultLang
+  languageChanged(action)) {
     willRun = true;
   } else {
     // Don't execute the search if the inbound query params
@@ -5447,6 +5499,20 @@ const runSearch = (action, state, queryParams) => {
   return willRun;
 };
 
+/**
+ * Patch mutates original params argument to decode certain
+ * url encoded params which can creep into urls and cause a
+ * flash of different content when hydrating from SSR
+ * @param params SearchParams
+ * @returns SearchParams
+ */
+const sanitiseParams = params => {
+  if (params && typeof params === 'object') for (const param of Object.keys(params)) {
+    if (typeof params[param] === 'string') params[param] = params[param].replaceAll('%2C', ',');
+  }
+  return params;
+};
+
 /**
  * This will tell us if filter parameters have been
  * changed by some external event such as a route change
@@ -5463,12 +5529,17 @@ const filterParamsChanged = (action, state) => {
   const selectedFilters = getSelectedFilters(ogState, facet, context, 'js');
   const paramsChanged = Object.entries(selectedFilters).map(([filterKey, selectedValues]) => {
     const inboundValues = params && params[filterKey] && params[filterKey].split(',') || [];
-    if (!areArraysEqualSets(selectedValues, inboundValues)) return true;
+    if (!util.areArraysEqualSets(selectedValues, inboundValues)) return true;
   });
   return paramsChanged.filter(f => f === true).length > 0;
 };
-
-/* eslint-disable no-console */
+const languageChanged = action => {
+  const stateLanguages = getQueryParameter$2({
+    ...action,
+    state: action.ogState
+  }, 'languages', []);
+  return !util.areArraysEqualSets(action.languages || [], stateLanguages);
+};
 const debugExecuteSearch = (action, state) => {
   const [queryParams, runSearch] = generateQueryParams(action, state);
   console.log('runSearch', runSearch, 'action', action, 'filterParamsChanged', filterParamsChanged(action, state), 'getIsLoaded(state, context, facet)', getIsLoaded(state, action.context, action.facet));
@@ -5549,35 +5620,97 @@ function* setRouteFilters(action) {
   const {
     mappers,
     params,
-    listingType,
-    defaultLang,
-    debug
+    composition,
+    debug,
+    ssr
+  } = action;
+  let {
+    defaultLang
   } = action;
-  const context = listingType ? Context.listings : Context.facets;
   const state = toJS(yield effects.select());
-  const ssr = getIsSsr(state);
+  const isSSR = getIsSsr(state);
+  sanitiseParams(params);
 
   // Get current facet from params or state
-  let currentFacet = params && params.facet || listingType;
+  const facet = (params === null || params === void 0 ? void 0 : params.facet) || action.facet;
+  const listingType = (params === null || params === void 0 ? void 0 : params.listingType) || action.listingType;
+
+  // Determine facets or listings context
+  let context = listingType ? Context.listings : Context.facets;
+  let currentFacet = listingType || facet;
+
+  // Instead of just taking the facet/listing from params,
+  // we need to check all aliases to determine the correct facet/listing
+  const currentLanguage = yield effects.select(selectors$1.selectCurrentLanguage);
+  if (currentFacet) {
+    const currentLocalised = yield effects.select(getCurrentFromLocalised, currentFacet, currentLanguage, context);
+    if (currentLocalised) {
+      currentFacet = currentLocalised.facet;
+      defaultLang = currentLocalised.language;
+    }
+  }
+
+  // If composition is set, and no facet/listingType in params,
+  // pick the first facet/listing from the composition
+  if (composition) {
+    const compositions = getSearchCompositions(state);
+    const compositionConfig = compositions[composition];
+    if (compositionConfig) {
+      if ('facets' in compositionConfig) {
+        if (!facet) {
+          var _compositionConfig$fa;
+          const firstFacetKey = (_compositionConfig$fa = compositionConfig.facets) === null || _compositionConfig$fa === void 0 ? void 0 : _compositionConfig$fa[0];
+          context = Context.facets;
+          currentFacet = firstFacetKey;
+        }
+      } else if ('listings' in compositionConfig) {
+        if (!listingType) {
+          var _compositionConfig$li;
+          const firstListingKey = (_compositionConfig$li = compositionConfig.listings) === null || _compositionConfig$li === void 0 ? void 0 : _compositionConfig$li[0];
+          context = Context.listings;
+          currentFacet = firstListingKey;
+        }
+      }
+    }
+  }
 
   // If Listing use listing type (ignore params.facet)
-  if (context === Context.listings) {
+  if (context === Context.listings && listingType) {
     currentFacet = listingType;
   }
 
   // Pick the default facet from initialState
   if (!currentFacet) {
-    var _Object$keys;
+    var _tabs$, _Object$keys;
     const tabs = getSearchTabs(state, 'js');
-    currentFacet = (tabs === null || tabs === void 0 ? void 0 : tabs[0].defaultFacet) || ((_Object$keys = Object.keys(getFacets(state, 'js'))) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0]) || '';
+    currentFacet = (tabs === null || tabs === void 0 || (_tabs$ = tabs[0]) === null || _tabs$ === void 0 ? void 0 : _tabs$.defaultFacet) || ((_Object$keys = Object.keys(getFacets(state, 'js'))) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0]) || '';
+  }
+
+  // Ensure we have a language set
+  if (!defaultLang) defaultLang = currentLanguage;
+
+  // When we have a currentFacet, check the defaultLang
+  // and translate any filter params from the localised aliases
+  // to the actual filter keys
+  if (currentFacet && defaultLang) {
+    for (const paramKey of Object.keys(params || {})) {
+      const filterKey = yield effects.select(getFilterKeyFromLocalised, paramKey, defaultLang, currentFacet, context);
+      if (filterKey && filterKey !== paramKey) {
+        params[filterKey] = params[paramKey];
+        delete params[paramKey];
+      }
+    }
   }
   const nextAction = {
     type: SET_ROUTE_FILTERS,
     context,
+    composition,
     facet: currentFacet,
     mappers,
     params,
     defaultLang,
+    languages: defaultLang ? [defaultLang] : [],
+    isSSR,
     ssr,
     debug
   };
@@ -5609,7 +5742,7 @@ function* doSearch(action) {
   const nextAction = {
     ...action,
     type: SET_SEARCH_FILTERS,
-    ssr: getIsSsr(state),
+    isSSR: getIsSsr(state),
     facet: action.facet || ((_action$params = action.params) === null || _action$params === void 0 ? void 0 : _action$params.facet)
   };
   if (nextAction.facet && (action.config || Object.keys(getFacet$1(state, nextAction.facet, action.context, 'js')).length > 0)) {
@@ -5629,7 +5762,9 @@ function* loadFilters(action) {
   const {
     facet: facetKey,
     context,
-    mappers = {}
+    mappers = {},
+    languages,
+    ssr
   } = action;
   const filtersToLoad = yield effects.select(getFiltersToLoad, facetKey, context, 'js');
   if (filtersToLoad.length > 0) {
@@ -5637,7 +5772,8 @@ function* loadFilters(action) {
       type: LOAD_FILTERS,
       filtersToLoad,
       facetKey,
-      context
+      context,
+      languages
     });
     const selectedKeys = yield effects.select(getSelectedFilters, facetKey, context, 'js');
     const facet = yield effects.select(getFacet$1, facetKey, context, 'js');
@@ -5649,9 +5785,11 @@ function* loadFilters(action) {
         filterKey,
         filter: filters[filterKey],
         projectId,
+        languages,
         selectedKeys: selectedKeys[filterKey],
         context,
-        mapper: 'filterItems' in mappers && mappers.filterItems || mapEntriesToFilterItems
+        mapper: 'filterItems' in mappers && mappers.filterItems || mapEntriesToFilterItems,
+        ssr
       });
     });
     if (filtersToLoadSagas) yield effects.all(filtersToLoadSagas);
@@ -5659,17 +5797,26 @@ function* loadFilters(action) {
 }
 function* loadFilter(action) {
   const {
+    context,
     facetKey,
-    filterKey,
     filter,
+    filterKey,
+    languages,
+    mapper,
     projectId,
     selectedKeys,
-    context,
-    mapper
+    // get api instance from SSR context that is connected to the current request in SSR,
+    // fall back to the imported cachedSearch api that is not connected to the current SSR context
+    ssr: {
+      api
+    } = {
+      api: ContensisDeliveryApi.cachedSearch
+    }
   } = action;
   const {
     contentTypeId,
     customWhere,
+    pageSize,
     path
   } = filter;
   const createStateFrom = {
@@ -5677,6 +5824,7 @@ function* loadFilter(action) {
     context,
     error: undefined,
     facetKey,
+    filter,
     filterKey,
     payload: {},
     selectedKeys,
@@ -5684,16 +5832,16 @@ function* loadFilter(action) {
   };
   try {
     if (contentTypeId) {
-      const versionStatus = yield effects.select(selectVersionStatus);
-      const query = filterQuery(Array.isArray(contentTypeId) ? contentTypeId : [contentTypeId], versionStatus, customWhere);
-      const payload = yield cachedSearch.search(query, 0, projectId);
+      const versionStatus = yield effects.select(version.selectVersionStatus);
+      const query = filterQuery(Array.isArray(contentTypeId) ? contentTypeId : [contentTypeId], languages, versionStatus, customWhere, pageSize);
+      const payload = yield api.search(query, 0, projectId);
       if (!payload) throw new Error('No payload returned by search');
       if (payload.type === 'error') throw payload;
       createStateFrom.payload = payload;
     }
     if (path) {
-      const payload = yield cachedSearch.getTaxonomyNodeByPath(path, projectId);
-      if (!payload) throw new Error(`No payload returned for taxonomy path: '${path}'`);
+      const payload = yield cachedTaxonomyLookup.getTaxonomyNodeByPath(path, projectId);
+      if (!payload) throw new Error(`Nothing returned for taxonomy: '${path}'`);
       if (payload.type === 'error') throw payload;
       createStateFrom.payload = payload;
     }
@@ -5736,7 +5884,7 @@ function* ensureSearch(action) {
       });
     }
   } catch (error) {
-    log__namespace.error(...['Error running search saga:', error, error.stack]);
+    log__namespace.error('Error running ensureSearch:', error, error.stack);
   }
 }
 function* executeSearch(action) {
@@ -5744,7 +5892,8 @@ function* executeSearch(action) {
     context,
     facet,
     queryParams,
-    mappers
+    mappers,
+    ssr
   } = action;
   try {
     const state = yield effects.select();
@@ -5754,19 +5903,19 @@ function* executeSearch(action) {
     const customApi = getCustomApi(state, facet, context, 'js');
     if (customApi) {
       const apiParams = typeof mappers === 'object' && typeof mappers.customApi === 'function' && mappers.customApi(queryParams) || mapQueryParamsToCustomApi(queryParams);
-      result.payload = yield callCustomApi(customApi, apiParams);
+      result.payload = yield util.callCustomApi(customApi, apiParams, ssr);
       result.duration = 1;
     } else {
       if (queryParams.featuredResults) {
         featuredQuery = searchQuery(queryParams, true);
-        featuredResult = yield timedSearch(featuredQuery, queryParams.linkDepth, queryParams.projectId, queryParams.env);
-        queryParams.excludeIds = getItemsFromResult(featuredResult).map(fi => {
+        featuredResult = yield util.timedSearch(featuredQuery, queryParams.linkDepth, queryParams.projectId, ssr);
+        queryParams.excludeIds = util.getItemsFromResult(featuredResult).map(fi => {
           var _fi$sys;
           return fi === null || fi === void 0 || (_fi$sys = fi.sys) === null || _fi$sys === void 0 ? void 0 : _fi$sys.id;
         }).filter(fi => typeof fi === 'string');
       }
       const query = searchQuery(queryParams);
-      result = yield timedSearch(query, queryParams.linkDepth, queryParams.projectId, queryParams.env);
+      result = yield util.timedSearch(query, queryParams.linkDepth, queryParams.projectId, ssr);
     }
     const createStateFrom = {
       action,
@@ -5779,7 +5928,7 @@ function* executeSearch(action) {
     const nextAction = mapJson__default.default(createStateFrom, facetTemplate);
     yield effects.put(nextAction);
   } catch (error) {
-    log__namespace.error(...['Error running search saga:', error, error.stack]);
+    log__namespace.error('Error running executeSearch:', error, error.stack);
   }
 }
 function* preloadOtherFacets(action) {
@@ -5790,9 +5939,10 @@ function* preloadOtherFacets(action) {
     debug
   } = action;
   const state = yield effects.select();
-  const currentFacet = getCurrentFacet(state);
-  if (!preload && facet === currentFacet && context !== Context.listings) {
-    const allFacets = getFacets(state, 'js');
+  const currentFacet = getCurrent$2(state, context);
+  const currentComposition = getCurrentComposition(state);
+  if (!preload && facet === currentFacet && (context !== Context.listings || currentComposition)) {
+    const allFacets = currentComposition ? getCompositionFacets(state, currentComposition) : getFacets(state, 'js');
     const otherFacets = Object.keys(allFacets).filter(f => f !== currentFacet);
     yield effects.all(otherFacets.map((preloadFacet = '') => {
       const preloadAction = {
@@ -5833,9 +5983,13 @@ function* updateCurrentTab(action) {
 }
 function* clearFilters(action) {
   const {
+    clear,
     mappers
   } = action;
-  const uri = yield buildUri({}, mappers);
+  const term = clear !== null && clear !== void 0 && clear.term ? '' : undefined;
+  const uri = yield buildUri({
+    term
+  }, mappers);
   yield effects.put(navigate(uri));
 }
 function* updateCurrentFacet(action) {
@@ -5977,6 +6131,7 @@ exports.getPaging = getPaging;
 exports.getQueryParameter = getQueryParameter$2;
 exports.getRenderableFilters = getRenderableFilters$2;
 exports.getResults = getResults;
+exports.getResultsInfo = getResultsInfo;
 exports.getSearchTerm = getSearchTerm$2;
 exports.getSearchTotalCount = getSearchTotalCount$1;
 exports.getSelectedFilters = getSelectedFilters;
@@ -5985,13 +6140,11 @@ exports.getTabsAndFacets = getTabsAndFacets$1;
 exports.getTotalCount = getTotalCount$1;
 exports.orderByExpression = orderByExpression;
 exports.queries = queries;
-exports.routeParams = routeParams;
 exports.searchSagas = searchSagas;
 exports.selectListing = selectListing;
 exports.selectors = selectors;
 exports.setRouteFilters = setRouteFilters;
 exports.termExpressions = termExpressions;
-exports.toArray = toArray;
 exports.triggerListingSsr = triggerListingSsr;
 exports.triggerMinilistSsr = triggerMinilistSsr;
 exports.triggerSearch = triggerSearch;
@@ -6007,4 +6160,4 @@ exports.updateSortOrder = updateSortOrder$1;
 exports.useFacets = useFacets;
 exports.useListing = useListing;
 exports.withMappers = withMappers;
-//# sourceMappingURL=sagas-CbZhaRNd.js.map
+//# sourceMappingURL=sagas-BCy9u6zA.js.map