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

package/esm/{sagas-xJU-zOpn.js → sagas-Fr9yRduO.js}

@@ -3,11 +3,17 @@ import { useDispatch, useSelector } from 'react-redux';
 import { createSelector } from 'reselect';
 import * as log from 'loglevel';
 import { takeEvery, select, put, call, all } from '@redux-saga/core/effects';
+import { s as selectVersionStatus } from './version-BQAL8sQO.js';
+import { L as LruCache, g as getClientConfig, c as cachedSearch } from './ContensisDeliveryApi-LWYXevZ1.js';
 import { Client } from 'contensis-delivery-api';
-import { stringify, parse } from 'query-string';
+import { a as removeEmptyAttributes, e as extractQuotedPhrases, f as fixFreeTextForElastic, c as convertKeyForAggregation, g as getItemsFromResult, b as cleanseFieldIdForAggregation, d as areArraysEqualSets, h as callCustomApi, i as timedSearch } from './util-Bl2u6LpY.js';
+import { s as selectCurrentLanguage } from './selectors-DcmvOeX2.js';
+import './slice-C6JLQik8.js';
 import mapJson, { jpath } from 'jsonpath-mapper';
 import { Op, OrderBy, Query } from 'contensis-core-api';
 import merge from 'deepmerge';
+import { parse, stringify } from 'query-string';
+import { N as selectStaticRoute, o as selectCurrentPath, f as selectCurrentProject } from './selectors-8ROQrTd7.js';
 import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './_commonjsHelpers-BFTU3MAI.js';
 
 const ACTION_PREFIX = '@SEARCH/';
@@ -109,10 +115,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) => {
@@ -213,12 +221,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 = 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 = 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 {
@@ -236,9 +299,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 = 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 = 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);
@@ -249,19 +345,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 = 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);
 };
@@ -299,6 +438,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');
 };
