@k-int/stripes-kint-components 4.5.1 → 4.6.1

package/es/lib/settingsHooks/useSettings.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -16,85 +15,69 @@ var _utils = require("../utils");
 var _hooks = require("../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var useSettings = function useSettings(_ref) {
-  var _ref$allowGlobalEdit = _ref.allowGlobalEdit,
-    allowGlobalEdit = _ref$allowGlobalEdit === void 0 ? true : _ref$allowGlobalEdit,
-    dynamicPageExclusions = _ref.dynamicPageExclusions,
-    passedIntlKey = _ref.intlKey,
-    passedIntlNS = _ref.intlNS,
-    _ref$labelOverrides = _ref.labelOverrides,
-    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
-    persistentPages = _ref.persistentPages,
-    refdataEndpoint = _ref.refdataEndpoint,
-    settingEndpoint = _ref.settingEndpoint,
-    templateEndpoint = _ref.templateEndpoint;
-  var ky = (0, _core.useOkapiKy)();
-  var kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
-  var queryParams = (0, _utils.generateKiwtQueryParams)({
-    filters: dynamicPageExclusions === null || dynamicPageExclusions === void 0 ? void 0 : dynamicPageExclusions.map(function (dpe) {
-      return {
-        path: 'section',
-        comparator: '!=',
-        value: dpe
-      };
-    }),
+const useSettings = _ref => {
+  let {
+    allowGlobalEdit = true,
+    dynamicPageExclusions,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {},
+    persistentPages,
+    refdataEndpoint,
+    settingEndpoint,
+    templateEndpoint
+  } = _ref;
+  const ky = (0, _core.useOkapiKy)();
+  const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
+  const queryParams = (0, _utils.generateKiwtQueryParams)({
+    filters: dynamicPageExclusions === null || dynamicPageExclusions === void 0 ? void 0 : dynamicPageExclusions.map(dpe => ({
+      path: 'section',
+      comparator: '!=',
+      value: dpe
+    })),
     perPage: 100,
     stats: false
   }, {});
-  var _useQuery = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useSettings', 'appSettings', settingEndpoint, queryParams], function () {
-      return ky("".concat(settingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json();
-    }),
-    _useQuery$data = _useQuery.data,
-    appSettings = _useQuery$data === void 0 ? [] : _useQuery$data,
-    isLoading = _useQuery.isLoading;
-  var sections = _toConsumableArray(new Set(appSettings.map(function (s) {
-    return s.section;
-  })));
-  var dynamic = sections.map(function (section) {
+  const {
+    data: appSettings = [],
+    isLoading
+  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useSettings', 'appSettings', settingEndpoint, queryParams], () => ky("".concat(settingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json());
+  const sections = [...new Set(appSettings.map(s => s.section))];
+  const dynamic = sections.map(section => {
     return {
       route: section,
       label: kintIntl.formatKintMessage({
         id: "settings.settingsSection.".concat((0, _utils.toCamelCase)(section)),
         fallbackMessage: section
       }),
-      component: function component(props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPagePane, {
+      component: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPagePane, {
+        intlKey: passedIntlKey,
+        intlNS: passedIntlNS,
+        sectionName: section,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPage, {
+          allowEdit: allowGlobalEdit,
           intlKey: passedIntlKey,
           intlNS: passedIntlNS,
+          labelOverrides: labelOverrides,
           sectionName: section,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPage, _objectSpread({
-            allowEdit: allowGlobalEdit,
-            intlKey: passedIntlKey,
-            intlNS: passedIntlNS,
-            labelOverrides: labelOverrides,
-            sectionName: section
-          }, props))
-        });
-      }
+          ...props
+        })
+      })
     };
   });
-  var pageList = persistentPages.concat(dynamic).sort(_utils.sortByLabel);
-  var intlKey = (0, _hooks.useIntlKey)(passedIntlKey, passedIntlNS);
-  var SettingsContextProvider = function SettingsContextProvider(_ref2) {
-    var children = _ref2.children;
+  const pageList = persistentPages.concat(dynamic).sort(_utils.sortByLabel);
+  const intlKey = (0, _hooks.useIntlKey)(passedIntlKey, passedIntlNS);
+  const SettingsContextProvider = _ref2 => {
+    let {
+      children
+    } = _ref2;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contexts.SettingsContext.Provider, {
       value: {
-        intlKey: intlKey,
+        intlKey,
         // This is only here for backwards compatibility... is now grabbed from useIntlKey instead of what's passed in directly
-        refdataEndpoint: refdataEndpoint,
-        settingEndpoint: settingEndpoint,
-        templateEndpoint: templateEndpoint
+        refdataEndpoint,
+        settingEndpoint,
+        templateEndpoint
       },
       children: children
     });
@@ -102,24 +85,27 @@ var useSettings = function useSettings(_ref) {
   SettingsContextProvider.propTypes = {
     children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node])
   };
-  var SettingsComponent = function SettingsComponent(props) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, _objectSpread({
+  const SettingsComponent = props => {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, {
       pages: pageList,
       paneTitle: kintIntl.formatKintMessage({
         id: 'meta.title'
-      })
-    }, props));
+      }),
+      ...props
+    });
   };
