npm - @nebula.js/stardust - Versions diffs - 3.2.2 → 3.3.0-alpha.0 - Mend

@nebula.js/stardust 3.2.2 → 3.3.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/core/esm/dev.js +1943 -1425
package/core/esm/dev.js.map +1 -1
package/core/esm/index.js +6 -4
package/core/esm/index.js.map +1 -1
package/core/package.json +4 -4
package/dist/stardust.dev.js +3654 -2200
package/dist/stardust.dev.js.map +1 -1
package/dist/stardust.js +16 -14
package/dist/stardust.js.map +1 -1
package/package.json +13 -13
package/types/index.d.ts +11 -11

package/core/esm/dev.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
-* @nebula.js/stardust v3.2.2
+* @nebula.js/stardust v3.3.0-alpha.0
 * Copyright (c) 2023 QlikTech International AB
 * Released under the MIT license.
 */
@@ -3928,6 +3928,7 @@ const globalStateClassesMapping = {
   checked: 'checked',
   completed: 'completed',
   disabled: 'disabled',
+  readOnly: 'readOnly',
   error: 'error',
   expanded: 'expanded',
   focused: 'focused',
@@ -5219,8 +5220,6 @@ var createCache = function createCache(options) {
   return cache;
 };
-var createCache$1 = createCache;
 var jsxRuntimeExports$1 = {};
 var jsxRuntime = {
   get exports(){ return jsxRuntimeExports$1; },
@@ -5265,23 +5264,28 @@ function requireJsxRuntime () {
 var jsxRuntimeExports = requireJsxRuntime();
-const cache$1 = createCache$1({
-  key: 'css',
-  prepend: true
-});
+let cache$1;
+if (typeof document === 'object') {
+  cache$1 = createCache({
+    key: 'css',
+    prepend: true
+  });
+}
 function StyledEngineProvider(props) {
   const {
     injectFirst,
     children
   } = props;
-  return injectFirst ? /*#__PURE__*/jsxRuntimeExports.jsx(CacheProvider, {
+  return injectFirst && cache$1 ? /*#__PURE__*/jsxRuntimeExports.jsx(CacheProvider, {
     value: cache$1,
     children: children
   }) : children;
 }
-/** @license MUI v5.11.0
+/**
+ * @mui/styled-engine v5.11.11
  *
+ * @license MIT
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
@@ -7968,7 +7972,7 @@ function create$3(definition) {
   return cache[key];
 }
-const NEBULA_VERSION_HASH = "07c0" ;
+const NEBULA_VERSION_HASH = "c721" ;
 ClassNameGenerator$1.configure(componentName => {
   return "njs-".concat(NEBULA_VERSION_HASH, "-").concat(componentName.replace('Mui', ''));
 });
@@ -8487,7 +8491,7 @@ function boot(_ref2) {
   const appRef = React__default.createRef();
   const element = document.createElement('div');
   element.style.display = 'none';
-  element.setAttribute('data-nebulajs-version', "3.2.2" );
+  element.setAttribute('data-nebulajs-version', "3.3.0-alpha.0" );
   element.setAttribute('data-app-id', app.id);
   document.body.appendChild(element);
   ReactDOM.render( /*#__PURE__*/React__default.createElement(NebulaApp, {
@@ -8650,7 +8654,7 @@ const lock = props => _objectSpread2(_objectSpread2({}, props), {}, {
   shapes: [{
     type: 'path',
     attrs: {
-      d: 'M13,7 L8,7 L13,7 L13,4.98151367 C13,2.23029964 10.7614237,0 8,0 C5.23857625,0 3,2.23029964 3,4.98151367 L3,7 L3.75,7 L3,7 L4.5,7 L4.5,5.33193359 C4.5,3.21561511 5.54860291,1.5 8,1.5 C10.4513971,1.5 11.5,3.21561511 11.5,5.33193359 L11.5,7 L12.25,7 L3,7 C2.44771525,7 2,7.44771525 2,8 L2,15 C2,15.5522847 2.44771525,16 3,16 L13,16 C13.5522847,16 14,15.5522847 14,15 L14,8 C14,7.44771525 13.5522847,7 13,7 L3,7 L13,7 Z'
+      d: 'M8 10a1 1 0 0 1 .5 1.866v.634a.5.5 0 0 1-1 0v-.634A1 1 0 0 1 8 10ZM3.625 7.035A2 2 0 0 0 2 9v5a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V9a2 2 0 0 0-1.625-1.965V5.383a4.375 4.375 0 0 0-8.75 0v1.652ZM3 9a1 1 0 0 1 .931-.998h8.138A1 1 0 0 1 13 9v5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V9Zm8.375-3.617V7h-6.75V5.383a3.375 3.375 0 0 1 6.75 0Z'
     }
   }]
 });
@@ -9533,7 +9537,15 @@ function getFieldKeyboardNavigation(_ref) {
 }
 function getListboxInlineKeyboardNavigation(_ref2) {
   let {
-    setKeyboardActive
+    setKeyboardActive,
+    hovering,
+    setHovering,
+    updateKeyScroll,
+    containerRef,
+    currentScrollIndex,
+    app,
+    appSelections,
+    constraints
   } = _ref2;
   const focusInsideListbox = element => {
     const fieldElement = element.querySelector('.search input, .value.selector, .value, .ActionsToolbar-* button');
@@ -9546,9 +9558,16 @@ function getListboxInlineKeyboardNavigation(_ref2) {
     setKeyboardActive(false);
     element.focus();
   };
+  const updateKeyScrollOnHover = newState => {
+    if (hovering) {
+      updateKeyScroll(newState);
+    }
+  };
   const handleKeyDown = event => {
     const {
-      keyCode
+      keyCode,
+      ctrlKey = false,
+      shiftKey = false
     } = event.nativeEvent;
     switch (keyCode) {
       // case KEYS.TAB: TODO: Focus confirm button using keyboard.focusSelection when we can access the useKeyboard hook.
@@ -9563,6 +9582,36 @@ function getListboxInlineKeyboardNavigation(_ref2) {
       case KEYS.ESCAPE:
         focusContainer(event.currentTarget);
         break;
+      case KEYS.ARROW_UP:
+        updateKeyScrollOnHover({
+          up: 1
+        });
+        break;
+      case KEYS.ARROW_DOWN:
+        updateKeyScrollOnHover({
+          down: 1
+        });
+        break;
+      case KEYS.PAGE_UP:
+        updateKeyScrollOnHover({
+          up: currentScrollIndex.stop - currentScrollIndex.start
+        });
+        break;
+      case KEYS.PAGE_DOWN:
+        updateKeyScrollOnHover({
+          down: currentScrollIndex.stop - currentScrollIndex.start
+        });
+        break;
+      case KEYS.HOME:
+        updateKeyScrollOnHover({
+          scrollPosition: ctrlKey && shiftKey ? 'overflowStart' : 'start'
+        });
+        break;
+      case KEYS.END:
+        updateKeyScrollOnHover({
+          scrollPosition: ctrlKey && shiftKey ? 'overflowEnd' : 'end'
+        });
+        break;
       default:
         return;
     }
@@ -9571,7 +9620,60 @@ function getListboxInlineKeyboardNavigation(_ref2) {
     // from handling keydown events.
     event.preventDefault();
   };
-  return handleKeyDown;
+  const focusOnHoverDisabled = () => {
+    var _app$isInModalSelecti, _app$isInModalSelecti2;
+    const selectNotAllowed = (constraints === null || constraints === void 0 ? void 0 : constraints.select) || (constraints === null || constraints === void 0 ? void 0 : constraints.active);
+    const appInModal = (_app$isInModalSelecti = (_app$isInModalSelecti2 = app.isInModalSelection) === null || _app$isInModalSelecti2 === void 0 ? void 0 : _app$isInModalSelecti2.call(app)) !== null && _app$isInModalSelecti !== void 0 ? _app$isInModalSelecti : appSelections.isInModal();
+    return selectNotAllowed || appInModal;
+  };
+  const handleOnMouseEnter = () => {
+    if (!focusOnHoverDisabled()) {
+      var _containerRef$current, _containerRef$current2;
+      setHovering(true);
+      containerRef === null || containerRef === void 0 ? void 0 : (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : (_containerRef$current2 = _containerRef$current.focus) === null || _containerRef$current2 === void 0 ? void 0 : _containerRef$current2.call(_containerRef$current);
+    }
+  };
+  const handleOnMouseLeave = () => {
+    if (hovering) {
+      var _containerRef$current3, _containerRef$current4;
+      setHovering(false);
+      containerRef === null || containerRef === void 0 ? void 0 : (_containerRef$current3 = containerRef.current) === null || _containerRef$current3 === void 0 ? void 0 : (_containerRef$current4 = _containerRef$current3.blur) === null || _containerRef$current4 === void 0 ? void 0 : _containerRef$current4.call(_containerRef$current3);
+    }
+  };
+  return {
+    handleKeyDown,
+    handleOnMouseEnter,
+    handleOnMouseLeave
+  };
+}
+function getGridItemSizes(_ref) {
+  let {
+    dataLayout,
+    layoutOrder,
+    itemPadding
+  } = _ref;
+  // Simulate margin/padding by making the item smaller than its container.
+  if (dataLayout === 'singleColumn') {
+    return {
+      height: '100%',
+      width: '100%'
+    };
+  }
+  switch (layoutOrder) {
+    case 'row':
+      return {
+        height: "calc(100% - ".concat(itemPadding, "px)"),
+        width: "calc(100% - ".concat(2 * itemPadding, "px)")
+      };
+    case 'column':
+      return {
+        height: "calc(100% - ".concat(itemPadding, "px)"),
+        width: "calc(100% - ".concat(2 * itemPadding, "px)")
+      };
+    default:
+      return {};
+  }
 }
 const PREFIX$a = 'RowColumn';
@@ -9615,7 +9717,7 @@ const getSelectedStyle = _ref => {
     background: theme.palette.selected.main,
     color: theme.palette.selected.mainContrastText,
     '&:focus': {
-      boxShadow: "inset 0 0 0 2px rgba(0, 0, 0, 0.3)",
+      boxShadow: "inset 0 0 0 2px ".concat(theme.palette.custom.focusBorder),
       outline: 'none'
     },
     '& $cell': {
@@ -9623,36 +9725,53 @@ const getSelectedStyle = _ref => {
     }
   };
 };
-const Root$1 = styled$1('div', {
-  shouldForwardProp: props => props !== 'flexBasisProp'
+const ItemGrid = styled$1(Grid, {
+  shouldForwardProp: prop => !['dataLayout', 'layoutOrder', 'itemPadding'].includes(prop)
 })(_ref2 => {
+  let {
+    dataLayout,
+    layoutOrder,
+    itemPadding
+  } = _ref2;
+  return {
+    ["&.".concat(classes$a.fieldRoot)]: getGridItemSizes({
+      dataLayout,
+      layoutOrder,
+      itemPadding
+    })
+  };
+});
+const Root$1 = styled$1('div', {
+  shouldForwardProp: prop => !['flexBasisProp', 'isGridMode', 'isGridCol', 'dense'].includes(prop)
+})(_ref3 => {
   var _theme$listBox$conten, _theme$listBox, _theme$listBox$conten2, _theme$listBox$conten3, _theme$listBox2, _theme$listBox2$conte, _theme$listBox3, _theme$listBox3$conte, _theme$listBox4, _theme$listBox4$conte;
   let {
     theme,
     flexBasisProp,
+    isGridMode,
+    isGridCol,
     dense
-  } = _ref2;
+  } = _ref3;
   return {
+    '&:focus': {
+      boxShadow: "inset 0 0 0 2px ".concat(theme.palette.custom.focusBorder, " !important")
+    },
+    '&:focus-visible': {
+      outline: 'none'
+    },
     ["& .".concat(classes$a.row)]: {
       flexWrap: 'nowrap',
       color: (_theme$listBox$conten = (_theme$listBox = theme.listBox) === null || _theme$listBox === void 0 ? void 0 : (_theme$listBox$conten2 = _theme$listBox.content) === null || _theme$listBox$conten2 === void 0 ? void 0 : _theme$listBox$conten2.color) !== null && _theme$listBox$conten !== void 0 ? _theme$listBox$conten : theme.palette.text.primary
     },
     ["& .".concat(classes$a.rowBorderBottom)]: {
-      borderBottom: "1px solid ".concat(theme.palette.divider)
+      borderBottom: isGridCol ? 'none' : "1px solid ".concat(theme.palette.divider),
+      borderLeft: isGridCol ? "1px solid ".concat(theme.palette.divider) : 'none'
     },
     ["& .".concat(classes$a.column)]: {
       flexWrap: 'nowrap',
       borderRight: "1px solid ".concat(theme.palette.divider),
       color: (_theme$listBox$conten3 = (_theme$listBox2 = theme.listBox) === null || _theme$listBox2 === void 0 ? void 0 : (_theme$listBox2$conte = _theme$listBox2.content) === null || _theme$listBox2$conte === void 0 ? void 0 : _theme$listBox2$conte.color) !== null && _theme$listBox$conten3 !== void 0 ? _theme$listBox$conten3 : theme.palette.text.primary
     },
-    ["& .".concat(classes$a.fieldRoot)]: {
-      '&:focus': {
-        boxShadow: "inset 0 0 0 2px ".concat(theme.palette.custom.focusBorder, " !important")
-      },
-      '&:focus-visible': {
-        outline: 'none'
-      }
-    },
     // The interior wrapper for all field content.
     ["& .".concat(classes$a.cell)]: {
       display: 'flex',
@@ -9712,22 +9831,27 @@ const Root$1 = styled$1('div', {
       padding: theme.spacing(1, 1, 1, 0)
     },
     // Selection styles (S=Selected, XS=ExcludedSelected, A=Available, X=Excluded).
-    ["& .".concat(classes$a.S)]: _objectSpread2({}, getSelectedStyle({
+    ["& .".concat(classes$a.S)]: _objectSpread2(_objectSpread2({}, getSelectedStyle({
       theme
-    })),
+    })), {}, {
+      border: isGridMode ? 'none' : undefined
+    }),
     ["& .".concat(classes$a.XS)]: _objectSpread2(_objectSpread2({}, getSelectedStyle({
       theme
     })), {}, {
       background: theme.palette.selected.excluded,
-      color: theme.palette.selected.mainContrastText
+      color: theme.palette.selected.mainContrastText,
+      border: isGridMode ? 'none' : undefined
     }),
     ["& .".concat(classes$a.A)]: {
       background: theme.palette.selected.alternative,
-      color: theme.palette.selected.alternativeContrastText
+      color: theme.palette.selected.alternativeContrastText,
+      border: isGridMode ? 'none' : undefined
     },
     ["& .".concat(classes$a.X)]: {
       background: theme.palette.selected.excluded,
-      color: theme.palette.selected.excludedContrastText
+      color: theme.palette.selected.excludedContrastText,
+      border: isGridMode ? 'none' : undefined
     },
     ["& .".concat(classes$a.frequencyCount)]: {
       width: '66px',
@@ -9735,7 +9859,8 @@ const Root$1 = styled$1('div', {
     },
     ["&.".concat(classes$a.barContainer)]: {
       height: '100%',
-      display: 'inline-block'
+      display: 'flex',
+      alignItems: 'center'
     },
     ["& .".concat(classes$a.bar)]: {
       border: "".concat(barBorderWidthPx, "px solid"),
@@ -9766,14 +9891,15 @@ const Root$1 = styled$1('div', {
     }
   };
 });
-function RowColumn(_ref3) {
+function RowColumn(_ref4) {
+  var _cell$qText;
   let {
     index,
     rowIndex,
     columnIndex,
     style,
     data
-  } = _ref3;
+  } = _ref4;
   const {
     onClick,
     onMouseDown,
@@ -9785,7 +9911,7 @@ function RowColumn(_ref3) {
     checkboxes = false,
     textAlign,
     direction,
-    dense = false,
+    layoutOptions = {},
     freqIsAllowed,
     isSingleSelect,
     actions,
@@ -9795,11 +9921,16 @@ function RowColumn(_ref3) {
     showGray = true,
     columnCount = 1,
     rowCount = 1,
-    layoutOrder,
     dataOffset,
     focusListItems,
-    listCount
+    listCount,
+    itemPadding
   } = data;
+  const {
+    dense = false,
+    dataLayout = 'singleColumn',
+    layoutOrder
+  } = layoutOptions;
   let cellIndex;
   let styles;
   const count = {
@@ -9871,7 +10002,7 @@ function RowColumn(_ref3) {
     const selected = cell.qState === 'S' || cell.qState === 'XS' || cell.qState === 'L';
     setSelected(selected);
     const clazzArr = [column ? classes$a.column : classes$a.row];
-    if (!(histogram && dense) && !checkboxes) clazzArr.push(classes$a.rowBorderBottom);
+    if (!(histogram && (dense || checkboxes))) clazzArr.push(classes$a.rowBorderBottom);
     if (!checkboxes) {
       if (cell.qState === 'XS') {
         clazzArr.push(showGray ? classes$a.XS : classes$a.S);
@@ -9903,13 +10034,13 @@ function RowColumn(_ref3) {
   } else {
     valueTextAlign = (textAlign === null || textAlign === void 0 ? void 0 : textAlign.align) || 'left';
   }
-  const getValueField = _ref4 => {
+  const getValueField = _ref5 => {
     let {
       lbl,
       ix,
       color,
       highlighted = false
-    } = _ref4;
+    } = _ref5;
     return /*#__PURE__*/React__default.createElement(Typography, {
       component: "span",
       variant: "body2",
@@ -9930,17 +10061,19 @@ function RowColumn(_ref3) {
     }
     event.preventDefault();
   };
-  const getCheckboxField = _ref5 => {
+  const isGridCol = dataLayout === 'grid' && layoutOrder === 'column';
+  const getCheckboxField = _ref6 => {
     let {
       lbl,
       color,
       qElemNumber
-    } = _ref5;
+    } = _ref6;
     const cb = /*#__PURE__*/React__default.createElement(ListboxCheckbox, {
       label: lbl,
       checked: isSelected,
       dense: dense,
       excluded: isExcluded(cell),
+      isGridCol: isGridCol,
       showGray: showGray
     });
     const rb = /*#__PURE__*/React__default.createElement(ListBoxRadioButton, {
@@ -9961,7 +10094,7 @@ function RowColumn(_ref3) {
       key: qElemNumber
     });
   };
-  const label = cell ? cell.qText : '';
+  const label = (_cell$qText = cell === null || cell === void 0 ? void 0 : cell.qText) !== null && _cell$qText !== void 0 ? _cell$qText : '';
   const getFrequencyText = () => {
     if (cell) {
       return cell.qFrequency ? cell.qFrequency : frequencyTextNone;
@@ -9973,12 +10106,12 @@ function RowColumn(_ref3) {
   const ranges = cell && cell.qHighlightRanges && cell.qHighlightRanges.qRanges.sort((a, b) => a.qCharPos - b.qCharPos) || [];
   const labels = getSegmentsFromRanges(label, ranges);
   const getField = checkboxes ? getCheckboxField : getValueField;
-  const getFieldWithRanges = _ref6 => {
+  const getFieldWithRanges = _ref7 => {
     let {
       lbls
-    } = _ref6;
-    const labelsWithRanges = lbls.map((_ref7, ix) => {
-      let [lbl, highlighted] = _ref7;
+    } = _ref7;
+    const labelsWithRanges = lbls.map((_ref8, ix) => {
+      let [lbl, highlighted] = _ref8;
       return getValueField({
         ix,
         highlighted,
@@ -10018,16 +10151,21 @@ function RowColumn(_ref3) {
   return /*#__PURE__*/React__default.createElement(Root$1, {
     className: classes$a.barContainer,
     flexBasisProp: flexBasisVal,
+    style: styles,
+    isGridCol: isGridCol,
+    isGridMode: dataLayout === 'grid',
     dense: dense
-  }, /*#__PURE__*/React__default.createElement(Grid, {
+  }, /*#__PURE__*/React__default.createElement(ItemGrid, {
     ref: rowRef,
     container: true,
+    dataLayout: dataLayout,
+    layoutOrder: layoutOrder,
+    itemPadding: itemPadding,
     gap: 0,
     className: joinClassNames(['value', ...classArr]),
     classes: {
       root: classes$a.fieldRoot
     },
-    style: styles,
     onClick: onClick,
     onMouseDown: onMouseDown,
     onMouseUp: onMouseUp,
@@ -11663,16 +11801,15 @@ function getListBoxComponents(_ref) {
     listCount,
     overflowDisclaimer,
     setScrollPosition,
-    focusListItems
+    focusListItems,
+    setCurrentScrollIndex
   } = _ref;
   const {
     layoutOptions = {},
     frequencyMax
   } = layout || {};
   const {
-    dense = false
-  } = layoutOptions || {};
-  const {
+    itemPadding,
     listHeight,
     itemSize,
     rowCount,
@@ -11694,7 +11831,7 @@ function getListBoxComponents(_ref) {
     pages
   }, isLocked || selectDisabled() ? {} : interactionEvents), {}, {
     checkboxes,
-    dense,
+    layoutOptions,
     frequencyMode,
     freqIsAllowed: getFrequencyAllowed({
       width,
@@ -11703,6 +11840,7 @@ function getListBoxComponents(_ref) {
     }),
     isSingleSelect,
     textAlign,
+    itemPadding,
     actions: {
       select,
       confirm: () => selections === null || selections === void 0 ? void 0 : selections.confirm.call(selections),
@@ -11737,6 +11875,10 @@ function getListBoxComponents(_ref) {
       itemSize: itemSize,
       onItemsRendered: renderProps => {
         var _layout$qListObject, _layout$qListObject$q;
+        setCurrentScrollIndex({
+          start: renderProps.visibleStartIndex,
+          stop: renderProps.visibleStopIndex
+        });
         if (scrollState) {
           scrollState.setScrollPos(renderProps.visibleStopIndex);
         }
@@ -11773,6 +11915,11 @@ function getListBoxComponents(_ref) {
     local.current.listRef = ref;
     const handleGridItemsRendered = renderProps => {
       var _layout$qListObject2, _layout$qListObject2$;
+      const isRow = layoutOrder === 'row';
+      setCurrentScrollIndex({
+        start: isRow ? renderProps.visibleRowStartIndex : renderProps.visibleColumnStartIndex,
+        stop: isRow ? renderProps.visibleRowStopIndex : renderProps.visibleColumnStopIndex
+      });
       const renderOptions = deriveRenderOptions({
         renderProps,
         scrollState,
@@ -11806,8 +11953,7 @@ function getListBoxComponents(_ref) {
       itemData: _objectSpread2(_objectSpread2({}, commonItemData), {}, {
         column: undefined,
         columnCount,
-        rowCount,
-        layoutOrder
+        rowCount
       }),
       onItemsRendered: handleGridItemsRendered,
       ref: ref
@@ -11845,8 +11991,17 @@ function getListSizes(_ref) {
   let columnCount;
   let columnWidth;
   let rowCount;
-  const itemSize = dense ? 20 : 29;
-  const listHeight = height || 8 * itemSize;
+  const isGridMode = dataLayout === 'grid';
+  const itemPadding = 4;
+  const denseItemSize = 20;
+  const normalItemSize = isGridMode ? 32 : 29;
+  let itemSize = dense ? denseItemSize : normalItemSize;
+  if (isGridMode) {
+    // Emulate a margin between items using padding, since the list library
+    // needs an explicit row height and cannot handle margins.
+    itemSize += itemPadding;
+  }
+  const listHeight = height !== null && height !== void 0 ? height : 8 * itemSize;
   if (layoutOrder) {
     if (layoutOrder === 'row') {
       overflowStyling = {
@@ -11896,7 +12051,8 @@ function getListSizes(_ref) {
     maxCount: {
       row: maxRowCount,
       column: maxColumnCount
-    }
+    },
+    itemPadding
   };
 }
@@ -12412,7 +12568,14 @@ function ListBox(_ref) {
     keyboard = {},
     showGray = true,
     scrollState,
-    selectDisabled = () => false
+    selectDisabled = () => false,
+    keyScroll = {
+      state: {},
+      reset: () => {}
+    },
+    currentScrollIndex = {
+      set: () => {}
+    }
   } = _ref;
   const [initScrollPosIsSet, setInitScrollPosIsSet] = useState$1(false);
   const [layout] = useLayout$1(model);
@@ -12505,8 +12668,12 @@ function ListBox(_ref) {
     local.current.validPages = false;
     if (loaderRef.current) {
       loaderRef.current.resetloadMoreItemsCache(true);
-      // Skip scrollToItem if we are in selections.
-      if (layout && layout.qSelectionInfo.qInSelections) {
+      const isScrollingToEnd = keyScroll.state.scrollPosition === 'overflowEnd';
+      // Skip scrollToItem if we are in selections or if scrolling to the end.
+      if (layout && layout.qSelectionInfo.qInSelections || isScrollingToEnd) {
+        if (isScrollingToEnd) {
+          keyScroll.reset();
+        }
         return;
       }
       local.current.dataOffset = 0;
@@ -12577,6 +12744,21 @@ function ListBox(_ref) {
     }
     scrollToIndex(scrollIndex);
   };
+  useEffect$1(() => {
+    const s = keyScroll.state;
+    if (s.up) {
+      scrollToIndex(currentScrollIndex.state.start - s.up);
+    } else if (s.down) {
+      scrollToIndex(currentScrollIndex.state.stop + s.down);
+    } else if (s.scrollPosition) {
+      setScrollPosition(s.scrollPosition);
+    }
+    if (s.scrollPosition === 'overflowEnd') {
+      return; // Do keyScroll.reset() in fetchData() to avoid scrolling to top.
+    }
+    keyScroll.reset();
+  }, [keyScroll.state.up, keyScroll.state.down, keyScroll.state.scrollPosition]);
   const {
     textAlign
   } = (layout === null || layout === void 0 ? void 0 : layout.qListObject.qDimensionInfo) || {};
@@ -12624,7 +12806,8 @@ function ListBox(_ref) {
       set: showOverflowDisclaimer
     },
     setScrollPosition,
-    focusListItems: getFocusState()
+    focusListItems: getFocusState(),
+    setCurrentScrollIndex: currentScrollIndex.set
   });
   const {
     columnWidth,
@@ -12902,6 +13085,8 @@ const StyledPopover$1 = styled$1(Popover)(_ref => {
     theme
   } = _ref;
   return {
+    // Set here to allow clicking through the modals container
+    pointerEvents: 'none',
     ["& .".concat(classes$8.icon)]: {
       color: theme.palette.text.primary
     }
@@ -12949,6 +13134,10 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
     ref: ref,
     open: show,
     anchorEl: alignTo.current,
+    getContentAnchorEl: null,
+    container: alignTo.current,
+    disablePortal: true,
+    hideBackdrop: true,
     transitionDuration: 0,
     slotProps: {
       root: {
@@ -12957,11 +13146,11 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
     },
     anchorOrigin: {
       vertical: 'bottom',
-      horizontal: 'left'
+      horizontal: 'right'
     },
     transformOrigin: {
       vertical: 'top',
-      horizontal: 'left'
+      horizontal: 'right'
     },
     PaperProps: {
       style: _objectSpread2({
@@ -13106,7 +13295,9 @@ function ActionsToolbar(_ref3) {
     const buttons = actionsElement.querySelectorAll('button:not(.Mui-disabled)');
     return buttons[last ? buttons.length - 1 : 0];
   };
-  useEffect$1(() => () => setShowMoreItems(false), [popover.show]);
+  useEffect$1(() => () => {
+    setShowMoreItems(false);
+  }, [popover.show, show, selections.show]);
   useEffect$1(() => {
     if (!focusHandler) return;
     const focusFirst = () => {
@@ -13122,6 +13313,7 @@ function ActionsToolbar(_ref3) {
   }, []);
   let moreEnabled = more$1.enabled;
   let moreActions = more$1.actions;
+  const moreAlignTo = more$1.alignTo || moreRef;
   const newActions = actions.filter(a => !a.hidden);
   if (newActions.length > maxItems) {
     const newMoreActions = newActions.splice(-(newActions.length - maxItems) - 1);
@@ -13186,7 +13378,7 @@ function ActionsToolbar(_ref3) {
   }), showMoreItems && /*#__PURE__*/React__default.createElement(More$1, {
     show: showMoreItems,
     actions: moreActions,
-    alignTo: moreRef,
+    alignTo: moreAlignTo,
     popoverProps: more$1.popoverProps,
     popoverPaperStyle: more$1.popoverPaperStyle,
     onCloseOrActionClick: handleCloseShowMoreItems
@@ -13215,7 +13407,7 @@ const search = props => _objectSpread2(_objectSpread2({}, props), {}, {
   shapes: [{
     type: 'path',
     attrs: {
-      d: 'M15.7873809,13.80959 C16.1870614,14.209868 15.9872212,15.1104934 15.4876205,15.5107714 C15.08794,15.9110493 14.1886588,16.2112578 13.7889782,15.8109798 L11.0911347,13.1091035 L10.9912145,12.5086866 L10.2917736,11.8082001 C9.19265216,12.5086866 7.89369045,13.0090341 6.49480859,13.0090341 C2.89768383,13.0090341 0,10.1070188 0,6.50451703 C0,2.90201529 2.89768383,0 6.49480859,0 C10.0919334,0 12.9896172,2.90201529 12.9896172,6.50451703 C12.9896172,7.90548992 12.4900165,9.20639333 11.7905756,10.3071577 L12.4900165,11.0076442 L13.0895373,11.1077137 L15.7873809,13.80959 Z M11.2909749,6.50451703 C11.2909749,5.20361362 10.7913743,4.00277971 9.89209309,3.00208478 C8.9928119,2.10145935 7.79377031,1.60111188 6.49480859,1.60111188 C5.19584688,1.60111188 3.99680529,2.10145935 2.99760397,3.00208478 C2.09832278,4.00277971 1.59872212,5.20361362 1.59872212,6.50451703 C1.59872212,7.80542043 2.09832278,9.00625434 2.99760397,9.90687978 C3.89688516,10.8075052 5.09592674,11.3078527 6.49480859,11.3078527 C7.79377031,11.4079222 8.9928119,10.9075747 9.89209309,9.90687978 C10.7913743,9.00625434 11.2909749,7.80542043 11.2909749,6.50451703 Z'
+      d: 'M8.588 11.415a6 6 0 1 1 2.828-2.829l4.101 4a1.5 1.5 0 0 1 .014 2.134l-.707.707a1.5 1.5 0 0 1-2.108.014l-4.128-4.026ZM11 6A5 5 0 1 0 1 6a5 5 0 0 0 10 0Zm-1.52 4.888 3.934 3.837a.5.5 0 0 0 .703-.005l.707-.707a.5.5 0 0 0-.005-.711l-3.926-3.829a6.034 6.034 0 0 1-1.413 1.415Z'
     }
   }]
 });
@@ -13248,7 +13440,8 @@ function ListBoxSearch(_ref3) {
     keyboard,
     dense = false,
     visible = true,
-    wildCardSearch = true,
+    autoFocus = true,
+    wildCardSearch = false,
     searchEnabled
   } = _ref3;
   const {
@@ -13373,6 +13566,7 @@ function ListBoxSearch(_ref3) {
     onFocus: handleFocus,
     onChange: onChange,
     onKeyDown: onKeyDown,
+    autoFocus: autoFocus,
     inputProps: {
       tabIndex: keyboard && (!keyboard.enabled || keyboard.active) ? 0 : -1
     }
@@ -13567,7 +13761,7 @@ const getClickOutFuncs = _ref3 => {
   let {
     elements,
     objectSelections,
-    options
+    options = {}
   } = _ref3;
   const handler = createHandler({
     elements,
@@ -13655,7 +13849,8 @@ function ListBoxPopover(_ref) {
     close,
     app,
     fieldName,
-    stateName = '$'
+    stateName = '$',
+    autoFocus
   } = _ref;
   const isMasterDim = Boolean(fieldName === null || fieldName === void 0 ? void 0 : fieldName.qLibraryId);
   const open = show && Boolean(alignTo.current);
@@ -13787,10 +13982,14 @@ function ListBoxPopover(_ref) {
   }, /*#__PURE__*/React__default.createElement("div", {
     ref: moreAlignTo
   }), /*#__PURE__*/React__default.createElement(ListBoxSearch, {
-    selections: selections,
+    visible: true,
     model: model,
     listCount: listCount,
-    visible: true
+    selections: selections,
+    keyboard: {
+      enabled: false
+    },
+    autoFocus: autoFocus !== null && autoFocus !== void 0 ? autoFocus : true
   }), /*#__PURE__*/React__default.createElement(ListBox, {
     model: model,
     selections: selections,
@@ -14305,7 +14504,7 @@ function getItems(layout) {
   if (layout.alternateStates) {
     layout.alternateStates.forEach(s => collect(s.qSelectionObject, fields, s.stateName));
   }
-  return Object.keys(fields).map(key => fields[key]);
+  return Object.keys(fields).map(key => fields[key]).filter(f => !f.selections.some(s => s.qIsHidden));
 }
 function SelectedFields(_ref) {
   let {
@@ -15027,6 +15226,7 @@ const addListboxTheme = themeApi => {
 };
 const PREFIX$4 = 'ListBoxInline';
+const searchIconWidth = 28;
 const classes$4 = {
   listBoxHeader: "".concat(PREFIX$4, "-listBoxHeader"),
   screenReaderOnly: "".concat(PREFIX$4, "-screenReaderOnly")
@@ -15040,7 +15240,8 @@ const StyledGrid$3 = styled$1(Grid)(_ref => {
     backgroundColor: (_theme$listBox$backgr = (_theme$listBox = theme.listBox) === null || _theme$listBox === void 0 ? void 0 : _theme$listBox.backgroundColor) !== null && _theme$listBox$backgr !== void 0 ? _theme$listBox$backgr : theme.palette.background.default,
     ["& .".concat(classes$4.listBoxHeader)]: {
       alignSelf: 'center',
-      display: 'inline-flex'
+      display: 'inline-flex',
+      width: "calc(100% - ".concat(searchIconWidth, "px)")
     },
     ["& .".concat(classes$4.screenReaderOnly)]: {
       position: 'absolute',
@@ -15067,6 +15268,7 @@ function ListBoxInline(_ref3) {
     options = {}
   } = _ref3;
   const {
+    app,
     direction,
     frequencyMode,
     listLayout,
@@ -15106,17 +15308,43 @@ function ListBoxInline(_ref3) {
   const {
     translator,
     keyboardNavigation,
-    themeApi
+    themeApi,
+    constraints
   } = useContext(InstanceContext);
   theme.listBox = addListboxTheme(themeApi);
   const moreAlignTo = useRef();
+  const containerRef = useRef();
   const [searchContainer, searchContainerRef] = useRefWithCallback();
   const [layout] = useLayout$1(model);
   const [showToolbar, setShowToolbar] = useState$1(false);
   const [showSearch, setShowSearch] = useState$1(false);
   const [keyboardActive, setKeyboardActive] = useState$1(false);
-  const handleKeyDown = getListboxInlineKeyboardNavigation({
-    setKeyboardActive
+  const [hovering, setHovering] = useState$1(false);
+  const [keyScroll, setKeyScroll] = useState$1({
+    down: 0,
+    up: 0,
+    scrollPosition: ''
+  });
+  const updateKeyScroll = newState => setKeyScroll(current => _objectSpread2(_objectSpread2({}, current), newState));
+  const [currentScrollIndex, setCurrentScrollIndex] = useState$1({
+    start: 0,
+    stop: 0
+  });
+  const [appSelections] = useAppSelections(app);
+  const {
+    handleKeyDown,
+    handleOnMouseEnter,
+    handleOnMouseLeave
+  } = getListboxInlineKeyboardNavigation({
+    setKeyboardActive,
+    hovering,
+    setHovering,
+    updateKeyScroll,
+    containerRef,
+    currentScrollIndex,
+    app,
+    appSelections,
+    constraints
   });
   // Expose the keyboard flags in the same way as the keyboard hook does.
@@ -15128,16 +15356,17 @@ function ListBoxInline(_ref3) {
   if ((layout === null || layout === void 0 ? void 0 : layout.toolbar) !== undefined) {
     toolbar = layout.toolbar;
   }
+  toolbar = toolbar && (layout === null || layout === void 0 ? void 0 : layout.title) !== '';
   useEffect$1(() => {
     const show = () => {
       setShowToolbar(true);
-      if (search === 'inSelection') {
+      if (search === 'toggle' && toolbar === false) {
         setShowSearch(true);
       }
     };
     const hide = () => {
       setShowToolbar(false);
-      if (search === 'toggle' || search === 'inSelection') {
+      if (search === 'toggle') {
         setShowSearch(false);
       }
     };
@@ -15154,7 +15383,7 @@ function ListBoxInline(_ref3) {
         selections.removeListener('activated', hide);
       }
     };
-  }, [selections]);
+  }, [selections, toolbar]);
   useEffect$1(() => {
     if (!searchContainer || !searchContainer.current) {
       return;
@@ -15174,7 +15403,8 @@ function ListBoxInline(_ref3) {
     model,
     translator
   }) : [];
-  const searchVisible = (search === true || (search === 'toggle' || search === 'inSelection') && showSearch) && !selectDisabled();
+  const showSearchToggle = search === 'toggle' && showSearch;
+  const searchVisible = (search === true || showSearchToggle) && !selectDisabled();
   const dense = (_layout$layoutOptions = (_layout$layoutOptions2 = layout.layoutOptions) === null || _layout$layoutOptions2 === void 0 ? void 0 : _layout$layoutOptions2.dense) !== null && _layout$layoutOptions !== void 0 ? _layout$layoutOptions : false;
   const searchHeight = dense ? 27 : 40;
   const extraheight = dense ? 39 : 49;
@@ -15187,6 +15417,7 @@ function ListBoxInline(_ref3) {
     const newValue = !showSearch;
     setShowSearch(newValue);
   };
+  const shouldAutoFocus = searchVisible && search === 'toggle';
   return /*#__PURE__*/React__default.createElement(StyledGrid$3, {
     className: "listbox-container",
     container: true,
@@ -15198,18 +15429,27 @@ function ListBoxInline(_ref3) {
       minHeight: "".concat(minHeight, "px"),
       flexFlow: 'column nowrap'
     },
-    onKeyDown: handleKeyDown
-  }, toolbar && layout.title && /*#__PURE__*/React__default.createElement(Grid, {
+    onKeyDown: handleKeyDown,
+    onMouseEnter: handleOnMouseEnter,
+    onMouseLeave: handleOnMouseLeave,
+    ref: containerRef
+  }, toolbar && /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     container: true,
     style: {
       padding: theme.spacing(1)
-    }
+    },
+    wrap: "nowrap"
+  }, /*#__PURE__*/React__default.createElement(Grid, {
+    item: true,
+    container: true,
+    wrap: "nowrap"
   }, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     sx: {
       display: 'flex',
-      alignItems: 'center'
+      alignItems: 'center',
+      width: searchIconWidth
     }
   }, isLocked ? /*#__PURE__*/React__default.createElement(IconButton, {
     tabIndex: -1,
@@ -15236,7 +15476,7 @@ function ListBoxInline(_ref3) {
   }, /*#__PURE__*/React__default.createElement(Title, {
     variant: "h6",
     noWrap: true
-  }, layout.title)), /*#__PURE__*/React__default.createElement(Grid, {
+  }, layout.title))), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: true
   }), /*#__PURE__*/React__default.createElement(Grid, {
@@ -15270,7 +15510,9 @@ function ListBoxInline(_ref3) {
     },
     role: "region",
     "aria-label": translator.get('Listbox.ResultFilterLabel')
-  }, /*#__PURE__*/React__default.createElement(Grid, {
+  }, /*#__PURE__*/React__default.createElement("div", {
+    ref: moreAlignTo
+  }), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     ref: searchContainerRef
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -15281,6 +15523,8 @@ function ListBoxInline(_ref3) {
     dense: dense,
     keyboard: keyboard,
     visible: searchVisible,
+    search: search,
+    autoFocus: shouldAutoFocus,
     searchContainerRef: searchContainerRef,
     wildCardSearch: wildCardSearch,
     searchEnabled: searchEnabled
@@ -15288,8 +15532,6 @@ function ListBoxInline(_ref3) {
     item: true,
     xs: true
   }, /*#__PURE__*/React__default.createElement("div", {
-    ref: moreAlignTo
-  }), /*#__PURE__*/React__default.createElement("div", {
     className: classes$4.screenReaderOnly
   }, translator.get('Listbox.ScreenReaderInstructions')), /*#__PURE__*/React__default.createElement(AutoSizer, null, _ref4 => {
     let {
@@ -15313,7 +15555,19 @@ function ListBoxInline(_ref3) {
       selectDisabled: selectDisabled,
       keyboard: keyboard,
       showGray: showGray,
-      scrollState: scrollState
+      scrollState: scrollState,
+      keyScroll: {
+        state: keyScroll,
+        reset: () => setKeyScroll({
+          up: 0,
+          down: 0,
+          scrollPosition: ''
+        })
+      },
+      currentScrollIndex: {
+        state: currentScrollIndex,
+        set: setCurrentScrollIndex
+      }
     });
   }))));
 }
@@ -15356,6 +15610,7 @@ function useExistingModel(_ref) {
 }
 function useOnTheFlyModel(_ref) {
+  var _options$title;
   let {
     app,
     fieldIdentifier,
@@ -15365,11 +15620,14 @@ function useOnTheFlyModel(_ref) {
   const [fieldDef, setFieldDef] = useState$1('');
   const [isFetching, setIsFetching] = useState$1(true);
   const [model, setModel] = useState$1();
+  const [fallbackTitle, setFallbackTitle] = useState$1();
+  const title = (_options$title = options.title) !== null && _options$title !== void 0 ? _options$title : fallbackTitle;
   useEffect$1(() => {
     async function fetchMasterItem() {
       try {
         const dim = await app.getDimension(fieldIdentifier.qLibraryId);
         const dimLayout = await dim.getLayout();
+        setFallbackTitle(dimLayout.qDim.title);
         setFieldDef(dimLayout.qDim.qFieldDefs ? dimLayout.qDim.qFieldDefs[0] : '');
         setIsFetching(false);
       } catch (e) {
@@ -15386,10 +15644,10 @@ function useOnTheFlyModel(_ref) {
       fetchMasterItem();
     } else {
       setIsFetching(false);
+      setFallbackTitle(fieldIdentifier);
     }
   }, []);
   const {
-    title,
     dense,
     checkboxes,
     properties = {}
@@ -15420,9 +15678,14 @@ function useOnTheFlyModel(_ref) {
       break;
   }
   const getListdefFrequencyMode = () => histogram && frequencyMode === 'N' ? 'V' : frequencyMode;
+  const id = useRef();
+  if (!id.current) {
+    id.current = uid();
+  }
   const listdef = {
     qInfo: {
-      qType: 'njsListbox'
+      qType: 'njsListbox',
+      qId: id.current
     },
     qListObjectDef: {
       qStateName: stateName,
@@ -15575,7 +15838,8 @@ function ListBoxWrapper(_ref) {
   }
   const opts = _objectSpread2(_objectSpread2({}, options), {}, {
     selections,
-    model
+    model,
+    app
   });
   return /*#__PURE__*/React__default.createElement(ListBoxInline, {
     options: opts
@@ -15642,7 +15906,8 @@ function ListBoxPopoverWrapper(_ref) {
     transformOrigin: options.transformOrigin,
     close: handleCloseShowState,
     fieldName: fieldIdentifier,
-    stateName: stateName
+    stateName: stateName,
+    autoFocus: options.autoFocus
   });
 }
@@ -17560,7 +17825,7 @@ const validateTarget = (translator, layout, properties, def) => {
   const minD = def.dimensions.min();
   const minM = def.measures.min();
   const c = def.resolveLayout(layout);
-  const reqDimErrors = validateInfo(minD, getInfo(c.qDimensionInfo), i => def.dimensions.description(properties, i), translator.get('Visualization.Invalid.Dimension'), translator.get('Visualization.UnfulfilledCalculationCondition'));
+  const reqDimErrors = validateInfo(minD, getInfo(c.qDimensionInfo || c.qItems), i => def.dimensions.description(properties, i), translator.get('Visualization.Invalid.Dimension'), translator.get('Visualization.UnfulfilledCalculationCondition'));
   const reqMeasErrors = validateInfo(minM, getInfo(c.qMeasureInfo), i => def.measures.description(properties, i), translator.get('Visualization.Invalid.Measure'), translator.get('Visualization.UnfulfilledCalculationCondition'));
   return {
     reqDimErrors,
@@ -17579,7 +17844,7 @@ const validateCubes = (translator, targets, layout) => {
     const minD = def.dimensions.min();
     const minM = def.measures.min();
     const c = def.resolveLayout(layout);
-    const d = getInfo(c.qDimensionInfo).filter(filterData); // Filter out optional calc conditions
+    const d = getInfo(c.qDimensionInfo || c.qItems).filter(filterData); // Filter out optional calc conditions
     const m = getInfo(c.qMeasureInfo).filter(filterData); // Filter out optional calc conditions
     aggMinD += minD;
     aggMinM += minM;
@@ -20786,9 +21051,9 @@ const resolveValue = (data, reference, defaultValue) => {
 function target(def) {
   const propertyPath = def.path || '/qHyperCubeDef';
   const layoutPath = propertyPath.slice(0, -3);
-  if (/\/(qHyperCube|qListObject)$/.test(layoutPath) === false) {
+  if (/\/(qHyperCube|qListObject|qChildList)$/.test(layoutPath) === false) {
     const d = layoutPath.includes('/qHyperCube') ? 'qHyperCubeDef' : 'qListObjectDef';
-    throw new Error("Incorrect definition for ".concat(d, " at ").concat(propertyPath, ". Valid paths include /qHyperCubeDef or /qListObjectDef, e.g. data/qHyperCubeDef"));
+    throw new Error("Incorrect definition for ".concat(d, " at ").concat(propertyPath, ". Valid paths include /qHyperCubeDef, /qListObjectDef, or /qChildListDef, e.g. data/qHyperCubeDef"));
   }
   return {
     propertyPath,
@@ -20908,1350 +21173,1603 @@ var semver = {
 };
 (function (module, exports) {
-  exports = module.exports = SemVer;
-  var debug;
-  /* istanbul ignore next */
-  if (typeof process === 'object' && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
-    debug = function () {
-      var args = Array.prototype.slice.call(arguments, 0);
-      args.unshift('SEMVER');
-      console.log.apply(console, args);
-    };
-  } else {
-    debug = function () {};
-  }
+	exports = module.exports = SemVer;
+	var debug;
+	/* istanbul ignore next */
+	if (typeof process === 'object' &&
+	    process.env &&
+	    process.env.NODE_DEBUG &&
+	    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
+	  debug = function () {
+	    var args = Array.prototype.slice.call(arguments, 0);
+	    args.unshift('SEMVER');
+	    console.log.apply(console, args);
+	  };
+	} else {
+	  debug = function () {};
+	}
-  // Note: this is the semver.org version of the spec that it implements
-  // Not necessarily the package version of this code.
-  exports.SEMVER_SPEC_VERSION = '2.0.0';
-  var MAX_LENGTH = 256;
-  var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */9007199254740991;
-  // Max safe segment length for coercion.
-  var MAX_SAFE_COMPONENT_LENGTH = 16;
-  // The actual regexps go on exports.re
-  var re = exports.re = [];
-  var src = exports.src = [];
-  var t = exports.tokens = {};
-  var R = 0;
-  function tok(n) {
-    t[n] = R++;
-  }
-  // 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.
-  tok('NUMERICIDENTIFIER');
-  src[t.NUMERICIDENTIFIER] = '0|[1-9]\\d*';
-  tok('NUMERICIDENTIFIERLOOSE');
-  src[t.NUMERICIDENTIFIERLOOSE] = '[0-9]+';
-  // ## Non-numeric Identifier
-  // Zero or more digits, followed by a letter or hyphen, and then zero or
-  // more letters, digits, or hyphens.
-  tok('NONNUMERICIDENTIFIER');
-  src[t.NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
-  // ## Main Version
-  // Three dot-separated numeric identifiers.
-  tok('MAINVERSION');
-  src[t.MAINVERSION] = '(' + src[t.NUMERICIDENTIFIER] + ')\\.' + '(' + src[t.NUMERICIDENTIFIER] + ')\\.' + '(' + src[t.NUMERICIDENTIFIER] + ')';
-  tok('MAINVERSIONLOOSE');
-  src[t.MAINVERSIONLOOSE] = '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' + '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' + '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')';
-  // ## Pre-release Version Identifier
-  // A numeric identifier, or a non-numeric identifier.
-  tok('PRERELEASEIDENTIFIER');
-  src[t.PRERELEASEIDENTIFIER] = '(?:' + src[t.NUMERICIDENTIFIER] + '|' + src[t.NONNUMERICIDENTIFIER] + ')';
-  tok('PRERELEASEIDENTIFIERLOOSE');
-  src[t.PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[t.NUMERICIDENTIFIERLOOSE] + '|' + src[t.NONNUMERICIDENTIFIER] + ')';
-  // ## Pre-release Version
-  // Hyphen, followed by one or more dot-separated pre-release version
-  // identifiers.
-  tok('PRERELEASE');
-  src[t.PRERELEASE] = '(?:-(' + src[t.PRERELEASEIDENTIFIER] + '(?:\\.' + src[t.PRERELEASEIDENTIFIER] + ')*))';
-  tok('PRERELEASELOOSE');
-  src[t.PRERELEASELOOSE] = '(?:-?(' + src[t.PRERELEASEIDENTIFIERLOOSE] + '(?:\\.' + src[t.PRERELEASEIDENTIFIERLOOSE] + ')*))';
-  // ## Build Metadata Identifier
-  // Any combination of digits, letters, or hyphens.
-  tok('BUILDIDENTIFIER');
-  src[t.BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
-  // ## Build Metadata
-  // Plus sign, followed by one or more period-separated build metadata
-  // identifiers.
-  tok('BUILD');
-  src[t.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.
-  tok('FULL');
-  tok('FULLPLAIN');
-  src[t.FULLPLAIN] = 'v?' + src[t.MAINVERSION] + src[t.PRERELEASE] + '?' + src[t.BUILD] + '?';
-  src[t.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.
-  tok('LOOSEPLAIN');
-  src[t.LOOSEPLAIN] = '[v=\\s]*' + src[t.MAINVERSIONLOOSE] + src[t.PRERELEASELOOSE] + '?' + src[t.BUILD] + '?';
-  tok('LOOSE');
-  src[t.LOOSE] = '^' + src[t.LOOSEPLAIN] + '$';
-  tok('GTLT');
-  src[t.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.
-  tok('XRANGEIDENTIFIERLOOSE');
-  src[t.XRANGEIDENTIFIERLOOSE] = src[t.NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
-  tok('XRANGEIDENTIFIER');
-  src[t.XRANGEIDENTIFIER] = src[t.NUMERICIDENTIFIER] + '|x|X|\\*';
-  tok('XRANGEPLAIN');
-  src[t.XRANGEPLAIN] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIER] + ')' + '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' + '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' + '(?:' + src[t.PRERELEASE] + ')?' + src[t.BUILD] + '?' + ')?)?';
-  tok('XRANGEPLAINLOOSE');
-  src[t.XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' + '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' + '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' + '(?:' + src[t.PRERELEASELOOSE] + ')?' + src[t.BUILD] + '?' + ')?)?';
-  tok('XRANGE');
-  src[t.XRANGE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAIN] + '$';
-  tok('XRANGELOOSE');
-  src[t.XRANGELOOSE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAINLOOSE] + '$';
-  // Coercion.
-  // Extract anything that could conceivably be a part of a valid semver
-  tok('COERCE');
-  src[t.COERCE] = '(^|[^\\d])' + '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' + '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' + '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' + '(?:$|[^\\d])';
-  tok('COERCERTL');
-  re[t.COERCERTL] = new RegExp(src[t.COERCE], 'g');
-  // Tilde ranges.
-  // Meaning is "reasonably at or greater than"
-  tok('LONETILDE');
-  src[t.LONETILDE] = '(?:~>?)';
-  tok('TILDETRIM');
-  src[t.TILDETRIM] = '(\\s*)' + src[t.LONETILDE] + '\\s+';
-  re[t.TILDETRIM] = new RegExp(src[t.TILDETRIM], 'g');
-  var tildeTrimReplace = '$1~';
-  tok('TILDE');
-  src[t.TILDE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAIN] + '$';
-  tok('TILDELOOSE');
-  src[t.TILDELOOSE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAINLOOSE] + '$';
-  // Caret ranges.
-  // Meaning is "at least and backwards compatible with"
-  tok('LONECARET');
-  src[t.LONECARET] = '(?:\\^)';
-  tok('CARETTRIM');
-  src[t.CARETTRIM] = '(\\s*)' + src[t.LONECARET] + '\\s+';
-  re[t.CARETTRIM] = new RegExp(src[t.CARETTRIM], 'g');
-  var caretTrimReplace = '$1^';
-  tok('CARET');
-  src[t.CARET] = '^' + src[t.LONECARET] + src[t.XRANGEPLAIN] + '$';
-  tok('CARETLOOSE');
-  src[t.CARETLOOSE] = '^' + src[t.LONECARET] + src[t.XRANGEPLAINLOOSE] + '$';
-  // A simple gt/lt/eq thing, or just "" to indicate "any version"
-  tok('COMPARATORLOOSE');
-  src[t.COMPARATORLOOSE] = '^' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + ')$|^$';
-  tok('COMPARATOR');
-  src[t.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`
-  tok('COMPARATORTRIM');
-  src[t.COMPARATORTRIM] = '(\\s*)' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + '|' + src[t.XRANGEPLAIN] + ')';
-  // this one has to use the /g flag
-  re[t.COMPARATORTRIM] = new RegExp(src[t.COMPARATORTRIM], 'g');
-  var 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.
-  tok('HYPHENRANGE');
-  src[t.HYPHENRANGE] = '^\\s*(' + src[t.XRANGEPLAIN] + ')' + '\\s+-\\s+' + '(' + src[t.XRANGEPLAIN] + ')' + '\\s*$';
-  tok('HYPHENRANGELOOSE');
-  src[t.HYPHENRANGELOOSE] = '^\\s*(' + src[t.XRANGEPLAINLOOSE] + ')' + '\\s+-\\s+' + '(' + src[t.XRANGEPLAINLOOSE] + ')' + '\\s*$';
-  // Star ranges basically just allow anything at all.
-  tok('STAR');
-  src[t.STAR] = '(<|>)?=?\\s*\\*';
-  // Compile to actual regexp objects.
-  // All are flag-free, unless they were created above with a flag.
-  for (var i = 0; i < R; i++) {
-    debug(i, src[i]);
-    if (!re[i]) {
-      re[i] = new RegExp(src[i]);
-    }
-  }
-  exports.parse = parse;
-  function parse(version, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      };
-    }
-    if (version instanceof SemVer) {
-      return version;
-    }
-    if (typeof version !== 'string') {
-      return null;
-    }
-    if (version.length > MAX_LENGTH) {
-      return null;
-    }
-    var r = options.loose ? re[t.LOOSE] : re[t.FULL];
-    if (!r.test(version)) {
-      return null;
-    }
-    try {
-      return new SemVer(version, options);
-    } catch (er) {
-      return null;
-    }
-  }
-  exports.valid = valid;
-  function valid(version, options) {
-    var v = parse(version, options);
-    return v ? v.version : null;
-  }
-  exports.clean = clean;
-  function clean(version, options) {
-    var s = parse(version.trim().replace(/^[=v]+/, ''), options);
-    return s ? s.version : null;
-  }
-  exports.SemVer = SemVer;
-  function SemVer(version, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      };
-    }
-    if (version instanceof SemVer) {
-      if (version.loose === options.loose) {
-        return version;
-      } else {
-        version = version.version;
-      }
-    } else if (typeof version !== 'string') {
-      throw new TypeError('Invalid Version: ' + version);
-    }
-    if (version.length > MAX_LENGTH) {
-      throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters');
-    }
-    if (!(this instanceof SemVer)) {
-      return new SemVer(version, options);
-    }
-    debug('SemVer', version, options);
-    this.options = options;
-    this.loose = !!options.loose;
-    var m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL]);
-    if (!m) {
-      throw new TypeError('Invalid Version: ' + version);
-    }
-    this.raw = version;
+	// Note: this is the semver.org version of the spec that it implements
+	// Not necessarily the package version of this code.
+	exports.SEMVER_SPEC_VERSION = '2.0.0';
-    // 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');
-    }
-    if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-      throw new TypeError('Invalid minor version');
-    }
-    if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-      throw new TypeError('Invalid patch version');
-    }
+	var MAX_LENGTH = 256;
+	var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+	  /* istanbul ignore next */ 9007199254740991;
-    // numberify any prerelease numeric ids
-    if (!m[4]) {
-      this.prerelease = [];
-    } else {
-      this.prerelease = m[4].split('.').map(function (id) {
-        if (/^[0-9]+$/.test(id)) {
-          var num = +id;
-          if (num >= 0 && num < MAX_SAFE_INTEGER) {
-            return num;
-          }
-        }
-        return id;
-      });
-    }
-    this.build = m[5] ? m[5].split('.') : [];
-    this.format();
-  }
-  SemVer.prototype.format = function () {
-    this.version = this.major + '.' + this.minor + '.' + this.patch;
-    if (this.prerelease.length) {
-      this.version += '-' + this.prerelease.join('.');
-    }
-    return this.version;
-  };
-  SemVer.prototype.toString = function () {
-    return this.version;
-  };
-  SemVer.prototype.compare = function (other) {
-    debug('SemVer.compare', this.version, this.options, other);
-    if (!(other instanceof SemVer)) {
-      other = new SemVer(other, this.options);
-    }
-    return this.compareMain(other) || this.comparePre(other);
-  };
-  SemVer.prototype.compareMain = function (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);
-  };
-  SemVer.prototype.comparePre = function (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;
-    } else if (!this.prerelease.length && other.prerelease.length) {
-      return 1;
-    } else if (!this.prerelease.length && !other.prerelease.length) {
-      return 0;
-    }
-    var i = 0;
-    do {
-      var a = this.prerelease[i];
-      var b = other.prerelease[i];
-      debug('prerelease compare', i, a, b);
-      if (a === undefined && b === undefined) {
-        return 0;
-      } else if (b === undefined) {
-        return 1;
-      } else if (a === undefined) {
-        return -1;
-      } else if (a === b) {
-        continue;
-      } else {
-        return compareIdentifiers(a, b);
-      }
-    } while (++i);
-  };
-  SemVer.prototype.compareBuild = function (other) {
-    if (!(other instanceof SemVer)) {
-      other = new SemVer(other, this.options);
-    }
-    var i = 0;
-    do {
-      var a = this.build[i];
-      var b = other.build[i];
-      debug('prerelease compare', i, a, b);
-      if (a === undefined && b === undefined) {
-        return 0;
-      } else if (b === undefined) {
-        return 1;
-      } else if (a === undefined) {
-        return -1;
-      } else if (a === b) {
-        continue;
-      } else {
-        return compareIdentifiers(a, b);
-      }
-    } while (++i);
-  };
+	// Max safe segment length for coercion.
+	var MAX_SAFE_COMPONENT_LENGTH = 16;
-  // preminor will bump the version up to the next minor release, and immediately
-  // down to pre-release. premajor and prepatch work the same way.
-  SemVer.prototype.inc = function (release, identifier) {
-    switch (release) {
-      case 'premajor':
-        this.prerelease.length = 0;
-        this.patch = 0;
-        this.minor = 0;
-        this.major++;
-        this.inc('pre', identifier);
-        break;
-      case 'preminor':
-        this.prerelease.length = 0;
-        this.patch = 0;
-        this.minor++;
-        this.inc('pre', identifier);
-        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
-        // relevant at this point.
-        this.prerelease.length = 0;
-        this.inc('patch', identifier);
-        this.inc('pre', identifier);
-        break;
-      // If the input is a non-prerelease version, this acts the same as
-      // prepatch.
-      case 'prerelease':
-        if (this.prerelease.length === 0) {
-          this.inc('patch', identifier);
-        }
-        this.inc('pre', identifier);
-        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) {
-          this.major++;
-        }
-        this.minor = 0;
-        this.patch = 0;
-        this.prerelease = [];
-        break;
-      case 'minor':
-        // If this is a pre-minor version, bump up to the same minor version.
-        // Otherwise increment minor.
-        // 1.2.0-5 bumps to 1.2.0
-        // 1.2.1 bumps to 1.3.0
-        if (this.patch !== 0 || this.prerelease.length === 0) {
-          this.minor++;
-        }
-        this.patch = 0;
-        this.prerelease = [];
-        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.
-        // 1.2.0-5 patches to 1.2.0
-        // 1.2.0 patches to 1.2.1
-        if (this.prerelease.length === 0) {
-          this.patch++;
-        }
-        this.prerelease = [];
-        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':
-        if (this.prerelease.length === 0) {
-          this.prerelease = [0];
-        } else {
-          var 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
-            this.prerelease.push(0);
-          }
-        }
-        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
-          if (this.prerelease[0] === identifier) {
-            if (isNaN(this.prerelease[1])) {
-              this.prerelease = [identifier, 0];
-            }
-          } else {
-            this.prerelease = [identifier, 0];
-          }
-        }
-        break;
-      default:
-        throw new Error('invalid increment argument: ' + release);
-    }
-    this.format();
-    this.raw = this.version;
-    return this;
-  };
-  exports.inc = inc;
-  function inc(version, release, loose, identifier) {
-    if (typeof loose === 'string') {
-      identifier = loose;
-      loose = undefined;
-    }
-    try {
-      return new SemVer(version, loose).inc(release, identifier).version;
-    } catch (er) {
-      return null;
-    }
-  }
-  exports.diff = diff;
-  function diff(version1, version2) {
-    if (eq(version1, version2)) {
-      return null;
-    } else {
-      var v1 = parse(version1);
-      var v2 = parse(version2);
-      var prefix = '';
-      if (v1.prerelease.length || v2.prerelease.length) {
-        prefix = 'pre';
-        var defaultResult = 'prerelease';
-      }
-      for (var key in v1) {
-        if (key === 'major' || key === 'minor' || key === 'patch') {
-          if (v1[key] !== v2[key]) {
-            return prefix + key;
-          }
-        }
-      }
-      return defaultResult; // may be undefined
-    }
-  }
+	// The actual regexps go on exports.re
+	var re = exports.re = [];
+	var src = exports.src = [];
+	var t = exports.tokens = {};
+	var R = 0;
-  exports.compareIdentifiers = compareIdentifiers;
-  var numeric = /^[0-9]+$/;
-  function compareIdentifiers(a, b) {
-    var anum = numeric.test(a);
-    var 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;
-  }
-  exports.rcompareIdentifiers = rcompareIdentifiers;
-  function rcompareIdentifiers(a, b) {
-    return compareIdentifiers(b, a);
-  }
-  exports.major = major;
-  function major(a, loose) {
-    return new SemVer(a, loose).major;
-  }
-  exports.minor = minor;
-  function minor(a, loose) {
-    return new SemVer(a, loose).minor;
-  }
-  exports.patch = patch;
-  function patch(a, loose) {
-    return new SemVer(a, loose).patch;
-  }
-  exports.compare = compare;
-  function compare(a, b, loose) {
-    return new SemVer(a, loose).compare(new SemVer(b, loose));
-  }
-  exports.compareLoose = compareLoose;
-  function compareLoose(a, b) {
-    return compare(a, b, true);
-  }
-  exports.compareBuild = compareBuild;
-  function compareBuild(a, b, loose) {
-    var versionA = new SemVer(a, loose);
-    var versionB = new SemVer(b, loose);
-    return versionA.compare(versionB) || versionA.compareBuild(versionB);
-  }
-  exports.rcompare = rcompare;
-  function rcompare(a, b, loose) {
-    return compare(b, a, loose);
-  }
-  exports.sort = sort;
-  function sort(list, loose) {
-    return list.sort(function (a, b) {
-      return exports.compareBuild(a, b, loose);
-    });
-  }
-  exports.rsort = rsort;
-  function rsort(list, loose) {
-    return list.sort(function (a, b) {
-      return exports.compareBuild(b, a, loose);
-    });
-  }
-  exports.gt = gt;
-  function gt(a, b, loose) {
-    return compare(a, b, loose) > 0;
-  }
-  exports.lt = lt;
-  function lt(a, b, loose) {
-    return compare(a, b, loose) < 0;
-  }
-  exports.eq = eq;
-  function eq(a, b, loose) {
-    return compare(a, b, loose) === 0;
-  }
-  exports.neq = neq;
-  function neq(a, b, loose) {
-    return compare(a, b, loose) !== 0;
-  }
-  exports.gte = gte;
-  function gte(a, b, loose) {
-    return compare(a, b, loose) >= 0;
-  }
-  exports.lte = lte;
-  function lte(a, b, loose) {
-    return compare(a, b, loose) <= 0;
-  }
-  exports.cmp = cmp;
-  function cmp(a, op, b, loose) {
-    switch (op) {
-      case '===':
-        if (typeof a === 'object') a = a.version;
-        if (typeof b === 'object') b = b.version;
-        return a === b;
-      case '!==':
-        if (typeof a === 'object') a = a.version;
-        if (typeof b === 'object') b = b.version;
-        return a !== b;
-      case '':
-      case '=':
-      case '==':
-        return eq(a, b, loose);
-      case '!=':
-        return neq(a, b, loose);
-      case '>':
-        return gt(a, b, loose);
-      case '>=':
-        return gte(a, b, loose);
-      case '<':
-        return lt(a, b, loose);
-      case '<=':
-        return lte(a, b, loose);
-      default:
-        throw new TypeError('Invalid operator: ' + op);
-    }
-  }
-  exports.Comparator = Comparator;
-  function Comparator(comp, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      };
-    }
-    if (comp instanceof Comparator) {
-      if (comp.loose === !!options.loose) {
-        return comp;
-      } else {
-        comp = comp.value;
-      }
-    }
-    if (!(this instanceof Comparator)) {
-      return new Comparator(comp, options);
-    }
-    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);
-  }
-  var ANY = {};
-  Comparator.prototype.parse = function (comp) {
-    var r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
-    var m = comp.match(r);
-    if (!m) {
-      throw new TypeError('Invalid comparator: ' + comp);
-    }
-    this.operator = m[1] !== undefined ? m[1] : '';
-    if (this.operator === '=') {
-      this.operator = '';
-    }
+	function tok (n) {
+	  t[n] = R++;
+	}
-    // 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);
-    }
-  };
-  Comparator.prototype.toString = function () {
-    return this.value;
-  };
-  Comparator.prototype.test = function (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);
-  };
-  Comparator.prototype.intersects = function (comp, options) {
-    if (!(comp instanceof Comparator)) {
-      throw new TypeError('a Comparator is required');
-    }
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      };
-    }
-    var rangeTmp;
-    if (this.operator === '') {
-      if (this.value === '') {
-        return true;
-      }
-      rangeTmp = new Range(comp.value, options);
-      return satisfies(this.value, rangeTmp, options);
-    } else if (comp.operator === '') {
-      if (comp.value === '') {
-        return true;
-      }
-      rangeTmp = new Range(this.value, options);
-      return satisfies(comp.semver, rangeTmp, options);
-    }
-    var sameDirectionIncreasing = (this.operator === '>=' || this.operator === '>') && (comp.operator === '>=' || comp.operator === '>');
-    var sameDirectionDecreasing = (this.operator === '<=' || this.operator === '<') && (comp.operator === '<=' || comp.operator === '<');
-    var sameSemVer = this.semver.version === comp.semver.version;
-    var differentDirectionsInclusive = (this.operator === '>=' || this.operator === '<=') && (comp.operator === '>=' || comp.operator === '<=');
-    var oppositeDirectionsLessThan = cmp(this.semver, '<', comp.semver, options) && (this.operator === '>=' || this.operator === '>') && (comp.operator === '<=' || comp.operator === '<');
-    var oppositeDirectionsGreaterThan = cmp(this.semver, '>', comp.semver, options) && (this.operator === '<=' || this.operator === '<') && (comp.operator === '>=' || comp.operator === '>');
-    return sameDirectionIncreasing || sameDirectionDecreasing || sameSemVer && differentDirectionsInclusive || oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
-  };
-  exports.Range = Range;
-  function Range(range, options) {
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false
-      };
-    }
-    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) {
-      return new Range(range.value, options);
-    }
-    if (!(this instanceof Range)) {
-      return new Range(range, options);
-    }
-    this.options = options;
-    this.loose = !!options.loose;
-    this.includePrerelease = !!options.includePrerelease;
+	// The following Regular Expressions can be used for tokenizing,
+	// validating, and parsing SemVer version strings.
-    // First, split based on boolean or ||
-    this.raw = range;
-    this.set = range.split(/\s*\|\|\s*/).map(function (range) {
-      return this.parseRange(range.trim());
-    }, this).filter(function (c) {
-      // throw out any that are not relevant for whatever reason
-      return c.length;
-    });
-    if (!this.set.length) {
-      throw new TypeError('Invalid SemVer Range: ' + range);
-    }
-    this.format();
-  }
-  Range.prototype.format = function () {
-    this.range = this.set.map(function (comps) {
-      return comps.join(' ').trim();
-    }).join('||').trim();
-    return this.range;
-  };
-  Range.prototype.toString = function () {
-    return this.range;
-  };
-  Range.prototype.parseRange = function (range) {
-    var loose = this.options.loose;
-    range = range.trim();
-    // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
-    var hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE];
-    range = range.replace(hr, hyphenReplace);
-    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, re[t.COMPARATORTRIM]);
-    // `~ 1.2.3` => `~1.2.3`
-    range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
-    // `^ 1.2.3` => `^1.2.3`
-    range = range.replace(re[t.CARETTRIM], caretTrimReplace);
-    // normalize spaces
-    range = range.split(/\s+/).join(' ');
-    // At this point, the range is completely trimmed and
-    // ready to be split into comparators.
-    var compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
-    var set = range.split(' ').map(function (comp) {
-      return parseComparator(comp, this.options);
-    }, this).join(' ').split(/\s+/);
-    if (this.options.loose) {
-      // in loose mode, throw out any that are not valid comparators
-      set = set.filter(function (comp) {
-        return !!comp.match(compRe);
-      });
-    }
-    set = set.map(function (comp) {
-      return new Comparator(comp, this.options);
-    }, this);
-    return set;
-  };
-  Range.prototype.intersects = function (range, options) {
-    if (!(range instanceof Range)) {
-      throw new TypeError('a Range is required');
-    }
-    return this.set.some(function (thisComparators) {
-      return isSatisfiable(thisComparators, options) && range.set.some(function (rangeComparators) {
-        return isSatisfiable(rangeComparators, options) && thisComparators.every(function (thisComparator) {
-          return rangeComparators.every(function (rangeComparator) {
-            return thisComparator.intersects(rangeComparator, options);
-          });
-        });
-      });
-    });
-  };
+	// ## Numeric Identifier
+	// A single `0`, or a non-zero digit followed by zero or more digits.
-  // take a set of comparators and determine whether there
-  // exists a version which can satisfy it
-  function isSatisfiable(comparators, options) {
-    var result = true;
-    var remainingComparators = comparators.slice();
-    var testComparator = remainingComparators.pop();
-    while (result && remainingComparators.length) {
-      result = remainingComparators.every(function (otherComparator) {
-        return testComparator.intersects(otherComparator, options);
-      });
-      testComparator = remainingComparators.pop();
-    }
-    return result;
-  }
+	tok('NUMERICIDENTIFIER');
+	src[t.NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+	tok('NUMERICIDENTIFIERLOOSE');
+	src[t.NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+	// ## Non-numeric Identifier
+	// Zero or more digits, followed by a letter or hyphen, and then zero or
+	// more letters, digits, or hyphens.
+	tok('NONNUMERICIDENTIFIER');
+	src[t.NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+	// ## Main Version
+	// Three dot-separated numeric identifiers.
+	tok('MAINVERSION');
+	src[t.MAINVERSION] = '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
+	                   '(' + src[t.NUMERICIDENTIFIER] + ')\\.' +
+	                   '(' + src[t.NUMERICIDENTIFIER] + ')';
+	tok('MAINVERSIONLOOSE');
+	src[t.MAINVERSIONLOOSE] = '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
+	                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')\\.' +
+	                        '(' + src[t.NUMERICIDENTIFIERLOOSE] + ')';
+	// ## Pre-release Version Identifier
+	// A numeric identifier, or a non-numeric identifier.
+	tok('PRERELEASEIDENTIFIER');
+	src[t.PRERELEASEIDENTIFIER] = '(?:' + src[t.NUMERICIDENTIFIER] +
+	                            '|' + src[t.NONNUMERICIDENTIFIER] + ')';
+	tok('PRERELEASEIDENTIFIERLOOSE');
+	src[t.PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[t.NUMERICIDENTIFIERLOOSE] +
+	                                 '|' + src[t.NONNUMERICIDENTIFIER] + ')';
+	// ## Pre-release Version
+	// Hyphen, followed by one or more dot-separated pre-release version
+	// identifiers.
+	tok('PRERELEASE');
+	src[t.PRERELEASE] = '(?:-(' + src[t.PRERELEASEIDENTIFIER] +
+	                  '(?:\\.' + src[t.PRERELEASEIDENTIFIER] + ')*))';
+	tok('PRERELEASELOOSE');
+	src[t.PRERELEASELOOSE] = '(?:-?(' + src[t.PRERELEASEIDENTIFIERLOOSE] +
+	                       '(?:\\.' + src[t.PRERELEASEIDENTIFIERLOOSE] + ')*))';
+	// ## Build Metadata Identifier
+	// Any combination of digits, letters, or hyphens.
+	tok('BUILDIDENTIFIER');
+	src[t.BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+	// ## Build Metadata
+	// Plus sign, followed by one or more period-separated build metadata
+	// identifiers.
+	tok('BUILD');
+	src[t.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.
+	tok('FULL');
+	tok('FULLPLAIN');
+	src[t.FULLPLAIN] = 'v?' + src[t.MAINVERSION] +
+	                  src[t.PRERELEASE] + '?' +
+	                  src[t.BUILD] + '?';
+	src[t.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.
+	tok('LOOSEPLAIN');
+	src[t.LOOSEPLAIN] = '[v=\\s]*' + src[t.MAINVERSIONLOOSE] +
+	                  src[t.PRERELEASELOOSE] + '?' +
+	                  src[t.BUILD] + '?';
+	tok('LOOSE');
+	src[t.LOOSE] = '^' + src[t.LOOSEPLAIN] + '$';
+	tok('GTLT');
+	src[t.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.
+	tok('XRANGEIDENTIFIERLOOSE');
+	src[t.XRANGEIDENTIFIERLOOSE] = src[t.NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
+	tok('XRANGEIDENTIFIER');
+	src[t.XRANGEIDENTIFIER] = src[t.NUMERICIDENTIFIER] + '|x|X|\\*';
+	tok('XRANGEPLAIN');
+	src[t.XRANGEPLAIN] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIER] + ')' +
+	                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
+	                   '(?:\\.(' + src[t.XRANGEIDENTIFIER] + ')' +
+	                   '(?:' + src[t.PRERELEASE] + ')?' +
+	                   src[t.BUILD] + '?' +
+	                   ')?)?';
+	tok('XRANGEPLAINLOOSE');
+	src[t.XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:\\.(' + src[t.XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:' + src[t.PRERELEASELOOSE] + ')?' +
+	                        src[t.BUILD] + '?' +
+	                        ')?)?';
+	tok('XRANGE');
+	src[t.XRANGE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAIN] + '$';
+	tok('XRANGELOOSE');
+	src[t.XRANGELOOSE] = '^' + src[t.GTLT] + '\\s*' + src[t.XRANGEPLAINLOOSE] + '$';
+	// Coercion.
+	// Extract anything that could conceivably be a part of a valid semver
+	tok('COERCE');
+	src[t.COERCE] = '(^|[^\\d])' +
+	              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+	              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+	              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+	              '(?:$|[^\\d])';
+	tok('COERCERTL');
+	re[t.COERCERTL] = new RegExp(src[t.COERCE], 'g');
+	// Tilde ranges.
+	// Meaning is "reasonably at or greater than"
+	tok('LONETILDE');
+	src[t.LONETILDE] = '(?:~>?)';
+	tok('TILDETRIM');
+	src[t.TILDETRIM] = '(\\s*)' + src[t.LONETILDE] + '\\s+';
+	re[t.TILDETRIM] = new RegExp(src[t.TILDETRIM], 'g');
+	var tildeTrimReplace = '$1~';
+	tok('TILDE');
+	src[t.TILDE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAIN] + '$';
+	tok('TILDELOOSE');
+	src[t.TILDELOOSE] = '^' + src[t.LONETILDE] + src[t.XRANGEPLAINLOOSE] + '$';
+	// Caret ranges.
+	// Meaning is "at least and backwards compatible with"
+	tok('LONECARET');
+	src[t.LONECARET] = '(?:\\^)';
+	tok('CARETTRIM');
+	src[t.CARETTRIM] = '(\\s*)' + src[t.LONECARET] + '\\s+';
+	re[t.CARETTRIM] = new RegExp(src[t.CARETTRIM], 'g');
+	var caretTrimReplace = '$1^';
+	tok('CARET');
+	src[t.CARET] = '^' + src[t.LONECARET] + src[t.XRANGEPLAIN] + '$';
+	tok('CARETLOOSE');
+	src[t.CARETLOOSE] = '^' + src[t.LONECARET] + src[t.XRANGEPLAINLOOSE] + '$';
+	// A simple gt/lt/eq thing, or just "" to indicate "any version"
+	tok('COMPARATORLOOSE');
+	src[t.COMPARATORLOOSE] = '^' + src[t.GTLT] + '\\s*(' + src[t.LOOSEPLAIN] + ')$|^$';
+	tok('COMPARATOR');
+	src[t.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`
+	tok('COMPARATORTRIM');
+	src[t.COMPARATORTRIM] = '(\\s*)' + src[t.GTLT] +
+	                      '\\s*(' + src[t.LOOSEPLAIN] + '|' + src[t.XRANGEPLAIN] + ')';
+	// this one has to use the /g flag
+	re[t.COMPARATORTRIM] = new RegExp(src[t.COMPARATORTRIM], 'g');
+	var 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.
+	tok('HYPHENRANGE');
+	src[t.HYPHENRANGE] = '^\\s*(' + src[t.XRANGEPLAIN] + ')' +
+	                   '\\s+-\\s+' +
+	                   '(' + src[t.XRANGEPLAIN] + ')' +
+	                   '\\s*$';
+	tok('HYPHENRANGELOOSE');
+	src[t.HYPHENRANGELOOSE] = '^\\s*(' + src[t.XRANGEPLAINLOOSE] + ')' +
+	                        '\\s+-\\s+' +
+	                        '(' + src[t.XRANGEPLAINLOOSE] + ')' +
+	                        '\\s*$';
+	// Star ranges basically just allow anything at all.
+	tok('STAR');
+	src[t.STAR] = '(<|>)?=?\\s*\\*';
+	// Compile to actual regexp objects.
+	// All are flag-free, unless they were created above with a flag.
+	for (var i = 0; i < R; i++) {
+	  debug(i, src[i]);
+	  if (!re[i]) {
+	    re[i] = new RegExp(src[i]);
+	  }
+	}
-  // Mostly just for testing and legacy API reasons
-  exports.toComparators = toComparators;
-  function toComparators(range, options) {
-    return new Range(range, options).set.map(function (comp) {
-      return comp.map(function (c) {
-        return c.value;
-      }).join(' ').trim().split(' ');
-    });
-  }
+	exports.parse = parse;
+	function parse (version, options) {
+	  if (!options || typeof options !== 'object') {
+	    options = {
+	      loose: !!options,
+	      includePrerelease: false
+	    };
+	  }
+	  if (version instanceof SemVer) {
+	    return version
+	  }
+	  if (typeof version !== 'string') {
+	    return null
+	  }
+	  if (version.length > MAX_LENGTH) {
+	    return null
+	  }
+	  var r = options.loose ? re[t.LOOSE] : re[t.FULL];
+	  if (!r.test(version)) {
+	    return null
+	  }
+	  try {
+	    return new SemVer(version, options)
+	  } catch (er) {
+	    return null
+	  }
+	}
-  // comprised of xranges, tildes, stars, and gtlt's at this point.
-  // already replaced the hyphen ranges
-  // turn into a set of JUST comparators.
-  function 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;
-  }
-  function isX(id) {
-    return !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
-  // ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
-  // ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
-  // ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
-  // ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
-  function replaceTildes(comp, options) {
-    return comp.trim().split(/\s+/).map(function (comp) {
-      return replaceTilde(comp, options);
-    }).join(' ');
-  }
-  function replaceTilde(comp, options) {
-    var r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
-    return comp.replace(r, function (_, M, m, p, pr) {
-      debug('tilde', comp, _, M, m, p, pr);
-      var ret;
-      if (isX(M)) {
-        ret = '';
-      } else if (isX(m)) {
-        ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-      } else if (isX(p)) {
-        // ~1.2 == >=1.2.0 <1.3.0
-        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-      } else if (pr) {
-        debug('replaceTilde pr', pr);
-        ret = '>=' + M + '.' + m + '.' + p + '-' + pr + ' <' + M + '.' + (+m + 1) + '.0';
-      } else {
-        // ~1.2.3 == >=1.2.3 <1.3.0
-        ret = '>=' + M + '.' + m + '.' + p + ' <' + M + '.' + (+m + 1) + '.0';
-      }
-      debug('tilde return', ret);
-      return ret;
-    });
-  }
+	exports.valid = valid;
+	function valid (version, options) {
+	  var v = parse(version, options);
+	  return v ? v.version : null
+	}
-  // ^ --> * (any, kinda silly)
-  // ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
-  // ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
-  // ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
-  // ^1.2.3 --> >=1.2.3 <2.0.0
-  // ^1.2.0 --> >=1.2.0 <2.0.0
-  function replaceCarets(comp, options) {
-    return comp.trim().split(/\s+/).map(function (comp) {
-      return replaceCaret(comp, options);
-    }).join(' ');
-  }
-  function replaceCaret(comp, options) {
-    debug('caret', comp, options);
-    var r = options.loose ? re[t.CARETLOOSE] : re[t.CARET];
-    return comp.replace(r, function (_, M, m, p, pr) {
-      debug('caret', comp, _, M, m, p, pr);
-      var ret;
-      if (isX(M)) {
-        ret = '';
-      } else if (isX(m)) {
-        ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
-      } else if (isX(p)) {
-        if (M === '0') {
-          ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
-        } else {
-          ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
-        }
-      } else if (pr) {
-        debug('replaceCaret pr', pr);
-        if (M === '0') {
-          if (m === '0') {
-            ret = '>=' + M + '.' + m + '.' + p + '-' + pr + ' <' + M + '.' + m + '.' + (+p + 1);
-          } else {
-            ret = '>=' + M + '.' + m + '.' + p + '-' + pr + ' <' + M + '.' + (+m + 1) + '.0';
-          }
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p + '-' + pr + ' <' + (+M + 1) + '.0.0';
-        }
-      } else {
-        debug('no pr');
-        if (M === '0') {
-          if (m === '0') {
-            ret = '>=' + M + '.' + m + '.' + p + ' <' + M + '.' + m + '.' + (+p + 1);
-          } else {
-            ret = '>=' + M + '.' + m + '.' + p + ' <' + M + '.' + (+m + 1) + '.0';
-          }
-        } else {
-          ret = '>=' + M + '.' + m + '.' + p + ' <' + (+M + 1) + '.0.0';
-        }
-      }
-      debug('caret return', ret);
-      return ret;
-    });
-  }
-  function replaceXRanges(comp, options) {
-    debug('replaceXRanges', comp, options);
-    return comp.split(/\s+/).map(function (comp) {
-      return replaceXRange(comp, options);
-    }).join(' ');
-  }
-  function replaceXRange(comp, options) {
-    comp = comp.trim();
-    var r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
-    return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
-      debug('xRange', comp, ret, gtlt, M, m, p, pr);
-      var xM = isX(M);
-      var xm = xM || isX(m);
-      var xp = xm || isX(p);
-      var anyX = xp;
-      if (gtlt === '=' && anyX) {
-        gtlt = '';
-      }
+	exports.clean = clean;
+	function clean (version, options) {
+	  var s = parse(version.trim().replace(/^[=v]+/, ''), options);
+	  return s ? s.version : null
+	}
-      // 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
-          // >1.2.3 => >= 1.2.4
-          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;
-          }
-        }
-        ret = gtlt + M + '.' + m + '.' + p + pr;
-      } else if (xm) {
-        ret = '>=' + M + '.0.0' + pr + ' <' + (+M + 1) + '.0.0' + pr;
-      } else if (xp) {
-        ret = '>=' + M + '.' + m + '.0' + pr + ' <' + M + '.' + (+m + 1) + '.0' + pr;
-      }
-      debug('xRange return', ret);
-      return ret;
-    });
-  }
+	exports.SemVer = SemVer;
+	function SemVer (version, options) {
+	  if (!options || typeof options !== 'object') {
+	    options = {
+	      loose: !!options,
+	      includePrerelease: false
+	    };
+	  }
+	  if (version instanceof SemVer) {
+	    if (version.loose === options.loose) {
+	      return version
+	    } else {
+	      version = version.version;
+	    }
+	  } else if (typeof version !== 'string') {
+	    throw new TypeError('Invalid Version: ' + version)
+	  }
+	  if (version.length > MAX_LENGTH) {
+	    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+	  }
+	  if (!(this instanceof SemVer)) {
+	    return new SemVer(version, options)
+	  }
+	  debug('SemVer', version, options);
+	  this.options = options;
+	  this.loose = !!options.loose;
+	  var m = version.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL]);
+	  if (!m) {
+	    throw new TypeError('Invalid Version: ' + 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')
+	  }
+	  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+	    throw new TypeError('Invalid minor version')
+	  }
+	  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+	    throw new TypeError('Invalid patch version')
+	  }
+	  // numberify any prerelease numeric ids
+	  if (!m[4]) {
+	    this.prerelease = [];
+	  } else {
+	    this.prerelease = m[4].split('.').map(function (id) {
+	      if (/^[0-9]+$/.test(id)) {
+	        var num = +id;
+	        if (num >= 0 && num < MAX_SAFE_INTEGER) {
+	          return num
+	        }
+	      }
+	      return id
+	    });
+	  }
+	  this.build = m[5] ? m[5].split('.') : [];
+	  this.format();
+	}
-  // Because * is AND-ed with everything else in the comparator,
-  // and '' means "any version", just remove the *s entirely.
-  function 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], '');
-  }
-  // 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 Any 3.4.x will do
-  // 1.2 - 3.4 => >=1.2.0 <3.5.0
-  function hyphenReplace($0, from, fM, fm, fp, fpr, fb, to, tM, tm, tp, tpr, tb) {
-    if (isX(fM)) {
-      from = '';
-    } else if (isX(fm)) {
-      from = '>=' + fM + '.0.0';
-    } else if (isX(fp)) {
-      from = '>=' + fM + '.' + fm + '.0';
-    } else {
-      from = '>=' + from;
-    }
-    if (isX(tM)) {
-      to = '';
-    } else if (isX(tm)) {
-      to = '<' + (+tM + 1) + '.0.0';
-    } else if (isX(tp)) {
-      to = '<' + tM + '.' + (+tm + 1) + '.0';
-    } else if (tpr) {
-      to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
-    } else {
-      to = '<=' + to;
-    }
-    return (from + ' ' + to).trim();
-  }
+	SemVer.prototype.format = function () {
+	  this.version = this.major + '.' + this.minor + '.' + this.patch;
+	  if (this.prerelease.length) {
+	    this.version += '-' + this.prerelease.join('.');
+	  }
+	  return this.version
+	};
+	SemVer.prototype.toString = function () {
+	  return this.version
+	};
+	SemVer.prototype.compare = function (other) {
+	  debug('SemVer.compare', this.version, this.options, other);
+	  if (!(other instanceof SemVer)) {
+	    other = new SemVer(other, this.options);
+	  }
+	  return this.compareMain(other) || this.comparePre(other)
+	};
+	SemVer.prototype.compareMain = function (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)
+	};
+	SemVer.prototype.comparePre = function (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
+	  } else if (!this.prerelease.length && other.prerelease.length) {
+	    return 1
+	  } else if (!this.prerelease.length && !other.prerelease.length) {
+	    return 0
+	  }
+	  var i = 0;
+	  do {
+	    var a = this.prerelease[i];
+	    var b = other.prerelease[i];
+	    debug('prerelease compare', i, a, b);
+	    if (a === undefined && b === undefined) {
+	      return 0
+	    } else if (b === undefined) {
+	      return 1
+	    } else if (a === undefined) {
+	      return -1
+	    } else if (a === b) {
+	      continue
+	    } else {
+	      return compareIdentifiers(a, b)
+	    }
+	  } while (++i)
+	};
+	SemVer.prototype.compareBuild = function (other) {
+	  if (!(other instanceof SemVer)) {
+	    other = new SemVer(other, this.options);
+	  }
+	  var i = 0;
+	  do {
+	    var a = this.build[i];
+	    var b = other.build[i];
+	    debug('prerelease compare', i, a, b);
+	    if (a === undefined && b === undefined) {
+	      return 0
+	    } else if (b === undefined) {
+	      return 1
+	    } else if (a === undefined) {
+	      return -1
+	    } else if (a === b) {
+	      continue
+	    } else {
+	      return compareIdentifiers(a, b)
+	    }
+	  } 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.
+	SemVer.prototype.inc = function (release, identifier) {
+	  switch (release) {
+	    case 'premajor':
+	      this.prerelease.length = 0;
+	      this.patch = 0;
+	      this.minor = 0;
+	      this.major++;
+	      this.inc('pre', identifier);
+	      break
+	    case 'preminor':
+	      this.prerelease.length = 0;
+	      this.patch = 0;
+	      this.minor++;
+	      this.inc('pre', identifier);
+	      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
+	      // relevant at this point.
+	      this.prerelease.length = 0;
+	      this.inc('patch', identifier);
+	      this.inc('pre', identifier);
+	      break
+	    // If the input is a non-prerelease version, this acts the same as
+	    // prepatch.
+	    case 'prerelease':
+	      if (this.prerelease.length === 0) {
+	        this.inc('patch', identifier);
+	      }
+	      this.inc('pre', identifier);
+	      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) {
+	        this.major++;
+	      }
+	      this.minor = 0;
+	      this.patch = 0;
+	      this.prerelease = [];
+	      break
+	    case 'minor':
+	      // If this is a pre-minor version, bump up to the same minor version.
+	      // Otherwise increment minor.
+	      // 1.2.0-5 bumps to 1.2.0
+	      // 1.2.1 bumps to 1.3.0
+	      if (this.patch !== 0 || this.prerelease.length === 0) {
+	        this.minor++;
+	      }
+	      this.patch = 0;
+	      this.prerelease = [];
+	      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.
+	      // 1.2.0-5 patches to 1.2.0
+	      // 1.2.0 patches to 1.2.1
+	      if (this.prerelease.length === 0) {
+	        this.patch++;
+	      }
+	      this.prerelease = [];
+	      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':
+	      if (this.prerelease.length === 0) {
+	        this.prerelease = [0];
+	      } else {
+	        var 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
+	          this.prerelease.push(0);
+	        }
+	      }
+	      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
+	        if (this.prerelease[0] === identifier) {
+	          if (isNaN(this.prerelease[1])) {
+	            this.prerelease = [identifier, 0];
+	          }
+	        } else {
+	          this.prerelease = [identifier, 0];
+	        }
+	      }
+	      break
+	    default:
+	      throw new Error('invalid increment argument: ' + release)
+	  }
+	  this.format();
+	  this.raw = this.version;
+	  return this
+	};
+	exports.inc = inc;
+	function inc (version, release, loose, identifier) {
+	  if (typeof (loose) === 'string') {
+	    identifier = loose;
+	    loose = undefined;
+	  }
+	  try {
+	    return new SemVer(version, loose).inc(release, identifier).version
+	  } catch (er) {
+	    return null
+	  }
+	}
-  // if ANY of the sets match ALL of its comparators, then pass
-  Range.prototype.test = function (version) {
-    if (!version) {
-      return false;
-    }
-    if (typeof version === 'string') {
-      try {
-        version = new SemVer(version, this.options);
-      } catch (er) {
-        return false;
-      }
-    }
-    for (var i = 0; i < this.set.length; i++) {
-      if (testSet(this.set[i], version, this.options)) {
-        return true;
-      }
-    }
-    return false;
-  };
-  function testSet(set, version, options) {
-    for (var 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 (i = 0; i < set.length; i++) {
-        debug(set[i].semver);
-        if (set[i].semver === ANY) {
-          continue;
-        }
-        if (set[i].semver.prerelease.length > 0) {
-          var allowed = set[i].semver;
-          if (allowed.major === version.major && allowed.minor === version.minor && allowed.patch === version.patch) {
-            return true;
-          }
-        }
-      }
+	exports.diff = diff;
+	function diff (version1, version2) {
+	  if (eq(version1, version2)) {
+	    return null
+	  } else {
+	    var v1 = parse(version1);
+	    var v2 = parse(version2);
+	    var prefix = '';
+	    if (v1.prerelease.length || v2.prerelease.length) {
+	      prefix = 'pre';
+	      var defaultResult = 'prerelease';
+	    }
+	    for (var key in v1) {
+	      if (key === 'major' || key === 'minor' || key === 'patch') {
+	        if (v1[key] !== v2[key]) {
+	          return prefix + key
+	        }
+	      }
+	    }
+	    return defaultResult // may be undefined
+	  }
+	}
-      // Version has a -pre, but it's not one of the ones we like.
-      return false;
-    }
-    return true;
-  }
-  exports.satisfies = satisfies;
-  function satisfies(version, range, options) {
-    try {
-      range = new Range(range, options);
-    } catch (er) {
-      return false;
-    }
-    return range.test(version);
-  }
-  exports.maxSatisfying = maxSatisfying;
-  function maxSatisfying(versions, range, options) {
-    var max = null;
-    var maxSV = null;
-    try {
-      var rangeObj = new Range(range, options);
-    } catch (er) {
-      return null;
-    }
-    versions.forEach(function (v) {
-      if (rangeObj.test(v)) {
-        // satisfies(v, range, options)
-        if (!max || maxSV.compare(v) === -1) {
-          // compare(max, v, true)
-          max = v;
-          maxSV = new SemVer(max, options);
-        }
-      }
-    });
-    return max;
-  }
-  exports.minSatisfying = minSatisfying;
-  function minSatisfying(versions, range, options) {
-    var min = null;
-    var minSV = null;
-    try {
-      var rangeObj = new Range(range, options);
-    } catch (er) {
-      return null;
-    }
-    versions.forEach(function (v) {
-      if (rangeObj.test(v)) {
-        // satisfies(v, range, options)
-        if (!min || minSV.compare(v) === 1) {
-          // compare(min, v, true)
-          min = v;
-          minSV = new SemVer(min, options);
-        }
-      }
-    });
-    return min;
-  }
-  exports.minVersion = minVersion;
-  function minVersion(range, loose) {
-    range = new Range(range, loose);
-    var minver = new SemVer('0.0.0');
-    if (range.test(minver)) {
-      return minver;
-    }
-    minver = new SemVer('0.0.0-0');
-    if (range.test(minver)) {
-      return minver;
-    }
-    minver = null;
-    for (var i = 0; i < range.set.length; ++i) {
-      var comparators = range.set[i];
-      comparators.forEach(function (comparator) {
-        // Clone to avoid manipulating the comparator's semver object.
-        var compver = new SemVer(comparator.semver.version);
-        switch (comparator.operator) {
-          case '>':
-            if (compver.prerelease.length === 0) {
-              compver.patch++;
-            } else {
-              compver.prerelease.push(0);
-            }
-            compver.raw = compver.format();
-          /* fallthrough */
-          case '':
-          case '>=':
-            if (!minver || gt(minver, compver)) {
-              minver = compver;
-            }
-            break;
-          case '<':
-          case '<=':
-            /* Ignore maximum versions */
-            break;
-          /* istanbul ignore next */
-          default:
-            throw new Error('Unexpected operation: ' + comparator.operator);
-        }
-      });
-    }
-    if (minver && range.test(minver)) {
-      return minver;
-    }
-    return null;
-  }
-  exports.validRange = validRange;
-  function validRange(range, options) {
-    try {
-      // Return '*' instead of '' so that truthiness works.
-      // This will throw if it's invalid anyway
-      return new Range(range, options).range || '*';
-    } catch (er) {
-      return null;
-    }
-  }
+	exports.compareIdentifiers = compareIdentifiers;
-  // Determine if version is less than all the versions possible in the range
-  exports.ltr = ltr;
-  function ltr(version, range, options) {
-    return outside(version, range, '<', options);
-  }
+	var numeric = /^[0-9]+$/;
+	function compareIdentifiers (a, b) {
+	  var anum = numeric.test(a);
+	  var bnum = numeric.test(b);
-  // Determine if version is greater than all the versions possible in the range.
-  exports.gtr = gtr;
-  function gtr(version, range, options) {
-    return outside(version, range, '>', options);
-  }
-  exports.outside = outside;
-  function outside(version, range, hilo, options) {
-    version = new SemVer(version, options);
-    range = new Range(range, options);
-    var gtfn, ltefn, ltfn, comp, ecomp;
-    switch (hilo) {
-      case '>':
-        gtfn = gt;
-        ltefn = lte;
-        ltfn = lt;
-        comp = '>';
-        ecomp = '>=';
-        break;
-      case '<':
-        gtfn = lt;
-        ltefn = gte;
-        ltfn = gt;
-        comp = '<';
-        ecomp = '<=';
-        break;
-      default:
-        throw new TypeError('Must provide a hilo val of "<" or ">"');
-    }
+	  if (anum && bnum) {
+	    a = +a;
+	    b = +b;
+	  }
-    // If it satisifes the range it is not outside
-    if (satisfies(version, range, options)) {
-      return false;
-    }
+	  return a === b ? 0
+	    : (anum && !bnum) ? -1
+	    : (bnum && !anum) ? 1
+	    : a < b ? -1
+	    : 1
+	}
+	exports.rcompareIdentifiers = rcompareIdentifiers;
+	function rcompareIdentifiers (a, b) {
+	  return compareIdentifiers(b, a)
+	}
-    // From now on, variable terms are as if we're in "gtr" mode.
-    // but note that everything is flipped for the "ltr" function.
+	exports.major = major;
+	function major (a, loose) {
+	  return new SemVer(a, loose).major
+	}
-    for (var i = 0; i < range.set.length; ++i) {
-      var comparators = range.set[i];
-      var high = null;
-      var low = null;
-      comparators.forEach(function (comparator) {
-        if (comparator.semver === ANY) {
-          comparator = new Comparator('>=0.0.0');
-        }
-        high = high || comparator;
-        low = low || comparator;
-        if (gtfn(comparator.semver, high.semver, options)) {
-          high = comparator;
-        } else if (ltfn(comparator.semver, low.semver, options)) {
-          low = comparator;
-        }
-      });
+	exports.minor = minor;
+	function minor (a, loose) {
+	  return new SemVer(a, loose).minor
+	}
-      // If the edge version comparator has a operator then our version
-      // isn't outside it
-      if (high.operator === comp || high.operator === ecomp) {
-        return false;
-      }
+	exports.patch = patch;
+	function patch (a, loose) {
+	  return new SemVer(a, loose).patch
+	}
-      // If the lowest version comparator has an operator and our version
-      // is less than it then it isn't higher than the range
-      if ((!low.operator || low.operator === comp) && ltefn(version, low.semver)) {
-        return false;
-      } else if (low.operator === ecomp && ltfn(version, low.semver)) {
-        return false;
-      }
-    }
-    return true;
-  }
-  exports.prerelease = prerelease;
-  function prerelease(version, options) {
-    var parsed = parse(version, options);
-    return parsed && parsed.prerelease.length ? parsed.prerelease : null;
-  }
-  exports.intersects = intersects;
-  function intersects(r1, r2, options) {
-    r1 = new Range(r1, options);
-    r2 = new Range(r2, options);
-    return r1.intersects(r2);
-  }
-  exports.coerce = coerce;
-  function coerce(version, options) {
-    if (version instanceof SemVer) {
-      return version;
-    }
-    if (typeof version === 'number') {
-      version = String(version);
-    }
-    if (typeof version !== 'string') {
-      return null;
-    }
-    options = options || {};
-    var match = null;
-    if (!options.rtl) {
-      match = version.match(re[t.COERCE]);
-    } else {
-      // Find the right-most coercible string that does not share
-      // a terminus with a more left-ward coercible string.
-      // Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
-      //
-      // Walk through the string checking with a /g regexp
-      // Manually set the index so as to pick up overlapping matches.
-      // Stop when we get a match that ends at the string end, since no
-      // coercible string can be more right-ward without the same terminus.
-      var next;
-      while ((next = re[t.COERCERTL].exec(version)) && (!match || match.index + match[0].length !== version.length)) {
-        if (!match || next.index + next[0].length !== match.index + match[0].length) {
-          match = next;
-        }
-        re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length;
-      }
-      // leave it in a clean state
-      re[t.COERCERTL].lastIndex = -1;
-    }
-    if (match === null) {
-      return null;
-    }
-    return parse(match[2] + '.' + (match[3] || '0') + '.' + (match[4] || '0'), options);
-  }
-})(semver, semverExports);
+	exports.compare = compare;
+	function compare (a, b, loose) {
+	  return new SemVer(a, loose).compare(new SemVer(b, loose))
+	}
+	exports.compareLoose = compareLoose;
+	function compareLoose (a, b) {
+	  return compare(a, b, true)
+	}
+	exports.compareBuild = compareBuild;
+	function compareBuild (a, b, loose) {
+	  var versionA = new SemVer(a, loose);
+	  var versionB = new SemVer(b, loose);
+	  return versionA.compare(versionB) || versionA.compareBuild(versionB)
+	}
+	exports.rcompare = rcompare;
+	function rcompare (a, b, loose) {
+	  return compare(b, a, loose)
+	}
+	exports.sort = sort;
+	function sort (list, loose) {
+	  return list.sort(function (a, b) {
+	    return exports.compareBuild(a, b, loose)
+	  })
+	}
+	exports.rsort = rsort;
+	function rsort (list, loose) {
+	  return list.sort(function (a, b) {
+	    return exports.compareBuild(b, a, loose)
+	  })
+	}
+	exports.gt = gt;
+	function gt (a, b, loose) {
+	  return compare(a, b, loose) > 0
+	}
+	exports.lt = lt;
+	function lt (a, b, loose) {
+	  return compare(a, b, loose) < 0
+	}
+	exports.eq = eq;
+	function eq (a, b, loose) {
+	  return compare(a, b, loose) === 0
+	}
+	exports.neq = neq;
+	function neq (a, b, loose) {
+	  return compare(a, b, loose) !== 0
+	}
+	exports.gte = gte;
+	function gte (a, b, loose) {
+	  return compare(a, b, loose) >= 0
+	}
+	exports.lte = lte;
+	function lte (a, b, loose) {
+	  return compare(a, b, loose) <= 0
+	}
+	exports.cmp = cmp;
+	function cmp (a, op, b, loose) {
+	  switch (op) {
+	    case '===':
+	      if (typeof a === 'object')
+	        a = a.version;
+	      if (typeof b === 'object')
+	        b = b.version;
+	      return a === b
+	    case '!==':
+	      if (typeof a === 'object')
+	        a = a.version;
+	      if (typeof b === 'object')
+	        b = b.version;
+	      return a !== b
+	    case '':
+	    case '=':
+	    case '==':
+	      return eq(a, b, loose)
+	    case '!=':
+	      return neq(a, b, loose)
+	    case '>':
+	      return gt(a, b, loose)
+	    case '>=':
+	      return gte(a, b, loose)
+	    case '<':
+	      return lt(a, b, loose)
+	    case '<=':
+	      return lte(a, b, loose)
+	    default:
+	      throw new TypeError('Invalid operator: ' + op)
+	  }
+	}
+	exports.Comparator = Comparator;
+	function Comparator (comp, options) {
+	  if (!options || typeof options !== 'object') {
+	    options = {
+	      loose: !!options,
+	      includePrerelease: false
+	    };
+	  }
+	  if (comp instanceof Comparator) {
+	    if (comp.loose === !!options.loose) {
+	      return comp
+	    } else {
+	      comp = comp.value;
+	    }
+	  }
+	  if (!(this instanceof Comparator)) {
+	    return new Comparator(comp, options)
+	  }
+	  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);
+	}
+	var ANY = {};
+	Comparator.prototype.parse = function (comp) {
+	  var r = this.options.loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
+	  var 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);
+	  }
+	};
+	Comparator.prototype.toString = function () {
+	  return this.value
+	};
+	Comparator.prototype.test = function (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)
+	};
+	Comparator.prototype.intersects = function (comp, options) {
+	  if (!(comp instanceof Comparator)) {
+	    throw new TypeError('a Comparator is required')
+	  }
+	  if (!options || typeof options !== 'object') {
+	    options = {
+	      loose: !!options,
+	      includePrerelease: false
+	    };
+	  }
+	  var rangeTmp;
+	  if (this.operator === '') {
+	    if (this.value === '') {
+	      return true
+	    }
+	    rangeTmp = new Range(comp.value, options);
+	    return satisfies(this.value, rangeTmp, options)
+	  } else if (comp.operator === '') {
+	    if (comp.value === '') {
+	      return true
+	    }
+	    rangeTmp = new Range(this.value, options);
+	    return satisfies(comp.semver, rangeTmp, options)
+	  }
+	  var sameDirectionIncreasing =
+	    (this.operator === '>=' || this.operator === '>') &&
+	    (comp.operator === '>=' || comp.operator === '>');
+	  var sameDirectionDecreasing =
+	    (this.operator === '<=' || this.operator === '<') &&
+	    (comp.operator === '<=' || comp.operator === '<');
+	  var sameSemVer = this.semver.version === comp.semver.version;
+	  var differentDirectionsInclusive =
+	    (this.operator === '>=' || this.operator === '<=') &&
+	    (comp.operator === '>=' || comp.operator === '<=');
+	  var oppositeDirectionsLessThan =
+	    cmp(this.semver, '<', comp.semver, options) &&
+	    ((this.operator === '>=' || this.operator === '>') &&
+	    (comp.operator === '<=' || comp.operator === '<'));
+	  var oppositeDirectionsGreaterThan =
+	    cmp(this.semver, '>', comp.semver, options) &&
+	    ((this.operator === '<=' || this.operator === '<') &&
+	    (comp.operator === '>=' || comp.operator === '>'));
+	  return sameDirectionIncreasing || sameDirectionDecreasing ||
+	    (sameSemVer && differentDirectionsInclusive) ||
+	    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+	};
+	exports.Range = Range;
+	function Range (range, options) {
+	  if (!options || typeof options !== 'object') {
+	    options = {
+	      loose: !!options,
+	      includePrerelease: false
+	    };
+	  }
+	  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) {
+	    return new Range(range.value, options)
+	  }
+	  if (!(this instanceof Range)) {
+	    return new Range(range, options)
+	  }
+	  this.options = options;
+	  this.loose = !!options.loose;
+	  this.includePrerelease = !!options.includePrerelease;
+	  // First, split based on boolean or ||
+	  this.raw = range;
+	  this.set = range.split(/\s*\|\|\s*/).map(function (range) {
+	    return this.parseRange(range.trim())
+	  }, this).filter(function (c) {
+	    // throw out any that are not relevant for whatever reason
+	    return c.length
+	  });
+	  if (!this.set.length) {
+	    throw new TypeError('Invalid SemVer Range: ' + range)
+	  }
+	  this.format();
+	}
+	Range.prototype.format = function () {
+	  this.range = this.set.map(function (comps) {
+	    return comps.join(' ').trim()
+	  }).join('||').trim();
+	  return this.range
+	};
+	Range.prototype.toString = function () {
+	  return this.range
+	};
+	Range.prototype.parseRange = function (range) {
+	  var loose = this.options.loose;
+	  range = range.trim();
+	  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+	  var hr = loose ? re[t.HYPHENRANGELOOSE] : re[t.HYPHENRANGE];
+	  range = range.replace(hr, hyphenReplace);
+	  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, re[t.COMPARATORTRIM]);
+	  // `~ 1.2.3` => `~1.2.3`
+	  range = range.replace(re[t.TILDETRIM], tildeTrimReplace);
+	  // `^ 1.2.3` => `^1.2.3`
+	  range = range.replace(re[t.CARETTRIM], caretTrimReplace);
+	  // normalize spaces
+	  range = range.split(/\s+/).join(' ');
+	  // At this point, the range is completely trimmed and
+	  // ready to be split into comparators.
+	  var compRe = loose ? re[t.COMPARATORLOOSE] : re[t.COMPARATOR];
+	  var set = range.split(' ').map(function (comp) {
+	    return parseComparator(comp, this.options)
+	  }, this).join(' ').split(/\s+/);
+	  if (this.options.loose) {
+	    // in loose mode, throw out any that are not valid comparators
+	    set = set.filter(function (comp) {
+	      return !!comp.match(compRe)
+	    });
+	  }
+	  set = set.map(function (comp) {
+	    return new Comparator(comp, this.options)
+	  }, this);
+	  return set
+	};
+	Range.prototype.intersects = function (range, options) {
+	  if (!(range instanceof Range)) {
+	    throw new TypeError('a Range is required')
+	  }
+	  return this.set.some(function (thisComparators) {
+	    return (
+	      isSatisfiable(thisComparators, options) &&
+	      range.set.some(function (rangeComparators) {
+	        return (
+	          isSatisfiable(rangeComparators, options) &&
+	          thisComparators.every(function (thisComparator) {
+	            return rangeComparators.every(function (rangeComparator) {
+	              return thisComparator.intersects(rangeComparator, options)
+	            })
+	          })
+	        )
+	      })
+	    )
+	  })
+	};
+	// take a set of comparators and determine whether there
+	// exists a version which can satisfy it
+	function isSatisfiable (comparators, options) {
+	  var result = true;
+	  var remainingComparators = comparators.slice();
+	  var testComparator = remainingComparators.pop();
+	  while (result && remainingComparators.length) {
+	    result = remainingComparators.every(function (otherComparator) {
+	      return testComparator.intersects(otherComparator, options)
+	    });
+	    testComparator = remainingComparators.pop();
+	  }
+	  return result
+	}
+	// Mostly just for testing and legacy API reasons
+	exports.toComparators = toComparators;
+	function toComparators (range, options) {
+	  return new Range(range, options).set.map(function (comp) {
+	    return comp.map(function (c) {
+	      return c.value
+	    }).join(' ').trim().split(' ')
+	  })
+	}
+	// comprised of xranges, tildes, stars, and gtlt's at this point.
+	// already replaced the hyphen ranges
+	// turn into a set of JUST comparators.
+	function 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
+	}
+	function isX (id) {
+	  return !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
+	// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+	// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+	// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+	// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+	function replaceTildes (comp, options) {
+	  return comp.trim().split(/\s+/).map(function (comp) {
+	    return replaceTilde(comp, options)
+	  }).join(' ')
+	}
+	function replaceTilde (comp, options) {
+	  var r = options.loose ? re[t.TILDELOOSE] : re[t.TILDE];
+	  return comp.replace(r, function (_, M, m, p, pr) {
+	    debug('tilde', comp, _, M, m, p, pr);
+	    var ret;
+	    if (isX(M)) {
+	      ret = '';
+	    } else if (isX(m)) {
+	      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+	    } else if (isX(p)) {
+	      // ~1.2 == >=1.2.0 <1.3.0
+	      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+	    } else if (pr) {
+	      debug('replaceTilde pr', pr);
+	      ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+	            ' <' + M + '.' + (+m + 1) + '.0';
+	    } else {
+	      // ~1.2.3 == >=1.2.3 <1.3.0
+	      ret = '>=' + M + '.' + m + '.' + p +
+	            ' <' + M + '.' + (+m + 1) + '.0';
+	    }
+	    debug('tilde return', ret);
+	    return ret
+	  })
+	}
+	// ^ --> * (any, kinda silly)
+	// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+	// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+	// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+	// ^1.2.3 --> >=1.2.3 <2.0.0
+	// ^1.2.0 --> >=1.2.0 <2.0.0
+	function replaceCarets (comp, options) {
+	  return comp.trim().split(/\s+/).map(function (comp) {
+	    return replaceCaret(comp, options)
+	  }).join(' ')
+	}
+	function replaceCaret (comp, options) {
+	  debug('caret', comp, options);
+	  var r = options.loose ? re[t.CARETLOOSE] : re[t.CARET];
+	  return comp.replace(r, function (_, M, m, p, pr) {
+	    debug('caret', comp, _, M, m, p, pr);
+	    var ret;
+	    if (isX(M)) {
+	      ret = '';
+	    } else if (isX(m)) {
+	      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+	    } else if (isX(p)) {
+	      if (M === '0') {
+	        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+	      } else {
+	        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
+	      }
+	    } else if (pr) {
+	      debug('replaceCaret pr', pr);
+	      if (M === '0') {
+	        if (m === '0') {
+	          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+	                ' <' + M + '.' + m + '.' + (+p + 1);
+	        } else {
+	          ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+	                ' <' + M + '.' + (+m + 1) + '.0';
+	        }
+	      } else {
+	        ret = '>=' + M + '.' + m + '.' + p + '-' + pr +
+	              ' <' + (+M + 1) + '.0.0';
+	      }
+	    } else {
+	      debug('no pr');
+	      if (M === '0') {
+	        if (m === '0') {
+	          ret = '>=' + M + '.' + m + '.' + p +
+	                ' <' + M + '.' + m + '.' + (+p + 1);
+	        } else {
+	          ret = '>=' + M + '.' + m + '.' + p +
+	                ' <' + M + '.' + (+m + 1) + '.0';
+	        }
+	      } else {
+	        ret = '>=' + M + '.' + m + '.' + p +
+	              ' <' + (+M + 1) + '.0.0';
+	      }
+	    }
+	    debug('caret return', ret);
+	    return ret
+	  })
+	}
+	function replaceXRanges (comp, options) {
+	  debug('replaceXRanges', comp, options);
+	  return comp.split(/\s+/).map(function (comp) {
+	    return replaceXRange(comp, options)
+	  }).join(' ')
+	}
+	function replaceXRange (comp, options) {
+	  comp = comp.trim();
+	  var r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
+	  return comp.replace(r, function (ret, gtlt, M, m, p, pr) {
+	    debug('xRange', comp, ret, gtlt, M, m, p, pr);
+	    var xM = isX(M);
+	    var xm = xM || isX(m);
+	    var xp = xm || isX(p);
+	    var 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
+	        // >1.2.3 => >= 1.2.4
+	        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;
+	        }
+	      }
+	      ret = gtlt + M + '.' + m + '.' + p + pr;
+	    } else if (xm) {
+	      ret = '>=' + M + '.0.0' + pr + ' <' + (+M + 1) + '.0.0' + pr;
+	    } else if (xp) {
+	      ret = '>=' + M + '.' + m + '.0' + pr +
+	        ' <' + M + '.' + (+m + 1) + '.0' + pr;
+	    }
+	    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.
+	function 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], '')
+	}
+	// 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 Any 3.4.x will do
+	// 1.2 - 3.4 => >=1.2.0 <3.5.0
+	function hyphenReplace ($0,
+	  from, fM, fm, fp, fpr, fb,
+	  to, tM, tm, tp, tpr, tb) {
+	  if (isX(fM)) {
+	    from = '';
+	  } else if (isX(fm)) {
+	    from = '>=' + fM + '.0.0';
+	  } else if (isX(fp)) {
+	    from = '>=' + fM + '.' + fm + '.0';
+	  } else {
+	    from = '>=' + from;
+	  }
+	  if (isX(tM)) {
+	    to = '';
+	  } else if (isX(tm)) {
+	    to = '<' + (+tM + 1) + '.0.0';
+	  } else if (isX(tp)) {
+	    to = '<' + tM + '.' + (+tm + 1) + '.0';
+	  } else if (tpr) {
+	    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
+	  } else {
+	    to = '<=' + to;
+	  }
+	  return (from + ' ' + to).trim()
+	}
+	// if ANY of the sets match ALL of its comparators, then pass
+	Range.prototype.test = function (version) {
+	  if (!version) {
+	    return false
+	  }
+	  if (typeof version === 'string') {
+	    try {
+	      version = new SemVer(version, this.options);
+	    } catch (er) {
+	      return false
+	    }
+	  }
+	  for (var i = 0; i < this.set.length; i++) {
+	    if (testSet(this.set[i], version, this.options)) {
+	      return true
+	    }
+	  }
+	  return false
+	};
+	function testSet (set, version, options) {
+	  for (var 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 (i = 0; i < set.length; i++) {
+	      debug(set[i].semver);
+	      if (set[i].semver === ANY) {
+	        continue
+	      }
+	      if (set[i].semver.prerelease.length > 0) {
+	        var 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
+	}
+	exports.satisfies = satisfies;
+	function satisfies (version, range, options) {
+	  try {
+	    range = new Range(range, options);
+	  } catch (er) {
+	    return false
+	  }
+	  return range.test(version)
+	}
+	exports.maxSatisfying = maxSatisfying;
+	function maxSatisfying (versions, range, options) {
+	  var max = null;
+	  var maxSV = null;
+	  try {
+	    var rangeObj = new Range(range, options);
+	  } catch (er) {
+	    return null
+	  }
+	  versions.forEach(function (v) {
+	    if (rangeObj.test(v)) {
+	      // satisfies(v, range, options)
+	      if (!max || maxSV.compare(v) === -1) {
+	        // compare(max, v, true)
+	        max = v;
+	        maxSV = new SemVer(max, options);
+	      }
+	    }
+	  });
+	  return max
+	}
+	exports.minSatisfying = minSatisfying;
+	function minSatisfying (versions, range, options) {
+	  var min = null;
+	  var minSV = null;
+	  try {
+	    var rangeObj = new Range(range, options);
+	  } catch (er) {
+	    return null
+	  }
+	  versions.forEach(function (v) {
+	    if (rangeObj.test(v)) {
+	      // satisfies(v, range, options)
+	      if (!min || minSV.compare(v) === 1) {
+	        // compare(min, v, true)
+	        min = v;
+	        minSV = new SemVer(min, options);
+	      }
+	    }
+	  });
+	  return min
+	}
+	exports.minVersion = minVersion;
+	function minVersion (range, loose) {
+	  range = new Range(range, loose);
+	  var minver = new SemVer('0.0.0');
+	  if (range.test(minver)) {
+	    return minver
+	  }
+	  minver = new SemVer('0.0.0-0');
+	  if (range.test(minver)) {
+	    return minver
+	  }
+	  minver = null;
+	  for (var i = 0; i < range.set.length; ++i) {
+	    var comparators = range.set[i];
+	    comparators.forEach(function (comparator) {
+	      // Clone to avoid manipulating the comparator's semver object.
+	      var compver = new SemVer(comparator.semver.version);
+	      switch (comparator.operator) {
+	        case '>':
+	          if (compver.prerelease.length === 0) {
+	            compver.patch++;
+	          } else {
+	            compver.prerelease.push(0);
+	          }
+	          compver.raw = compver.format();
+	          /* fallthrough */
+	        case '':
+	        case '>=':
+	          if (!minver || gt(minver, compver)) {
+	            minver = compver;
+	          }
+	          break
+	        case '<':
+	        case '<=':
+	          /* Ignore maximum versions */
+	          break
+	        /* istanbul ignore next */
+	        default:
+	          throw new Error('Unexpected operation: ' + comparator.operator)
+	      }
+	    });
+	  }
+	  if (minver && range.test(minver)) {
+	    return minver
+	  }
+	  return null
+	}
+	exports.validRange = validRange;
+	function validRange (range, options) {
+	  try {
+	    // Return '*' instead of '' so that truthiness works.
+	    // This will throw if it's invalid anyway
+	    return new Range(range, options).range || '*'
+	  } catch (er) {
+	    return null
+	  }
+	}
+	// Determine if version is less than all the versions possible in the range
+	exports.ltr = ltr;
+	function ltr (version, range, options) {
+	  return outside(version, range, '<', options)
+	}
+	// Determine if version is greater than all the versions possible in the range.
+	exports.gtr = gtr;
+	function gtr (version, range, options) {
+	  return outside(version, range, '>', options)
+	}
+	exports.outside = outside;
+	function outside (version, range, hilo, options) {
+	  version = new SemVer(version, options);
+	  range = new Range(range, options);
+	  var gtfn, ltefn, ltfn, comp, ecomp;
+	  switch (hilo) {
+	    case '>':
+	      gtfn = gt;
+	      ltefn = lte;
+	      ltfn = lt;
+	      comp = '>';
+	      ecomp = '>=';
+	      break
+	    case '<':
+	      gtfn = lt;
+	      ltefn = gte;
+	      ltfn = gt;
+	      comp = '<';
+	      ecomp = '<=';
+	      break
+	    default:
+	      throw new TypeError('Must provide a hilo val of "<" or ">"')
+	  }
+	  // If it satisifes the range it is not outside
+	  if (satisfies(version, range, options)) {
+	    return false
+	  }
+	  // From now on, variable terms are as if we're in "gtr" mode.
+	  // but note that everything is flipped for the "ltr" function.
+	  for (var i = 0; i < range.set.length; ++i) {
+	    var comparators = range.set[i];
+	    var high = null;
+	    var low = null;
+	    comparators.forEach(function (comparator) {
+	      if (comparator.semver === ANY) {
+	        comparator = new Comparator('>=0.0.0');
+	      }
+	      high = high || comparator;
+	      low = low || comparator;
+	      if (gtfn(comparator.semver, high.semver, options)) {
+	        high = comparator;
+	      } else if (ltfn(comparator.semver, low.semver, options)) {
+	        low = comparator;
+	      }
+	    });
+	    // If the edge version comparator has a operator then our version
+	    // isn't outside it
+	    if (high.operator === comp || high.operator === ecomp) {
+	      return false
+	    }
+	    // If the lowest version comparator has an operator and our version
+	    // is less than it then it isn't higher than the range
+	    if ((!low.operator || low.operator === comp) &&
+	        ltefn(version, low.semver)) {
+	      return false
+	    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+	      return false
+	    }
+	  }
+	  return true
+	}
+	exports.prerelease = prerelease;
+	function prerelease (version, options) {
+	  var parsed = parse(version, options);
+	  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+	}
+	exports.intersects = intersects;
+	function intersects (r1, r2, options) {
+	  r1 = new Range(r1, options);
+	  r2 = new Range(r2, options);
+	  return r1.intersects(r2)
+	}
+	exports.coerce = coerce;
+	function coerce (version, options) {
+	  if (version instanceof SemVer) {
+	    return version
+	  }
+	  if (typeof version === 'number') {
+	    version = String(version);
+	  }
+	  if (typeof version !== 'string') {
+	    return null
+	  }
+	  options = options || {};
+	  var match = null;
+	  if (!options.rtl) {
+	    match = version.match(re[t.COERCE]);
+	  } else {
+	    // Find the right-most coercible string that does not share
+	    // a terminus with a more left-ward coercible string.
+	    // Eg, '1.2.3.4' wants to coerce '2.3.4', not '3.4' or '4'
+	    //
+	    // Walk through the string checking with a /g regexp
+	    // Manually set the index so as to pick up overlapping matches.
+	    // Stop when we get a match that ends at the string end, since no
+	    // coercible string can be more right-ward without the same terminus.
+	    var next;
+	    while ((next = re[t.COERCERTL].exec(version)) &&
+	      (!match || match.index + match[0].length !== version.length)
+	    ) {
+	      if (!match ||
+	          next.index + next[0].length !== match.index + match[0].length) {
+	        match = next;
+	      }
+	      re[t.COERCERTL].lastIndex = next.index + next[1].length + next[2].length;
+	    }
+	    // leave it in a clean state
+	    re[t.COERCERTL].lastIndex = -1;
+	  }
+	  if (match === null) {
+	    return null
+	  }
+	  return parse(match[2] +
+	    '.' + (match[3] || '0') +
+	    '.' + (match[4] || '0'), options)
+	}
+} (semver, semverExports));
 const LOADED = {};
@@ -22813,7 +23331,7 @@ function nuked() {
          */
         /**
-         * @typedef { boolean | 'toggle' | 'inSelection' } SearchMode
+         * @typedef { boolean | 'toggle' } SearchMode
          */
         /**
@@ -22859,7 +23377,7 @@ function nuked() {
            * @param {ListLayout=} [options.listLayout=vertical] Layout direction vertical|horizontal (not applicable for existing objects)
            * @param {FrequencyMode=} [options.frequencyMode=none] Show frequency none|value|percent|relative
            * @param {boolean=} [options.histogram=false] Show histogram bar (not applicable for existing objects)
-           * @param {SearchMode=} [options.search=true] Show the search bar permanently, using the toggle button or when in selection: false|true|toggle|inSelection
+           * @param {SearchMode=} [options.search=true] Show the search bar permanently, using the toggle button or when in selection: false|true|toggle
            * @param {boolean=} [options.toolbar=true] Show the toolbar
            * @param {boolean=} [options.checkboxes=false] Show values as checkboxes instead of as fields (not applicable for existing objects)
            * @param {boolean=} [options.dense=false] Reduces padding and text size (not applicable for existing objects)