@@ -312,9 +452,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');
@@ -355,7 +492,6 @@ const selectFacets = {
   getCurrent: getCurrentFacet,
   getCurrentTab: getCurrentTab$1,
   getCustomApi,
-  getCustomEnv,
   getFacet: getFacet$1,
   getFacetTitles: getFacetTitles$1,
   getFacets,
@@ -365,6 +501,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,
@@ -396,6 +534,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),
@@ -417,23 +557,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,
@@ -441,6 +582,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,
@@ -450,7 +595,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,
@@ -459,275 +607,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 = 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 = 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 = 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 = 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 staticRoute = 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
@@ -745,17 +647,33 @@ const searchUriTemplate = {
     pageIndex,
     pageSize
   }) => {
-    const searchContext = getSearchContext(state);
+    var _staticRoute$route2;
+    const context = getSearchContext(state);
+    const staticRoute = 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(parse(currentSearch));
-    if (orderBy) currentQs.orderBy = orderBy;
+
+    // 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(currentQs, stateFilters));
+    const mergedSearch = removeEmptyAttributes(merge(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
@@ -791,6 +709,7 @@ const {
   getFacetTitles,
   getFeaturedResults: getFeaturedResults$1,
   getIsLoading: getIsLoading$1,
+  getLocalisedCurrent: getLocalisedCurrent$1,
   getPageIndex: getPageIndex$1,
   getPageIsLoading: getPageIsLoading$1,
   getQueryParameter: getQueryParameter$1,
@@ -802,6 +721,8 @@ const {
   getTotalCount
 } = selectFacets;
 const makeSelectFacetsProps = () => createSelector(state => state, (_, mappers) => mappers, (state, mappers) => ({
+  composition: getComposition(state),
+  currentComposition: getCurrentComposition(state),
   currentFacet: getCurrent$1(state),
   currentPageIndex: getPageIndex$1(state),
   currentTabIndex: getCurrentTab(state),
@@ -812,10 +733,11 @@ const makeSelectFacetsProps = () => createSelector(state => state, (_, mappers)
   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'),
@@ -844,6 +766,8 @@ const useFacets = ({
     updateSortOrder: orderBy => dispatch(withMappers(updateSortOrder$1(orderBy), m))
   };
   const {
+    composition,
+    currentComposition,
     currentFacet,
     currentPageIndex,
     currentTabIndex,
@@ -854,6 +778,7 @@ const useFacets = ({
     featured,
     filters,
     isLoading,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -866,6 +791,8 @@ const useFacets = ({
     totalCount
   } = useSelector(state => selectListingProps(state, m));
   return {
+    composition,
+    currentComposition,
     currentFacet,
     currentPageIndex,
     currentTabIndex,
@@ -876,6 +803,7 @@ const useFacets = ({
     featured,
     filters,
     isLoading,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -895,6 +823,7 @@ const {
   getFeaturedResults,
   getIsLoading,
   getListing,
+  getLocalisedCurrent,
   getPageIndex,
   getPageIsLoading,
   getQueryParameter,
@@ -902,16 +831,19 @@ const {
   getSearchTerm
 } = selectListing;
 const makeSelectListingProps = () => 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({
@@ -936,12 +868,15 @@ const useListing = ({
     updateSortOrder: orderBy => dispatch(withMappers(updateSortOrder$1(orderBy), m))
   };
   const {
+    composition,
+    currentComposition,
     currentListing,
     currentPageIndex,
     featured,
     filters,
     isLoading,
     listing,
+    localisedCurrent,
     paging,
     pageIsLoading,
     results,
@@ -951,12 +886,15 @@ const useListing = ({
     sortOrder
   } = useSelector(state => selectListingProps(state, m));
   return {
+    composition,
+    currentComposition,
     currentListing,
     currentPageIndex,
     featured,
     filters,
     isLoading,
     listing,
+    localisedCurrent,
     pageIsLoading,
     paging,
     results,
@@ -969,11 +907,53 @@ const useListing = ({
   };
 };
 
+class CachedTaxonomyLookup {
+  constructor() {
+    this.cache = new LruCache();
+    this.taxonomyLookup = {};
+  }
+  getTaxonomyNodeByPath(path, project, env) {
+    const client = Client.create(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'
@@ -1008,16 +988,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(Op.not(fieldExpression(Fields.sys.contentTypeId, notContentTypeIds)[0]));
   }
-  if (expressions.length > 1) return [Op.or(...expressions)];
   return expressions;
 };
 const filterExpressions = (filters, isOptional = false) => {
@@ -1040,6 +1024,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) {
     /**
@@ -1150,7 +1137,6 @@ const between = (field, value) => {
       const [minimum, maximum] = valArr;
       return 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;
     }
@@ -1167,7 +1153,6 @@ const distanceWithin = (field, value) => {
       const [lat, lon] = valArr;
       return 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;
     }
@@ -1320,10 +1305,10 @@ var expressions = /*#__PURE__*/Object.freeze({
   termExpressions: termExpressions
 });
 
-const filterQuery = (contentTypeIds, versionStatus, customWhere) => {
-  const query = new Query(...[...contentTypeIdExpression(contentTypeIds), ...defaultExpressions(versionStatus), ...customWhereExpressions(customWhere)]);
+const filterQuery = (contentTypeIds, languages, versionStatus, customWhere, pageSize = 100) => {
+  const query = new Query(...[...contentTypeIdExpression(contentTypeIds), ...languagesExpression(languages), ...defaultExpressions(versionStatus), ...customWhereExpressions(customWhere)]);
   query.orderBy = OrderBy.asc(Fields.entryTitle);
-  query.pageSize = 100;
+  query.pageSize = pageSize;
   return query;
 };
 const searchQuery = ({
@@ -5055,13 +5040,59 @@ const facetTemplate = {
       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[convertKeyForAggregation(filter.fieldId)] || {};
+        } else if (Array.isArray(filter.fieldId)) {
+          for (const fieldId of filter.fieldId) {
+            aggregation = merge(aggregation, aggregations[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[convertKeyForAggregation(filter.aggregations)] || {};
+          } else if (Array.isArray(filter.aggregations)) {
+            aggregation = {};
+            for (const fieldId of filter.aggregations) {
+              aggregation = merge(aggregation, aggregations[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()];
@@ -5142,6 +5173,7 @@ const facetTemplate = {
   },
   preload: 'action.preload',
   ogState: 'action.ogState',
+  state: 'state',
   debug: 'action.debug'
 };
 const filterTemplate = {
@@ -5161,7 +5193,7 @@ const filterTemplate = {
       selectedKeys,
       mapper,
       facet,
-      filterKey
+      filter
     }) => {
       // Handle taxonomy filter items
       if (payload && 'children' in payload) {
@@ -5174,10 +5206,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[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[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);
@@ -5185,7 +5225,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 [];
     }
@@ -5242,10 +5282,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 = cleanseFieldIdForAggregation(id);
+          const aggregationKey = convertKeyForAggregation(field);
+          if (!aggregations[aggregationKey]) {
+            aggregations[aggregationKey] = {
+              field,
+              size: 100
+            };
+          }
+        }
+      } else if (filter.fieldId) {
+        const field = cleanseFieldIdForAggregation(filter.fieldId);
+        aggregations[convertKeyForAggregation(field)] = {
+          field,
           size: 100
         };
       }
@@ -5259,11 +5311,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
@@ -5294,9 +5341,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', []),
@@ -5386,23 +5431,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
@@ -5421,6 +5473,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
@@ -5441,8 +5507,13 @@ const filterParamsChanged = (action, state) => {
   });
   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 !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));
@@ -5523,35 +5594,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 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 select(selectCurrentLanguage);
+  if (currentFacet) {
+    const currentLocalised = yield 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 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
   };
@@ -5583,7 +5716,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)) {
@@ -5603,7 +5736,9 @@ function* loadFilters(action) {
   const {
     facet: facetKey,
     context,
-    mappers = {}
+    mappers = {},
+    languages,
+    ssr
   } = action;
   const filtersToLoad = yield select(getFiltersToLoad, facetKey, context, 'js');
   if (filtersToLoad.length > 0) {
@@ -5611,7 +5746,8 @@ function* loadFilters(action) {
       type: LOAD_FILTERS,
       filtersToLoad,
       facetKey,
-      context
+      context,
+      languages
     });
     const selectedKeys = yield select(getSelectedFilters, facetKey, context, 'js');
     const facet = yield select(getFacet$1, facetKey, context, 'js');
@@ -5623,9 +5759,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 all(filtersToLoadSagas);
@@ -5633,17 +5771,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: cachedSearch
+    }
   } = action;
   const {
     contentTypeId,
     customWhere,
+    pageSize,
     path
   } = filter;
   const createStateFrom = {
@@ -5651,6 +5798,7 @@ function* loadFilter(action) {
     context,
     error: undefined,
     facetKey,
+    filter,
     filterKey,
     payload: {},
     selectedKeys,
@@ -5659,15 +5807,15 @@ function* loadFilter(action) {
   try {
     if (contentTypeId) {
       const versionStatus = yield select(selectVersionStatus);
-      const query = filterQuery(Array.isArray(contentTypeId) ? contentTypeId : [contentTypeId], versionStatus, customWhere);
-      const payload = yield cachedSearch.search(query, 0, projectId);
+      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;
     }
@@ -5710,7 +5858,7 @@ function* ensureSearch(action) {
       });
     }
   } catch (error) {
-    log.error(...['Error running search saga:', error, error.stack]);
+    log.error('Error running ensureSearch:', error, error.stack);
   }
 }
 function* executeSearch(action) {
@@ -5718,7 +5866,8 @@ function* executeSearch(action) {
     context,
     facet,
     queryParams,
-    mappers
+    mappers,
+    ssr
   } = action;
   try {
     const state = yield select();
@@ -5728,19 +5877,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 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);
+        featuredResult = yield timedSearch(featuredQuery, queryParams.linkDepth, queryParams.projectId, ssr);
         queryParams.excludeIds = 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 timedSearch(query, queryParams.linkDepth, queryParams.projectId, ssr);
     }
     const createStateFrom = {
       action,
@@ -5753,7 +5902,7 @@ function* executeSearch(action) {
     const nextAction = mapJson(createStateFrom, facetTemplate);
     yield put(nextAction);
   } catch (error) {
-    log.error(...['Error running search saga:', error, error.stack]);
+    log.error('Error running executeSearch:', error, error.stack);
   }
 }
 function* preloadOtherFacets(action) {
@@ -5764,9 +5913,10 @@ function* preloadOtherFacets(action) {
     debug
   } = action;
   const state = yield 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 all(otherFacets.map((preloadFacet = '') => {
       const preloadAction = {
@@ -5807,9 +5957,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 put(navigate(uri));
 }
 function* updateCurrentFacet(action) {
@@ -5912,5 +6066,5 @@ function* triggerSearchSsr(options) {
   yield call(setRouteFilters, options);
 }
 
-export { useFacets as $, updateCurrentFacet$1 as A, clearFilters$1 as B, selectListing as C, triggerSearch as D, Context as E, getFilters as F, toArray as G, UPDATE_SELECTED_FILTERS as H, UPDATE_SEARCH_TERM as I, UPDATE_PAGE_SIZE as J, UPDATE_PAGE_INDEX as K, SET_SEARCH_ENTRIES as L, SET_ROUTE_FILTERS as M, LOAD_FILTERS_COMPLETE as N, LOAD_FILTERS_ERROR as O, LOAD_FILTERS as P, EXECUTE_SEARCH_ERROR as Q, EXECUTE_SEARCH as R, SET_SEARCH_FILTERS as S, CLEAR_FILTERS as T, UPDATE_SORT_ORDER as U, APPLY_CONFIG as V, actions as W, selectors as X, types as Y, expressions as Z, queries as _, getTabsAndFacets$1 as a, useListing as a0, doSearch as a1, setRouteFilters as a2, searchSagas as a3, triggerListingSsr as a4, triggerMinilistSsr as a5, triggerSearchSsr as a6, routeParams as a7, defaultExpressions as a8, termExpressions as a9, contentTypeIdExpression as aa, filterExpressions as ab, orderByExpression as ac, customWhereExpressions as ad, cloneDeep as ae, getQueryParameter$2 as b, getSelectedFilters as c, getSearchTotalCount$1 as d, getSearchTerm$2 as e, getResults as f, getTotalCount$1 as g, getPageIsLoading$2 as h, getPaging as i, getIsLoading$2 as j, getRenderableFilters$2 as k, getFeaturedResults$2 as l, getFacetTitles$1 as m, getFacetsTotalCount$1 as n, getTabFacets$1 as o, getFacet$1 as p, getCurrentTab$1 as q, getPageIndex$2 as r, getCurrentFacet as s, updateSelectedFilters as t, updateSortOrder$1 as u, updateSearchTerm$1 as v, withMappers as w, updatePageSize$1 as x, updatePageIndex$1 as y, updateCurrentTab$1 as z };
-//# sourceMappingURL=sagas-xJU-zOpn.js.map
+export { useFacets as $, updateCurrentTab$1 as A, updateCurrentFacet$1 as B, clearFilters$1 as C, selectListing as D, triggerSearch as E, Context as F, getFilters as G, UPDATE_SELECTED_FILTERS as H, UPDATE_SEARCH_TERM as I, UPDATE_PAGE_SIZE as J, UPDATE_PAGE_INDEX as K, SET_SEARCH_ENTRIES as L, SET_ROUTE_FILTERS as M, LOAD_FILTERS_COMPLETE as N, LOAD_FILTERS_ERROR as O, LOAD_FILTERS as P, EXECUTE_SEARCH_ERROR as Q, EXECUTE_SEARCH as R, SET_SEARCH_FILTERS as S, CLEAR_FILTERS as T, UPDATE_SORT_ORDER as U, APPLY_CONFIG as V, actions as W, selectors as X, types as Y, expressions as Z, queries as _, getTabsAndFacets$1 as a, useListing as a0, doSearch as a1, setRouteFilters as a2, searchSagas as a3, triggerListingSsr as a4, triggerMinilistSsr as a5, triggerSearchSsr as a6, defaultExpressions as a7, termExpressions as a8, contentTypeIdExpression as a9, filterExpressions as aa, orderByExpression as ab, customWhereExpressions as ac, cloneDeep as ad, getQueryParameter$2 as b, getSelectedFilters as c, getSearchTotalCount$1 as d, getSearchTerm$2 as e, getResultsInfo as f, getTotalCount$1 as g, getResults as h, getPageIsLoading$2 as i, getPaging as j, getIsLoading$2 as k, getRenderableFilters$2 as l, getFeaturedResults$2 as m, getFacetTitles$1 as n, getFacetsTotalCount$1 as o, getTabFacets$1 as p, getFacet$1 as q, getCurrentTab$1 as r, getPageIndex$2 as s, getCurrentFacet as t, updateSortOrder$1 as u, updateSelectedFilters as v, withMappers as w, updateSearchTerm$1 as x, updatePageSize$1 as y, updatePageIndex$1 as z };
+//# sourceMappingURL=sagas-Fr9yRduO.js.map