@k-int/stripes-kint-components 5.6.0 → 5.7.0

package/es/lib/hooks/useQIndex.js

@@ -14,10 +14,10 @@ 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) {
       let newQuery;
       if (newQindex !== '') {
         newQuery = {
@@ -32,13 +32,13 @@ const useQIndex = () => {
       }
       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];

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 || {};

package/es/lib/hooks/useTemplates.js

@@ -18,16 +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 = 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,32 +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 || (_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 = 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 {

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, {

package/es/lib/utils/buildUrl.js

@@ -17,13 +17,12 @@ function removeEmpty(obj) {
   return cleanObj;
 }
 function buildUrl(location, values, basePath) {
-  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);
+  const locationQuery = 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));
+    url += `?${_queryString.default.stringify(params)}`;
   }
   return url;
 }

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 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);
+  let returnString = `${queryObject.path}${queryObject.comparator}`;
   if (queryObject.value) {
-    returnString += "".concat(queryObject.value);
+    returnString += `${queryObject.value}`;
   }
   return returnString;
 };
@@ -20,17 +20,17 @@ const deparseKiwtQueryFilters = queryArray => {
     let returnString = '';
     queryArray.forEach(qa => {
       if (Array.isArray(qa)) {
-        returnString += "(".concat(deparseKiwtQueryFilters(qa), ")");
+        returnString += `(${deparseKiwtQueryFilters(qa)})`;
       } else if (typeof qa === 'string') {
         returnString += qa;
       } else {
         // Assuming object at this stage
-        returnString += "".concat(deparseKiwtQueryFiltersObject(qa));
+        returnString += `${deparseKiwtQueryFiltersObject(qa)}`;
       }
     });
     return returnString.trim();
   } else {
-    throw new Error("deparseKiwtQuery expects a parameter of type Array, passed: ".concat(queryArray));
+    throw new Error(`deparseKiwtQuery expects a parameter of type Array, passed: ${queryArray}`);
   }
 };
 var _default = exports.default = deparseKiwtQueryFilters;

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

@@ -21,7 +21,7 @@ const parseKiwtQueryFiltersRecursive = query => {
       return (0, _parseKiwtQueryString.default)(query);
     }
   } else {
-    throw new Error("Unexpected query type: ".concat(query));
+    throw new Error(`Unexpected query type: ${query}`);
   }
 };
 
@@ -33,7 +33,7 @@ const parseKiwtQueryFilters = queryString => {
     const queryGroups = (0, _parseKiwtQueryGroups.default)(queryString);
     return parseKiwtQueryFiltersRecursive(queryGroups);
   } else {
-    throw new Error("parseKiwtQuery expects a parameter of type String, passed: ".concat(queryString));
+    throw new Error(`parseKiwtQuery expects a parameter of type String, passed: ${queryString}`);
   }
 };
 

package/es/lib/utils/filterParsers/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 || 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 || 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

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

