@k-int/stripes-kint-components 5.0.0 → 5.1.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,25 +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;
-exports.default = _default;
+var _default = exports.default = useSettings;

package/es/lib/utils/buildUrl.js

@@ -9,20 +9,18 @@ var _lodash = require("lodash");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // File copied from https://github.com/folio-org/stripes-smart-components/blob/master/lib/SearchAndSort/buildUrl.js
 
-function getLocationQuery(location) {
-  return location.query ? location.query : _queryString.default.parse(location.search);
-}
 function removeEmpty(obj) {
-  var cleanObj = {};
-  (0, _lodash.forOwn)(obj, function (value, key) {
+  const cleanObj = {};
+  (0, _lodash.forOwn)(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));
+  var _location$query;
+  const locationQuery = (_location$query = location === null || location === void 0 ? void 0 : location.query) !== null && _location$query !== void 0 ? _location$query : _queryString.default.parse(location.search);
+  let url = values._path || basePath || location.pathname;
+  const params = removeEmpty(Object.assign(locationQuery, values));
   (0, _lodash.unset)(params, '_path');
   if (!(0, _lodash.isEmpty)(params)) {
     url += "?".concat(_queryString.default.stringify(params));

package/es/lib/utils/filterParsers/deparseKiwtQueryFilters.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deparseKiwtQueryFiltersObject = exports.default = void 0;
+// Does not validate object... make sure you pass it the right thing
+const deparseKiwtQueryFiltersObject = queryObject => {
+  let returnString = "".concat(queryObject.path, " ").concat(queryObject.comparator);
+  if (queryObject.value) {
+    returnString += " ".concat(queryObject.value);
+  }
+  return returnString;
+};
+
+// Takes an Array of the shape defined by parseKiwtQuery and restructures that into an equivalent KIWT queryString
+exports.deparseKiwtQueryFiltersObject = deparseKiwtQueryFiltersObject;
+const deparseKiwtQueryFilters = queryArray => {
+  if (Array.isArray(queryArray)) {
+    let returnString = '';
+    queryArray.forEach(qa => {
+      if (Array.isArray(qa)) {
+        returnString += " (".concat(deparseKiwtQueryFilters(qa), ")");
+      } else if (typeof qa === 'string') {
+        returnString += " ".concat(qa);
+      } else {
+        // Assuming object at this stage
+        returnString += " ".concat(deparseKiwtQueryFiltersObject(qa));
+      }
+    });
+    return returnString.trim();
+  } else {
+    throw new Error("deparseKiwtQuery expects a parameter of type Array, passed: ".concat(queryArray));
+  }
+};
+var _default = exports.default = deparseKiwtQueryFilters;

package/es/lib/utils/filterParsers/index.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "deparseKiwtQueryFilters", {
+  enumerable: true,
+  get: function () {
+    return _deparseKiwtQueryFilters.default;
+  }
+});
+Object.defineProperty(exports, "deparseKiwtQueryFiltersObject", {
+  enumerable: true,
+  get: function () {
+    return _deparseKiwtQueryFilters.deparseKiwtQueryFiltersObject;
+  }
+});
+Object.defineProperty(exports, "parseKiwtQueryFilters", {
+  enumerable: true,
+  get: function () {
+    return _parseKiwtQueryFilters.default;
+  }
+});
+Object.defineProperty(exports, "parseKiwtQueryFiltersRecursive", {
+  enumerable: true,
+  get: function () {
+    return _parseKiwtQueryFilters.parseKiwtQueryFiltersRecursive;
+  }
+});
+Object.defineProperty(exports, "parseKiwtQueryGroups", {
+  enumerable: true,
+  get: function () {
+    return _parseKiwtQueryGroups.default;
+  }
+});
+Object.defineProperty(exports, "parseKiwtQueryString", {
+  enumerable: true,
+  get: function () {
+    return _parseKiwtQueryString.default;
+  }
+});
+var _parseKiwtQueryGroups = _interopRequireDefault(require("./parseKiwtQueryGroups"));
+var _parseKiwtQueryString = _interopRequireDefault(require("./parseKiwtQueryString"));
+var _parseKiwtQueryFilters = _interopRequireWildcard(require("./parseKiwtQueryFilters"));
+var _deparseKiwtQueryFilters = _interopRequireWildcard(require("./deparseKiwtQueryFilters"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/es/lib/utils/filterParsers/parseKiwtQueryFilters.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseKiwtQueryFiltersRecursive = exports.default = void 0;
+var _parseKiwtQueryGroups = _interopRequireDefault(require("./parseKiwtQueryGroups"));
+var _parseKiwtQueryString = _interopRequireDefault(require("./parseKiwtQueryString"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// This is an amalgam of parseKiwtQueryGroups, which splits up grouped queries
+// and parseKiwtQueryString, which figures out comparator vs attribute, etc
+
+// This will handle the nested recursion logic, switching between String and Array
+const parseKiwtQueryFiltersRecursive = query => {
+  if (Array.isArray(query)) {
+    return query.map(q => parseKiwtQueryFiltersRecursive(q));
+  } else if (typeof query === 'string') {
+    if (query === '&&' || query === '||') {
+      return query;
+    } else {
+      return (0, _parseKiwtQueryString.default)(query);
+    }
+  } else {
+    throw new Error("Unexpected query type: ".concat(query));
+  }
+};
+
+// This accepts a STRING only
+exports.parseKiwtQueryFiltersRecursive = parseKiwtQueryFiltersRecursive;
+const parseKiwtQueryFilters = queryString => {
+  if (typeof queryString === 'string') {
+    // parseKiwtQueryGroups already recurses, so we know is the right shape all the way down
+    const queryGroups = (0, _parseKiwtQueryGroups.default)(queryString);
+    return parseKiwtQueryFiltersRecursive(queryGroups);
+  } else {
+    throw new Error("parseKiwtQuery expects a parameter of type String, passed: ".concat(queryString));
+  }
+};
+
+/* RETURN SHAPE
+ * This will return nested arrays of Objects, Strings and Arrays.
+ * Each array refers to a bracketed group
+ * Each object is a single query value (attribute, comparator and value)
+ * Each string should be boolean && or ||
+ * To be read from left to right
+ */
+var _default = exports.default = parseKiwtQueryFilters;

package/es/lib/utils/{parseKiwtQueryGroups.js → filterParsers/parseKiwtQueryGroups.js}

@@ -25,7 +25,7 @@ exports.default = void 0;
  * @returns [] tokenized query as a series of nested arrays
  * @throws Error if parens are unmatched
  */
-var parseKiwtQueryGroups = function parseKiwtQueryGroups(query) {
+const parseKiwtQueryGroups = query => {
   // Split on tokens, keeping them all in tact in the correct position.
   // This could be handled without the filter, which omits empty-string
   // matches, using a look-behind:
@@ -33,18 +33,18 @@ var parseKiwtQueryGroups = function parseKiwtQueryGroups(query) {
   // but Webkit hasn't implemented look-behind yet so that breaks Safari.
   // https://bugs.webkit.org/show_bug.cgi?id=174931
   // <sigh>
-  var splitString = query.split(/(\|\||&&|\(|\))/).filter(Boolean);
+  const splitString = query.split(/(\|\||&&|\(|\))/).map(ss => ss.trim()).filter(Boolean);
 
   // Keep track of what to skip over when we return from each level of nesting
-  var skipCount = [0];
+  let skipCount = [0];
 
   // Ensure parens are properly closed
-  var unclosedParens = 0;
-  var groupParser = function groupParser(parseArray) {
-    var nestLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-    var group = [];
+  let unclosedParens = 0;
+  const groupParser = function (parseArray) {
+    let nestLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    const group = [];
     // Iterate over each element in the array, recursively calling this when hitting parens
-    parseArray === null || parseArray === void 0 ? void 0 : parseArray.every(function (element, index) {
+    parseArray === null || parseArray === void 0 || parseArray.every((element, index) => {
       var _skipCount;
       if (skipCount[nestLevel] > 0) {
         skipCount[nestLevel] -= 1;
@@ -57,14 +57,14 @@ var parseKiwtQueryGroups = function parseKiwtQueryGroups(query) {
       }
 
       // At the levels below all of the following will need
-      skipCount = (_skipCount = skipCount) === null || _skipCount === void 0 ? void 0 : _skipCount.map(function (n, i) {
+      skipCount = (_skipCount = skipCount) === null || _skipCount === void 0 ? void 0 : _skipCount.map((n, i) => {
         if (i < nestLevel) {
           return n + 1;
         }
         return n;
       });
       if (element !== '(' && element !== ')') {
-        group === null || group === void 0 ? void 0 : group.push(element);
+        group === null || group === void 0 || group.push(element);
       } else if (element === ')') {
         // Remove the corresponding skipCount level because we're going down a nesting level
         skipCount.pop();
@@ -82,7 +82,7 @@ var parseKiwtQueryGroups = function parseKiwtQueryGroups(query) {
     });
     return group;
   };
-  var outputGroups = groupParser(splitString);
+  const outputGroups = groupParser(splitString);
 
   // abort: dangling open-paren
   if (unclosedParens > 0) {
@@ -90,5 +90,4 @@ var parseKiwtQueryGroups = function parseKiwtQueryGroups(query) {
   }
   return outputGroups;
 };
-var _default = parseKiwtQueryGroups;
-exports.default = _default;
+var _default = exports.default = parseKiwtQueryGroups;

package/es/lib/utils/{parseKiwtQueryGroups.test.js → filterParsers/parseKiwtQueryGroups.test.js}

@@ -2,49 +2,49 @@
 
 var _parseKiwtQueryGroups = _interopRequireDefault(require("./parseKiwtQueryGroups"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('parseKiwtQueryGroups', function () {
-  it('handles simple queries without parens', function () {
-    var result = (0, _parseKiwtQueryGroups.default)('foo==bar');
+describe('parseKiwtQueryGroups', () => {
+  it('handles simple queries without parens', () => {
+    const result = (0, _parseKiwtQueryGroups.default)('foo==bar');
     expect(result).toEqual(['foo==bar']);
   });
-  it('handles simple queries with parens', function () {
-    var result = (0, _parseKiwtQueryGroups.default)('(foo==bar)');
+  it('handles simple queries with parens', () => {
+    const result = (0, _parseKiwtQueryGroups.default)('(foo==bar)');
     expect(result).toEqual([['foo==bar']]);
   });
-  it('handles conjunctions', function () {
-    var result = (0, _parseKiwtQueryGroups.default)('(foo==bar&&bat==baz)');
+  it('handles conjunctions', () => {
+    const result = (0, _parseKiwtQueryGroups.default)('(foo==bar&&bat==baz)');
     expect(result).toEqual([['foo==bar', '&&', 'bat==baz']]);
   });
-  it('handles disjunctions', function () {
-    var result = (0, _parseKiwtQueryGroups.default)('(foo==bar||bat==baz)');
+  it('handles disjunctions', () => {
+    const result = (0, _parseKiwtQueryGroups.default)('(foo==bar||bat==baz)');
     expect(result).toEqual([['foo==bar', '||', 'bat==baz']]);
   });
-  it('handles nested clauses', function () {
-    var result = (0, _parseKiwtQueryGroups.default)('(foo==bar&&(bat==baz||bat==quux))');
+  it('handles nested clauses', () => {
+    const result = (0, _parseKiwtQueryGroups.default)('(foo==bar&&(bat==baz||bat==quux))');
     expect(result).toEqual([['foo==bar', '&&', ['bat==baz', '||', 'bat==quux']]]);
   });
-  it('throws on dangling (', function () {
+  it('throws on dangling (', () => {
     try {
       (0, _parseKiwtQueryGroups.default)('(foo==bar');
     } catch (e) {
       expect(e.message).toMatch('Found unclosed paretheses, stopping parse.');
     }
   });
-  it('throws on dangling )', function () {
+  it('throws on dangling )', () => {
     try {
       (0, _parseKiwtQueryGroups.default)('bat==quux)');
     } catch (e) {
       expect(e.message).toMatch('Unexpected character \')\' found, stopping parse.');
     }
   });
-  it('throws on nested dangling (', function () {
+  it('throws on nested dangling (', () => {
     try {
       (0, _parseKiwtQueryGroups.default)('(foo==bar&&(bat==baz||bat==quux)');
     } catch (e) {
       expect(e.message).toMatch('Found unclosed paretheses, stopping parse.');
     }
   });
-  it('throws on nested dangling )', function () {
+  it('throws on nested dangling )', () => {
     try {
       (0, _parseKiwtQueryGroups.default)('foo==bar&&(bat==baz||bat==quux))&&(monkey==bagel||thunder==chicken)');
     } catch (e) {

package/es/lib/utils/filterParsers/parseKiwtQueryString.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _comparators = _interopRequireDefault(require("../../constants/comparators"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/*
+ * This is designed to take a SINGLE query string of the form
+ * attribute == value, or attribute isEmpty, or attribute ~= value, etc
+ *
+ * Will return an object: {path: 'attribute', comparator: '==', value: 'value'}
+ */ // No magic numbers sonarlint -.-
+const FIRST = 0;
+const SECOND = 1;
+const THIRD = 2;
+const parseKiwtQueryString = queryString => {
+  const comparatorMatch = new RegExp("(".concat(_comparators.default.join('|'), ")"));
+  // See parseKiwtQueryGroups for breakdown of why this filter is needed
+  const splitString = queryString.split(comparatorMatch).map(ss => ss.trim()).filter(Boolean);
+
+  /*
+   * As far as I can tell, with input of a SINGLE query string at a time,
+   * with 2 entries we will have a special case comparator, with 3 we
+   * have a comparator, attribute and value.. value can be null in those cases
+   */
+  return {
+    path: splitString[FIRST],
+    comparator: splitString[SECOND],
+    value: splitString[THIRD]
+  };
+};
+var _default = exports.default = parseKiwtQueryString;

package/es/lib/utils/generateKiwtQuery.js

@@ -6,10 +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;
-exports.default = _default;
+var _default = exports.default = generateKiwtQuery;