@nebula.js/stardust 5.2.0 → 5.3.0

package/core/esm/dev.js

@@ -1,5 +1,5 @@
 /*
-* @nebula.js/stardust v5.2.0
+* @nebula.js/stardust v5.3.0
 * Copyright (c) 2024 QlikTech International AB
 * Released under the MIT license.
 */
@@ -717,14 +717,14 @@ function _defineProperty(e, r, t) {
     writable: !0
   }) : e[r] = t, e;
 }
-function _extends$2() {
-  return _extends$2 = Object.assign ? Object.assign.bind() : function (n) {
+function _extends$6() {
+  return _extends$6 = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
     return n;
-  }, _extends$2.apply(null, arguments);
+  }, _extends$6.apply(null, arguments);
 }
 function ownKeys(e, r) {
   var t = Object.keys(e);
@@ -751,18 +751,18 @@ function _objectWithoutProperties(e, t) {
   if (null == e) return {};
   var o,
     r,
-    i = _objectWithoutPropertiesLoose$1(e, t);
+    i = _objectWithoutPropertiesLoose$2(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
-function _objectWithoutPropertiesLoose$1(r, e) {
+function _objectWithoutPropertiesLoose$2(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -3923,24 +3923,32 @@ var formatMuiErrorMessage = /*#__PURE__*/Object.freeze({
 
 var THEME_ID = '$$material';
 
-function _extends$1() {
-  return _extends$1 = Object.assign ? Object.assign.bind() : function (n) {
-    for (var e = 1; e < arguments.length; e++) {
-      var t = arguments[e];
-      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+function _extends$5() {
+  _extends$5 = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
     }
-    return n;
-  }, _extends$1.apply(null, arguments);
+    return target;
+  };
+  return _extends$5.apply(this, arguments);
 }
 
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
-    t[n] = r[n];
+function _objectWithoutPropertiesLoose$1(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
   }
-  return t;
+  return target;
 }
 
 /*
@@ -5243,7 +5251,7 @@ function GlobalStyles(props) {
 }
 
 /**
- * @mui/styled-engine v5.15.14
+ * @mui/styled-engine v5.16.4
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -5274,6 +5282,49 @@ var styledEngine = /*#__PURE__*/Object.freeze({
 	keyframes: keyframes
 });
 
+function _extends$4() {
+  _extends$4 = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends$4.apply(this, arguments);
+}
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+  return target;
+}
+
+function _extends$3() {
+  _extends$3 = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends$3.apply(this, arguments);
+}
+
 // https://github.com/sindresorhus/is-plain-obj/blob/main/index.js
 function isPlainObject(item) {
   if (typeof item !== 'object' || item === null) {
@@ -5295,7 +5346,7 @@ function deepClone(source) {
 function deepmerge$1(target, source, options = {
   clone: true
 }) {
-  const output = options.clone ? _extends$1({}, target) : target;
+  const output = options.clone ? _extends$3({}, target) : target;
   if (isPlainObject(target) && isPlainObject(source)) {
     Object.keys(source).forEach(key => {
       if (isPlainObject(source[key]) &&
@@ -5328,7 +5379,7 @@ const sortBreakpointsValues = values => {
   // Sort in ascending order
   breakpointsAsArray.sort((breakpoint1, breakpoint2) => breakpoint1.val - breakpoint2.val);
   return breakpointsAsArray.reduce((acc, obj) => {
-    return _extends$1({}, acc, {
+    return _extends$4({}, acc, {
       [obj.key]: obj.val
     });
   }, {});
@@ -5385,7 +5436,7 @@ function createBreakpoints(breakpoints) {
     }
     return between(key, keys[keys.indexOf(key) + 1]).replace('@media', '@media not all and');
   }
-  return _extends$1({
+  return _extends$4({
     keys,
     values: sortedValues,
     up,
@@ -6432,15 +6483,15 @@ function createTheme$2(options = {}, ...args) {
     direction: 'ltr',
     components: {},
     // Inject component definitions.
-    palette: _extends$1({
+    palette: _extends$4({
       mode: 'light'
     }, paletteInput),
     spacing,
-    shape: _extends$1({}, shape, shapeInput)
+    shape: _extends$4({}, shape, shapeInput)
   }, other);
   muiTheme.applyStyles = applyStyles;
   muiTheme = args.reduce((acc, argument) => deepmerge$1(acc, argument), muiTheme);
-  muiTheme.unstable_sxConfig = _extends$1({}, defaultSxConfig, other == null ? void 0 : other.unstable_sxConfig);
+  muiTheme.unstable_sxConfig = _extends$4({}, defaultSxConfig, other == null ? void 0 : other.unstable_sxConfig);
   muiTheme.unstable_sx = function sx(props) {
     return styleFunctionSx$1({
       sx: props,
@@ -6505,12 +6556,12 @@ function extendSxProp(props) {
       if (!isPlainObject(result)) {
         return systemProps;
       }
-      return _extends$1({}, systemProps, result);
+      return _extends$4({}, systemProps, result);
     };
   } else {
-    finalSx = _extends$1({}, systemProps, inSx);
+    finalSx = _extends$4({}, systemProps, inSx);
   }
-  return _extends$1({}, otherProps, {
+  return _extends$4({}, otherProps, {
     sx: finalSx
   });
 }
@@ -6653,10 +6704,10 @@ var getDisplayName = /*#__PURE__*/Object.freeze({
  * @returns {object} resolved props
  */
 function resolveProps(defaultProps, props) {
-  const output = _extends$1({}, props);
+  const output = _extends$3({}, props);
   Object.keys(defaultProps).forEach(propName => {
     if (propName.toString().match(/^(components|slots)$/)) {
-      output[propName] = _extends$1({}, defaultProps[propName], output[propName]);
+      output[propName] = _extends$3({}, defaultProps[propName], output[propName]);
     } else if (propName.toString().match(/^(componentsProps|slotProps)$/)) {
       const defaultSlotProps = defaultProps[propName] || {};
       const slotProps = props[propName];
@@ -6668,7 +6719,7 @@ function resolveProps(defaultProps, props) {
         // Reduce the iteration if the default slot props is empty
         output[propName] = slotProps;
       } else {
-        output[propName] = _extends$1({}, slotProps);
+        output[propName] = _extends$3({}, slotProps);
         Object.keys(defaultSlotProps).forEach(slotPropName => {
           output[propName][slotPropName] = resolveProps(defaultSlotProps[slotPropName], slotProps[slotPropName]);
         });
@@ -6680,36 +6731,6 @@ function resolveProps(defaultProps, props) {
   return output;
 }
 
-function getThemeProps(params) {
-  const {
-    theme,
-    name,
-    props
-  } = params;
-  if (!theme || !theme.components || !theme.components[name] || !theme.components[name].defaultProps) {
-    return props;
-  }
-  return resolveProps(theme.components[name].defaultProps, props);
-}
-
-function useThemeProps$1({
-  props,
-  name,
-  defaultTheme,
-  themeId
-}) {
-  let theme = useTheme$3(defaultTheme);
-  if (themeId) {
-    theme = theme[themeId] || theme;
-  }
-  const mergedProps = getThemeProps({
-    theme,
-    name,
-    props
-  });
-  return mergedProps;
-}
-
 /**
  * A version of `React.useLayoutEffect` that does not show a warning when server-side rendering.
  * This is useful for effects that are only needed for client-side rendering but not for SSR.
@@ -6728,6 +6749,21 @@ var clamp = /*#__PURE__*/Object.freeze({
 	default: clamp$1
 });
 
+function _extends$2() {
+  _extends$2 = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends$2.apply(this, arguments);
+}
+
 /**
  * Safe chained function.
  *
@@ -7125,7 +7161,7 @@ function mergeOuterLocalTheme(outerTheme, localTheme) {
     const mergedTheme = localTheme(outerTheme);
     return mergedTheme;
   }
-  return _extends$1({}, outerTheme, localTheme);
+  return _extends$2({}, outerTheme, localTheme);
 }
 
 /**
@@ -7159,18 +7195,62 @@ function RtlProvider(_ref) {
       value
     } = _ref,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$e);
-  return /*#__PURE__*/jsxRuntimeExports.jsx(RtlContext.Provider, _extends$1({
+  return /*#__PURE__*/jsxRuntimeExports.jsx(RtlContext.Provider, _extends$4({
     value: value != null ? value : true
   }, props));
 }
 
+const PropsContext = /*#__PURE__*/React.createContext(undefined);
+function DefaultPropsProvider({
+  value,
+  children
+}) {
+  return /*#__PURE__*/jsxRuntimeExports.jsx(PropsContext.Provider, {
+    value: value,
+    children: children
+  });
+}
+function getThemeProps(params) {
+  const {
+    theme,
+    name,
+    props
+  } = params;
+  if (!theme || !theme.components || !theme.components[name]) {
+    return props;
+  }
+  const config = theme.components[name];
+  if (config.defaultProps) {
+    // compatible with v5 signature
+    return resolveProps(config.defaultProps, props);
+  }
+  if (!config.styleOverrides && !config.variants) {
+    // v6 signature, no property 'defaultProps'
+    return resolveProps(config, props);
+  }
+  return props;
+}
+function useDefaultProps$1({
+  props,
+  name
+}) {
+  const ctx = React.useContext(PropsContext);
+  return getThemeProps({
+    props,
+    name,
+    theme: {
+      components: ctx
+    }
+  });
+}
+
 const EMPTY_THEME = {};
 function useThemeScoping(themeId, upperTheme, localTheme, isPrivate = false) {
   return React.useMemo(() => {
     const resolvedTheme = themeId ? upperTheme[themeId] || upperTheme : upperTheme;
     if (typeof localTheme === 'function') {
       const mergedTheme = localTheme(resolvedTheme);
-      const result = themeId ? _extends$1({}, upperTheme, {
+      const result = themeId ? _extends$4({}, upperTheme, {
         [themeId]: mergedTheme
       }) : mergedTheme;
       // must return a function for the private theme to NOT merge with the upper theme.
@@ -7180,9 +7260,9 @@ function useThemeScoping(themeId, upperTheme, localTheme, isPrivate = false) {
       }
       return result;
     }
-    return themeId ? _extends$1({}, upperTheme, {
+    return themeId ? _extends$4({}, upperTheme, {
       [themeId]: localTheme
-    }) : _extends$1({}, upperTheme, localTheme);
+    }) : _extends$4({}, upperTheme, localTheme);
   }, [themeId, upperTheme, localTheme, isPrivate]);
 }
 
@@ -7210,7 +7290,10 @@ function ThemeProvider$1(props) {
       value: engineTheme,
       children: /*#__PURE__*/jsxRuntimeExports.jsx(RtlProvider, {
         value: rtlValue,
-        children: children
+        children: /*#__PURE__*/jsxRuntimeExports.jsx(DefaultPropsProvider, {
+          value: engineTheme == null ? void 0 : engineTheme.components,
+          children: children
+        })
       })
     })
   });
@@ -7227,8 +7310,8 @@ function adaptV4Theme(inputTheme) {
       props = {},
       styleOverrides = {}
     } = inputTheme,
-    other = _objectWithoutPropertiesLoose(inputTheme, _excluded$d);
-  const theme = _extends$1({}, other, {
+    other = _objectWithoutPropertiesLoose$1(inputTheme, _excluded$d);
+  const theme = _extends$5({}, other, {
     components: {}
   });
 
@@ -7262,13 +7345,13 @@ function adaptV4Theme(inputTheme) {
   // theme.mixins.gutters
   const breakpoints = createBreakpoints(inputTheme.breakpoints || {});
   const spacing = theme.spacing;
-  theme.mixins = _extends$1({
+  theme.mixins = _extends$5({
     gutters: (styles = {}) => {
-      return _extends$1({
+      return _extends$5({
         paddingLeft: spacing(2),
         paddingRight: spacing(2)
       }, styles, {
-        [breakpoints.up('sm')]: _extends$1({
+        [breakpoints.up('sm')]: _extends$5({
           paddingLeft: spacing(3),
           paddingRight: spacing(3)
         }, styles[breakpoints.up('sm')])
@@ -7279,9 +7362,9 @@ function adaptV4Theme(inputTheme) {
       type: typeInput,
       mode: modeInput
     } = palette,
-    paletteRest = _objectWithoutPropertiesLoose(palette, _excluded2$2);
+    paletteRest = _objectWithoutPropertiesLoose$1(palette, _excluded2$2);
   const finalMode = modeInput || typeInput || 'light';
-  theme.palette = _extends$1({
+  theme.palette = _extends$5({
     // theme.palette.text.hint
     text: {
       hint: finalMode === 'dark' ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.38)'
@@ -7293,7 +7376,7 @@ function adaptV4Theme(inputTheme) {
 }
 
 function createMixins(breakpoints, mixins) {
-  return _extends$1({
+  return _extends$5({
     toolbar: {
       minHeight: 56,
       [breakpoints.up('xs')]: {
@@ -7310,24 +7393,24 @@ function createMixins(breakpoints, mixins) {
 
 var colorManipulator = {};
 
-var interopRequireDefault = {exports: {}};
+var interopRequireDefault$1 = {exports: {}};
 
 (function (module) {
-	function _interopRequireDefault(e) {
-	  return e && e.__esModule ? e : {
-	    "default": e
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : {
+	    "default": obj
 	  };
 	}
 	module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports; 
-} (interopRequireDefault));
+} (interopRequireDefault$1));
 
-var interopRequireDefaultExports = interopRequireDefault.exports;
+var interopRequireDefaultExports$1 = interopRequireDefault$1.exports;
 
 var require$$1 = /*@__PURE__*/getAugmentedNamespace(formatMuiErrorMessage);
 
 var require$$2 = /*@__PURE__*/getAugmentedNamespace(clamp);
 
-var _interopRequireDefault$2 = interopRequireDefaultExports;
+var _interopRequireDefault$2 = interopRequireDefaultExports$1;
 Object.defineProperty(colorManipulator, "__esModule", {
   value: true
 });
@@ -7984,7 +8067,7 @@ function createPalette(palette) {
       contrastThreshold = 3,
       tonalOffset = 0.2
     } = palette,
-    other = _objectWithoutPropertiesLoose(palette, _excluded$c);
+    other = _objectWithoutPropertiesLoose$1(palette, _excluded$c);
   const primary = palette.primary || getDefaultPrimary(mode);
   const secondary = palette.secondary || getDefaultSecondary(mode);
   const error = palette.error || getDefaultError(mode);
@@ -8006,7 +8089,7 @@ function createPalette(palette) {
     lightShade = 300,
     darkShade = 700
   }) => {
-    color = _extends$1({}, color);
+    color = _extends$5({}, color);
     if (!color.main && color[mainShade]) {
       color.main = color[mainShade];
     }
@@ -8027,9 +8110,9 @@ function createPalette(palette) {
     dark: dark$1,
     light: light$1
   };
-  const paletteOutput = deepmerge$1(_extends$1({
+  const paletteOutput = deepmerge$1(_extends$5({
     // A collection of common colors.
-    common: _extends$1({}, common),
+    common: _extends$5({}, common),
     // prevent mutable object.
     // The palette mode, can be light or dark.
     mode,
@@ -8114,10 +8197,10 @@ function createTypography(palette, typography) {
       allVariants,
       pxToRem: pxToRem2
     } = _ref,
-    other = _objectWithoutPropertiesLoose(_ref, _excluded$b);
+    other = _objectWithoutPropertiesLoose$1(_ref, _excluded$b);
   const coef = fontSize / 14;
   const pxToRem = pxToRem2 || (size => `${size / htmlFontSize * coef}rem`);
-  const buildVariant = (fontWeight, size, lineHeight, letterSpacing, casing) => _extends$1({
+  const buildVariant = (fontWeight, size, lineHeight, letterSpacing, casing) => _extends$5({
     fontFamily,
     fontWeight,
     fontSize: pxToRem(size),
@@ -8149,7 +8232,7 @@ function createTypography(palette, typography) {
       letterSpacing: 'inherit'
     }
   };
-  return deepmerge$1(_extends$1({
+  return deepmerge$1(_extends$5({
     htmlFontSize,
     pxToRem,
     fontFamily,
@@ -8216,18 +8299,18 @@ function getAutoHeightDuration(height) {
   return Math.round((4 + 15 * constant ** 0.25 + constant / 5) * 10);
 }
 function createTransitions(inputTransitions) {
-  const mergedEasing = _extends$1({}, easing, inputTransitions.easing);
-  const mergedDuration = _extends$1({}, duration, inputTransitions.duration);
+  const mergedEasing = _extends$5({}, easing, inputTransitions.easing);
+  const mergedDuration = _extends$5({}, duration, inputTransitions.duration);
   const create = (props = ['all'], options = {}) => {
     const {
         duration: durationOption = mergedDuration.standard,
         easing: easingOption = mergedEasing.easeInOut,
         delay = 0
       } = options;
-      _objectWithoutPropertiesLoose(options, _excluded$a);
+      _objectWithoutPropertiesLoose$1(options, _excluded$a);
     return (Array.isArray(props) ? props : [props]).map(animatedProp => `${animatedProp} ${typeof durationOption === 'string' ? durationOption : formatMs(durationOption)} ${easingOption} ${typeof delay === 'string' ? delay : formatMs(delay)}`).join(',');
   };
-  return _extends$1({
+  return _extends$5({
     getAutoHeightDuration,
     create
   }, inputTransitions, {
@@ -8257,7 +8340,7 @@ function createTheme(options = {}, ...args) {
       transitions: transitionsInput = {},
       typography: typographyInput = {}
     } = options,
-    other = _objectWithoutPropertiesLoose(options, _excluded$9);
+    other = _objectWithoutPropertiesLoose$1(options, _excluded$9);
   if (options.vars) {
     throw new Error(formatMuiErrorMessage$1(18));
   }
@@ -8270,11 +8353,11 @@ function createTheme(options = {}, ...args) {
     shadows: shadows.slice(),
     typography: createTypography(palette, typographyInput),
     transitions: createTransitions(transitionsInput),
-    zIndex: _extends$1({}, zIndex)
+    zIndex: _extends$5({}, zIndex)
   });
   muiTheme = deepmerge$1(muiTheme, other);
   muiTheme = args.reduce((acc, argument) => deepmerge$1(acc, argument), muiTheme);
-  muiTheme.unstable_sxConfig = _extends$1({}, defaultSxConfig, other == null ? void 0 : other.unstable_sxConfig);
+  muiTheme.unstable_sxConfig = _extends$5({}, defaultSxConfig, other == null ? void 0 : other.unstable_sxConfig);
   muiTheme.unstable_sx = function sx(props) {
     return styleFunctionSx$1({
       sx: props,
@@ -8291,40 +8374,33 @@ function useTheme$1() {
   return theme[THEME_ID] || theme;
 }
 
-function useThemeProps({
-  props,
-  name
-}) {
-  return useThemeProps$1({
-    props,
-    name,
-    defaultTheme,
-    themeId: THEME_ID
-  });
-}
-
 var createStyled$1 = {};
 
-var _extends = {exports: {}};
+var _extends$1 = {exports: {}};
 
 var hasRequired_extends;
 
 function require_extends () {
-	if (hasRequired_extends) return _extends.exports;
+	if (hasRequired_extends) return _extends$1.exports;
 	hasRequired_extends = 1;
 	(function (module) {
 		function _extends() {
-		  return (module.exports = _extends = Object.assign ? Object.assign.bind() : function (n) {
-		    for (var e = 1; e < arguments.length; e++) {
-		      var t = arguments[e];
-		      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+		  module.exports = _extends = Object.assign ? Object.assign.bind() : function (target) {
+		    for (var i = 1; i < arguments.length; i++) {
+		      var source = arguments[i];
+		      for (var key in source) {
+		        if (Object.prototype.hasOwnProperty.call(source, key)) {
+		          target[key] = source[key];
+		        }
+		      }
 		    }
-		    return n;
-		  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _extends.apply(null, arguments);
+		    return target;
+		  }, module.exports.__esModule = true, module.exports["default"] = module.exports;
+		  return _extends.apply(this, arguments);
 		}
 		module.exports = _extends, module.exports.__esModule = true, module.exports["default"] = module.exports; 
-	} (_extends));
-	return _extends.exports;
+	} (_extends$1));
+	return _extends$1.exports;
 }
 
 var objectWithoutPropertiesLoose = {exports: {}};
@@ -8335,14 +8411,17 @@ function requireObjectWithoutPropertiesLoose () {
 	if (hasRequiredObjectWithoutPropertiesLoose) return objectWithoutPropertiesLoose.exports;
 	hasRequiredObjectWithoutPropertiesLoose = 1;
 	(function (module) {
-		function _objectWithoutPropertiesLoose(r, e) {
-		  if (null == r) return {};
-		  var t = {};
-		  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-		    if (e.indexOf(n) >= 0) continue;
-		    t[n] = r[n];
+		function _objectWithoutPropertiesLoose(source, excluded) {
+		  if (source == null) return {};
+		  var target = {};
+		  var sourceKeys = Object.keys(source);
+		  var key, i;
+		  for (i = 0; i < sourceKeys.length; i++) {
+		    key = sourceKeys[i];
+		    if (excluded.indexOf(key) >= 0) continue;
+		    target[key] = source[key];
 		  }
-		  return t;
+		  return target;
 		}
 		module.exports = _objectWithoutPropertiesLoose, module.exports.__esModule = true, module.exports["default"] = module.exports; 
 	} (objectWithoutPropertiesLoose));
@@ -8361,7 +8440,7 @@ var require$$7 = /*@__PURE__*/getAugmentedNamespace(createTheme$1);
 
 var require$$8 = /*@__PURE__*/getAugmentedNamespace(styleFunctionSx);
 
-var _interopRequireDefault$1 = interopRequireDefaultExports;
+var _interopRequireDefault$1 = interopRequireDefaultExports$1;
 Object.defineProperty(createStyled$1, "__esModule", {
   value: true
 });
@@ -8612,27 +8691,55 @@ function ThemeProvider(_ref) {
   let {
       theme: themeInput
     } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
+    props = _objectWithoutPropertiesLoose$1(_ref, _excluded$7);
   const scopedTheme = themeInput[THEME_ID];
-  return /*#__PURE__*/jsxRuntimeExports.jsx(ThemeProvider$1, _extends$1({}, props, {
+  return /*#__PURE__*/jsxRuntimeExports.jsx(ThemeProvider$1, _extends$5({}, props, {
     themeId: scopedTheme ? THEME_ID : undefined,
     theme: scopedTheme || themeInput
   }));
 }
 
-function _setPrototypeOf(t, e) {
-  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
-    return t.__proto__ = e, t;
-  }, _setPrototypeOf(t, e);
+function useDefaultProps(params) {
+  return useDefaultProps$1(params);
+}
+
+function _extends() {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+  return _extends.apply(this, arguments);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+  return _setPrototypeOf(o, p);
 }
 
-function _inheritsLoose(t, o) {
-  t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
+function _inheritsLoose(subClass, superClass) {
+  subClass.prototype = Object.create(superClass.prototype);
+  subClass.prototype.constructor = subClass;
+  _setPrototypeOf(subClass, superClass);
 }
 
-function _assertThisInitialized(e) {
-  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  return e;
+function _assertThisInitialized(self) {
+  if (self === void 0) {
+    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  }
+
+  return self;
 }
 
 const buttonClasses = generateUtilityClasses('MuiButton', ['root', 'text', 'textInherit', 'textPrimary', 'textSecondary', 'textSuccess', 'textError', 'textInfo', 'textWarning', 'outlined', 'outlinedInherit', 'outlinedPrimary', 'outlinedSecondary', 'outlinedSuccess', 'outlinedError', 'outlinedInfo', 'outlinedWarning', 'contained', 'containedInherit', 'containedPrimary', 'containedSecondary', 'containedSuccess', 'containedError', 'containedInfo', 'containedWarning', 'disableElevation', 'focusVisible', 'disabled', 'colorInherit', 'colorPrimary', 'colorSecondary', 'colorSuccess', 'colorError', 'colorInfo', 'colorWarning', 'textSizeSmall', 'textSizeMedium', 'textSizeLarge', 'outlinedSizeSmall', 'outlinedSizeMedium', 'outlinedSizeLarge', 'containedSizeSmall', 'containedSizeMedium', 'containedSizeLarge', 'sizeMedium', 'sizeSmall', 'sizeLarge', 'fullWidth', 'startIcon', 'endIcon', 'icon', 'iconSizeSmall', 'iconSizeMedium', 'iconSizeLarge']);
@@ -8974,7 +9081,7 @@ function create$3(definition) {
   return cache[key];
 }
 
-const NEBULA_VERSION_HASH = "01bb" ;
+const NEBULA_VERSION_HASH = "b434";
 ClassNameGenerator.configure(componentName => {
   return "njs-".concat(NEBULA_VERSION_HASH, "-").concat(componentName.replace('Mui', ''));
 });
@@ -9206,7 +9313,7 @@ function boot(_ref2) {
   const appRef = React__default.createRef();
   const element = document.createElement('div');
   element.style.display = 'none';
-  element.setAttribute('data-nebulajs-version', "5.2.0" );
+  element.setAttribute('data-nebulajs-version', "5.3.0");
   element.setAttribute('data-app-id', app.id);
   document.body.appendChild(element);
   if (context) {
@@ -9590,7 +9697,7 @@ function SvgIcon$1(_ref) {
     return (
       /*#__PURE__*/
       // eslint-disable-next-line react/no-array-index-key
-      React__default.createElement(Type, _extends$2({
+      React__default.createElement(Type, _extends$6({
         key: ix
       }, attrs))
     );
@@ -11216,6 +11323,78 @@ const KEYS = Object.freeze({
   isArrow: key => key === KEYS.ARROW_UP || key === KEYS.ARROW_DOWN || key === KEYS.ARROW_LEFT || key === KEYS.ARROW_RIGHT
 });
 
+function removeInnnerTabStops(container) {
+  container === null || container === void 0 || container.querySelectorAll('[tabIndex="0"]').forEach(elm => {
+    elm.setAttribute('tabIndex', -1);
+  });
+}
+function removeLastFocused(container) {
+  container === null || container === void 0 || container.querySelectorAll('.last-focused').forEach(elm => {
+    elm.classList.remove('last-focused');
+  });
+}
+function getVizCell(container) {
+  return (container === null || container === void 0 ? void 0 : container.closest('.njs-cell')) || (container === null || container === void 0 ? void 0 : container.closest('.qv-gridcell')) || (container === null || container === void 0 ? void 0 : container.closest('.qv-gs-listbox'));
+}
+
+// Emulate the keyboard hook, until we support it in the Listbox.
+function useTempKeyboard(_ref) {
+  let {
+    containerRef,
+    enabled
+  } = _ref;
+  const [keyboardActive, setKeyboardActive] = useState$1(false);
+  const keyboard = {
+    enabled,
+    active: keyboardActive,
+    // innerTabStops: whether keyboard permits inner tab stops
+    // (inner = everything inside .listbox-container)
+
+    innerTabStops: !enabled || keyboardActive,
+    blur(resetFocus) {
+      var _containerRef$current;
+      if (!enabled) {
+        return;
+      }
+      setKeyboardActive(false);
+      const vizCell = getVizCell(containerRef.current) || ((_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.parentElement);
+      removeInnnerTabStops(containerRef.current);
+      removeLastFocused(containerRef.current);
+      if (resetFocus && vizCell) {
+        // Move focus to the viz's cell.
+        vizCell.setAttribute('tabIndex', 0);
+        containerRef.current.setAttribute('tabIndex', -1);
+        vizCell.focus();
+      }
+    },
+    focus() {
+      if (!enabled) {
+        return;
+      }
+      setKeyboardActive(true);
+      const c = containerRef.current;
+      const searchField = c === null || c === void 0 ? void 0 : c.querySelector('.search input');
+      const lastSelectedRow = c === null || c === void 0 ? void 0 : c.querySelector('.value.last-focused');
+      const firstRowElement = c === null || c === void 0 ? void 0 : c.querySelector('.value.selector, .value');
+      const confirmButton = c === null || c === void 0 ? void 0 : c.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm');
+      const unlockCoverButton = c === null || c === void 0 ? void 0 : c.querySelector('#listbox-unlock-button');
+      const cyclicButton = c === null || c === void 0 ? void 0 : c.querySelector('.listbox-cyclic-button');
+      const elementToFocus = cyclicButton || searchField || lastSelectedRow || firstRowElement || unlockCoverButton || confirmButton;
+      elementToFocus === null || elementToFocus === void 0 || elementToFocus.setAttribute('tabIndex', 0);
+      elementToFocus === null || elementToFocus === void 0 || elementToFocus.focus();
+    },
+    focusSelection() {
+      const unlockCoverButton = document.querySelector('#listbox-unlock-button');
+      const confirmButton = document.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm:not(:disabled)');
+      const btnToFocus = unlockCoverButton || confirmButton;
+      btnToFocus === null || btnToFocus === void 0 || btnToFocus.setAttribute('tabIndex', 0);
+      btnToFocus === null || btnToFocus === void 0 || btnToFocus.focus();
+      return btnToFocus;
+    }
+  };
+  return keyboard;
+}
+
 const getElementIndex = currentTarget => +currentTarget.getAttribute('data-n');
 const focusSearch = container => {
   const searchField = container === null || container === void 0 ? void 0 : container.querySelector('.search input');
@@ -11223,10 +11402,49 @@ const focusSearch = container => {
   return searchField;
 };
 const focusRow = container => {
-  const row = container === null || container === void 0 ? void 0 : container.querySelector('.value.last-focused, .value.selector, .value');
-  row === null || row === void 0 || row.setAttribute('tabIndex', 0);
-  row === null || row === void 0 || row.focus();
-  return row;
+  const lastFocusedRow = container === null || container === void 0 ? void 0 : container.querySelector('.value.last-focused');
+  const selectorRow = container === null || container === void 0 ? void 0 : container.querySelector('.value.selector');
+  const row = container === null || container === void 0 ? void 0 : container.querySelector('.value');
+  const rowToFocus = lastFocusedRow || selectorRow || row;
+  rowToFocus === null || rowToFocus === void 0 || rowToFocus.setAttribute('tabIndex', 0);
+  rowToFocus === null || rowToFocus === void 0 || rowToFocus.focus();
+  removeLastFocused(container);
+  return rowToFocus;
+};
+const focusCyclicButton = container => {
+  const button = container === null || container === void 0 ? void 0 : container.querySelector('.listbox-cyclic-button:not(:disabled)');
+  button === null || button === void 0 || button.setAttribute('tabIndex', 0);
+  button === null || button === void 0 || button.focus();
+  return button;
+};
+const blur$1 = (event, keyboard) => {
+  if (!keyboard.enabled) return;
+  const {
+    currentTarget,
+    target
+  } = event;
+  const isFocusedOnListbox = target.classList.contains('listbox-container');
+  const container = currentTarget.closest('.listbox-container');
+  const vizCell = getVizCell(container);
+  const isSingleListbox = (vizCell === null || vizCell === void 0 ? void 0 : vizCell.querySelectorAll('.listbox-container').length) === 1;
+  if (isFocusedOnListbox || isSingleListbox) {
+    // Move the focus from listbox container to the viz container.
+    keyboard.blur(true);
+  } else {
+    // More than one listbox: Move focus from row to listbox container.
+
+    // 1. Remove last-focused class from row siblings.
+    removeLastFocused(container);
+
+    // 2. Add last-focused class so we can re-focus it later.
+    currentTarget.classList.add('last-focused');
+
+    // 3. Blur row and focus the listbox container.
+    keyboard.blur();
+    const c = currentTarget.closest('.listbox-container');
+    c.setAttribute('tabIndex', -1);
+    c === null || c === void 0 || c.focus();
+  }
 };
 
 // Find next item index to focus in the dom element list on key up and key down
@@ -11339,28 +11557,33 @@ function getRowsKeyboardNavigation(_ref) {
         {
           // Try to focus search field, otherwise confirm button.
           const container = currentTarget.closest('.listbox-container');
-          const inSelection = isModal();
-
+          const inSelection = typeof isModal !== 'undefined' ? isModal() : undefined;
           // TODO: use a store to keep track of this row.
           currentTarget.classList.add('last-focused'); // so that we can go back here when we tab back
 
+          const useDefaultBrowserSupport = !(keyboard !== null && keyboard !== void 0 && keyboard.enabled);
+          if (useDefaultBrowserSupport) {
+            if (!inSelection) return;
+            keyboard.focusSelection();
+            event.preventDefault();
+            event.stopPropagation();
+            return;
+          }
           if (shiftKey) {
-            if (!focusSearch(container)) {
+            if (!focusSearch(container) && !focusCyclicButton(container)) {
               if (inSelection) {
                 keyboard.focusSelection();
               } else {
-                keyboard.blur(true);
+                blur$1(event, keyboard);
               }
             }
             break;
           }
 
           // Without shift key
-          if (inSelection) {
-            keyboard.focusSelection();
-          } else {
+          if (!keyboard.focusSelection() && !focusCyclicButton(container) && !focusSearch(container)) {
             currentTarget.blur();
-            keyboard.blur();
+            blur$1(event, keyboard);
           }
           break;
         }
@@ -12352,7 +12575,7 @@ function createGridComponent(_ref2) {
         className: className,
         onScroll: this._onScroll,
         ref: this._outerRefSetter,
-        style: _extends$1({
+        style: _extends({
           position: 'relative',
           height: height,
           width: width,
@@ -12851,7 +13074,7 @@ function createListComponent(_ref) {
         className: className,
         onScroll: onScroll,
         ref: this._outerRefSetter,
-        style: _extends$1({
+        style: _extends({
           position: 'relative',
           height: height,
           width: width,
@@ -13406,7 +13629,7 @@ function getListBoxComponents(_ref) {
     local.current.listRef = ref;
     return /*#__PURE__*/React__default.createElement(StyledFixedSizeList
     // eslint-disable-next-line react/jsx-props-no-spreading
-    , _extends$2({}, commonComponentOptions, {
+    , _extends$6({}, commonComponentOptions, {
       dataTestid: "fixed-size-list",
       scrollDisabled: constraints === null || constraints === void 0 ? void 0 : constraints.active,
       height: listHeight,
@@ -13483,7 +13706,7 @@ function getListBoxComponents(_ref) {
     };
     return /*#__PURE__*/React__default.createElement(StyledFixedSizeGrid
     // eslint-disable-next-line react/jsx-props-no-spreading
-    , _extends$2({}, commonComponentOptions, {
+    , _extends$6({}, commonComponentOptions, {
       dataTestid: "fixed-size-grid",
       scrollDisabled: constraints === null || constraints === void 0 ? void 0 : constraints.active,
       height: gridHeight,
@@ -13907,6 +14130,19 @@ function ListBoxDisclaimer(_ref2) {
 
 var Close$1 = {};
 
+var interopRequireDefault = {exports: {}};
+
+(function (module) {
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : {
+	    "default": obj
+	  };
+	}
+	module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports; 
+} (interopRequireDefault));
+
+var interopRequireDefaultExports = interopRequireDefault.exports;
+
 var createSvgIcon$1 = {};
 
 function getSvgIconUtilityClass(slot) {
@@ -13967,7 +14203,7 @@ const SvgIconRoot = styled('svg', {
   };
 });
 const SvgIcon = /*#__PURE__*/React.forwardRef(function SvgIcon(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiSvgIcon'
   });
@@ -13982,9 +14218,9 @@ const SvgIcon = /*#__PURE__*/React.forwardRef(function SvgIcon(inProps, ref) {
       titleAccess,
       viewBox = '0 0 24 24'
     } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$5);
+    other = _objectWithoutPropertiesLoose$1(props, _excluded$5);
   const hasSvgAsChild = /*#__PURE__*/React.isValidElement(children) && children.type === 'svg';
-  const ownerState = _extends$1({}, props, {
+  const ownerState = _extends$5({}, props, {
     color,
     component,
     fontSize,
@@ -13998,7 +14234,7 @@ const SvgIcon = /*#__PURE__*/React.forwardRef(function SvgIcon(inProps, ref) {
     more.viewBox = viewBox;
   }
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/jsxRuntimeExports.jsxs(SvgIconRoot, _extends$1({
+  return /*#__PURE__*/jsxRuntimeExports.jsxs(SvgIconRoot, _extends$5({
     as: component,
     className: clsx(classes.root, className),
     focusable: "false",
@@ -14017,7 +14253,7 @@ SvgIcon.muiName = 'SvgIcon';
 
 function createSvgIcon(path, displayName) {
   function Component(props, ref) {
-    return /*#__PURE__*/jsxRuntimeExports.jsx(SvgIcon, _extends$1({
+    return /*#__PURE__*/jsxRuntimeExports.jsx(SvgIcon, _extends$5({
       "data-testid": `${displayName}Icon`,
       ref: ref
     }, props, {
@@ -15006,7 +15242,7 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
   const autoFocusIndex = actions.findIndex(action => !action.disabled);
   return showActions && /*#__PURE__*/React__default.createElement(StyledPopover$1
   // eslint-disable-next-line react/jsx-props-no-spreading
-  , _extends$2({}, popoverProps, {
+  , _extends$6({}, popoverProps, {
     onClose: onCloseOrActionClick,
     ref: ref,
     open: show,
@@ -15443,6 +15679,7 @@ function ListBoxSearch(_ref2) {
     dense = false,
     visible = true,
     autoFocus = true,
+    beginSelectionOnFocus = true,
     wildCardSearch = false,
     searchEnabled,
     direction,
@@ -15500,11 +15737,20 @@ function ListBoxSearch(_ref2) {
     }
     return model.searchListObjectFor(TREE_PATH, searchValue);
   };
+  const beginSelection = () => {
+    const shouldBeginSelection = !selectionState.selectDisabled() && !selections.isModal();
+    if (shouldBeginSelection) {
+      selections.begin('/qListObjectDef');
+    }
+  };
   const handleFocus = () => {
     if (wildCardSearch) {
       setValue(WILDCARD);
       setWildcardOn(true);
     }
+    if (beginSelectionOnFocus) {
+      beginSelection();
+    }
   };
   const hasHits = () => {
     const listCount = getStoreValue("listCount");
@@ -15526,11 +15772,6 @@ function ListBoxSearch(_ref2) {
     }
     return response;
   };
-  function focusRow(container) {
-    const row = (container === null || container === void 0 ? void 0 : container.querySelector('.last-focused')) || (container === null || container === void 0 ? void 0 : container.querySelector('[role="row"]:first-child'));
-    row === null || row === void 0 || row.setAttribute('tabIndex', 0);
-    row === null || row === void 0 || row.focus();
-  }
   const onKeyDown = async e => {
     const {
       currentTarget
@@ -15552,17 +15793,14 @@ function ListBoxSearch(_ref2) {
       case 'Tab':
         {
           if (e.shiftKey) {
-            keyboard.focusSelection();
+            if (!focusCyclicButton(container)) {
+              keyboard.focusSelection();
+            }
           } else if (clearSearchRef.current) {
             clearSearchRef.current.focus();
           } else {
             // Focus the row we last visited or the first one.
             focusRow(container);
-
-            // Clean up.
-            container === null || container === void 0 || container.querySelectorAll('.last-focused').forEach(elm => {
-              elm.classList.remove('last-focused');
-            });
           }
           break;
         }
@@ -15606,11 +15844,6 @@ function ListBoxSearch(_ref2) {
           } else {
             // Focus the row we last visited or the first one.
             focusRow(container);
-
-            // Clean up.
-            container === null || container === void 0 || container.querySelectorAll('.last-focused').forEach(elm => {
-              elm.classList.remove('last-focused');
-            });
           }
           break;
         }
@@ -18240,7 +18473,8 @@ function ListBoxPopover(_ref) {
   }, [model]);
   const {
     translator,
-    themeApi
+    themeApi,
+    keyboardNavigation
   } = useContext(InstanceContext);
   const moreAlignTo = useRef();
   const containerRef = useRef();
@@ -18249,10 +18483,14 @@ function ListBoxPopover(_ref) {
   const [selectionState$1] = useState$1(() => selectionState({
     selectDisabled
   }));
+  const keyboard = useTempKeyboard({
+    containerRef,
+    enabled: keyboardNavigation
+  });
   const {
     checkboxes = checkboxesOption
   } = layout || {};
-  const themeSelectionColorsEnabled = flags.isEnabled('PS_22149_THEME_SELECTION_COLORS');
+  const themeSelectionColorsEnabled = flags === null || flags === void 0 ? void 0 : flags.isEnabled('PS_22149_THEME_SELECTION_COLORS');
   const styles = getStyles({
     themeApi,
     theme,
@@ -18280,7 +18518,8 @@ function ListBoxPopover(_ref) {
     layout,
     model,
     translator,
-    selectionState: selectionState$1
+    selectionState: selectionState$1,
+    selections
   });
   const onCtrlF = () => {
     const input = searchContainerRef.current.querySelector('input');
@@ -18288,6 +18527,7 @@ function ListBoxPopover(_ref) {
   };
   const hasSelections$1 = hasSelections(layout);
   return /*#__PURE__*/React__default.createElement(Popover, {
+    className: "listbox-container",
     open: open,
     onClose: popoverClose,
     anchorEl: alignTo.current,
@@ -18368,7 +18608,9 @@ function ListBoxPopover(_ref) {
     selections: selections,
     selectionState: selectionState$1,
     keyboard: {
-      enabled: false
+      enabled: false,
+      innerTabStops: true,
+      focusSelection: keyboard.focusSelection
     },
     autoFocus: autoFocus !== null && autoFocus !== void 0 ? autoFocus : true
   })), /*#__PURE__*/React__default.createElement(ListBox, {
@@ -18380,7 +18622,8 @@ function ListBoxPopover(_ref) {
     direction: "ltr",
     onSetListCount: c => setListCount(c),
     onCtrlF: onCtrlF,
-    styles: styles
+    styles: styles,
+    keyboard: keyboard
   }))));
 }
 
@@ -19537,114 +19780,17 @@ class AutoSizer extends Component {
   }
 }
 
-function removeInnnerTabStops(container) {
-  container === null || container === void 0 || container.querySelectorAll('[tabIndex="0"]').forEach(elm => {
-    elm.setAttribute('tabIndex', -1);
-  });
-}
-function removeLastFocused(container) {
-  container === null || container === void 0 || container.querySelectorAll('.last-focused').forEach(elm => {
-    elm.classList.remove('last-focused');
-  });
-}
-function getVizCell(container) {
-  return (container === null || container === void 0 ? void 0 : container.closest('.njs-cell')) || (container === null || container === void 0 ? void 0 : container.closest('.qv-gridcell'));
-}
-
-// Emulate the keyboard hook, until we support it in the Listbox.
-function useTempKeyboard(_ref) {
+/* eslint-disable no-param-reassign */
+function getListboxContainerKeyboardNavigation(_ref) {
   let {
-    containerRef,
-    enabled
+    keyboard,
+    hovering,
+    updateKeyScroll,
+    currentScrollIndex,
+    isModal,
+    constraints,
+    selections
   } = _ref;
-  const [keyboardActive, setKeyboardActive] = useState$1(false);
-  const keyboard = {
-    enabled,
-    active: keyboardActive,
-    // innerTabStops: whether keyboard permits inner tab stops
-    // (inner = everything inside .listbox-container)
-
-    innerTabStops: !enabled || keyboardActive,
-    blur(resetFocus) {
-      var _containerRef$current;
-      if (!enabled) {
-        return;
-      }
-      setKeyboardActive(false);
-      const vizCell = getVizCell(containerRef.current) || ((_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.parentElement);
-      removeInnnerTabStops(containerRef.current);
-      removeLastFocused(containerRef.current);
-      if (resetFocus && vizCell) {
-        // Move focus to the viz's cell.
-        vizCell.setAttribute('tabIndex', 0);
-        vizCell.focus();
-      }
-    },
-    focus() {
-      if (!enabled) {
-        return;
-      }
-      setKeyboardActive(true);
-      const c = containerRef.current;
-      const searchField = c === null || c === void 0 ? void 0 : c.querySelector('.search input');
-      const lastSelectedRow = c === null || c === void 0 ? void 0 : c.querySelector('.value.last-focused');
-      const firstRowElement = c === null || c === void 0 ? void 0 : c.querySelector('.value.selector, .value');
-      const confirmButton = c === null || c === void 0 ? void 0 : c.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm');
-      const unlockCoverButton = c === null || c === void 0 ? void 0 : c.querySelector('#listbox-unlock-button');
-      const elementToFocus = searchField || lastSelectedRow || firstRowElement || unlockCoverButton || confirmButton;
-      elementToFocus === null || elementToFocus === void 0 || elementToFocus.setAttribute('tabIndex', 0);
-      elementToFocus === null || elementToFocus === void 0 || elementToFocus.focus();
-    },
-    focusSelection() {
-      const unlockCoverButton = document.querySelector('#listbox-unlock-button');
-      const confirmButton = document.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm');
-      const btnToFocus = unlockCoverButton || confirmButton;
-      btnToFocus === null || btnToFocus === void 0 || btnToFocus.setAttribute('tabIndex', 0);
-      btnToFocus === null || btnToFocus === void 0 || btnToFocus.focus();
-    }
-  };
-  return keyboard;
-}
-
-/* eslint-disable no-param-reassign */
-function getListboxContainerKeyboardNavigation(_ref) {
-  let {
-    keyboard,
-    hovering,
-    updateKeyScroll,
-    containerRef,
-    currentScrollIndex,
-    isModal,
-    constraints
-  } = _ref;
-  const blur = event => {
-    const {
-      currentTarget,
-      target
-    } = event;
-    const isFocusedOnListbox = target.classList.contains('listbox-container');
-    const container = currentTarget.closest('.listbox-container');
-    const vizCell = getVizCell(container);
-    const isSingleListbox = (vizCell === null || vizCell === void 0 ? void 0 : vizCell.querySelectorAll('.listbox-container').length) === 1;
-    if (isFocusedOnListbox || isSingleListbox) {
-      // Move the focus from listbox container to the viz container.
-      keyboard.blur(true);
-    } else {
-      // More than one listbox: Move focus from row to listbox container.
-
-      // 1. Remove last-focused class from row siblings.
-      removeLastFocused(containerRef.current);
-
-      // 2. Add last-focused class so we can re-focus it later.
-      currentTarget.classList.add('last-focused');
-
-      // 3. Blur row and focus the listbox container.
-      keyboard.blur();
-      const c = currentTarget.closest('.listbox-container');
-      c.setAttribute('tabIndex', -1);
-      c === null || c === void 0 || c.focus();
-    }
-  };
   const handleKeyDown = event => {
     const {
       keyCode,
@@ -19662,16 +19808,18 @@ function getListboxContainerKeyboardNavigation(_ref) {
     const inSelection = isModal();
     switch (keyCode) {
       case KEYS.TAB:
-        if (inSelection) {
-          if (shiftKey) {
-            focusRow(container) || focusSearch(container);
-          } else {
-            focusSearch(container) || focusRow(container);
+        //  Only react to tab after enter/space have been pressed or the target element is inside listbox (mouse case) or target is selection toolbar
+        if (document.activeElement === container || !inSelection && !container.contains(document.activeElement)) return;
+        if (shiftKey) {
+          const focused = focusRow(container) || focusSearch(container);
+          if (!focused) {
+            blur$1(event, keyboard);
           }
-        } else if (shiftKey) {
-          keyboard.blur(true);
         } else {
-          break;
+          const focused = focusCyclicButton(container) || focusSearch(container) || focusRow(container);
+          if (!focused) {
+            break;
+          }
         }
         prevent();
         break;
@@ -19684,7 +19832,10 @@ function getListboxContainerKeyboardNavigation(_ref) {
         prevent();
         break;
       case KEYS.ESCAPE:
-        blur(event);
+        blur$1(event, keyboard);
+        if (selections.isActive()) {
+          selections.cancel();
+        }
         break;
     }
   };
@@ -19847,8 +19998,7 @@ function getListboxActionProps(_ref) {
     },
     extraItems,
     more: {
-      enabled: !isLocked && (showToolbar || selections.isActive()),
-      // show more button even when popover is not in selection mode
+      enabled: !isLocked,
       actions: listboxSelectionToolbarItems,
       popoverProps: {
         elevation: 0
@@ -19859,7 +20009,7 @@ function getListboxActionProps(_ref) {
       }
     },
     selections: {
-      show: showToolbar && selections.isActive(),
+      show: showToolbar,
       api: selections,
       onConfirm: () => {
         keyboard === null || keyboard === void 0 || keyboard.focus();
@@ -20002,7 +20152,8 @@ const createDimensionIconData = _ref => {
     app,
     selections,
     isPopover,
-    active
+    active,
+    keyboard
   } = _ref;
   switch (dimInfo.qGrouping) {
     case dimensionTypes.drillDown:
@@ -20014,21 +20165,52 @@ const createDimensionIconData = _ref => {
     case dimensionTypes.cyclic:
       {
         const clickable = app && active;
+        const stepToNextField = () => {
+          if (!isPopover) {
+            selections.confirm();
+          }
+          app.getDimension(dimInfo.qLibraryId).then(dimensionModel => {
+            if (!dimensionModel.stepCycle) {
+              // eslint-disable-next-line no-console
+              console.log("engine api spec version doesn't have support for function stepCycle");
+              return;
+            }
+            dimensionModel.stepCycle(1);
+          }).catch(() => null);
+        };
         return {
           icon: clickable ? ReloadIcon : CyclicIcon,
           tooltip: 'Listbox.Cyclic',
-          onClick: clickable ? () => {
-            if (!isPopover) {
-              selections.confirm();
-            }
-            app.getDimension(dimInfo.qLibraryId).then(dimensionModel => {
-              if (!dimensionModel.stepCycle) {
-                // eslint-disable-next-line no-console
-                console.log("engine api spec version doesn't have support for function stepCycle");
+          onClick: clickable ? stepToNextField : undefined,
+          onKeyDown: clickable ? event => {
+            const container = event.currentTarget.closest('.listbox-container');
+            switch (event.keyCode) {
+              case KEYS.SPACE:
+              case KEYS.ENTER:
+                stepToNextField();
+                break;
+              case KEYS.TAB:
+                {
+                  const useDefaultBrowserSupport = !keyboard.enabled;
+                  if (useDefaultBrowserSupport) {
+                    return;
+                  }
+                  let focused;
+                  if (event.shiftKey) {
+                    focused = keyboard.focusSelection();
+                  } else {
+                    focused = focusSearch(container) || focusRow(container);
+                  }
+                  if (!focused) {
+                    blur$1(event, keyboard);
+                  }
+                }
+                break;
+              default:
                 return;
-              }
-              dimensionModel.stepCycle(1);
-            }).catch(() => null);
+            }
+            event.preventDefault();
+            event.stopPropagation();
           } : undefined
         };
       }
@@ -20052,13 +20234,15 @@ function DimensionIcon(_ref) {
     iconData,
     translator,
     iconStyle,
-    disabled
+    disabled,
+    keyboard
   } = _ref;
   if (!iconData) return undefined;
   const {
     icon,
     tooltip,
-    onClick
+    onClick = undefined,
+    onKeyDown = undefined
   } = iconData;
   const Icon = icon;
   const title = translator.get(tooltip);
@@ -20066,11 +20250,14 @@ function DimensionIcon(_ref) {
   return isButton ? /*#__PURE__*/React__default.createElement(StyledButton, {
     variant: "outlined",
     onClick: onClick,
-    tabIndex: -1,
+    tabIndex: keyboard.innerTabStops ? 0 : -1,
     title: title,
     size: "large",
     disableRipple: true,
-    disabled: disabled
+    disabled: disabled,
+    onKeyDown: onKeyDown,
+    className: "listbox-cyclic-button",
+    "data-testid": "listbox-cyclic-button"
   }, /*#__PURE__*/React__default.createElement(Icon, {
     style: iconStyle
   })) : /*#__PURE__*/React__default.createElement(Icon, {
@@ -20153,7 +20340,8 @@ function ListBoxHeader(_ref2) {
     app,
     selections,
     isPopover,
-    active: !(constraints !== null && constraints !== void 0 && constraints.active)
+    active: !(constraints !== null && constraints !== void 0 && constraints.active),
+    keyboard
   });
   const showUnlock = showLock && isLocked;
   const showLockIcon = !showLock && isLocked; // shows instead of the cover button when field/dim is locked.
@@ -20229,7 +20417,7 @@ function ListBoxHeader(_ref2) {
     keyboard,
     autoConfirm
   });
-  const actionsToolbar = /*#__PURE__*/React__default.createElement(ActionsToolbar, _extends$2({
+  const actionsToolbar = /*#__PURE__*/React__default.createElement(ActionsToolbar, _extends$6({
     isRtl: isRtl,
     layout: layout
   }, toolbarProps));
@@ -20268,7 +20456,8 @@ function ListBoxHeader(_ref2) {
     iconData: iconData,
     iconStyle: iconStyle,
     disabled: selections.isActive() && isPopover,
-    translator: translator
+    translator: translator,
+    keyboard: keyboard
   })), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: true,
@@ -20389,7 +20578,7 @@ function ListBoxInline(_ref3) {
   const {
     checkboxes = checkboxesOption
   } = layout || {};
-  const themeSelectionColorsEnabled = flags.isEnabled('PS_22149_THEME_SELECTION_COLORS');
+  const themeSelectionColorsEnabled = flags === null || flags === void 0 ? void 0 : flags.isEnabled('PS_22149_THEME_SELECTION_COLORS');
   const styles = getStyles({
     app,
     themeApi,
@@ -20445,7 +20634,8 @@ function ListBoxInline(_ref3) {
     app,
     appSelections,
     constraints,
-    isModal: isModalMode
+    isModal: isModalMode,
+    selections
   }), [keyboard, hovering, updateKeyScroll, containerRef, currentScrollIndex, app, appSelections, constraints, isModalMode]);
   useEffect$1(() => {
     document.addEventListener('keydown', globalKeyDown);
@@ -20606,6 +20796,7 @@ function ListBoxInline(_ref3) {
     visible: searchVisible,
     search: search,
     autoFocus: shouldAutoFocus,
+    beginSelectionOnFocus: !isPopover,
     wildCardSearch: wildCardSearch,
     searchEnabled: searchEnabled,
     direction: direction,
@@ -22604,13 +22795,13 @@ function Progress(_ref2) {
   const s = SIZES[size];
   return /*#__PURE__*/React__default.createElement(Root, {
     className: classes$3.root
-  }, /*#__PURE__*/React__default.createElement(CircularProgress, _extends$2({
+  }, /*#__PURE__*/React__default.createElement(CircularProgress, _extends$6({
     variant: "determinate",
     value: 100,
     className: classes$3.back,
     size: s,
     thickness: 3
-  }, props)), /*#__PURE__*/React__default.createElement(CircularProgress, _extends$2({
+  }, props)), /*#__PURE__*/React__default.createElement(CircularProgress, _extends$6({
     variant: "indeterminate",
     disableShrink: true,
     className: classes$3.front,
@@ -22660,7 +22851,7 @@ function Cancel(_ref) {
     variant: "h6",
     align: "center",
     "data-tid": "update-active"
-  }, translator.get('Object.Update.Active')))), /*#__PURE__*/React__default.createElement(Grid, _extends$2({
+  }, translator.get('Object.Update.Active')))), /*#__PURE__*/React__default.createElement(Grid, _extends$6({
     item: true
   }, props), /*#__PURE__*/React__default.createElement(Button, {
     variant: "contained",
@@ -22687,7 +22878,7 @@ function Retry(_ref2) {
     "data-tid": "update-cancelled"
   }, translator.get('Object.Update.Cancelled'))), /*#__PURE__*/React__default.createElement(Grid, {
     item: true
-  }, /*#__PURE__*/React__default.createElement(Button, _extends$2({
+  }, /*#__PURE__*/React__default.createElement(Button, _extends$6({
     variant: "contained",
     onClick: retry
   }, props), translator.get('Retry'))));
@@ -27046,59 +27237,52 @@ function flagsFn () {
 }
 
 class LRUCache {
-  constructor () {
+  constructor() {
     this.max = 1000;
     this.map = new Map();
   }
-
-  get (key) {
+  get(key) {
     const value = this.map.get(key);
     if (value === undefined) {
-      return undefined
+      return undefined;
     } else {
       // Remove the key from the map and add it to the end
       this.map.delete(key);
       this.map.set(key, value);
-      return value
+      return value;
     }
   }
-
-  delete (key) {
-    return this.map.delete(key)
+  delete(key) {
+    return this.map.delete(key);
   }
-
-  set (key, value) {
+  set(key, value) {
     const deleted = this.delete(key);
-
     if (!deleted && value !== undefined) {
       // If cache is full, delete the least recently used item
       if (this.map.size >= this.max) {
         const firstKey = this.map.keys().next().value;
         this.delete(firstKey);
       }
-
       this.map.set(key, value);
     }
-
-    return this
+    return this;
   }
 }
-
 var lrucache = LRUCache;
 
 // parse out just the options we care about
-const looseOption = Object.freeze({ loose: true });
-const emptyOpts = Object.freeze({ });
+const looseOption = Object.freeze({
+  loose: true
+});
+const emptyOpts = Object.freeze({});
 const parseOptions$1 = options => {
   if (!options) {
-    return emptyOpts
+    return emptyOpts;
   }
-
   if (typeof options !== 'object') {
-    return looseOption
+    return looseOption;
   }
-
-  return options
+  return options;
 };
 var parseOptions_1 = parseOptions$1;
 
@@ -27107,10 +27291,8 @@ var re$1 = {exports: {}};
 // Note: this is the semver.org version of the spec that it implements
 // Not necessarily the package version of this code.
 const SEMVER_SPEC_VERSION = '2.0.0';
-
 const MAX_LENGTH$1 = 256;
-const MAX_SAFE_INTEGER$1 = Number.MAX_SAFE_INTEGER ||
-/* istanbul ignore next */ 9007199254740991;
+const MAX_SAFE_INTEGER$1 = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */9007199254740991;
 
 // Max safe segment length for coercion.
 const MAX_SAFE_COMPONENT_LENGTH = 16;
@@ -27118,17 +27300,7 @@ const MAX_SAFE_COMPONENT_LENGTH = 16;
 // Max safe length for a build identifier. The max length minus 6 characters for
 // the shortest version with a build 0.0.0+BUILD.
 const MAX_SAFE_BUILD_LENGTH = MAX_LENGTH$1 - 6;
-
-const RELEASE_TYPES = [
-  'major',
-  'premajor',
-  'minor',
-  'preminor',
-  'patch',
-  'prepatch',
-  'prerelease',
-];
-
+const RELEASE_TYPES = ['major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch', 'prerelease'];
 var constants = {
   MAX_LENGTH: MAX_LENGTH$1,
   MAX_SAFE_COMPONENT_LENGTH,
@@ -27137,443 +27309,352 @@ var constants = {
   RELEASE_TYPES,
   SEMVER_SPEC_VERSION,
   FLAG_INCLUDE_PRERELEASE: 0b001,
-  FLAG_LOOSE: 0b010,
+  FLAG_LOOSE: 0b010
 };
 
-const debug$1 = (
-  typeof process === 'object' &&
-  process.env &&
-  process.env.NODE_DEBUG &&
-  /\bsemver\b/i.test(process.env.NODE_DEBUG)
-) ? (...args) => console.error('SEMVER', ...args)
-  : () => {};
-
+const debug$1 = typeof process === 'object' && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? function () {
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+  return console.error('SEMVER', ...args);
+} : () => {};
 var debug_1 = debug$1;
 
 (function (module, exports) {
-	const {
-	  MAX_SAFE_COMPONENT_LENGTH,
-	  MAX_SAFE_BUILD_LENGTH,
-	  MAX_LENGTH,
-	} = constants;
-	const debug = debug_1;
-	exports = module.exports = {};
-
-	// The actual regexps go on exports.re
-	const re = exports.re = [];
-	const safeRe = exports.safeRe = [];
-	const src = exports.src = [];
-	const t = exports.t = {};
-	let R = 0;
-
-	const LETTERDASHNUMBER = '[a-zA-Z0-9-]';
-
-	// Replace some greedy regex tokens to prevent regex dos issues. These regex are
-	// used internally via the safeRe object since all inputs in this library get
-	// normalized first to trim and collapse all extra whitespace. The original
-	// regexes are exported for userland consumption and lower level usage. A
-	// future breaking change could export the safer regex only with a note that
-	// all input should have extra whitespace removed.
-	const safeRegexReplacements = [
-	  ['\\s', 1],
-	  ['\\d', MAX_LENGTH],
-	  [LETTERDASHNUMBER, MAX_SAFE_BUILD_LENGTH],
-	];
-
-	const makeSafeRegex = (value) => {
-	  for (const [token, max] of safeRegexReplacements) {
-	    value = value
-	      .split(`${token}*`).join(`${token}{0,${max}}`)
-	      .split(`${token}+`).join(`${token}{1,${max}}`);
-	  }
-	  return value
-	};
-
-	const createToken = (name, value, isGlobal) => {
-	  const safe = makeSafeRegex(value);
-	  const index = R++;
-	  debug(name, index, value);
-	  t[name] = index;
-	  src[index] = value;
-	  re[index] = new RegExp(value, isGlobal ? 'g' : undefined);
-	  safeRe[index] = new RegExp(safe, isGlobal ? 'g' : undefined);
-	};
-
-	// The following Regular Expressions can be used for tokenizing,
-	// validating, and parsing SemVer version strings.
-
-	// ## Numeric Identifier
-	// A single `0`, or a non-zero digit followed by zero or more digits.
-
-	createToken('NUMERICIDENTIFIER', '0|[1-9]\\d*');
-	createToken('NUMERICIDENTIFIERLOOSE', '\\d+');
-
-	// ## Non-numeric Identifier
-	// Zero or more digits, followed by a letter or hyphen, and then zero or
-	// more letters, digits, or hyphens.
-
-	createToken('NONNUMERICIDENTIFIER', `\\d*[a-zA-Z-]${LETTERDASHNUMBER}*`);
-
-	// ## Main Version
-	// Three dot-separated numeric identifiers.
-
-	createToken('MAINVERSION', `(${src[t.NUMERICIDENTIFIER]})\\.` +
-	                   `(${src[t.NUMERICIDENTIFIER]})\\.` +
-	                   `(${src[t.NUMERICIDENTIFIER]})`);
-
-	createToken('MAINVERSIONLOOSE', `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
-	                        `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
-	                        `(${src[t.NUMERICIDENTIFIERLOOSE]})`);
-
-	// ## Pre-release Version Identifier
-	// A numeric identifier, or a non-numeric identifier.
-
-	createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NUMERICIDENTIFIER]
-	}|${src[t.NONNUMERICIDENTIFIER]})`);
-
-	createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NUMERICIDENTIFIERLOOSE]
-	}|${src[t.NONNUMERICIDENTIFIER]})`);
-
-	// ## Pre-release Version
-	// Hyphen, followed by one or more dot-separated pre-release version
-	// identifiers.
-
-	createToken('PRERELEASE', `(?:-(${src[t.PRERELEASEIDENTIFIER]
-	}(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`);
-
-	createToken('PRERELEASELOOSE', `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]
-	}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`);
-
-	// ## Build Metadata Identifier
-	// Any combination of digits, letters, or hyphens.
-
-	createToken('BUILDIDENTIFIER', `${LETTERDASHNUMBER}+`);
-
-	// ## Build Metadata
-	// Plus sign, followed by one or more period-separated build metadata
-	// identifiers.
-
-	createToken('BUILD', `(?:\\+(${src[t.BUILDIDENTIFIER]
-	}(?:\\.${src[t.BUILDIDENTIFIER]})*))`);
-
-	// ## Full Version String
-	// A main version, followed optionally by a pre-release version and
-	// build metadata.
-
-	// Note that the only major, minor, patch, and pre-release sections of
-	// the version string are capturing groups.  The build metadata is not a
-	// capturing group, because it should not ever be used in version
-	// comparison.
-
-	createToken('FULLPLAIN', `v?${src[t.MAINVERSION]
-	}${src[t.PRERELEASE]}?${
-	  src[t.BUILD]}?`);
-
-	createToken('FULL', `^${src[t.FULLPLAIN]}$`);
-
-	// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
-	// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
-	// common in the npm registry.
-	createToken('LOOSEPLAIN', `[v=\\s]*${src[t.MAINVERSIONLOOSE]
-	}${src[t.PRERELEASELOOSE]}?${
-	  src[t.BUILD]}?`);
-
-	createToken('LOOSE', `^${src[t.LOOSEPLAIN]}$`);
-
-	createToken('GTLT', '((?:<|>)?=?)');
-
-	// Something like "2.*" or "1.2.x".
-	// Note that "x.x" is a valid xRange identifer, meaning "any version"
-	// Only the first item is strictly required.
-	createToken('XRANGEIDENTIFIERLOOSE', `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);
-	createToken('XRANGEIDENTIFIER', `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`);
-
-	createToken('XRANGEPLAIN', `[v=\\s]*(${src[t.XRANGEIDENTIFIER]})` +
-	                   `(?:\\.(${src[t.XRANGEIDENTIFIER]})` +
-	                   `(?:\\.(${src[t.XRANGEIDENTIFIER]})` +
-	                   `(?:${src[t.PRERELEASE]})?${
-	                     src[t.BUILD]}?` +
-	                   `)?)?`);
-
-	createToken('XRANGEPLAINLOOSE', `[v=\\s]*(${src[t.XRANGEIDENTIFIERLOOSE]})` +
-	                        `(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})` +
-	                        `(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})` +
-	                        `(?:${src[t.PRERELEASELOOSE]})?${
-	                          src[t.BUILD]}?` +
-	                        `)?)?`);
-
-	createToken('XRANGE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAIN]}$`);
-	createToken('XRANGELOOSE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`);
-
-	// Coercion.
-	// Extract anything that could conceivably be a part of a valid semver
-	createToken('COERCEPLAIN', `${'(^|[^\\d])' +
-	              '(\\d{1,'}${MAX_SAFE_COMPONENT_LENGTH}})` +
-	              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
-	              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`);
-	createToken('COERCE', `${src[t.COERCEPLAIN]}(?:$|[^\\d])`);
-	createToken('COERCEFULL', src[t.COERCEPLAIN] +
-	              `(?:${src[t.PRERELEASE]})?` +
-	              `(?:${src[t.BUILD]})?` +
-	              `(?:$|[^\\d])`);
-	createToken('COERCERTL', src[t.COERCE], true);
-	createToken('COERCERTLFULL', src[t.COERCEFULL], true);
-
-	// Tilde ranges.
-	// Meaning is "reasonably at or greater than"
-	createToken('LONETILDE', '(?:~>?)');
-
-	createToken('TILDETRIM', `(\\s*)${src[t.LONETILDE]}\\s+`, true);
-	exports.tildeTrimReplace = '$1~';
-
-	createToken('TILDE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`);
-	createToken('TILDELOOSE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`);
-
-	// Caret ranges.
-	// Meaning is "at least and backwards compatible with"
-	createToken('LONECARET', '(?:\\^)');
-
-	createToken('CARETTRIM', `(\\s*)${src[t.LONECARET]}\\s+`, true);
-	exports.caretTrimReplace = '$1^';
-
-	createToken('CARET', `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`);
-	createToken('CARETLOOSE', `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`);
-
-	// A simple gt/lt/eq thing, or just "" to indicate "any version"
-	createToken('COMPARATORLOOSE', `^${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]})$|^$`);
-	createToken('COMPARATOR', `^${src[t.GTLT]}\\s*(${src[t.FULLPLAIN]})$|^$`);
-
-	// An expression to strip any whitespace between the gtlt and the thing
-	// it modifies, so that `> 1.2.3` ==> `>1.2.3`
-	createToken('COMPARATORTRIM', `(\\s*)${src[t.GTLT]
-	}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true);
-	exports.comparatorTrimReplace = '$1$2$3';
-
-	// Something like `1.2.3 - 1.2.4`
-	// Note that these all use the loose form, because they'll be
-	// checked against either the strict or loose comparator form
-	// later.
-	createToken('HYPHENRANGE', `^\\s*(${src[t.XRANGEPLAIN]})` +
-	                   `\\s+-\\s+` +
-	                   `(${src[t.XRANGEPLAIN]})` +
-	                   `\\s*$`);
-
-	createToken('HYPHENRANGELOOSE', `^\\s*(${src[t.XRANGEPLAINLOOSE]})` +
-	                        `\\s+-\\s+` +
-	                        `(${src[t.XRANGEPLAINLOOSE]})` +
-	                        `\\s*$`);
-
-	// Star ranges basically just allow anything at all.
-	createToken('STAR', '(<|>)?=?\\s*\\*');
-	// >=0.0.0 is like a star
-	createToken('GTE0', '^\\s*>=\\s*0\\.0\\.0\\s*$');
-	createToken('GTE0PRE', '^\\s*>=\\s*0\\.0\\.0-0\\s*$'); 
-} (re$1, re$1.exports));
+  const {
+    MAX_SAFE_COMPONENT_LENGTH,
+    MAX_SAFE_BUILD_LENGTH,
+    MAX_LENGTH
+  } = constants;
+  const debug = debug_1;
+  exports = module.exports = {};
+
+  // The actual regexps go on exports.re
+  const re = exports.re = [];
+  const safeRe = exports.safeRe = [];
+  const src = exports.src = [];
+  const t = exports.t = {};
+  let R = 0;
+  const LETTERDASHNUMBER = '[a-zA-Z0-9-]';
+
+  // Replace some greedy regex tokens to prevent regex dos issues. These regex are
+  // used internally via the safeRe object since all inputs in this library get
+  // normalized first to trim and collapse all extra whitespace. The original
+  // regexes are exported for userland consumption and lower level usage. A
+  // future breaking change could export the safer regex only with a note that
+  // all input should have extra whitespace removed.
+  const safeRegexReplacements = [['\\s', 1], ['\\d', MAX_LENGTH], [LETTERDASHNUMBER, MAX_SAFE_BUILD_LENGTH]];
+  const makeSafeRegex = value => {
+    for (const [token, max] of safeRegexReplacements) {
+      value = value.split("".concat(token, "*")).join("".concat(token, "{0,").concat(max, "}")).split("".concat(token, "+")).join("".concat(token, "{1,").concat(max, "}"));
+    }
+    return value;
+  };
+  const createToken = (name, value, isGlobal) => {
+    const safe = makeSafeRegex(value);
+    const index = R++;
+    debug(name, index, value);
+    t[name] = index;
+    src[index] = value;
+    re[index] = new RegExp(value, isGlobal ? 'g' : undefined);
+    safeRe[index] = new RegExp(safe, isGlobal ? 'g' : undefined);
+  };
 
+  // The following Regular Expressions can be used for tokenizing,
+  // validating, and parsing SemVer version strings.
+
+  // ## Numeric Identifier
+  // A single `0`, or a non-zero digit followed by zero or more digits.
+
+  createToken('NUMERICIDENTIFIER', '0|[1-9]\\d*');
+  createToken('NUMERICIDENTIFIERLOOSE', '\\d+');
+
+  // ## Non-numeric Identifier
+  // Zero or more digits, followed by a letter or hyphen, and then zero or
+  // more letters, digits, or hyphens.
+
+  createToken('NONNUMERICIDENTIFIER', "\\d*[a-zA-Z-]".concat(LETTERDASHNUMBER, "*"));
+
+  // ## Main Version
+  // Three dot-separated numeric identifiers.
+
+  createToken('MAINVERSION', "(".concat(src[t.NUMERICIDENTIFIER], ")\\.") + "(".concat(src[t.NUMERICIDENTIFIER], ")\\.") + "(".concat(src[t.NUMERICIDENTIFIER], ")"));
+  createToken('MAINVERSIONLOOSE', "(".concat(src[t.NUMERICIDENTIFIERLOOSE], ")\\.") + "(".concat(src[t.NUMERICIDENTIFIERLOOSE], ")\\.") + "(".concat(src[t.NUMERICIDENTIFIERLOOSE], ")"));
+
+  // ## Pre-release Version Identifier
+  // A numeric identifier, or a non-numeric identifier.
+
+  createToken('PRERELEASEIDENTIFIER', "(?:".concat(src[t.NUMERICIDENTIFIER], "|").concat(src[t.NONNUMERICIDENTIFIER], ")"));
+  createToken('PRERELEASEIDENTIFIERLOOSE', "(?:".concat(src[t.NUMERICIDENTIFIERLOOSE], "|").concat(src[t.NONNUMERICIDENTIFIER], ")"));
+
+  // ## Pre-release Version
+  // Hyphen, followed by one or more dot-separated pre-release version
+  // identifiers.
+
+  createToken('PRERELEASE', "(?:-(".concat(src[t.PRERELEASEIDENTIFIER], "(?:\\.").concat(src[t.PRERELEASEIDENTIFIER], ")*))"));
+  createToken('PRERELEASELOOSE', "(?:-?(".concat(src[t.PRERELEASEIDENTIFIERLOOSE], "(?:\\.").concat(src[t.PRERELEASEIDENTIFIERLOOSE], ")*))"));
+
+  // ## Build Metadata Identifier
+  // Any combination of digits, letters, or hyphens.
+
+  createToken('BUILDIDENTIFIER', "".concat(LETTERDASHNUMBER, "+"));
+
+  // ## Build Metadata
+  // Plus sign, followed by one or more period-separated build metadata
+  // identifiers.
+
+  createToken('BUILD', "(?:\\+(".concat(src[t.BUILDIDENTIFIER], "(?:\\.").concat(src[t.BUILDIDENTIFIER], ")*))"));
+
+  // ## Full Version String
+  // A main version, followed optionally by a pre-release version and
+  // build metadata.
+
+  // Note that the only major, minor, patch, and pre-release sections of
+  // the version string are capturing groups.  The build metadata is not a
+  // capturing group, because it should not ever be used in version
+  // comparison.
+
+  createToken('FULLPLAIN', "v?".concat(src[t.MAINVERSION]).concat(src[t.PRERELEASE], "?").concat(src[t.BUILD], "?"));
+  createToken('FULL', "^".concat(src[t.FULLPLAIN], "$"));
+
+  // like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+  // also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+  // common in the npm registry.
+  createToken('LOOSEPLAIN', "[v=\\s]*".concat(src[t.MAINVERSIONLOOSE]).concat(src[t.PRERELEASELOOSE], "?").concat(src[t.BUILD], "?"));
+  createToken('LOOSE', "^".concat(src[t.LOOSEPLAIN], "$"));
+  createToken('GTLT', '((?:<|>)?=?)');
+
+  // Something like "2.*" or "1.2.x".
+  // Note that "x.x" is a valid xRange identifer, meaning "any version"
+  // Only the first item is strictly required.
+  createToken('XRANGEIDENTIFIERLOOSE', "".concat(src[t.NUMERICIDENTIFIERLOOSE], "|x|X|\\*"));
+  createToken('XRANGEIDENTIFIER', "".concat(src[t.NUMERICIDENTIFIER], "|x|X|\\*"));
+  createToken('XRANGEPLAIN', "[v=\\s]*(".concat(src[t.XRANGEIDENTIFIER], ")") + "(?:\\.(".concat(src[t.XRANGEIDENTIFIER], ")") + "(?:\\.(".concat(src[t.XRANGEIDENTIFIER], ")") + "(?:".concat(src[t.PRERELEASE], ")?").concat(src[t.BUILD], "?") + ")?)?");
+  createToken('XRANGEPLAINLOOSE', "[v=\\s]*(".concat(src[t.XRANGEIDENTIFIERLOOSE], ")") + "(?:\\.(".concat(src[t.XRANGEIDENTIFIERLOOSE], ")") + "(?:\\.(".concat(src[t.XRANGEIDENTIFIERLOOSE], ")") + "(?:".concat(src[t.PRERELEASELOOSE], ")?").concat(src[t.BUILD], "?") + ")?)?");
+  createToken('XRANGE', "^".concat(src[t.GTLT], "\\s*").concat(src[t.XRANGEPLAIN], "$"));
+  createToken('XRANGELOOSE', "^".concat(src[t.GTLT], "\\s*").concat(src[t.XRANGEPLAINLOOSE], "$"));
+
+  // Coercion.
+  // Extract anything that could conceivably be a part of a valid semver
+  createToken('COERCEPLAIN', "".concat('(^|[^\\d])' + '(\\d{1,').concat(MAX_SAFE_COMPONENT_LENGTH, "})") + "(?:\\.(\\d{1,".concat(MAX_SAFE_COMPONENT_LENGTH, "}))?") + "(?:\\.(\\d{1,".concat(MAX_SAFE_COMPONENT_LENGTH, "}))?"));
+  createToken('COERCE', "".concat(src[t.COERCEPLAIN], "(?:$|[^\\d])"));
+  createToken('COERCEFULL', src[t.COERCEPLAIN] + "(?:".concat(src[t.PRERELEASE], ")?") + "(?:".concat(src[t.BUILD], ")?") + "(?:$|[^\\d])");
+  createToken('COERCERTL', src[t.COERCE], true);
+  createToken('COERCERTLFULL', src[t.COERCEFULL], true);
+
+  // Tilde ranges.
+  // Meaning is "reasonably at or greater than"
+  createToken('LONETILDE', '(?:~>?)');
+  createToken('TILDETRIM', "(\\s*)".concat(src[t.LONETILDE], "\\s+"), true);
+  exports.tildeTrimReplace = '$1~';
+  createToken('TILDE', "^".concat(src[t.LONETILDE]).concat(src[t.XRANGEPLAIN], "$"));
+  createToken('TILDELOOSE', "^".concat(src[t.LONETILDE]).concat(src[t.XRANGEPLAINLOOSE], "$"));
+
+  // Caret ranges.
+  // Meaning is "at least and backwards compatible with"
+  createToken('LONECARET', '(?:\\^)');
+  createToken('CARETTRIM', "(\\s*)".concat(src[t.LONECARET], "\\s+"), true);
+  exports.caretTrimReplace = '$1^';
+  createToken('CARET', "^".concat(src[t.LONECARET]).concat(src[t.XRANGEPLAIN], "$"));
+  createToken('CARETLOOSE', "^".concat(src[t.LONECARET]).concat(src[t.XRANGEPLAINLOOSE], "$"));
+
+  // A simple gt/lt/eq thing, or just "" to indicate "any version"
+  createToken('COMPARATORLOOSE', "^".concat(src[t.GTLT], "\\s*(").concat(src[t.LOOSEPLAIN], ")$|^$"));
+  createToken('COMPARATOR', "^".concat(src[t.GTLT], "\\s*(").concat(src[t.FULLPLAIN], ")$|^$"));
+
+  // An expression to strip any whitespace between the gtlt and the thing
+  // it modifies, so that `> 1.2.3` ==> `>1.2.3`
+  createToken('COMPARATORTRIM', "(\\s*)".concat(src[t.GTLT], "\\s*(").concat(src[t.LOOSEPLAIN], "|").concat(src[t.XRANGEPLAIN], ")"), true);
+  exports.comparatorTrimReplace = '$1$2$3';
+
+  // Something like `1.2.3 - 1.2.4`
+  // Note that these all use the loose form, because they'll be
+  // checked against either the strict or loose comparator form
+  // later.
+  createToken('HYPHENRANGE', "^\\s*(".concat(src[t.XRANGEPLAIN], ")") + "\\s+-\\s+" + "(".concat(src[t.XRANGEPLAIN], ")") + "\\s*$");
+  createToken('HYPHENRANGELOOSE', "^\\s*(".concat(src[t.XRANGEPLAINLOOSE], ")") + "\\s+-\\s+" + "(".concat(src[t.XRANGEPLAINLOOSE], ")") + "\\s*$");
+
+  // Star ranges basically just allow anything at all.
+  createToken('STAR', '(<|>)?=?\\s*\\*');
+  // >=0.0.0 is like a star
+  createToken('GTE0', '^\\s*>=\\s*0\\.0\\.0\\s*$');
+  createToken('GTE0PRE', '^\\s*>=\\s*0\\.0\\.0-0\\s*$');
+})(re$1, re$1.exports);
 var reExports = re$1.exports;
 
 const numeric = /^[0-9]+$/;
 const compareIdentifiers$1 = (a, b) => {
   const anum = numeric.test(a);
   const bnum = numeric.test(b);
-
   if (anum && bnum) {
     a = +a;
     b = +b;
   }
-
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
+  return a === b ? 0 : anum && !bnum ? -1 : bnum && !anum ? 1 : a < b ? -1 : 1;
 };
-
 const rcompareIdentifiers = (a, b) => compareIdentifiers$1(b, a);
-
 var identifiers = {
   compareIdentifiers: compareIdentifiers$1,
-  rcompareIdentifiers,
+  rcompareIdentifiers
 };
 
 const debug = debug_1;
-const { MAX_LENGTH, MAX_SAFE_INTEGER } = constants;
-const { safeRe: re, t } = reExports;
-
+const {
+  MAX_LENGTH,
+  MAX_SAFE_INTEGER
+} = constants;
+const {
+  safeRe: re,
+  t
+} = reExports;
 const parseOptions = parseOptions_1;
-const { compareIdentifiers } = identifiers;
+const {
+  compareIdentifiers
+} = identifiers;
 let SemVer$1 = class SemVer {
-  constructor (version, options) {
+  constructor(version, options) {
     options = parseOptions(options);
-
     if (version instanceof SemVer) {
-      if (version.loose === !!options.loose &&
-          version.includePrerelease === !!options.includePrerelease) {
-        return version
+      if (version.loose === !!options.loose && version.includePrerelease === !!options.includePrerelease) {
+        return version;
       } else {
         version = version.version;
       }
     } else if (typeof version !== 'string') {
-      throw new TypeError(`Invalid version. Must be a string. Got type "${typeof version}".`)
+      throw new TypeError("Invalid version. Must be a string. Got type \"".concat(typeof version, "\"."));
     }
-
     if (version.length > MAX_LENGTH) {
-      throw new TypeError(
-        `version is longer than ${MAX_LENGTH} characters`
-      )
+      throw new TypeError("version is longer than ".concat(MAX_LENGTH, " characters"));
     }
-
     debug('SemVer', version, options);
     this.options = options;
     this.loose = !!options.loose;
     // this isn't actually relevant for versions, but keep it so that we
     // don't run into trouble passing this.options around.
     this.includePrerelease = !!options.includePrerelease;
-
     const m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL]);
-
     if (!m) {
-      throw new TypeError(`Invalid Version: ${version}`)
+      throw new TypeError("Invalid Version: ".concat(version));
     }
-
     this.raw = version;
 
     // these are actually numbers
     this.major = +m[1];
     this.minor = +m[2];
     this.patch = +m[3];
-
     if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-      throw new TypeError('Invalid major version')
+      throw new TypeError('Invalid major version');
     }
-
     if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-      throw new TypeError('Invalid minor version')
+      throw new TypeError('Invalid minor version');
     }
-
     if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-      throw new TypeError('Invalid patch version')
+      throw new TypeError('Invalid patch version');
     }
 
     // numberify any prerelease numeric ids
     if (!m[4]) {
       this.prerelease = [];
     } else {
-      this.prerelease = m[4].split('.').map((id) => {
+      this.prerelease = m[4].split('.').map(id => {
         if (/^[0-9]+$/.test(id)) {
           const num = +id;
           if (num >= 0 && num < MAX_SAFE_INTEGER) {
-            return num
+            return num;
           }
         }
-        return id
+        return id;
       });
     }
-
     this.build = m[5] ? m[5].split('.') : [];
     this.format();
   }
-
-  format () {
-    this.version = `${this.major}.${this.minor}.${this.patch}`;
+  format() {
+    this.version = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
     if (this.prerelease.length) {
-      this.version += `-${this.prerelease.join('.')}`;
+      this.version += "-".concat(this.prerelease.join('.'));
     }
-    return this.version
+    return this.version;
   }
-
-  toString () {
-    return this.version
+  toString() {
+    return this.version;
   }
-
-  compare (other) {
+  compare(other) {
     debug('SemVer.compare', this.version, this.options, other);
     if (!(other instanceof SemVer)) {
       if (typeof other === 'string' && other === this.version) {
-        return 0
+        return 0;
       }
       other = new SemVer(other, this.options);
     }
-
     if (other.version === this.version) {
-      return 0
+      return 0;
     }
-
-    return this.compareMain(other) || this.comparePre(other)
+    return this.compareMain(other) || this.comparePre(other);
   }
-
-  compareMain (other) {
+  compareMain(other) {
     if (!(other instanceof SemVer)) {
       other = new SemVer(other, this.options);
     }
-
-    return (
-      compareIdentifiers(this.major, other.major) ||
-      compareIdentifiers(this.minor, other.minor) ||
-      compareIdentifiers(this.patch, other.patch)
-    )
+    return compareIdentifiers(this.major, other.major) || compareIdentifiers(this.minor, other.minor) || compareIdentifiers(this.patch, other.patch);
   }
-
-  comparePre (other) {
+  comparePre(other) {
     if (!(other instanceof SemVer)) {
       other = new SemVer(other, this.options);
     }
 
     // NOT having a prerelease is > having one
     if (this.prerelease.length && !other.prerelease.length) {
-      return -1
+      return -1;
     } else if (!this.prerelease.length && other.prerelease.length) {
-      return 1
+      return 1;
     } else if (!this.prerelease.length && !other.prerelease.length) {
-      return 0
+      return 0;
     }
-
     let i = 0;
     do {
       const a = this.prerelease[i];
       const b = other.prerelease[i];
       debug('prerelease compare', i, a, b);
       if (a === undefined && b === undefined) {
-        return 0
+        return 0;
       } else if (b === undefined) {
-        return 1
+        return 1;
       } else if (a === undefined) {
-        return -1
+        return -1;
       } else if (a === b) {
-        continue
+        continue;
       } else {
-        return compareIdentifiers(a, b)
+        return compareIdentifiers(a, b);
       }
-    } while (++i)
+    } while (++i);
   }
-
-  compareBuild (other) {
+  compareBuild(other) {
     if (!(other instanceof SemVer)) {
       other = new SemVer(other, this.options);
     }
-
     let i = 0;
     do {
       const a = this.build[i];
       const b = other.build[i];
       debug('build compare', i, a, b);
       if (a === undefined && b === undefined) {
-        return 0
+        return 0;
       } else if (b === undefined) {
-        return 1
+        return 1;
       } else if (a === undefined) {
-        return -1
+        return -1;
       } else if (a === b) {
-        continue
+        continue;
       } else {
-        return compareIdentifiers(a, b)
+        return compareIdentifiers(a, b);
       }
-    } while (++i)
+    } while (++i);
   }
 
   // preminor will bump the version up to the next minor release, and immediately
   // down to pre-release. premajor and prepatch work the same way.
-  inc (release, identifier, identifierBase) {
+  inc(release, identifier, identifierBase) {
     switch (release) {
       case 'premajor':
         this.prerelease.length = 0;
@@ -27581,13 +27662,13 @@ let SemVer$1 = class SemVer {
         this.minor = 0;
         this.major++;
         this.inc('pre', identifier, identifierBase);
-        break
+        break;
       case 'preminor':
         this.prerelease.length = 0;
         this.patch = 0;
         this.minor++;
         this.inc('pre', identifier, identifierBase);
-        break
+        break;
       case 'prepatch':
         // If this is already a prerelease, it will bump to the next version
         // drop any prereleases that might already exist, since they are not
@@ -27595,7 +27676,7 @@ let SemVer$1 = class SemVer {
         this.prerelease.length = 0;
         this.inc('patch', identifier, identifierBase);
         this.inc('pre', identifier, identifierBase);
-        break
+        break;
       // If the input is a non-prerelease version, this acts the same as
       // prepatch.
       case 'prerelease':
@@ -27603,24 +27684,19 @@ let SemVer$1 = class SemVer {
           this.inc('patch', identifier, identifierBase);
         }
         this.inc('pre', identifier, identifierBase);
-        break
-
+        break;
       case 'major':
         // If this is a pre-major version, bump up to the same major version.
         // Otherwise increment major.
         // 1.0.0-5 bumps to 1.0.0
         // 1.1.0 bumps to 2.0.0
-        if (
-          this.minor !== 0 ||
-          this.patch !== 0 ||
-          this.prerelease.length === 0
-        ) {
+        if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0) {
           this.major++;
         }
         this.minor = 0;
         this.patch = 0;
         this.prerelease = [];
-        break
+        break;
       case 'minor':
         // If this is a pre-minor version, bump up to the same minor version.
         // Otherwise increment minor.
@@ -27631,7 +27707,7 @@ let SemVer$1 = class SemVer {
         }
         this.patch = 0;
         this.prerelease = [];
-        break
+        break;
       case 'patch':
         // If this is not a pre-release version, it will increment the patch.
         // If it is a pre-release it will bump up to the same patch version.
@@ -27641,68 +27717,64 @@ let SemVer$1 = class SemVer {
           this.patch++;
         }
         this.prerelease = [];
-        break
+        break;
       // This probably shouldn't be used publicly.
       // 1.0.0 'pre' would become 1.0.0-0 which is the wrong direction.
-      case 'pre': {
-        const base = Number(identifierBase) ? 1 : 0;
-
-        if (!identifier && identifierBase === false) {
-          throw new Error('invalid increment argument: identifier is empty')
-        }
-
-        if (this.prerelease.length === 0) {
-          this.prerelease = [base];
-        } else {
-          let i = this.prerelease.length;
-          while (--i >= 0) {
-            if (typeof this.prerelease[i] === 'number') {
-              this.prerelease[i]++;
-              i = -2;
-            }
+      case 'pre':
+        {
+          const base = Number(identifierBase) ? 1 : 0;
+          if (!identifier && identifierBase === false) {
+            throw new Error('invalid increment argument: identifier is empty');
           }
-          if (i === -1) {
-            // didn't increment anything
-            if (identifier === this.prerelease.join('.') && identifierBase === false) {
-              throw new Error('invalid increment argument: identifier already exists')
+          if (this.prerelease.length === 0) {
+            this.prerelease = [base];
+          } else {
+            let i = this.prerelease.length;
+            while (--i >= 0) {
+              if (typeof this.prerelease[i] === 'number') {
+                this.prerelease[i]++;
+                i = -2;
+              }
+            }
+            if (i === -1) {
+              // didn't increment anything
+              if (identifier === this.prerelease.join('.') && identifierBase === false) {
+                throw new Error('invalid increment argument: identifier already exists');
+              }
+              this.prerelease.push(base);
             }
-            this.prerelease.push(base);
-          }
-        }
-        if (identifier) {
-          // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-          // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-          let prerelease = [identifier, base];
-          if (identifierBase === false) {
-            prerelease = [identifier];
           }
-          if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-            if (isNaN(this.prerelease[1])) {
+          if (identifier) {
+            // 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+            // 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+            let prerelease = [identifier, base];
+            if (identifierBase === false) {
+              prerelease = [identifier];
+            }
+            if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
+              if (isNaN(this.prerelease[1])) {
+                this.prerelease = prerelease;
+              }
+            } else {
               this.prerelease = prerelease;
             }
-          } else {
-            this.prerelease = prerelease;
           }
+          break;
         }
-        break
-      }
       default:
-        throw new Error(`invalid increment argument: ${release}`)
+        throw new Error("invalid increment argument: ".concat(release));
     }
     this.raw = this.format();
     if (this.build.length) {
-      this.raw += `+${this.build.join('.')}`;
+      this.raw += "+".concat(this.build.join('.'));
     }
-    return this
+    return this;
   }
 };
-
 var semver = SemVer$1;
 
 const SemVer = semver;
-const compare$6 = (a, b, loose) =>
-  new SemVer(a, loose).compare(new SemVer(b, loose));
-
+const compare$6 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
 var compare_1 = compare$6;
 
 const compare$5 = compare_1;
@@ -27735,7 +27807,6 @@ const gt = gt_1;
 const gte = gte_1;
 const lt = lt_1;
 const lte = lte_1;
-
 const cmp = (a, op, b, loose) => {
   switch (op) {
     case '===':
@@ -27745,8 +27816,7 @@ const cmp = (a, op, b, loose) => {
       if (typeof b === 'object') {
         b = b.version;
       }
-      return a === b
-
+      return a === b;
     case '!==':
       if (typeof a === 'object') {
         a = a.version;
@@ -27754,731 +27824,628 @@ const cmp = (a, op, b, loose) => {
       if (typeof b === 'object') {
         b = b.version;
       }
-      return a !== b
-
+      return a !== b;
     case '':
     case '=':
     case '==':
-      return eq(a, b, loose)
-
+      return eq(a, b, loose);
     case '!=':
-      return neq(a, b, loose)
-
+      return neq(a, b, loose);
     case '>':
-      return gt(a, b, loose)
-
+      return gt(a, b, loose);
     case '>=':
-      return gte(a, b, loose)
-
+      return gte(a, b, loose);
     case '<':
-      return lt(a, b, loose)
-
+      return lt(a, b, loose);
     case '<=':
-      return lte(a, b, loose)
-
+      return lte(a, b, loose);
     default:
-      throw new TypeError(`Invalid operator: ${op}`)
+      throw new TypeError("Invalid operator: ".concat(op));
   }
 };
 var cmp_1 = cmp;
 
 var comparator;
 var hasRequiredComparator;
+function requireComparator() {
+  if (hasRequiredComparator) return comparator;
+  hasRequiredComparator = 1;
+  const ANY = Symbol('SemVer ANY');
+  // hoisted class for cyclic dependency
+  class Comparator {
+    static get ANY() {
+      return ANY;
+    }
+    constructor(comp, options) {
+      options = parseOptions(options);
+      if (comp instanceof Comparator) {
+        if (comp.loose === !!options.loose) {
+          return comp;
+        } else {
+          comp = comp.value;
+        }
+      }
+      comp = comp.trim().split(/\s+/).join(' ');
+      debug('comparator', comp, options);
+      this.options = options;
+      this.loose = !!options.loose;
+      this.parse(comp);
+      if (this.semver === ANY) {
+        this.value = '';
+      } else {
+        this.value = this.operator + this.semver.version;
+      }
+      debug('comp', this);
+    }
+    parse(comp) {
+      const r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
+      const m = comp.match(r);
+      if (!m) {
+        throw new TypeError("Invalid comparator: ".concat(comp));
+      }
+      this.operator = m[1] !== undefined ? m[1] : '';
+      if (this.operator === '=') {
+        this.operator = '';
+      }
 
-function requireComparator () {
-	if (hasRequiredComparator) return comparator;
-	hasRequiredComparator = 1;
-	const ANY = Symbol('SemVer ANY');
-	// hoisted class for cyclic dependency
-	class Comparator {
-	  static get ANY () {
-	    return ANY
-	  }
-
-	  constructor (comp, options) {
-	    options = parseOptions(options);
-
-	    if (comp instanceof Comparator) {
-	      if (comp.loose === !!options.loose) {
-	        return comp
-	      } else {
-	        comp = comp.value;
-	      }
-	    }
-
-	    comp = comp.trim().split(/\s+/).join(' ');
-	    debug('comparator', comp, options);
-	    this.options = options;
-	    this.loose = !!options.loose;
-	    this.parse(comp);
-
-	    if (this.semver === ANY) {
-	      this.value = '';
-	    } else {
-	      this.value = this.operator + this.semver.version;
-	    }
-
-	    debug('comp', this);
-	  }
-
-	  parse (comp) {
-	    const r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
-	    const m = comp.match(r);
-
-	    if (!m) {
-	      throw new TypeError(`Invalid comparator: ${comp}`)
-	    }
-
-	    this.operator = m[1] !== undefined ? m[1] : '';
-	    if (this.operator === '=') {
-	      this.operator = '';
-	    }
-
-	    // if it literally is just '>' or '' then allow anything.
-	    if (!m[2]) {
-	      this.semver = ANY;
-	    } else {
-	      this.semver = new SemVer(m[2], this.options.loose);
-	    }
-	  }
-
-	  toString () {
-	    return this.value
-	  }
-
-	  test (version) {
-	    debug('Comparator.test', version, this.options.loose);
-
-	    if (this.semver === ANY || version === ANY) {
-	      return true
-	    }
-
-	    if (typeof version === 'string') {
-	      try {
-	        version = new SemVer(version, this.options);
-	      } catch (er) {
-	        return false
-	      }
-	    }
-
-	    return cmp(version, this.operator, this.semver, this.options)
-	  }
-
-	  intersects (comp, options) {
-	    if (!(comp instanceof Comparator)) {
-	      throw new TypeError('a Comparator is required')
-	    }
-
-	    if (this.operator === '') {
-	      if (this.value === '') {
-	        return true
-	      }
-	      return new Range(comp.value, options).test(this.value)
-	    } else if (comp.operator === '') {
-	      if (comp.value === '') {
-	        return true
-	      }
-	      return new Range(this.value, options).test(comp.semver)
-	    }
-
-	    options = parseOptions(options);
-
-	    // Special cases where nothing can possibly be lower
-	    if (options.includePrerelease &&
-	      (this.value === '<0.0.0-0' || comp.value === '<0.0.0-0')) {
-	      return false
-	    }
-	    if (!options.includePrerelease &&
-	      (this.value.startsWith('<0.0.0') || comp.value.startsWith('<0.0.0'))) {
-	      return false
-	    }
-
-	    // Same direction increasing (> or >=)
-	    if (this.operator.startsWith('>') && comp.operator.startsWith('>')) {
-	      return true
-	    }
-	    // Same direction decreasing (< or <=)
-	    if (this.operator.startsWith('<') && comp.operator.startsWith('<')) {
-	      return true
-	    }
-	    // same SemVer and both sides are inclusive (<= or >=)
-	    if (
-	      (this.semver.version === comp.semver.version) &&
-	      this.operator.includes('=') && comp.operator.includes('=')) {
-	      return true
-	    }
-	    // opposite directions less than
-	    if (cmp(this.semver, '<', comp.semver, options) &&
-	      this.operator.startsWith('>') && comp.operator.startsWith('<')) {
-	      return true
-	    }
-	    // opposite directions greater than
-	    if (cmp(this.semver, '>', comp.semver, options) &&
-	      this.operator.startsWith('<') && comp.operator.startsWith('>')) {
-	      return true
-	    }
-	    return false
-	  }
-	}
+      // if it literally is just '>' or '' then allow anything.
+      if (!m[2]) {
+        this.semver = ANY;
+      } else {
+        this.semver = new SemVer(m[2], this.options.loose);
+      }
+    }
+    toString() {
+      return this.value;
+    }
+    test(version) {
+      debug('Comparator.test', version, this.options.loose);
+      if (this.semver === ANY || version === ANY) {
+        return true;
+      }
+      if (typeof version === 'string') {
+        try {
+          version = new SemVer(version, this.options);
+        } catch (er) {
+          return false;
+        }
+      }
+      return cmp(version, this.operator, this.semver, this.options);
+    }
+    intersects(comp, options) {
+      if (!(comp instanceof Comparator)) {
+        throw new TypeError('a Comparator is required');
+      }
+      if (this.operator === '') {
+        if (this.value === '') {
+          return true;
+        }
+        return new Range(comp.value, options).test(this.value);
+      } else if (comp.operator === '') {
+        if (comp.value === '') {
+          return true;
+        }
+        return new Range(this.value, options).test(comp.semver);
+      }
+      options = parseOptions(options);
 
-	comparator = Comparator;
+      // Special cases where nothing can possibly be lower
+      if (options.includePrerelease && (this.value === '<0.0.0-0' || comp.value === '<0.0.0-0')) {
+        return false;
+      }
+      if (!options.includePrerelease && (this.value.startsWith('<0.0.0') || comp.value.startsWith('<0.0.0'))) {
+        return false;
+      }
 
-	const parseOptions = parseOptions_1;
-	const { safeRe: re, t } = reExports;
-	const cmp = cmp_1;
-	const debug = debug_1;
-	const SemVer = semver;
-	const Range = requireRange();
-	return comparator;
+      // Same direction increasing (> or >=)
+      if (this.operator.startsWith('>') && comp.operator.startsWith('>')) {
+        return true;
+      }
+      // Same direction decreasing (< or <=)
+      if (this.operator.startsWith('<') && comp.operator.startsWith('<')) {
+        return true;
+      }
+      // same SemVer and both sides are inclusive (<= or >=)
+      if (this.semver.version === comp.semver.version && this.operator.includes('=') && comp.operator.includes('=')) {
+        return true;
+      }
+      // opposite directions less than
+      if (cmp(this.semver, '<', comp.semver, options) && this.operator.startsWith('>') && comp.operator.startsWith('<')) {
+        return true;
+      }
+      // opposite directions greater than
+      if (cmp(this.semver, '>', comp.semver, options) && this.operator.startsWith('<') && comp.operator.startsWith('>')) {
+        return true;
+      }
+      return false;
+    }
+  }
+  comparator = Comparator;
+  const parseOptions = parseOptions_1;
+  const {
+    safeRe: re,
+    t
+  } = reExports;
+  const cmp = cmp_1;
+  const debug = debug_1;
+  const SemVer = semver;
+  const Range = requireRange();
+  return comparator;
 }
 
 var range;
 var hasRequiredRange;
+function requireRange() {
+  if (hasRequiredRange) return range;
+  hasRequiredRange = 1;
+  const SPACE_CHARACTERS = /\s+/g;
+
+  // hoisted class for cyclic dependency
+  class Range {
+    constructor(range, options) {
+      options = parseOptions(options);
+      if (range instanceof Range) {
+        if (range.loose === !!options.loose && range.includePrerelease === !!options.includePrerelease) {
+          return range;
+        } else {
+          return new Range(range.raw, options);
+        }
+      }
+      if (range instanceof Comparator) {
+        // just put it in the set and return
+        this.raw = range.value;
+        this.set = [[range]];
+        this.formatted = undefined;
+        return this;
+      }
+      this.options = options;
+      this.loose = !!options.loose;
+      this.includePrerelease = !!options.includePrerelease;
+
+      // First reduce all whitespace as much as possible so we do not have to rely
+      // on potentially slow regexes like \s*. This is then stored and used for
+      // future error messages as well.
+      this.raw = range.trim().replace(SPACE_CHARACTERS, ' ');
+
+      // First, split on ||
+      this.set = this.raw.split('||')
+      // map the range to a 2d array of comparators
+      .map(r => this.parseRange(r.trim()))
+      // throw out any comparator lists that are empty
+      // this generally means that it was not a valid range, which is allowed
+      // in loose mode, but will still throw if the WHOLE range is invalid.
+      .filter(c => c.length);
+      if (!this.set.length) {
+        throw new TypeError("Invalid SemVer Range: ".concat(this.raw));
+      }
+
+      // if we have any that are not the null set, throw out null sets.
+      if (this.set.length > 1) {
+        // keep the first one, in case they're all null sets
+        const first = this.set[0];
+        this.set = this.set.filter(c => !isNullSet(c[0]));
+        if (this.set.length === 0) {
+          this.set = [first];
+        } else if (this.set.length > 1) {
+          // if we have any that are *, then the range is just *
+          for (const c of this.set) {
+            if (c.length === 1 && isAny(c[0])) {
+              this.set = [c];
+              break;
+            }
+          }
+        }
+      }
+      this.formatted = undefined;
+    }
+    get range() {
+      if (this.formatted === undefined) {
+        this.formatted = '';
+        for (let i = 0; i < this.set.length; i++) {
+          if (i > 0) {
+            this.formatted += '||';
+          }
+          const comps = this.set[i];
+          for (let k = 0; k < comps.length; k++) {
+            if (k > 0) {
+              this.formatted += ' ';
+            }
+            this.formatted += comps[k].toString().trim();
+          }
+        }
+      }
+      return this.formatted;
+    }
+    format() {
+      return this.range;
+    }
+    toString() {
+      return this.range;
+    }
+    parseRange(range) {
+      // memoize range parsing for performance.
+      // this is a very hot path, and fully deterministic.
+      const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
+      const memoKey = memoOpts + ':' + range;
+      const cached = cache.get(memoKey);
+      if (cached) {
+        return cached;
+      }
+      const loose = this.options.loose;
+      // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+      const hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE];
+      range = range.replace(hr, hyphenReplace(this.options.includePrerelease));
+      debug('hyphen replace', range);
+
+      // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+      range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace);
+      debug('comparator trim', range);
+
+      // `~ 1.2.3` => `~1.2.3`
+      range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
+      debug('tilde trim', range);
+
+      // `^ 1.2.3` => `^1.2.3`
+      range = range.replace(re[t.CARETTRIM], caretTrimReplace);
+      debug('caret trim', range);
+
+      // At this point, the range is completely trimmed and
+      // ready to be split into comparators.
+
+      let rangeList = range.split(' ').map(comp => parseComparator(comp, this.options)).join(' ').split(/\s+/)
+      // >=0.0.0 is equivalent to *
+      .map(comp => replaceGTE0(comp, this.options));
+      if (loose) {
+        // in loose mode, throw out any that are not valid comparators
+        rangeList = rangeList.filter(comp => {
+          debug('loose invalid filter', comp, this.options);
+          return !!comp.match(re[t.COMPARATORLOOSE]);
+        });
+      }
+      debug('range list', rangeList);
 
-function requireRange () {
-	if (hasRequiredRange) return range;
-	hasRequiredRange = 1;
-	// hoisted class for cyclic dependency
-	class Range {
-	  constructor (range, options) {
-	    options = parseOptions(options);
-
-	    if (range instanceof Range) {
-	      if (
-	        range.loose === !!options.loose &&
-	        range.includePrerelease === !!options.includePrerelease
-	      ) {
-	        return range
-	      } else {
-	        return new Range(range.raw, options)
-	      }
-	    }
-
-	    if (range instanceof Comparator) {
-	      // just put it in the set and return
-	      this.raw = range.value;
-	      this.set = [[range]];
-	      this.format();
-	      return this
-	    }
-
-	    this.options = options;
-	    this.loose = !!options.loose;
-	    this.includePrerelease = !!options.includePrerelease;
-
-	    // First reduce all whitespace as much as possible so we do not have to rely
-	    // on potentially slow regexes like \s*. This is then stored and used for
-	    // future error messages as well.
-	    this.raw = range
-	      .trim()
-	      .split(/\s+/)
-	      .join(' ');
-
-	    // First, split on ||
-	    this.set = this.raw
-	      .split('||')
-	      // map the range to a 2d array of comparators
-	      .map(r => this.parseRange(r.trim()))
-	      // throw out any comparator lists that are empty
-	      // this generally means that it was not a valid range, which is allowed
-	      // in loose mode, but will still throw if the WHOLE range is invalid.
-	      .filter(c => c.length);
-
-	    if (!this.set.length) {
-	      throw new TypeError(`Invalid SemVer Range: ${this.raw}`)
-	    }
-
-	    // if we have any that are not the null set, throw out null sets.
-	    if (this.set.length > 1) {
-	      // keep the first one, in case they're all null sets
-	      const first = this.set[0];
-	      this.set = this.set.filter(c => !isNullSet(c[0]));
-	      if (this.set.length === 0) {
-	        this.set = [first];
-	      } else if (this.set.length > 1) {
-	        // if we have any that are *, then the range is just *
-	        for (const c of this.set) {
-	          if (c.length === 1 && isAny(c[0])) {
-	            this.set = [c];
-	            break
-	          }
-	        }
-	      }
-	    }
-
-	    this.format();
-	  }
-
-	  format () {
-	    this.range = this.set
-	      .map((comps) => comps.join(' ').trim())
-	      .join('||')
-	      .trim();
-	    return this.range
-	  }
-
-	  toString () {
-	    return this.range
-	  }
-
-	  parseRange (range) {
-	    // memoize range parsing for performance.
-	    // this is a very hot path, and fully deterministic.
-	    const memoOpts =
-	      (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) |
-	      (this.options.loose && FLAG_LOOSE);
-	    const memoKey = memoOpts + ':' + range;
-	    const cached = cache.get(memoKey);
-	    if (cached) {
-	      return cached
-	    }
-
-	    const loose = this.options.loose;
-	    // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-	    const hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE];
-	    range = range.replace(hr, hyphenReplace(this.options.includePrerelease));
-	    debug('hyphen replace', range);
-
-	    // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
-	    range = range.replace(re[t.COMPARATORTRIM], comparatorTrimReplace);
-	    debug('comparator trim', range);
-
-	    // `~ 1.2.3` => `~1.2.3`
-	    range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
-	    debug('tilde trim', range);
-
-	    // `^ 1.2.3` => `^1.2.3`
-	    range = range.replace(re[t.CARETTRIM], caretTrimReplace);
-	    debug('caret trim', range);
-
-	    // At this point, the range is completely trimmed and
-	    // ready to be split into comparators.
-
-	    let rangeList = range
-	      .split(' ')
-	      .map(comp => parseComparator(comp, this.options))
-	      .join(' ')
-	      .split(/\s+/)
-	      // >=0.0.0 is equivalent to *
-	      .map(comp => replaceGTE0(comp, this.options));
-
-	    if (loose) {
-	      // in loose mode, throw out any that are not valid comparators
-	      rangeList = rangeList.filter(comp => {
-	        debug('loose invalid filter', comp, this.options);
-	        return !!comp.match(re[t.COMPARATORLOOSE])
-	      });
-	    }
-	    debug('range list', rangeList);
-
-	    // if any comparators are the null set, then replace with JUST null set
-	    // if more than one comparator, remove any * comparators
-	    // also, don't include the same comparator more than once
-	    const rangeMap = new Map();
-	    const comparators = rangeList.map(comp => new Comparator(comp, this.options));
-	    for (const comp of comparators) {
-	      if (isNullSet(comp)) {
-	        return [comp]
-	      }
-	      rangeMap.set(comp.value, comp);
-	    }
-	    if (rangeMap.size > 1 && rangeMap.has('')) {
-	      rangeMap.delete('');
-	    }
-
-	    const result = [...rangeMap.values()];
-	    cache.set(memoKey, result);
-	    return result
-	  }
-
-	  intersects (range, options) {
-	    if (!(range instanceof Range)) {
-	      throw new TypeError('a Range is required')
-	    }
-
-	    return this.set.some((thisComparators) => {
-	      return (
-	        isSatisfiable(thisComparators, options) &&
-	        range.set.some((rangeComparators) => {
-	          return (
-	            isSatisfiable(rangeComparators, options) &&
-	            thisComparators.every((thisComparator) => {
-	              return rangeComparators.every((rangeComparator) => {
-	                return thisComparator.intersects(rangeComparator, options)
-	              })
-	            })
-	          )
-	        })
-	      )
-	    })
-	  }
-
-	  // if ANY of the sets match ALL of its comparators, then pass
-	  test (version) {
-	    if (!version) {
-	      return false
-	    }
-
-	    if (typeof version === 'string') {
-	      try {
-	        version = new SemVer(version, this.options);
-	      } catch (er) {
-	        return false
-	      }
-	    }
-
-	    for (let i = 0; i < this.set.length; i++) {
-	      if (testSet(this.set[i], version, this.options)) {
-	        return true
-	      }
-	    }
-	    return false
-	  }
-	}
+      // if any comparators are the null set, then replace with JUST null set
+      // if more than one comparator, remove any * comparators
+      // also, don't include the same comparator more than once
+      const rangeMap = new Map();
+      const comparators = rangeList.map(comp => new Comparator(comp, this.options));
+      for (const comp of comparators) {
+        if (isNullSet(comp)) {
+          return [comp];
+        }
+        rangeMap.set(comp.value, comp);
+      }
+      if (rangeMap.size > 1 && rangeMap.has('')) {
+        rangeMap.delete('');
+      }
+      const result = [...rangeMap.values()];
+      cache.set(memoKey, result);
+      return result;
+    }
+    intersects(range, options) {
+      if (!(range instanceof Range)) {
+        throw new TypeError('a Range is required');
+      }
+      return this.set.some(thisComparators => {
+        return isSatisfiable(thisComparators, options) && range.set.some(rangeComparators => {
+          return isSatisfiable(rangeComparators, options) && thisComparators.every(thisComparator => {
+            return rangeComparators.every(rangeComparator => {
+              return thisComparator.intersects(rangeComparator, options);
+            });
+          });
+        });
+      });
+    }
 
-	range = Range;
-
-	const LRU = lrucache;
-	const cache = new LRU();
-
-	const parseOptions = parseOptions_1;
-	const Comparator = requireComparator();
-	const debug = debug_1;
-	const SemVer = semver;
-	const {
-	  safeRe: re,
-	  t,
-	  comparatorTrimReplace,
-	  tildeTrimReplace,
-	  caretTrimReplace,
-	} = reExports;
-	const { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = constants;
-
-	const isNullSet = c => c.value === '<0.0.0-0';
-	const isAny = c => c.value === '';
-
-	// take a set of comparators and determine whether there
-	// exists a version which can satisfy it
-	const isSatisfiable = (comparators, options) => {
-	  let result = true;
-	  const remainingComparators = comparators.slice();
-	  let testComparator = remainingComparators.pop();
-
-	  while (result && remainingComparators.length) {
-	    result = remainingComparators.every((otherComparator) => {
-	      return testComparator.intersects(otherComparator, options)
-	    });
-
-	    testComparator = remainingComparators.pop();
-	  }
-
-	  return result
-	};
-
-	// comprised of xranges, tildes, stars, and gtlt's at this point.
-	// already replaced the hyphen ranges
-	// turn into a set of JUST comparators.
-	const parseComparator = (comp, options) => {
-	  debug('comp', comp, options);
-	  comp = replaceCarets(comp, options);
-	  debug('caret', comp);
-	  comp = replaceTildes(comp, options);
-	  debug('tildes', comp);
-	  comp = replaceXRanges(comp, options);
-	  debug('xrange', comp);
-	  comp = replaceStars(comp, options);
-	  debug('stars', comp);
-	  return comp
-	};
-
-	const isX = id => !id || id.toLowerCase() === 'x' || id === '*';
-
-	// ~, ~> --> * (any, kinda silly)
-	// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0-0
-	// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0-0
-	// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0-0
-	// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0-0
-	// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0-0
-	// ~0.0.1 --> >=0.0.1 <0.1.0-0
-	const replaceTildes = (comp, options) => {
-	  return comp
-	    .trim()
-	    .split(/\s+/)
-	    .map((c) => replaceTilde(c, options))
-	    .join(' ')
-	};
-
-	const replaceTilde = (comp, options) => {
-	  const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
-	  return comp.replace(r, (_, M, m, p, pr) => {
-	    debug('tilde', comp, _, M, m, p, pr);
-	    let ret;
-
-	    if (isX(M)) {
-	      ret = '';
-	    } else if (isX(m)) {
-	      ret = `>=${M}.0.0 <${+M + 1}.0.0-0`;
-	    } else if (isX(p)) {
-	      // ~1.2 == >=1.2.0 <1.3.0-0
-	      ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0-0`;
-	    } else if (pr) {
-	      debug('replaceTilde pr', pr);
-	      ret = `>=${M}.${m}.${p}-${pr
-	      } <${M}.${+m + 1}.0-0`;
-	    } else {
-	      // ~1.2.3 == >=1.2.3 <1.3.0-0
-	      ret = `>=${M}.${m}.${p
-	      } <${M}.${+m + 1}.0-0`;
-	    }
-
-	    debug('tilde return', ret);
-	    return ret
-	  })
-	};
-
-	// ^ --> * (any, kinda silly)
-	// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0-0
-	// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0-0
-	// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0-0
-	// ^1.2.3 --> >=1.2.3 <2.0.0-0
-	// ^1.2.0 --> >=1.2.0 <2.0.0-0
-	// ^0.0.1 --> >=0.0.1 <0.0.2-0
-	// ^0.1.0 --> >=0.1.0 <0.2.0-0
-	const replaceCarets = (comp, options) => {
-	  return comp
-	    .trim()
-	    .split(/\s+/)
-	    .map((c) => replaceCaret(c, options))
-	    .join(' ')
-	};
-
-	const replaceCaret = (comp, options) => {
-	  debug('caret', comp, options);
-	  const r = options.loose ? re[t.CARETLOOSE] : re[t.CARET];
-	  const z = options.includePrerelease ? '-0' : '';
-	  return comp.replace(r, (_, M, m, p, pr) => {
-	    debug('caret', comp, _, M, m, p, pr);
-	    let ret;
-
-	    if (isX(M)) {
-	      ret = '';
-	    } else if (isX(m)) {
-	      ret = `>=${M}.0.0${z} <${+M + 1}.0.0-0`;
-	    } else if (isX(p)) {
-	      if (M === '0') {
-	        ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0-0`;
-	      } else {
-	        ret = `>=${M}.${m}.0${z} <${+M + 1}.0.0-0`;
-	      }
-	    } else if (pr) {
-	      debug('replaceCaret pr', pr);
-	      if (M === '0') {
-	        if (m === '0') {
-	          ret = `>=${M}.${m}.${p}-${pr
-	          } <${M}.${m}.${+p + 1}-0`;
-	        } else {
-	          ret = `>=${M}.${m}.${p}-${pr
-	          } <${M}.${+m + 1}.0-0`;
-	        }
-	      } else {
-	        ret = `>=${M}.${m}.${p}-${pr
-	        } <${+M + 1}.0.0-0`;
-	      }
-	    } else {
-	      debug('no pr');
-	      if (M === '0') {
-	        if (m === '0') {
-	          ret = `>=${M}.${m}.${p
-	          }${z} <${M}.${m}.${+p + 1}-0`;
-	        } else {
-	          ret = `>=${M}.${m}.${p
-	          }${z} <${M}.${+m + 1}.0-0`;
-	        }
-	      } else {
-	        ret = `>=${M}.${m}.${p
-	        } <${+M + 1}.0.0-0`;
-	      }
-	    }
-
-	    debug('caret return', ret);
-	    return ret
-	  })
-	};
-
-	const replaceXRanges = (comp, options) => {
-	  debug('replaceXRanges', comp, options);
-	  return comp
-	    .split(/\s+/)
-	    .map((c) => replaceXRange(c, options))
-	    .join(' ')
-	};
-
-	const replaceXRange = (comp, options) => {
-	  comp = comp.trim();
-	  const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
-	  return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
-	    debug('xRange', comp, ret, gtlt, M, m, p, pr);
-	    const xM = isX(M);
-	    const xm = xM || isX(m);
-	    const xp = xm || isX(p);
-	    const anyX = xp;
-
-	    if (gtlt === '=' && anyX) {
-	      gtlt = '';
-	    }
-
-	    // if we're including prereleases in the match, then we need
-	    // to fix this to -0, the lowest possible prerelease value
-	    pr = options.includePrerelease ? '-0' : '';
-
-	    if (xM) {
-	      if (gtlt === '>' || gtlt === '<') {
-	        // nothing is allowed
-	        ret = '<0.0.0-0';
-	      } else {
-	        // nothing is forbidden
-	        ret = '*';
-	      }
-	    } else if (gtlt && anyX) {
-	      // we know patch is an x, because we have any x at all.
-	      // replace X with 0
-	      if (xm) {
-	        m = 0;
-	      }
-	      p = 0;
-
-	      if (gtlt === '>') {
-	        // >1 => >=2.0.0
-	        // >1.2 => >=1.3.0
-	        gtlt = '>=';
-	        if (xm) {
-	          M = +M + 1;
-	          m = 0;
-	          p = 0;
-	        } else {
-	          m = +m + 1;
-	          p = 0;
-	        }
-	      } else if (gtlt === '<=') {
-	        // <=0.7.x is actually <0.8.0, since any 0.7.x should
-	        // pass.  Similarly, <=7.x is actually <8.0.0, etc.
-	        gtlt = '<';
-	        if (xm) {
-	          M = +M + 1;
-	        } else {
-	          m = +m + 1;
-	        }
-	      }
-
-	      if (gtlt === '<') {
-	        pr = '-0';
-	      }
-
-	      ret = `${gtlt + M}.${m}.${p}${pr}`;
-	    } else if (xm) {
-	      ret = `>=${M}.0.0${pr} <${+M + 1}.0.0-0`;
-	    } else if (xp) {
-	      ret = `>=${M}.${m}.0${pr
-	      } <${M}.${+m + 1}.0-0`;
-	    }
-
-	    debug('xRange return', ret);
-
-	    return ret
-	  })
-	};
-
-	// Because * is AND-ed with everything else in the comparator,
-	// and '' means "any version", just remove the *s entirely.
-	const replaceStars = (comp, options) => {
-	  debug('replaceStars', comp, options);
-	  // Looseness is ignored here.  star is always as loose as it gets!
-	  return comp
-	    .trim()
-	    .replace(re[t.STAR], '')
-	};
-
-	const replaceGTE0 = (comp, options) => {
-	  debug('replaceGTE0', comp, options);
-	  return comp
-	    .trim()
-	    .replace(re[options.includePrerelease ? t.GTE0PRE : t.GTE0], '')
-	};
-
-	// This function is passed to string.replace(re[t.HYPHENRANGE])
-	// M, m, patch, prerelease, build
-	// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
-	// 1.2.3 - 3.4 => >=1.2.0 <3.5.0-0 Any 3.4.x will do
-	// 1.2 - 3.4 => >=1.2.0 <3.5.0-0
-	// TODO build?
-	const hyphenReplace = incPr => ($0,
-	  from, fM, fm, fp, fpr, fb,
-	  to, tM, tm, tp, tpr) => {
-	  if (isX(fM)) {
-	    from = '';
-	  } else if (isX(fm)) {
-	    from = `>=${fM}.0.0${incPr ? '-0' : ''}`;
-	  } else if (isX(fp)) {
-	    from = `>=${fM}.${fm}.0${incPr ? '-0' : ''}`;
-	  } else if (fpr) {
-	    from = `>=${from}`;
-	  } else {
-	    from = `>=${from}${incPr ? '-0' : ''}`;
-	  }
-
-	  if (isX(tM)) {
-	    to = '';
-	  } else if (isX(tm)) {
-	    to = `<${+tM + 1}.0.0-0`;
-	  } else if (isX(tp)) {
-	    to = `<${tM}.${+tm + 1}.0-0`;
-	  } else if (tpr) {
-	    to = `<=${tM}.${tm}.${tp}-${tpr}`;
-	  } else if (incPr) {
-	    to = `<${tM}.${tm}.${+tp + 1}-0`;
-	  } else {
-	    to = `<=${to}`;
-	  }
-
-	  return `${from} ${to}`.trim()
-	};
-
-	const testSet = (set, version, options) => {
-	  for (let i = 0; i < set.length; i++) {
-	    if (!set[i].test(version)) {
-	      return false
-	    }
-	  }
-
-	  if (version.prerelease.length && !options.includePrerelease) {
-	    // Find the set of versions that are allowed to have prereleases
-	    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
-	    // That should allow `1.2.3-pr.2` to pass.
-	    // However, `1.2.4-alpha.notready` should NOT be allowed,
-	    // even though it's within the range set by the comparators.
-	    for (let i = 0; i < set.length; i++) {
-	      debug(set[i].semver);
-	      if (set[i].semver === Comparator.ANY) {
-	        continue
-	      }
-
-	      if (set[i].semver.prerelease.length > 0) {
-	        const allowed = set[i].semver;
-	        if (allowed.major === version.major &&
-	            allowed.minor === version.minor &&
-	            allowed.patch === version.patch) {
-	          return true
-	        }
-	      }
-	    }
-
-	    // Version has a -pre, but it's not one of the ones we like.
-	    return false
-	  }
-
-	  return true
-	};
-	return range;
+    // if ANY of the sets match ALL of its comparators, then pass
+    test(version) {
+      if (!version) {
+        return false;
+      }
+      if (typeof version === 'string') {
+        try {
+          version = new SemVer(version, this.options);
+        } catch (er) {
+          return false;
+        }
+      }
+      for (let i = 0; i < this.set.length; i++) {
+        if (testSet(this.set[i], version, this.options)) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+  range = Range;
+  const LRU = lrucache;
+  const cache = new LRU();
+  const parseOptions = parseOptions_1;
+  const Comparator = requireComparator();
+  const debug = debug_1;
+  const SemVer = semver;
+  const {
+    safeRe: re,
+    t,
+    comparatorTrimReplace,
+    tildeTrimReplace,
+    caretTrimReplace
+  } = reExports;
+  const {
+    FLAG_INCLUDE_PRERELEASE,
+    FLAG_LOOSE
+  } = constants;
+  const isNullSet = c => c.value === '<0.0.0-0';
+  const isAny = c => c.value === '';
+
+  // take a set of comparators and determine whether there
+  // exists a version which can satisfy it
+  const isSatisfiable = (comparators, options) => {
+    let result = true;
+    const remainingComparators = comparators.slice();
+    let testComparator = remainingComparators.pop();
+    while (result && remainingComparators.length) {
+      result = remainingComparators.every(otherComparator => {
+        return testComparator.intersects(otherComparator, options);
+      });
+      testComparator = remainingComparators.pop();
+    }
+    return result;
+  };
+
+  // comprised of xranges, tildes, stars, and gtlt's at this point.
+  // already replaced the hyphen ranges
+  // turn into a set of JUST comparators.
+  const parseComparator = (comp, options) => {
+    debug('comp', comp, options);
+    comp = replaceCarets(comp, options);
+    debug('caret', comp);
+    comp = replaceTildes(comp, options);
+    debug('tildes', comp);
+    comp = replaceXRanges(comp, options);
+    debug('xrange', comp);
+    comp = replaceStars(comp, options);
+    debug('stars', comp);
+    return comp;
+  };
+  const isX = id => !id || id.toLowerCase() === 'x' || id === '*';
+
+  // ~, ~> --> * (any, kinda silly)
+  // ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0-0
+  // ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0-0
+  // ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0-0
+  // ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0-0
+  // ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0-0
+  // ~0.0.1 --> >=0.0.1 <0.1.0-0
+  const replaceTildes = (comp, options) => {
+    return comp.trim().split(/\s+/).map(c => replaceTilde(c, options)).join(' ');
+  };
+  const replaceTilde = (comp, options) => {
+    const r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+    return comp.replace(r, (_, M, m, p, pr) => {
+      debug('tilde', comp, _, M, m, p, pr);
+      let ret;
+      if (isX(M)) {
+        ret = '';
+      } else if (isX(m)) {
+        ret = ">=".concat(M, ".0.0 <").concat(+M + 1, ".0.0-0");
+      } else if (isX(p)) {
+        // ~1.2 == >=1.2.0 <1.3.0-0
+        ret = ">=".concat(M, ".").concat(m, ".0 <").concat(M, ".").concat(+m + 1, ".0-0");
+      } else if (pr) {
+        debug('replaceTilde pr', pr);
+        ret = ">=".concat(M, ".").concat(m, ".").concat(p, "-").concat(pr, " <").concat(M, ".").concat(+m + 1, ".0-0");
+      } else {
+        // ~1.2.3 == >=1.2.3 <1.3.0-0
+        ret = ">=".concat(M, ".").concat(m, ".").concat(p, " <").concat(M, ".").concat(+m + 1, ".0-0");
+      }
+      debug('tilde return', ret);
+      return ret;
+    });
+  };
+
+  // ^ --> * (any, kinda silly)
+  // ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0-0
+  // ^2.0, ^2.0.x --> >=2.0.0 <3.0.0-0
+  // ^1.2, ^1.2.x --> >=1.2.0 <2.0.0-0
+  // ^1.2.3 --> >=1.2.3 <2.0.0-0
+  // ^1.2.0 --> >=1.2.0 <2.0.0-0
+  // ^0.0.1 --> >=0.0.1 <0.0.2-0
+  // ^0.1.0 --> >=0.1.0 <0.2.0-0
+  const replaceCarets = (comp, options) => {
+    return comp.trim().split(/\s+/).map(c => replaceCaret(c, options)).join(' ');
+  };
+  const replaceCaret = (comp, options) => {
+    debug('caret', comp, options);
+    const r = options.loose ? re[t.CARETLOOSE] : re[t.CARET];
+    const z = options.includePrerelease ? '-0' : '';
+    return comp.replace(r, (_, M, m, p, pr) => {
+      debug('caret', comp, _, M, m, p, pr);
+      let ret;
+      if (isX(M)) {
+        ret = '';
+      } else if (isX(m)) {
+        ret = ">=".concat(M, ".0.0").concat(z, " <").concat(+M + 1, ".0.0-0");
+      } else if (isX(p)) {
+        if (M === '0') {
+          ret = ">=".concat(M, ".").concat(m, ".0").concat(z, " <").concat(M, ".").concat(+m + 1, ".0-0");
+        } else {
+          ret = ">=".concat(M, ".").concat(m, ".0").concat(z, " <").concat(+M + 1, ".0.0-0");
+        }
+      } else if (pr) {
+        debug('replaceCaret pr', pr);
+        if (M === '0') {
+          if (m === '0') {
+            ret = ">=".concat(M, ".").concat(m, ".").concat(p, "-").concat(pr, " <").concat(M, ".").concat(m, ".").concat(+p + 1, "-0");
+          } else {
+            ret = ">=".concat(M, ".").concat(m, ".").concat(p, "-").concat(pr, " <").concat(M, ".").concat(+m + 1, ".0-0");
+          }
+        } else {
+          ret = ">=".concat(M, ".").concat(m, ".").concat(p, "-").concat(pr, " <").concat(+M + 1, ".0.0-0");
+        }
+      } else {
+        debug('no pr');
+        if (M === '0') {
+          if (m === '0') {
+            ret = ">=".concat(M, ".").concat(m, ".").concat(p).concat(z, " <").concat(M, ".").concat(m, ".").concat(+p + 1, "-0");
+          } else {
+            ret = ">=".concat(M, ".").concat(m, ".").concat(p).concat(z, " <").concat(M, ".").concat(+m + 1, ".0-0");
+          }
+        } else {
+          ret = ">=".concat(M, ".").concat(m, ".").concat(p, " <").concat(+M + 1, ".0.0-0");
+        }
+      }
+      debug('caret return', ret);
+      return ret;
+    });
+  };
+  const replaceXRanges = (comp, options) => {
+    debug('replaceXRanges', comp, options);
+    return comp.split(/\s+/).map(c => replaceXRange(c, options)).join(' ');
+  };
+  const replaceXRange = (comp, options) => {
+    comp = comp.trim();
+    const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
+    return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
+      debug('xRange', comp, ret, gtlt, M, m, p, pr);
+      const xM = isX(M);
+      const xm = xM || isX(m);
+      const xp = xm || isX(p);
+      const anyX = xp;
+      if (gtlt === '=' && anyX) {
+        gtlt = '';
+      }
+
+      // if we're including prereleases in the match, then we need
+      // to fix this to -0, the lowest possible prerelease value
+      pr = options.includePrerelease ? '-0' : '';
+      if (xM) {
+        if (gtlt === '>' || gtlt === '<') {
+          // nothing is allowed
+          ret = '<0.0.0-0';
+        } else {
+          // nothing is forbidden
+          ret = '*';
+        }
+      } else if (gtlt && anyX) {
+        // we know patch is an x, because we have any x at all.
+        // replace X with 0
+        if (xm) {
+          m = 0;
+        }
+        p = 0;
+        if (gtlt === '>') {
+          // >1 => >=2.0.0
+          // >1.2 => >=1.3.0
+          gtlt = '>=';
+          if (xm) {
+            M = +M + 1;
+            m = 0;
+            p = 0;
+          } else {
+            m = +m + 1;
+            p = 0;
+          }
+        } else if (gtlt === '<=') {
+          // <=0.7.x is actually <0.8.0, since any 0.7.x should
+          // pass.  Similarly, <=7.x is actually <8.0.0, etc.
+          gtlt = '<';
+          if (xm) {
+            M = +M + 1;
+          } else {
+            m = +m + 1;
+          }
+        }
+        if (gtlt === '<') {
+          pr = '-0';
+        }
+        ret = "".concat(gtlt + M, ".").concat(m, ".").concat(p).concat(pr);
+      } else if (xm) {
+        ret = ">=".concat(M, ".0.0").concat(pr, " <").concat(+M + 1, ".0.0-0");
+      } else if (xp) {
+        ret = ">=".concat(M, ".").concat(m, ".0").concat(pr, " <").concat(M, ".").concat(+m + 1, ".0-0");
+      }
+      debug('xRange return', ret);
+      return ret;
+    });
+  };
+
+  // Because * is AND-ed with everything else in the comparator,
+  // and '' means "any version", just remove the *s entirely.
+  const replaceStars = (comp, options) => {
+    debug('replaceStars', comp, options);
+    // Looseness is ignored here.  star is always as loose as it gets!
+    return comp.trim().replace(re[t.STAR], '');
+  };
+  const replaceGTE0 = (comp, options) => {
+    debug('replaceGTE0', comp, options);
+    return comp.trim().replace(re[options.includePrerelease ? t.GTE0PRE : t.GTE0], '');
+  };
+
+  // This function is passed to string.replace(re[t.HYPHENRANGE])
+  // M, m, patch, prerelease, build
+  // 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+  // 1.2.3 - 3.4 => >=1.2.0 <3.5.0-0 Any 3.4.x will do
+  // 1.2 - 3.4 => >=1.2.0 <3.5.0-0
+  // TODO build?
+  const hyphenReplace = incPr => ($0, from, fM, fm, fp, fpr, fb, to, tM, tm, tp, tpr) => {
+    if (isX(fM)) {
+      from = '';
+    } else if (isX(fm)) {
+      from = ">=".concat(fM, ".0.0").concat(incPr ? '-0' : '');
+    } else if (isX(fp)) {
+      from = ">=".concat(fM, ".").concat(fm, ".0").concat(incPr ? '-0' : '');
+    } else if (fpr) {
+      from = ">=".concat(from);
+    } else {
+      from = ">=".concat(from).concat(incPr ? '-0' : '');
+    }
+    if (isX(tM)) {
+      to = '';
+    } else if (isX(tm)) {
+      to = "<".concat(+tM + 1, ".0.0-0");
+    } else if (isX(tp)) {
+      to = "<".concat(tM, ".").concat(+tm + 1, ".0-0");
+    } else if (tpr) {
+      to = "<=".concat(tM, ".").concat(tm, ".").concat(tp, "-").concat(tpr);
+    } else if (incPr) {
+      to = "<".concat(tM, ".").concat(tm, ".").concat(+tp + 1, "-0");
+    } else {
+      to = "<=".concat(to);
+    }
+    return "".concat(from, " ").concat(to).trim();
+  };
+  const testSet = (set, version, options) => {
+    for (let i = 0; i < set.length; i++) {
+      if (!set[i].test(version)) {
+        return false;
+      }
+    }
+    if (version.prerelease.length && !options.includePrerelease) {
+      // Find the set of versions that are allowed to have prereleases
+      // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+      // That should allow `1.2.3-pr.2` to pass.
+      // However, `1.2.4-alpha.notready` should NOT be allowed,
+      // even though it's within the range set by the comparators.
+      for (let i = 0; i < set.length; i++) {
+        debug(set[i].semver);
+        if (set[i].semver === Comparator.ANY) {
+          continue;
+        }
+        if (set[i].semver.prerelease.length > 0) {
+          const allowed = set[i].semver;
+          if (allowed.major === version.major && allowed.minor === version.minor && allowed.patch === version.patch) {
+            return true;
+          }
+        }
+      }
+
+      // Version has a -pre, but it's not one of the ones we like.
+      return false;
+    }
+    return true;
+  };
+  return range;
 }
 
 const Range = requireRange();
@@ -28486,12 +28453,11 @@ const satisfies = (version, range, options) => {
   try {
     range = new Range(range, options);
   } catch (er) {
-    return false
+    return false;
   }
-  return range.test(version)
+  return range.test(version);
 };
 var satisfies_1 = satisfies;
-
 var satisfies$1 = /*@__PURE__*/getDefaultExportFromCjs(satisfies_1);
 
 const LOADED = {};