@k-int/stripes-kint-components 4.7.2 → 4.7.3

package/es/lib/hooks/useMutateModConfigEntry.js

@@ -21,12 +21,12 @@ const useMutateModConfigEntry = _ref => {
     configName,
     moduleName
   });
-  const putQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'putConfigEntry', id], async data => ky.put("".concat(_endpoints.MOD_SETTINGS_ENDPOINT, "/").concat(id), {
+  const putQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'putConfigEntry', id], async data => ky.put(`${_endpoints.MOD_SETTINGS_ENDPOINT}/${id}`, {
     json: data
   }).json().then(() => {
     queryClient.invalidateQueries(baseNamespace);
   }));
-  const postQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'postConfigEntry'], async data => ky.post("".concat(_endpoints.MOD_SETTINGS_ENDPOINT), {
+  const postQueryObject = (0, _reactQuery.useMutation)([...baseNamespace, 'postConfigEntry'], async data => ky.post(`${_endpoints.MOD_SETTINGS_ENDPOINT}`, {
     json: data
   }).json().then(() => {
     queryClient.invalidateQueries(baseNamespace);
@@ -36,5 +36,4 @@ const useMutateModConfigEntry = _ref => {
   }
   return postQueryObject;
 };
-var _default = useMutateModConfigEntry;
-exports.default = _default;
+var _default = exports.default = useMutateModConfigEntry;

package/es/lib/hooks/useMutateRefdataCategory.js

@@ -22,24 +22,23 @@ const useMutateRefdataCategory = _ref => {
   const returnObj = {};
   const ky = (0, _core.useOkapiKy)();
   const invalidateRefdata = (0, _useInvalidateRefdata.default)();
-  const deleteQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useMutateRefdataCategory', 'delete'], async id => ky.delete("".concat(endpoint, "/").concat(id)).json().then(afterQueryCalls === null || afterQueryCalls === void 0 ? void 0 : afterQueryCalls.delete).then(() => invalidateRefdata()).catch(catchQueryCalls === null || catchQueryCalls === void 0 ? void 0 : catchQueryCalls.delete), queryParams === null || queryParams === void 0 ? void 0 : queryParams.delete);
+  const deleteQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useMutateRefdataCategory', 'delete'], async id => ky.delete(`${endpoint}/${id}`).json().then(afterQueryCalls?.delete).then(() => invalidateRefdata()).catch(catchQueryCalls?.delete), queryParams?.delete);
   const postQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useMutateRefdataCategory', 'post'], async payload => ky.post(endpoint, {
     json: {
       ...payload,
       values: []
     }
-  }).json().then(afterQueryCalls === null || afterQueryCalls === void 0 ? void 0 : afterQueryCalls.post).then(() => invalidateRefdata()).catch(catchQueryCalls === null || catchQueryCalls === void 0 ? void 0 : catchQueryCalls.post), queryParams === null || queryParams === void 0 ? void 0 : queryParams.post);
-  if (returnQueryObject !== null && returnQueryObject !== void 0 && returnQueryObject.delete) {
+  }).json().then(afterQueryCalls?.post).then(() => invalidateRefdata()).catch(catchQueryCalls?.post), queryParams?.post);
+  if (returnQueryObject?.delete) {
     returnObj.delete = deleteQueryObject;
   } else {
     returnObj.delete = deleteQueryObject.mutateAsync;
   }
-  if (returnQueryObject !== null && returnQueryObject !== void 0 && returnQueryObject.post) {
+  if (returnQueryObject?.post) {
     returnObj.post = postQueryObject;
   } else {
     returnObj.post = postQueryObject.mutateAsync;
   }
   return returnObj;
 };
-var _default = useMutateRefdataCategory;
-exports.default = _default;
+var _default = exports.default = useMutateRefdataCategory;

package/es/lib/hooks/useMutateRefdataValue.js