-  var SettingsComponentWithContext = function SettingsComponentWithContext(props) {
+  const SettingsComponentWithContext = props => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(SettingsContextProvider, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SettingsComponent, _objectSpread({}, props))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SettingsComponent, {
+        ...props
+      })
     });
   };
   return {
-    isLoading: isLoading,
-    pageList: pageList,
+    isLoading,
+    pageList,
     SettingsComponent: SettingsComponentWithContext,
-    SettingsContextProvider: SettingsContextProvider
+    SettingsContextProvider
   };
 };
 var _default = useSettings;

package/es/lib/utils/buildUrl.js

@@ -15,16 +15,16 @@ function getLocationQuery(location) {
   return location.query ? location.query : _queryString.default.parse(location.search);
 }
 function removeEmpty(obj) {
-  var cleanObj = {};
-  (0, _forOwn2.default)(obj, function (value, key) {
+  const cleanObj = {};
+  (0, _forOwn2.default)(obj, (value, key) => {
     if (value) cleanObj[key] = value;
   });
   return cleanObj;
 }
 function buildUrl(location, values, basePath) {
-  var locationQuery = getLocationQuery(location);
-  var url = values._path || basePath || location.pathname;
-  var params = removeEmpty(Object.assign(locationQuery, values));
+  const locationQuery = getLocationQuery(location);
+  let url = values._path || basePath || location.pathname;
+  const params = removeEmpty(Object.assign(locationQuery, values));
   (0, _unset2.default)(params, '_path');
   if (!(0, _isEmpty2.default)(params)) {
     url += "?".concat(_queryString.default.stringify(params));

package/es/lib/utils/generateKiwtQuery.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _generateKiwtQueryParams = _interopRequireDefault(require("./generateKiwtQueryParams"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var generateKiwtQuery = function generateKiwtQuery(options, nsValues) {
-  var encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var paramsArray = (0, _generateKiwtQueryParams.default)(options, nsValues, encode);
+const generateKiwtQuery = function (options, nsValues) {
+  let encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  const paramsArray = (0, _generateKiwtQueryParams.default)(options, nsValues, encode);
   return paramsArray.length ? '?' + paramsArray.join('&') : '';
 };
 var _default = generateKiwtQuery;

package/es/lib/utils/generateKiwtQueryParams.js

@@ -4,37 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _excluded = ["searchKey", "filterConfig", "filterKeys", "sortKeys", "stats", "sort", "filters"];
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var conditionalEncodeURIComponent = function conditionalEncodeURIComponent(str) {
-  var encode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+const conditionalEncodeURIComponent = function (str) {
+  let encode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   if (encode) {
     return encodeURIComponent(str);
   }
   return str;
 };
-var buildFilterOptionBlock = function buildFilterOptionBlock(opf) {
-  var isNested = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+const buildFilterOptionBlock = function (opf) {
+  let isNested = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  let encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   if (opf !== null && opf !== void 0 && opf.groupValues) {
-    var groupValues = opf.groupValues;
+    const groupValues = opf.groupValues;
 
     // Small utility function to add negation and brackets to the options block where necessary
-    var negationAndNesting = function negationAndNesting(str) {
-      return "".concat(groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '!' : '').concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '(' : '').concat(str).concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? ')' : '');
-    };
+    const negationAndNesting = str => "".concat(groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '!' : '').concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? '(' : '').concat(str).concat(isNested || groupValues !== null && groupValues !== void 0 && groupValues.NOT ? ')' : '');
 
     // First check whether groupValues is ANDed or ORed together
     if (groupValues !== null && groupValues !== void 0 && groupValues.AND && Array.isArray(groupValues.AND) || groupValues !== null && groupValues !== void 0 && groupValues.OR && Array.isArray(groupValues.OR)) {
@@ -42,19 +26,15 @@ var buildFilterOptionBlock = function buildFilterOptionBlock(opf) {
       // AND takes precedence
       if (groupValues.AND) {
         var _groupValues$AND, _groupValues$AND$map;
-        return negationAndNesting(groupValues === null || groupValues === void 0 ? void 0 : (_groupValues$AND = groupValues.AND) === null || _groupValues$AND === void 0 ? void 0 : (_groupValues$AND$map = _groupValues$AND.map(function (gvo) {
-          return buildFilterOptionBlock(gvo, true, encode);
-        })) === null || _groupValues$AND$map === void 0 ? void 0 : _groupValues$AND$map.join('&&'));
+        return negationAndNesting(groupValues === null || groupValues === void 0 ? void 0 : (_groupValues$AND = groupValues.AND) === null || _groupValues$AND === void 0 ? void 0 : (_groupValues$AND$map = _groupValues$AND.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$AND$map === void 0 ? void 0 : _groupValues$AND$map.join('&&'));
       }
-      return negationAndNesting(groupValues === null || groupValues === void 0 ? void 0 : (_groupValues$OR = groupValues.OR) === null || _groupValues$OR === void 0 ? void 0 : (_groupValues$OR$map = _groupValues$OR.map(function (gvo) {
-        return buildFilterOptionBlock(gvo, true, encode);
-      })) === null || _groupValues$OR$map === void 0 ? void 0 : _groupValues$OR$map.join('||'));
+      return negationAndNesting(groupValues === null || groupValues === void 0 ? void 0 : (_groupValues$OR = groupValues.OR) === null || _groupValues$OR === void 0 ? void 0 : (_groupValues$OR$map = _groupValues$OR.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$OR$map === void 0 ? void 0 : _groupValues$OR$map.join('||'));
     }
     // If neither valid OR nor AND exist, ignore the block
   } else if (opf !== null && opf !== void 0 && opf.values) {
     // Build the values filter block
-    var innerFilters = [];
-    opf.values.forEach(function (opfv) {
+    const innerFilters = [];
+    opf.values.forEach(opfv => {
       if (opf.path) {
         var _opf$comparator;
         innerFilters.push("".concat(opf.path).concat((_opf$comparator = opf.comparator) !== null && _opf$comparator !== void 0 ? _opf$comparator : '==').concat(opfv));
@@ -67,126 +47,138 @@ var buildFilterOptionBlock = function buildFilterOptionBlock(opf) {
     // If no value OR values, then ignore
     if (opf.path) {
       var _opf$comparator2;
-      var filterString = "".concat(opf.path).concat((_opf$comparator2 = opf.comparator) !== null && _opf$comparator2 !== void 0 ? _opf$comparator2 : '==').concat(opf.value);
+      const filterString = "".concat(opf.path).concat((_opf$comparator2 = opf.comparator) !== null && _opf$comparator2 !== void 0 ? _opf$comparator2 : '==').concat(opf.value);
       return conditionalEncodeURIComponent(filterString, encode);
     }
     return conditionalEncodeURIComponent(opf.value, encode);
   }
   return null;
 };
-var generateKiwtQueryParams = function generateKiwtQueryParams(options, nsValues) {
-  var encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var qindex = nsValues.qindex,
-    query = nsValues.query,
-    filters = nsValues.filters,
-    sort = nsValues.sort;
-  var _options$searchKey = options.searchKey,
-    searchKey = _options$searchKey === void 0 ? '' : _options$searchKey,
-    _options$filterConfig = options.filterConfig,
-    filterConfig = _options$filterConfig === void 0 ? [] : _options$filterConfig,
-    _options$filterKeys = options.filterKeys,
-    filterKeys = _options$filterKeys === void 0 ? {} : _options$filterKeys,
-    _options$sortKeys = options.sortKeys,
-    sortKeys = _options$sortKeys === void 0 ? {} : _options$sortKeys,
-    _options$stats = options.stats,
-    stats = _options$stats === void 0 ? true : _options$stats,
-    optionsSort = options.sort,
-    optionsFilters = options.filters,
-    rest = _objectWithoutProperties(options, _excluded);
-  var paramsArray = [];
+const generateKiwtQueryParams = function (options, nsValues) {
+  let encode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  const {
+    qindex,
+    query,
+    filters,
+    sort
+  } = nsValues;
+  const {
+    searchKey = '',
+    filterConfig = [],
+    /* Assumtion made that if no filterKey is provided then the given filterValues for that key are standalaone, ie require no comparator or key */
+    filterKeys = {},
+    sortKeys = {},
+    stats = true,
+    /* Of the form [{ path: 'this.is.some.path', direction: 'asc'/'desc', value: 'someOverrideValue'}, ...]
+     * If only path is passed then assume asc.
+     * If value is passed then we ignore path/direction and append "sort=${value}" directly
+     */
+    sort: optionsSort,
+    /* Of the form
+      [
+        {
+          path: 'this.is.some.path'
+          comparator: '=='
+          value: 'this is a value' //OR
+          values: ['value1', 'value2'] //OR
+          groupValues: { // This is an object containing objects either in groups of AND or OR. AND takes precedence
+            AND: [
+              // Objects of the same shape as an individual filters object, recursively.
+            ],
+            NOT: true // When this is set to true, the entire group is negated
+          }
+        },
+        ...
+      ]
+     * This (with value instead of values) will construct a query param: "filters=this.is.some.path==this is a value"
+     * If only value is passed, then it will construct directly: "filters=value"
+     * If no comparator is passed, it assumes '=='
+     * Values overwrites value and will construct "filters=this.is.some.path==value1||this.is.some.path==value2"
+     * Values WITHOUT path will construct "filters=value1||value2"
+     *
+     * GroupValues will override everything above, and group into brackets.
+     *
+     * If more complex query building is desired, this should be done externally and passed in as a standalone 'value'
+     */
+    filters: optionsFilters,
+    ...rest
+  } = options;
+  const paramsArray = [];
   if (query) {
     var _split;
-    paramsArray.push.apply(paramsArray, _toConsumableArray((_split = (qindex || searchKey).split(',')) === null || _split === void 0 ? void 0 : _split.map(function (m) {
-      return "match=".concat(conditionalEncodeURIComponent(m, encode));
-    })));
+    paramsArray.push(...((_split = (qindex || searchKey).split(',')) === null || _split === void 0 ? void 0 : _split.map(m => "match=".concat(conditionalEncodeURIComponent(m, encode)))));
     paramsArray.push("term=".concat(conditionalEncodeURIComponent(query, encode)));
   }
 
   // Actually build the optionsFilters block (Moved logic to its own function to allow recursion)
   if (optionsFilters) {
-    optionsFilters.forEach(function (opf) {
-      var optionsBlock = buildFilterOptionBlock(opf, false, encode);
+    optionsFilters.forEach(opf => {
+      const optionsBlock = buildFilterOptionBlock(opf, false, encode);
       if (optionsBlock) {
         paramsArray.push("filters=".concat(optionsBlock));
       }
     });
   }
   if (filters) {
-    var filterMap = {};
-    filters.split(',').forEach(function (filter) {
+    const filterMap = {};
+    filters.split(',').forEach(filter => {
       var _filter$trim;
-      var _filter$trim$split = (_filter$trim = filter.trim()) === null || _filter$trim === void 0 ? void 0 : _filter$trim.split('.'),
-        _filter$trim$split2 = _toArray(_filter$trim$split),
-        filterName = _filter$trim$split2[0],
-        filterRest = _filter$trim$split2.slice(1);
-      var filterValue = filterRest.join('.');
+      const [filterName, ...filterRest] = (_filter$trim = filter.trim()) === null || _filter$trim === void 0 ? void 0 : _filter$trim.split('.');
+      const filterValue = filterRest.join('.');
       if (filterMap[filterName] === undefined) filterMap[filterName] = [];
       filterMap[filterName].push(filterValue);
     });
 
     // We now have a filterMap of shape { status: ['active', 'cancelled'], type: ['local'] }
-    Object.entries(filterMap).forEach(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-        filterName = _ref2[0],
-        filterValues = _ref2[1];
-      var filterConfigEntry = filterConfig.find(function (conf) {
-        return conf.name === filterName;
-      });
-      var filterKey = filterKeys[filterName];
+    Object.entries(filterMap).forEach(_ref => {
+      let [filterName, filterValues] = _ref;
+      const filterConfigEntry = filterConfig.find(conf => conf.name === filterName);
+      const filterKey = filterKeys[filterName];
       if (filterConfigEntry) {
         // We have a direct mapping instruction, use it
-        var filterString = filterValues.map(function (v) {
+        const filterString = filterValues.map(v => {
           var _filterConfigEntry$va, _filterConfigEntry$va2;
-          var fceValue = filterConfigEntry === null || filterConfigEntry === void 0 ? void 0 : (_filterConfigEntry$va = filterConfigEntry.values) === null || _filterConfigEntry$va === void 0 ? void 0 : (_filterConfigEntry$va2 = _filterConfigEntry$va.find(function (fce) {
-            return fce.name === v;
-          })) === null || _filterConfigEntry$va2 === void 0 ? void 0 : _filterConfigEntry$va2.value;
+          const fceValue = filterConfigEntry === null || filterConfigEntry === void 0 ? void 0 : (_filterConfigEntry$va = filterConfigEntry.values) === null || _filterConfigEntry$va === void 0 ? void 0 : (_filterConfigEntry$va2 = _filterConfigEntry$va.find(fce => fce.name === v)) === null || _filterConfigEntry$va2 === void 0 ? void 0 : _filterConfigEntry$va2.value;
           return "".concat(filterName, "==").concat(fceValue !== null && fceValue !== void 0 ? fceValue : v);
         }).join('||');
         paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
       } else if (!filterKey) {
         // These filters have no key mapping so we just pass the values to the backend as-is.
-        paramsArray.push.apply(paramsArray, _toConsumableArray(filterValues === null || filterValues === void 0 ? void 0 : filterValues.map(function (f) {
-          return "filters=".concat(conditionalEncodeURIComponent(f, encode));
-        })));
+        paramsArray.push(...(filterValues === null || filterValues === void 0 ? void 0 : filterValues.map(f => "filters=".concat(conditionalEncodeURIComponent(f, encode)))));
       } else {
-        var _filterString = filterValues.map(function (v) {
-          return "".concat(filterKey, "==").concat(v);
-        }).join('||');
-        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(_filterString, encode)));
+        const filterString = filterValues.map(v => "".concat(filterKey, "==").concat(v)).join('||');
+        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
       }
     });
   }
   if (optionsSort && optionsSort.length > 0) {
-    optionsSort.forEach(function (os) {
+    optionsSort.forEach(os => {
       if (os.value) {
         paramsArray.push("sort=".concat(conditionalEncodeURIComponent(os.value, encode)));
       } else if (os.path) {
         var _os$direction;
         // If no path then ignore
-        var sortString = "".concat(os.path, ";").concat((_os$direction = os.direction) !== null && _os$direction !== void 0 ? _os$direction : 'asc');
+        const sortString = "".concat(os.path, ";").concat((_os$direction = os.direction) !== null && _os$direction !== void 0 ? _os$direction : 'asc');
         paramsArray.push("sort=".concat(conditionalEncodeURIComponent(sortString, encode)));
       }
     });
   }
   if (sort) {
     var _sort$trim;
-    paramsArray.push.apply(paramsArray, _toConsumableArray((_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',').map(function (sortKey) {
-      var descending = sortKey.startsWith('-');
-      var term = sortKey.replace('-', '');
+    paramsArray.push(...((_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',').map(sortKey => {
+      const descending = sortKey.startsWith('-');
+      let term = sortKey.replace('-', '');
       if (term in sortKeys) {
         term = term.replace(term, sortKeys[term]);
       }
-      var sortString = "".concat(term, ";").concat(descending ? 'desc' : 'asc');
+      const sortString = "".concat(term, ";").concat(descending ? 'desc' : 'asc');
       return "sort=".concat(conditionalEncodeURIComponent(sortString, encode));
     })));
   }
   if (stats) {
     paramsArray.push('stats=true');
   }
-  for (var _i2 = 0, _Object$entries = Object.entries(rest); _i2 < _Object$entries.length; _i2++) {
-    var _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
-      key = _Object$entries$_i[0],
-      value = _Object$entries$_i[1];
+  for (const [key, value] of Object.entries(rest)) {
     paramsArray.push("".concat(key, "=").concat(conditionalEncodeURIComponent(value, encode)));
   }
   return paramsArray;

package/es/lib/utils/groupCustomPropertiesByCtx.js

@@ -4,25 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var groupCustomPropertiesByCtx = function groupCustomPropertiesByCtx() {
-  var customProperties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return customProperties.reduce(function (acc, curr) {
+const groupCustomPropertiesByCtx = function () {
+  let customProperties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return customProperties.reduce((acc, curr) => {
     var _curr$ctx, _acc$ctx;
-    var ctx = (_curr$ctx = curr.ctx) !== null && _curr$ctx !== void 0 ? _curr$ctx : 'isNull';
-    var returnObj = _objectSpread({}, acc);
-    returnObj[ctx] = [].concat(_toConsumableArray((_acc$ctx = acc === null || acc === void 0 ? void 0 : acc[ctx]) !== null && _acc$ctx !== void 0 ? _acc$ctx : []), [curr]);
+    const ctx = (_curr$ctx = curr.ctx) !== null && _curr$ctx !== void 0 ? _curr$ctx : 'isNull';
+    const returnObj = {
+      ...acc
+    };
+    returnObj[ctx] = [...((_acc$ctx = acc === null || acc === void 0 ? void 0 : acc[ctx]) !== null && _acc$ctx !== void 0 ? _acc$ctx : []), curr];
     return returnObj;
   }, {});
 };

package/es/lib/utils/highlightString.js

@@ -4,46 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.highlightString = exports.boldString = void 0;
-var _matchString5 = _interopRequireDefault(require("./matchString"));
+var _matchString = _interopRequireDefault(require("./matchString"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var highlightString = function highlightString(match, str) {
-  var ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var _matchString = (0, _matchString5.default)(match, str, ignoreNull),
-    _matchString2 = _slicedToArray(_matchString, 2),
-    parts = _matchString2[0],
-    regex = _matchString2[1];
-  return parts.filter(function (part) {
-    return part;
-  }).map(function (part, i) {
-    return regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("mark", {
-      children: part
-    }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      children: part
-    }, i);
-  });
+const highlightString = function (match, str) {
+  let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  const [parts, regex] = (0, _matchString.default)(match, str, ignoreNull);
+  return parts.filter(part => part).map((part, i) => regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("mark", {
+    children: part
+  }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    children: part
+  }, i));
 };
 exports.highlightString = highlightString;
-var boldString = function boldString(match, str) {
-  var ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var _matchString3 = (0, _matchString5.default)(match, str, ignoreNull),
-    _matchString4 = _slicedToArray(_matchString3, 2),
-    parts = _matchString4[0],
-    regex = _matchString4[1];
-  return parts.filter(function (part) {
-    return part;
-  }).map(function (part, i) {
-    return regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
-      children: part
-    }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      children: part
-    }, i);
-  });
+const boldString = function (match, str) {
+  let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  const [parts, regex] = (0, _matchString.default)(match, str, ignoreNull);
+  return parts.filter(part => part).map((part, i) => regex.test(part) ? /*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+    children: part
+  }, i) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    children: part
+  }, i));
 };
 exports.boldString = boldString;