@@ -17,7 +17,7 @@ const FIRST = 0;
 const SECOND = 1;
 const THIRD = 2;
 const parseKiwtQueryString = queryString => {
-  const comparatorMatch = new RegExp("(".concat(_comparators.default.join('|'), ")"));
+  const comparatorMatch = new RegExp(`(${_comparators.default.join('|')})`);
   // See parseKiwtQueryGroups for breakdown of why this filter is needed
   const splitString = queryString.split(comparatorMatch).filter(Boolean);
 

package/es/lib/utils/generateKiwtQueryParams.js

@@ -17,40 +17,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;
+    if (groupValues?.AND && Array.isArray(groupValues.AND) || groupValues?.OR && Array.isArray(groupValues.OR)) {
       // AND takes precedence
       if (groupValues.AND) {
-        var _groupValues$AND;
-        return negationAndNesting(groupValues === null || groupValues === void 0 || (_groupValues$AND = groupValues.AND) === null || _groupValues$AND === void 0 || (_groupValues$AND = _groupValues$AND.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$AND === void 0 ? void 0 : _groupValues$AND.join('&&'));
+        return negationAndNesting(groupValues?.AND?.map(gvo => buildFilterOptionBlock(gvo, true, encode))?.join('&&'));
       }
-      return negationAndNesting(groupValues === null || groupValues === void 0 || (_groupValues$OR = groupValues.OR) === null || _groupValues$OR === void 0 || (_groupValues$OR = _groupValues$OR.map(gvo => buildFilterOptionBlock(gvo, true, encode))) === null || _groupValues$OR === void 0 ? void 0 : _groupValues$OR.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);
@@ -108,9 +104,8 @@ const generateKiwtQueryParams = function (options, nsValues) {
   } = options;
   const paramsArray = [];
   if (query) {
-    var _split, _ref;
-    paramsArray.push(...((_split = (_ref = qindex || searchKey) === null || _ref === void 0 ? void 0 : _ref.split(',')) !== null && _split !== 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)
@@ -118,71 +113,67 @@ 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$split, _filter$trim;
-      const [filterName, ...filterRest] = (_filter$trim$split = (_filter$trim = filter.trim()) === null || _filter$trim === void 0 ? void 0 : _filter$trim.split('.')) !== null && _filter$trim$split !== 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);
     });
 
     // We now have a filterMap of shape { status: ['active', 'cancelled'], type: ['local'] }
-    Object.entries(filterMap).forEach(_ref2 => {
-      let [filterName, filterValues] = _ref2;
+    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
         const filterString = filterValues.map(v => {
-          var _filterConfigEntry$va;
-          const fceValue = filterConfigEntry === null || filterConfigEntry === void 0 || (_filterConfigEntry$va = filterConfigEntry.values) === null || _filterConfigEntry$va === void 0 || (_filterConfigEntry$va = _filterConfigEntry$va.find(fce => fce.name === v)) === null || _filterConfigEntry$va === void 0 ? void 0 : _filterConfigEntry$va.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 ? 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$split, _sort$trim;
-    paramsArray.push(...((_sort$trim$split = (_sort$trim = sort.trim()) === null || _sort$trim === void 0 ? void 0 : _sort$trim.split(',')) !== null && _sort$trim$split !== 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;
 };

package/es/lib/utils/groupCustomPropertiesByCtx.js

@@ -7,12 +7,11 @@ 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;
   }, {});
 };

package/es/lib/utils/matchString.js

@@ -7,28 +7,26 @@ exports.default = void 0;
 var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const matchString = function (match, str) {
-  var _str$split2;
   let ignoreNull = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   let simpleSplit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   // Simple regex split -- this is default behaviour
-  const regexSimple = new RegExp("".concat(match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')), 'gi');
+  const regexSimple = new RegExp(`${match.split(/(\s+)/).filter(h => h.trim()).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')}`, 'gi');
 
   // Split Elivis "The King" Presley into [Elvis, The King, Presley]
-  const regex = new RegExp("".concat(match.split(/(?!\B"[^"]*)\s+(?![^"]*"\B)/).filter(h => h.trim()).map(quotedSection => {
+  const regex = new RegExp(`${match.split(/(?!\B"[^"]*)\s+(?![^"]*"\B)/).filter(h => h.trim()).map(quotedSection => {
     if (quotedSection.charAt(0) === '"' && quotedSection.charAt(quotedSection.length - 1) === '"') {
       return quotedSection.slice(1, quotedSection.length - 1);
     }
     return quotedSection;
-  }).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')), 'gi');
+  }).map(hl => '(' + (0, _escapeRegExp.default)(hl) + ')').join('|')}`, 'gi');
   if (ignoreNull && !match) {
     const nullRegex = /a^/gi; // Should match nothing
 
     return [[str], nullRegex];
   }
   if (simpleSplit) {
-    var _str$split;
-    return [(_str$split = str.split(regexSimple)) === null || _str$split === void 0 ? void 0 : _str$split.filter(s => s && s.trim()), regexSimple];
+    return [str.split(regexSimple)?.filter(s => s && s.trim()), regexSimple];
   }
-  return [(_str$split2 = str.split(regex)) === null || _str$split2 === void 0 ? void 0 : _str$split2.filter(s => s && s.trim()), regex];
+  return [str.split(regex)?.filter(s => s && s.trim()), regex];
 };
 var _default = exports.default = matchString;

package/es/lib/utils/parseErrorResponse.js

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const parseErrorResponse = async responseObj => {
-  var _ref;
-  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 || (_ref = _ref.find(header => header[0] === 'content-type')) === null || _ref === void 0 ? void 0 : _ref[1];
+  let errorResp = {
+    message: 'something went wrong'
+  };
+  if (!responseObj) {
+    return errorResp;
+  }
+  const code = responseObj?.status;
+  const contentType = [...responseObj?.headers]?.find(header => header[0] === 'content-type')?.[1];
   if (contentType.includes('json')) {
     errorResp = await responseObj.json();
   } else {

package/es/lib/utils/selectorSafe.js

@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const selectorSafe = string => {
-  var _string$normalize;
   // Normalise to separate diacritics from their base characters as "marks"
   // then strip out all marks.
-  return (_string$normalize = string.normalize('NFKD')) === null || _string$normalize === void 0 || (_string$normalize = _string$normalize.replace(/\p{M}/gu, '')
+  return string.normalize('NFKD')?.replace(/\p{M}/gu, '')
   // Then swap out any non-letter/number characters (Also ignore - and _) for `_`
-  ) === null || _string$normalize === void 0 ? void 0 : _string$normalize.replace(/[^\p{L}\p{N}\-_]/gu, '_');
+  ?.replace(/[^\p{L}\p{N}\-_]/gu, '_');
 };
 var _default = exports.default = selectorSafe;
 /*

package/es/lib/utils/sortByLabel.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const sortByLabel = (a, b) => {
-  var _a$label$toLowerCase, _a$label, _a$id, _b$label$toLowerCase, _b$label, _b$id;
-  const al = (_a$label$toLowerCase = (_a$label = a.label) === null || _a$label === void 0 ? void 0 : _a$label.toLowerCase()) !== null && _a$label$toLowerCase !== void 0 ? _a$label$toLowerCase : (_a$id = a.id) === null || _a$id === void 0 ? void 0 : _a$id.toLowerCase();
-  const bl = (_b$label$toLowerCase = (_b$label = b.label) === null || _b$label === void 0 ? void 0 : _b$label.toLowerCase()) !== null && _b$label$toLowerCase !== void 0 ? _b$label$toLowerCase : (_b$id = b.id) === null || _b$id === void 0 ? void 0 : _b$id.toLowerCase();
+  const al = a.label?.toLowerCase() ?? a.id?.toLowerCase();
+  const bl = b.label?.toLowerCase() ?? b.id?.toLowerCase();
   if (al < bl) {
     return -1;
   }

package/es/lib/validators/validators.js

@@ -64,7 +64,7 @@ const invalidNumber = function (value, _min, _max, intlKey, intlNS) {
       id: "errors.invalidNumber",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.invalidNumberError
+      overrideValue: labelOverrides?.invalidNumberError
     });
   }
   return undefined;
@@ -77,7 +77,7 @@ const rangeOverflow = function (value, min, max, intlKey, intlNS) {
       id: "errors.decimalValueNotInRange",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.decimalValueNotInRangeError,
+      overrideValue: labelOverrides?.decimalValueNotInRangeError,
       values: {
         min,
         max
@@ -94,7 +94,7 @@ const rangeUnderflow = function (value, min, max, intlKey, intlNS) {
       id: "errors.decimalValueNotInRange",
       intlKey: intlKey,
       intlNS: intlNS,
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.decimalValueNotInRangeError,
+      overrideValue: labelOverrides?.decimalValueNotInRangeError,
       values: {
         min,
         max

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@k-int/stripes-kint-components",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "description": "Stripes Component library for K-Int specific applications",
   "sideEffects": [
     "*.css"
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "lint": "eslint src",
+    "lint": "eslint src --resolve-plugins-relative-to ./node_modules/@folio/eslint-config-stripes/",
     "test": "yarn run test:jest",
     "test:jest": "jest --ci --coverage",
     "build:es": "rm -rf ./es && babel --extensions .js --ignore ./src/**/tests/**/* ./src --out-dir es",
@@ -29,7 +29,6 @@
   "devDependencies": {
     "@babel/cli": "^7.18.10",
     "@babel/core": "^7.18.6",
-    "@babel/eslint-parser": "^7.15.0",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-decorators": "^7.12.1",
     "@babel/plugin-proposal-function-sent": "^7.18.6",
@@ -58,8 +57,7 @@
     "classnames": ">=2.2.6",
     "core-js": "^3.6.1",
     "eslint": "^8.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.4.2",
+    "eslint-plugin-jest": "^28.0.0",
     "graphql": "^16.0.0",
     "identity-obj-proxy": "^3.0.0",
     "moment": "^2.29.4",