@@ -23,7 +23,7 @@ const useMutateRefdataValue = _ref => {
   const returnObj = {};
   const ky = (0, _core.useOkapiKy)();
   const invalidateRefdata = (0, _useInvalidateRefdata.default)();
-  const deleteQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useMutateRefdataValue', 'delete', id], async data => ky.put("".concat(endpoint, "/").concat(id), {
+  const deleteQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useMutateRefdataValue', 'delete', id], async data => ky.put(`${endpoint}/${id}`, {
     json: {
       id,
       values: [{
@@ -31,24 +31,23 @@ const useMutateRefdataValue = _ref => {
         _delete: true
       }]
     }
-  }).json().then(afterQueryCalls === null || afterQueryCalls === void 0 ? void 0 : afterQueryCalls.delete).then(() => invalidateRefdata()).catch(catchQueryCalls === null || catchQueryCalls === void 0 ? void 0 : catchQueryCalls.delete), queryParams === null || queryParams === void 0 ? void 0 : queryParams.delete);
-  const putQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'editableRefdataList', 'editValue', id], async data => ky.put("".concat(endpoint, "/").concat(id), {
+  }).json().then(afterQueryCalls?.delete).then(() => invalidateRefdata()).catch(catchQueryCalls?.delete), queryParams?.delete);
+  const putQueryObject = (0, _reactQuery.useMutation)(['stripes-kint-components', 'editableRefdataList', 'editValue', id], async data => ky.put(`${endpoint}/${id}`, {
     json: {
       id,
       values: [data]
     }
-  }).json().then(afterQueryCalls === null || afterQueryCalls === void 0 ? void 0 : afterQueryCalls.put).then(() => invalidateRefdata()).catch(catchQueryCalls === null || catchQueryCalls === void 0 ? void 0 : catchQueryCalls.put), queryParams === null || queryParams === void 0 ? void 0 : queryParams.put);
-  if (returnQueryObject !== null && returnQueryObject !== void 0 && returnQueryObject.delete) {
+  }).json().then(afterQueryCalls?.put).then(() => invalidateRefdata()).catch(catchQueryCalls?.put), queryParams?.put);
+  if (returnQueryObject?.delete) {
     returnObj.delete = deleteQueryObject;
   } else {
     returnObj.delete = deleteQueryObject.mutateAsync;
   }
-  if (returnQueryObject !== null && returnQueryObject !== void 0 && returnQueryObject.put) {
+  if (returnQueryObject?.put) {
     returnObj.put = putQueryObject;
   } else {
     returnObj.put = putQueryObject.mutateAsync;
   }
   return returnObj;
 };
-var _default = useMutateRefdataValue;
-exports.default = _default;
+var _default = exports.default = useMutateRefdataValue;

package/es/lib/hooks/useQIndex.js

