@k-int/stripes-kint-components 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 1.3.0 In progress
+## 1.4.0 Released 26th Nov 2021
+ * useHelperApp now exposes an `isOpen` function to check if current helper is open or not.
+ * useQIndex hook exposed to allow setting and parsing of qindex from url. QIndex now used in useKiwtSASQuery.
+ * useRefdata now accepts options, and defaults to 100 returns.
+ * GenerateKiwtQueryParams now exposed as well as the full generateKiwtQuery
+ * selectorSafe function exported
+ * NoResultsMessage component, used in SASQLookupComponent
+
+## 1.3.0 Released 9th Nov 2021
  * Added SASQRoute, SASQLookupComponent and SASQViewComponent
  * Deprecated TypeDown
  * Split TypeDown into two components, Typedown and QueryTypedown

package/es/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "EditableRefdataList", {
     return _EditableRefdataList.EditableRefdataList;
   }
 });
+Object.defineProperty(exports, "NoResultsMessage", {
+  enumerable: true,
+  get: function get() {
+    return _NoResultsMessage.NoResultsMessage;
+  }
+});
 Object.defineProperty(exports, "QueryTypedown", {
   enumerable: true,
   get: function get() {
@@ -81,6 +87,18 @@ Object.defineProperty(exports, "generateKiwtQuery", {
     return _utils.generateKiwtQuery;
   }
 });
+Object.defineProperty(exports, "generateKiwtQueryParams", {
+  enumerable: true,
+  get: function get() {
+    return _utils.generateKiwtQueryParams;
+  }
+});
+Object.defineProperty(exports, "selectorSafe", {
+  enumerable: true,
+  get: function get() {
+    return _utils.selectorSafe;
+  }
+});
 Object.defineProperty(exports, "useActiveElement", {
   enumerable: true,
   get: function get() {
@@ -111,6 +129,12 @@ Object.defineProperty(exports, "useMutateRefdataValue", {
     return _hooks.useMutateRefdataValue;
   }
 });
+Object.defineProperty(exports, "useQIndex", {
+  enumerable: true,
+  get: function get() {
+    return _hooks.useQIndex;
+  }
+});
 Object.defineProperty(exports, "useRefdata", {
   enumerable: true,
   get: function get() {
@@ -154,4 +178,6 @@ var _SASQLookupComponent = _interopRequireDefault(require("./lib/SASQLookupCompo
 
 var _SASQViewComponent = _interopRequireDefault(require("./lib/SASQViewComponent"));
 
+var _NoResultsMessage = require("./lib/NoResultsMessage");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/es/lib/NoResultsMessage/NoResultsMessage.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactIntl = require("react-intl");
+
+var _components = require("@folio/stripes/components");
+
+var _NoResultsMessage = _interopRequireDefault(require("../../../styles/NoResultsMessage.css"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var NoResultsMessage = function NoResultsMessage(_ref) {
+  var userIcon = _ref.icon,
+      isLoading = _ref.isLoading,
+      isError = _ref.isError,
+      error = _ref.error,
+      filterPaneIsVisible = _ref.filterPaneIsVisible,
+      userLabel = _ref.label,
+      searchTerm = _ref.searchTerm,
+      toggleFilterPane = _ref.toggleFilterPane;
+  var icon = 'search';
+
+  var label = /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
+    id: "stripes-smart-components.sas.noResults.default",
+    values: {
+      searchTerm: searchTerm
+    }
+  }); // No search term but no results
+
+
+  if (!searchTerm) {
+    icon = 'search';
+    label = /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
+      id: "stripes-smart-components.sas.noResults.noResults"
+    });
+  } // Loading results
+
+
+  if (isLoading) {
+    icon = 'spinner-ellipsis';
+    label = /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
+      id: "stripes-smart-components.sas.noResults.loading"
+    });
+  } // Request failure
+
+
+  if (isError) {
+    icon = 'exclamation-circle';
+    label = error === null || error === void 0 ? void 0 : error.message;
+  }
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _NoResultsMessage["default"].noResultsMessage
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _NoResultsMessage["default"].noResultsMessageLabelWrap
+  }, (icon || userIcon) && /*#__PURE__*/_react["default"].createElement(_components.Icon, {
+    icon: userIcon !== null && userIcon !== void 0 ? userIcon : icon,
+    iconRootClass: _NoResultsMessage["default"].noResultsMessageIcon
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: _NoResultsMessage["default"].noResultsMessageLabel
+  }, userLabel !== null && userLabel !== void 0 ? userLabel : label)), !filterPaneIsVisible && /*#__PURE__*/_react["default"].createElement(_components.Button, {
+    buttonClass: _NoResultsMessage["default"].noResultsMessageButton,
+    marginBottom0: true,
+    onClick: toggleFilterPane
+  }, /*#__PURE__*/_react["default"].createElement(_reactIntl.FormattedMessage, {
+    id: "stripes-kint-components.noResultsMessage.showFilters"
+  })));
+};
+
+NoResultsMessage.propTypes = {
+  error: _propTypes["default"].object,
+  filterPaneIsVisible: _propTypes["default"].bool.isRequired,
+  icon: _propTypes["default"].string,
+  isLoading: _propTypes["default"].bool,
+  isError: _propTypes["default"].bool,
+  label: _propTypes["default"].oneOfType(_propTypes["default"].string, _propTypes["default"].node, _propTypes["default"].func),
+  searchTerm: _propTypes["default"].string.isRequired,
+  toggleFilterPane: _propTypes["default"].func.isRequired
+};
+var _default = NoResultsMessage;
+exports["default"] = _default;

package/es/lib/NoResultsMessage/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "NoResultsMessage", {
+  enumerable: true,
+  get: function get() {
+    return _NoResultsMessage["default"];
+  }
+});
+
+var _NoResultsMessage = _interopRequireDefault(require("./NoResultsMessage"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/es/lib/SASQLookupComponent/SASQLookupComponent.js

@@ -19,6 +19,8 @@ var _smartComponents = require("@folio/stripes/smart-components");
 
 var _components = require("@folio/stripes/components");
 
+var _NoResultsMessage = require("../NoResultsMessage");
+
 var _utils = require("../utils");
 
 var _hooks = require("../hooks");
@@ -100,9 +102,16 @@ var SASQLookupComponent = function SASQLookupComponent(_ref) {
       filterPaneVisible = _useLocalStorageState2[0],
       setFilterPaneVisible = _useLocalStorageState2[1];
 
+  var toggleFilterPane = function toggleFilterPane() {
+    return setFilterPaneVisible(!filterPaneVisible);
+  };
+
   var _useInfiniteQuery = (0, _reactQuery.useInfiniteQuery)([namespace, id, 'data', query], fetchPageData),
       _useInfiniteQuery$dat = _useInfiniteQuery.data,
       totalData = _useInfiniteQuery$dat === void 0 ? {} : _useInfiniteQuery$dat,
+      error = _useInfiniteQuery.error,
+      isError = _useInfiniteQuery.isError,
+      isLoading = _useInfiniteQuery.isLoading,
       fetchNextPage = _useInfiniteQuery.fetchNextPage;
 
   var data = (_totalData$pages$redu = (_totalData$pages = totalData.pages) === null || _totalData$pages === void 0 ? void 0 : _totalData$pages.reduce(function (acc, curr) {
@@ -169,6 +178,14 @@ var SASQLookupComponent = function SASQLookupComponent(_ref) {
         autosize: true,
         columnMapping: columnMapping,
         contentData: data === null || data === void 0 ? void 0 : data.results,
+        isEmptyMessage: /*#__PURE__*/_react["default"].createElement(_NoResultsMessage.NoResultsMessage, {
+          error: error,
+          isError: isError,
+          isLoading: isLoading,
+          filterPaneIsVisible: filterPaneVisible,
+          searchTerm: query.query,
+          toggleFilterPane: toggleFilterPane
+        }),
         isSelected: function isSelected(_ref4) {
           var _match$params;
 

package/es/lib/hooks/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "useMutateRefdataValue", {
     return _useMutateRefdataValue["default"];
   }
 });
+Object.defineProperty(exports, "useQIndex", {
+  enumerable: true,
+  get: function get() {
+    return _useQIndex["default"];
+  }
+});
 Object.defineProperty(exports, "useRefdata", {
   enumerable: true,
   get: function get() {
@@ -60,4 +66,6 @@ var _useHelperApp = _interopRequireDefault(require("./useHelperApp"));
 
 var _useLocalStorageState = _interopRequireDefault(require("./useLocalStorageState"));
 
+var _useQIndex = _interopRequireDefault(require("./useQIndex"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

package/es/lib/hooks/useHelperApp.js

@@ -53,6 +53,11 @@ var useHelperApp = function useHelperApp(helpers) {
   var handleToggleHelper = (0, _react.useCallback)(function (helper) {
     setCurrentHelper(helper !== currentHelper ? helper : undefined);
   }, [currentHelper]);
+
+  var isOpen = function isOpen(hlp) {
+    return currentHelper === hlp;
+  };
+
   (0, _react.useEffect)(function () {
     if (currentHelper !== (query === null || query === void 0 ? void 0 : query.helper)) {
       var newQuery = _objectSpread(_objectSpread({}, query), {}, {
@@ -88,7 +93,8 @@ var useHelperApp = function useHelperApp(helpers) {
   });
   return {
     HelperComponent: HelperComponent,
-    helperToggleFunctions: helperToggleFunctions
+    helperToggleFunctions: helperToggleFunctions,
+    isOpen: isOpen
   };
 };
 

package/es/lib/hooks/useKiwtSASQuery.js

@@ -13,12 +13,20 @@ var _reactRouterDom = require("react-router-dom");
 
 var _buildUrl = _interopRequireDefault(require("../utils/buildUrl"));
 
+var _useQIndex = _interopRequireDefault(require("./useQIndex"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _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."); }
@@ -52,9 +60,22 @@ var useKiwtSASQuery = function useKiwtSASQuery() {
     return query;
   };
 
+  var _useQindex = (0, _useQIndex["default"])(),
+      _useQindex2 = _slicedToArray(_useQindex, 1),
+      qindex = _useQindex2[0]; // Ensure we update the query along with the querySetter
+
+
+  if (query.qindex !== qindex) {
+    setQuery(_objectSpread(_objectSpread({}, query), {}, {
+      qindex: qindex
+    }));
+  }
+
   var querySetter = function querySetter(_ref2) {
     var nsValues = _ref2.nsValues;
-    setQuery(nsValues);
+    setQuery(_objectSpread(_objectSpread(_objectSpread({}, query), nsValues), {}, {
+      qindex: qindex
+    }));
     locationQuerySetter({
       location: location,
       history: history,

package/es/lib/hooks/useQIndex.js

@@ -0,0 +1,75 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _reactRouterDom = require("react-router-dom");
+
+var _queryString = _interopRequireDefault(require("query-string"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var useQIndex = function useQIndex() {
+  var history = (0, _reactRouterDom.useHistory)();
+  var location = (0, _reactRouterDom.useLocation)();
+
+  var query = _queryString["default"].parse(location.search);
+
+  var _useState = (0, _react.useState)(query === null || query === void 0 ? void 0 : query.qindex),
+      _useState2 = _slicedToArray(_useState, 2),
+      currentQindex = _useState2[0],
+      setCurrentQindex = _useState2[1];
+
+  var handleQindexChange = function handleQindexChange(newQindex) {
+    setCurrentQindex(newQindex);
+
+    if (newQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
+      var newQuery = _objectSpread(_objectSpread({}, query), {}, {
+        qindex: newQindex
+      });
+
+      history.push({
+        pathname: location.pathname,
+        search: "?".concat(_queryString["default"].stringify(newQuery))
+      });
+    }
+  };
+
+  (0, _react.useEffect)(function () {
+    if (currentQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
+      setCurrentQindex(query === null || query === void 0 ? void 0 : query.qindex);
+    }
+  }, [currentQindex, history, location, query]);
+  return [currentQindex, handleQindexChange];
+};
+
+var _default = useQIndex;
+exports["default"] = _default;

package/es/lib/hooks/useRefdata.js

@@ -13,6 +13,8 @@ var _reactQuery = require("react-query");
 
 var _core = require("@folio/stripes/core");
 
+var _utils = require("../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var useRefdata = function useRefdata(_ref) {
@@ -20,20 +22,35 @@ var useRefdata = function useRefdata(_ref) {
       desc = _ref.desc,
       queryParams = _ref.queryParams,
       _ref$returnQueryObjec = _ref.returnQueryObject,
-      returnQueryObject = _ref$returnQueryObjec === void 0 ? false : _ref$returnQueryObjec;
+      returnQueryObject = _ref$returnQueryObjec === void 0 ? false : _ref$returnQueryObjec,
+      _ref$options = _ref.options,
+      options = _ref$options === void 0 ? {
+    filterKeys: {
+      DescKey: 'desc'
+    },
+    stats: false,
+    max: 100
+  } : _ref$options;
   var ky = (0, _core.useOkapiKy)();
-  var path = endpoint;
+  var nsValues = {};
+  /* Desc will tend to contain a '.', which will throw off generateKiwtQuery.
+   * To combat this we can insert another Desc. at the beginning to act as the filtername, so
+   * Funder.Name => Desc.desc=Funder.Name. This way "Desc" acts as the filterName, and without a filterKey
+   * "desc=Funder.Name" is passed wholesale to the query.
+   */
 
   if (Array.isArray(desc)) {
     // If we have an array, append a desc filter for each desc given
-    desc.forEach(function (d, index) {
-      path += "".concat(index === 0 ? '?filters=' : '%7C%7C', "desc=").concat(d);
-    });
+    nsValues.filters = desc.map(function (d) {
+      return "DescKey.".concat(d);
+    }).join(',');
   } else if (desc) {
     // If we just have a string, append a single desc filter
-    path += "?filters=desc=".concat(desc);
+    nsValues.filters = "DescKey.".concat(desc);
   }
 
+  var query = (0, _utils.generateKiwtQuery)(options, nsValues);
+  var path = "".concat(endpoint).concat(query);
   var queryObject = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useRefdata', 'refdata', desc !== null && desc !== void 0 ? desc : ''], function () {
     return ky(path).json();
   }, queryParams);

package/es/lib/utils/generateKiwtQuery.js

@@ -4,119 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _excluded = ["searchKey", "filterKeys", "sortKeys", "stats"];
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+var _generateKiwtQueryParams = _interopRequireDefault(require("./generateKiwtQueryParams"));
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var generateKiwtQuery = function generateKiwtQuery(options, nsValues) {
-  var query = nsValues.query,
-      filters = nsValues.filters,
-      sort = nsValues.sort;
-
-  var _options$searchKey = options.searchKey,
-      searchKey = _options$searchKey === void 0 ? '' : _options$searchKey,
-      _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,
-      rest = _objectWithoutProperties(options, _excluded);
-
-  var paramsArray = [];
-
-  if (query) {
-    var _searchKey$split;
-
-    paramsArray.push.apply(paramsArray, _toConsumableArray((_searchKey$split = searchKey.split(',')) === null || _searchKey$split === void 0 ? void 0 : _searchKey$split.map(function (m) {
-      return "match=".concat(m);
-    })));
-    paramsArray.push("term=".concat(query));
-  }
-
-  if (filters) {
-    var filterMap = {};
-    filters.split(',').forEach(function (filter) {
-      var _filter$split = filter.split('.'),
-          _filter$split2 = _toArray(_filter$split),
-          filterName = _filter$split2[0],
-          rest = _filter$split2.slice(1);
-
-      var filterValue = rest.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 filterKey = filterKeys[filterName];
-
-      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(f);
-        })));
-      } else {
-        var filterString = filterValues.map(function (v) {
-          return "".concat(filterKey, "==").concat(v);
-        }).join('||');
-        paramsArray.push("filters=".concat(filterString));
-      }
-    });
-  }
-
-  if (sort) {
-    paramsArray.push.apply(paramsArray, _toConsumableArray(sort.split(',').map(function (sortKey) {
-      var descending = sortKey.startsWith('-');
-      var term = sortKey.replace('-', '');
-
-      if (term in sortKeys) {
-        term = term.replace(term, sortKeys[term]);
-      }
-
-      return "sort=".concat(term, ";").concat(descending ? 'desc' : 'asc');
-    })));
-  }
-
-  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];
-
-    paramsArray.push("".concat(key, "=").concat(value));
-  }
-
+  var paramsArray = (0, _generateKiwtQueryParams["default"])(options, nsValues);
   return paramsArray.length ? '?' + paramsArray.map(function (p) {
     return encodeURI(p);
   }).join('&') : '';