@@ -8,32 +8,31 @@ 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 (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 _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const useQIndex = () => {
   const history = (0, _reactRouterDom.useHistory)();
   const location = (0, _reactRouterDom.useLocation)();
   const query = _queryString.default.parse(location.search);
-  const [currentQindex, setCurrentQindex] = (0, _react.useState)(query === null || query === void 0 ? void 0 : query.qindex);
+  const [currentQindex, setCurrentQindex] = (0, _react.useState)(query?.qindex);
   const handleQindexChange = newQindex => {
     setCurrentQindex(newQindex);
-    if (newQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
+    if (newQindex !== query?.qindex) {
       const newQuery = {
         ...query,
         qindex: newQindex
       };
       history.push({
         pathname: location.pathname,
-        search: "?".concat(_queryString.default.stringify(newQuery))
+        search: `?${_queryString.default.stringify(newQuery)}`
       });
     }
   };
   (0, _react.useEffect)(() => {
-    if (currentQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
-      setCurrentQindex(query === null || query === void 0 ? void 0 : query.qindex);
+    if (currentQindex !== query?.qindex) {
+      setCurrentQindex(query?.qindex);
     }
   }, [currentQindex, history, location, query]);
   return [currentQindex, handleQindexChange];
 };
-var _default = useQIndex;
-exports.default = _default;
+var _default = exports.default = useQIndex;

package/es/lib/hooks/useRefdata.js

@@ -28,13 +28,13 @@ const useRefdata = _ref => {
 
   if (Array.isArray(desc)) {
     // If we have an array, append a desc filter for each desc given
-    nsValues.filters = desc.map(d => "DescKey.".concat(d)).join(',');
+    nsValues.filters = desc.map(d => `DescKey.${d}`).join(',');
   } else if (desc) {
     // If we just have a string, append a single desc filter
-    nsValues.filters = "DescKey.".concat(desc);
+    nsValues.filters = `DescKey.${desc}`;
   }
   const query = (0, _utils.generateKiwtQuery)(options, nsValues);
-  const path = "".concat(endpoint).concat(query);
+  const path = `${endpoint}${query}`;
   const queryObject = (0, _reactQuery.useQuery)((0, _utils.refdataQueryKey)(desc), () => ky(path).json(), queryParams);
   if (returnQueryObject) {
     return queryObject || {};
@@ -50,5 +50,4 @@ useRefdata.propTypes = {
   queryParams: _propTypes.default.object,
   returnQueryObject: _propTypes.default.bool
 };
-var _default = useRefdata;
-exports.default = _default;
+var _default = exports.default = useRefdata;

package/es/lib/hooks/useSASQQueryMeta.js

@@ -30,5 +30,4 @@ const useSASQQueryMeta = id => {
     }
   };
 };
-var _default = useSASQQueryMeta;
-exports.default = _default;
+var _default = exports.default = useSASQQueryMeta;

package/es/lib/hooks/useTemplates.js

@@ -18,17 +18,16 @@ const useTemplates = _ref => {
   const ky = (0, _core.useOkapiKy)();
   const extraPathItems = [];
   if (context) {
-    extraPathItems.push("filters=context=".concat(context));
+    extraPathItems.push(`filters=context=${context}`);
   }
   if (sort) {
-    extraPathItems.push("sort=".concat(sort));
+    extraPathItems.push(`sort=${sort}`);
   }
   extraPathItems.push('max=500');
-  const path = "".concat(endpoint, "?").concat(extraPathItems.join('&'));
+  const path = `${endpoint}?${extraPathItems.join('&')}`;
   const {
     data: templates
-  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useTemplates', 'templates', context !== null && context !== void 0 ? context : ''], () => ky(path).json(), queryParams);
+  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useTemplates', 'templates', context ?? ''], () => ky(path).json(), queryParams);
   return templates || [];
 };
-var _default = useTemplates;
-exports.default = _default;
+var _default = exports.default = useTemplates;

package/es/lib/settingsHooks/useAppSettings.js

@@ -8,7 +8,6 @@ var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../utils");
 const useAppSettings = _ref => {
-  var _ref2, _ref3, _queryObject$data2;
   let {
     endpoint,
     keyName,
@@ -24,33 +23,29 @@ const useAppSettings = _ref => {
   };
   const namespaceArray = [endpoint];
   if (sectionName) {
-    var _defaultQueryParamObj;
-    defaultQueryParamObject.filters = [...((_defaultQueryParamObj = defaultQueryParamObject.filters) !== null && _defaultQueryParamObj !== void 0 ? _defaultQueryParamObj : []), {
+    defaultQueryParamObject.filters = [...(defaultQueryParamObject.filters ?? []), {
       path: 'section',
       value: sectionName
     }];
     namespaceArray.push(sectionName);
   }
   if (keyName) {
-    var _defaultQueryParamObj2;
-    defaultQueryParamObject.filters = [...((_defaultQueryParamObj2 = defaultQueryParamObject.filters) !== null && _defaultQueryParamObj2 !== void 0 ? _defaultQueryParamObj2 : []), {
+    defaultQueryParamObject.filters = [...(defaultQueryParamObject.filters ?? []), {
       path: 'key',
       value: keyName
     }];
     defaultQueryParamObject.perPage = 1;
     namespaceArray.push(keyName);
   }
-  const queryParamArray = (0, _utils.generateKiwtQueryParams)(options !== null && options !== void 0 ? options : defaultQueryParamObject, {});
+  const queryParamArray = (0, _utils.generateKiwtQueryParams)(options ?? defaultQueryParamObject, {});
   namespaceArray.push(queryParamArray);
-  const queryObject = (0, _reactQuery.useQuery)(namespaceArray, () => ky("".concat(endpoint, "?").concat(queryParamArray === null || queryParamArray === void 0 ? void 0 : queryParamArray.join('&'))).json(), queryParams);
+  const queryObject = (0, _reactQuery.useQuery)(namespaceArray, () => ky(`${endpoint}?${queryParamArray?.join('&')}`).json(), queryParams);
   if (returnQueryObject) {
     return queryObject;
   }
-  if ((_ref2 = queryParams !== null && queryParams !== void 0 ? queryParams : defaultQueryParamObject) !== null && _ref2 !== void 0 && _ref2.perPage && ((_ref3 = queryParams !== null && queryParams !== void 0 ? queryParams : defaultQueryParamObject) === null || _ref3 === void 0 ? void 0 : _ref3.perPage) === 1) {
-    var _queryObject$data$, _queryObject$data;
-    return (_queryObject$data$ = queryObject === null || queryObject === void 0 ? void 0 : (_queryObject$data = queryObject.data) === null || _queryObject$data === void 0 ? void 0 : _queryObject$data[0]) !== null && _queryObject$data$ !== void 0 ? _queryObject$data$ : {};
+  if ((queryParams ?? defaultQueryParamObject)?.perPage && (queryParams ?? defaultQueryParamObject)?.perPage === 1) {
+    return queryObject?.data?.[0] ?? {};
   }
-  return (_queryObject$data2 = queryObject === null || queryObject === void 0 ? void 0 : queryObject.data) !== null && _queryObject$data2 !== void 0 ? _queryObject$data2 : [];
+  return queryObject?.data ?? [];
 };
-var _default = useAppSettings;
-exports.default = _default;
+var _default = exports.default = useAppSettings;

package/es/lib/settingsHooks/useSettingSection.js

@@ -26,10 +26,10 @@ const useSettingSection = _ref => {
   }, {});
   const {
     data: settings = []
-  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useSetting', 'appSettings', queryParams, sectionName], () => ky("".concat(settingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json());
+  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useSetting', 'appSettings', queryParams, sectionName], () => ky(`${settingEndpoint}?${queryParams?.join('&')}`).json());
   const {
     mutateAsync: putSetting
-  } = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useSetting', 'putSetting', sectionName], data => ky.put("".concat(settingEndpoint).concat(data.id ? '/' + data.id : ''), {
+  } = (0, _reactQuery.useMutation)(['stripes-kint-components', 'useSetting', 'putSetting', sectionName], data => ky.put(`${settingEndpoint}${data.id ? '/' + data.id : ''}`, {
     json: data
   }));
   return {
@@ -37,5 +37,4 @@ const useSettingSection = _ref => {
     settings
   };
 };
-var _default = useSettingSection;
-exports.default = _default;
+var _default = exports.default = useSettingSection;

package/es/lib/settingsHooks/useSettings.js

@@ -30,7 +30,7 @@ const useSettings = _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 => ({
+    filters: dynamicPageExclusions?.map(dpe => ({
       path: 'section',
       comparator: '!=',
       value: dpe
@@ -41,13 +41,13 @@ const useSettings = _ref => {
   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());
+  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useSettings', 'appSettings', settingEndpoint, queryParams], () => ky(`${settingEndpoint}?${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)),
+        id: `settings.settingsSection.${(0, _utils.toCamelCase)(section)}`,
         fallbackMessage: section
       }),
       component: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPagePane, {
@@ -108,5 +108,4 @@ const useSettings = _ref => {
     SettingsContextProvider
   };
 };
-var _default = useSettings;
-exports.default = _default;
+var _default = exports.default = useSettings;

package/es/lib/utils/buildUrl.js

@@ -27,7 +27,7 @@ function buildUrl(location, values, basePath) {
   const params = removeEmpty(Object.assign(locationQuery, values));
   (0, _unset2.default)(params, '_path');
   if (!(0, _isEmpty2.default)(params)) {
-    url += "?".concat(_queryString.default.stringify(params));
+    url += `?${_queryString.default.stringify(params)}`;
   }
   return url;
 }

package/es/lib/utils/generateKiwtQuery.js

@@ -11,5 +11,4 @@ const generateKiwtQuery = function (options, nsValues) {
   const paramsArray = (0, _generateKiwtQueryParams.default)(options, nsValues, encode);
   return paramsArray.length ? '?' + paramsArray.join('&') : '';
 };
-var _default = generateKiwtQuery;
-exports.default = _default;
+var _default = exports.default = generateKiwtQuery;

package/es/lib/utils/generateKiwtQueryParams.js

@@ -14,40 +14,36 @@ const conditionalEncodeURIComponent = function (str) {
 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) {
+  if (opf?.groupValues) {
     const groupValues = opf.groupValues;
 
     // Small utility function to add negation and brackets to the options block where necessary
-    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 ? ')' : '');
+    const negationAndNesting = str => `${groupValues?.NOT ? '!' : ''}${isNested || groupValues?.NOT ? '(' : ''}${str}${isNested || 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)) {
-      var _groupValues$OR, _groupValues$OR$map;
+    if (groupValues?.AND && Array.isArray(groupValues.AND) || groupValues?.OR && Array.isArray(groupValues.OR)) {
       // 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(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$AND$map === void 0 ? void 0 : _groupValues$AND$map.join('&&'));
+        return negationAndNesting(groupValues?.AND?.map(gvo => buildFilterOptionBlock(gvo, true, encode))?.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('||'));
+      return negationAndNesting(groupValues?.OR?.map(gvo => buildFilterOptionBlock(gvo, true, encode))?.join('||'));
     }
     // If neither valid OR nor AND exist, ignore the block
-  } else if (opf !== null && opf !== void 0 && opf.values) {
+  } else if (opf?.values) {
     // Build the values filter block
     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));
+        innerFilters.push(`${opf.path}${opf.comparator ?? '=='}${opfv}`);
       } else {
         innerFilters.push(opfv);
       }
     });
     return conditionalEncodeURIComponent(innerFilters.join('||'), encode);
-  } else if (opf !== null && opf !== void 0 && opf.value) {
+  } else if (opf?.value) {
     // If no value OR values, then ignore
     if (opf.path) {
-      var _opf$comparator2;
-      const filterString = "".concat(opf.path).concat((_opf$comparator2 = opf.comparator) !== null && _opf$comparator2 !== void 0 ? _opf$comparator2 : '==').concat(opf.value);
+      const filterString = `${opf.path}${opf.comparator ?? '=='}${opf.value}`;
       return conditionalEncodeURIComponent(filterString, encode);
     }
     return conditionalEncodeURIComponent(opf.value, encode);
@@ -105,9 +101,8 @@ const generateKiwtQueryParams = function (options, nsValues) {
   } = options;
   const paramsArray = [];
   if (query) {
-    var _split;
-    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)));
+    paramsArray.push(...(qindex || searchKey).split(',')?.map(m => `match=${conditionalEncodeURIComponent(m, encode)}`));
+    paramsArray.push(`term=${conditionalEncodeURIComponent(query, encode)}`);
   }
 
   // Actually build the optionsFilters block (Moved logic to its own function to allow recursion)
@@ -115,15 +110,14 @@ const generateKiwtQueryParams = function (options, nsValues) {
     optionsFilters.forEach(opf => {
       const optionsBlock = buildFilterOptionBlock(opf, false, encode);
       if (optionsBlock) {
-        paramsArray.push("filters=".concat(optionsBlock));
+        paramsArray.push(`filters=${optionsBlock}`);
       }
     });
   }
   if (filters) {
     const filterMap = {};
     filters.split(',').forEach(filter => {
-      var _filter$trim;
-      const [filterName, ...filterRest] = (_filter$trim = filter.trim()) === null || _filter$trim === void 0 ? void 0 : _filter$trim.split('.');
+      const [filterName, ...filterRest] = filter.trim()?.split('.');
       const filterValue = filterRest.join('.');
       if (filterMap[filterName] === undefined) filterMap[filterName] = [];
       filterMap[filterName].push(filterValue);
@@ -137,51 +131,47 @@ const generateKiwtQueryParams = function (options, nsValues) {
       if (filterConfigEntry) {
         // We have a direct mapping instruction, use it
         const filterString = filterValues.map(v => {
-          var _filterConfigEntry$va, _filterConfigEntry$va2;
-          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);
+          const fceValue = filterConfigEntry?.values?.find(fce => fce.name === v)?.value;
+          return `${filterName}==${fceValue ?? v}`;
         }).join('||');
-        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
+        paramsArray.push(`filters=${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(...(filterValues === null || filterValues === void 0 ? void 0 : filterValues.map(f => "filters=".concat(conditionalEncodeURIComponent(f, encode)))));
+        paramsArray.push(...filterValues?.map(f => `filters=${conditionalEncodeURIComponent(f, encode)}`));
       } else {
-        const filterString = filterValues.map(v => "".concat(filterKey, "==").concat(v)).join('||');
-        paramsArray.push("filters=".concat(conditionalEncodeURIComponent(filterString, encode)));
+        const filterString = filterValues.map(v => `${filterKey}==${v}`).join('||');
+        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString, encode)}`);
       }
     });
   }
   if (optionsSort && optionsSort.length > 0) {
     optionsSort.forEach(os => {
       if (os.value) {
-        paramsArray.push("sort=".concat(conditionalEncodeURIComponent(os.value, encode)));
+        paramsArray.push(`sort=${conditionalEncodeURIComponent(os.value, encode)}`);
       } else if (os.path) {
-        var _os$direction;
         // If no path then ignore
-        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)));
+        const sortString = `${os.path};${os.direction ?? 'asc'}`;
+        paramsArray.push(`sort=${conditionalEncodeURIComponent(sortString, encode)}`);
       }
     });
   }
   if (sort) {
-    var _sort$trim;
-    paramsArray.push(...((_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',').map(sortKey => {
+    paramsArray.push(...sort.trim()?.split(',').map(sortKey => {
       const descending = sortKey.startsWith('-');
       let term = sortKey.replace('-', '');
       if (term in sortKeys) {
         term = term.replace(term, sortKeys[term]);
       }
-      const sortString = "".concat(term, ";").concat(descending ? 'desc' : 'asc');
-      return "sort=".concat(conditionalEncodeURIComponent(sortString, encode));
-    })));
+      const sortString = `${term};${descending ? 'desc' : 'asc'}`;
+      return `sort=${conditionalEncodeURIComponent(sortString, encode)}`;
+    }));
   }
   if (stats) {
     paramsArray.push('stats=true');
   }
   for (const [key, value] of Object.entries(rest)) {
-    paramsArray.push("".concat(key, "=").concat(conditionalEncodeURIComponent(value, encode)));
+    paramsArray.push(`${key}=${conditionalEncodeURIComponent(value, encode)}`);
   }
   return paramsArray;
 };
-var _default = generateKiwtQueryParams;
-exports.default = _default;
+var _default = exports.default = generateKiwtQueryParams;

package/es/lib/utils/groupCustomPropertiesByCtx.js

@@ -7,14 +7,12 @@ exports.default = void 0;
 const groupCustomPropertiesByCtx = function () {
   let customProperties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return customProperties.reduce((acc, curr) => {
-    var _curr$ctx, _acc$ctx;
-    const ctx = (_curr$ctx = curr.ctx) !== null && _curr$ctx !== void 0 ? _curr$ctx : 'isNull';
+    const ctx = 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];
+    returnObj[ctx] = [...(acc?.[ctx] ?? []), curr];
     return returnObj;
   }, {});
 };
-var _default = groupCustomPropertiesByCtx;
-exports.default = _default;
+var _default = exports.default = groupCustomPropertiesByCtx;

package/es/lib/utils/matchString.js

@@ -8,7 +8,7 @@ var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const matchString = function (match, str) {
   let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  const regex = new RegExp("".concat(match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')), 'gi');
+  const regex = new RegExp(`${match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')}`, 'gi');
   if (ignoreNull && !match) {
     const nullRegex = /a^/gi; // Should match nothing
 
@@ -16,5 +16,4 @@ const matchString = function (match, str) {
   }
   return [str.split(regex), regex];
 };
-var _default = matchString;
-exports.default = _default;
+var _default = exports.default = matchString;

package/es/lib/utils/modConfigEntriesQueryKey.js

@@ -20,5 +20,4 @@ const modConfigEntriesQueryKey = function () {
   }
   return namespace;
 };
-var _default = modConfigEntriesQueryKey;
-exports.default = _default;
+var _default = exports.default = modConfigEntriesQueryKey;

package/es/lib/utils/parseErrorResponse.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const parseErrorResponse = async responseObj => {
-  var _ref, _ref$find;
   let errorResp;
-  const code = responseObj === null || responseObj === void 0 ? void 0 : responseObj.status;
-  const contentType = (_ref = [...(responseObj === null || responseObj === void 0 ? void 0 : responseObj.headers)]) === null || _ref === void 0 ? void 0 : (_ref$find = _ref.find(header => header[0] === 'content-type')) === null || _ref$find === void 0 ? void 0 : _ref$find[1];
+  const code = responseObj?.status;
+  const contentType = [...responseObj?.headers]?.find(header => header[0] === 'content-type')?.[1];
   if (contentType.includes('json')) {
     errorResp = await responseObj.json();
   } else {
@@ -26,5 +25,4 @@ const parseErrorResponse = async responseObj => {
   }
   return errorResp;
 };
-var _default = parseErrorResponse;
-exports.default = _default;
+var _default = exports.default = parseErrorResponse;

package/es/lib/utils/parseKiwtQueryGroups.js

@@ -44,8 +44,7 @@ const parseKiwtQueryGroups = query => {
     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((element, index) => {
-      var _skipCount;
+    parseArray?.every((element, index) => {
       if (skipCount[nestLevel] > 0) {
         skipCount[nestLevel] -= 1;
         return true; // Equivalent to BREAK -- move onto next element
@@ -57,14 +56,14 @@ const parseKiwtQueryGroups = query => {
       }
 
       // At the levels below all of the following will need
-      skipCount = (_skipCount = skipCount) === null || _skipCount === void 0 ? void 0 : _skipCount.map((n, i) => {
+      skipCount = 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?.push(element);
       } else if (element === ')') {
         // Remove the corresponding skipCount level because we're going down a nesting level
         skipCount.pop();
@@ -74,7 +73,7 @@ const parseKiwtQueryGroups = query => {
         // Add next index to skipcount for the nesting
         skipCount.push(0);
         unclosedParens += 1;
-        group.push(groupParser(parseArray.slice(index + 1, parseArray === null || parseArray === void 0 ? void 0 : parseArray.length), nestLevel + 1));
+        group.push(groupParser(parseArray.slice(index + 1, parseArray?.length), nestLevel + 1));
       }
 
       // If all is well, continue on parsing
@@ -90,5 +89,4 @@ const parseKiwtQueryGroups = query => {
   }
   return outputGroups;
 };
-var _default = parseKiwtQueryGroups;
-exports.default = _default;
+var _default = exports.default = parseKiwtQueryGroups;

package/es/lib/utils/parseModConfigEntry.js

@@ -17,5 +17,4 @@ const parseModConfigEntry = setting => {
 
   return parsedSettings;
 };
-var _default = parseModConfigEntry;
-exports.default = _default;
+var _default = exports.default = parseModConfigEntry;

package/es/lib/utils/refdataOptions.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = {
+var _default = exports.default = {
   filterKeys: {
     DescKey: 'desc'
   },
@@ -13,5 +13,4 @@ var _default = {
   }],
   stats: false,
   max: 100
-};
-exports.default = _default;
+};

package/es/lib/utils/refdataQueryKey.js

@@ -11,5 +11,4 @@ const refdataQueryKey = desc => {
   }
   return keyArray;
 };
-var _default = refdataQueryKey;
-exports.default = _default;
+var _default = exports.default = refdataQueryKey;