npm - @nebula.js/stardust - Versions diffs - 4.0.0-alpha.8 → 4.0.0-alpha.9 - Mend

@nebula.js/stardust 4.0.0-alpha.8 → 4.0.0-alpha.9

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 (10) hide show

package/core/esm/dev.js +1782 -1678
package/core/esm/dev.js.map +1 -1
package/core/esm/index.js +3 -3
package/core/esm/index.js.map +1 -1
package/dist/stardust.dev.js +1812 -1685
package/dist/stardust.dev.js.map +1 -1
package/dist/stardust.js +13 -13
package/dist/stardust.js.map +1 -1
package/package.json +10 -10
package/types/index.d.ts +24 -13

package/core/esm/dev.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
-* @nebula.js/stardust v4.0.0-alpha.8
+* @nebula.js/stardust v4.0.0-alpha.9
 * Copyright (c) 2023 QlikTech International AB
 * Released under the MIT license.
 */
@@ -1653,6 +1653,246 @@ var Visualization_UnfulfilledCalculationCondition = {
 		"zh-TW": "不符計算條件"
 	}
 };
+var Object_Listbox_Selected = {
+	id: "Object.Listbox.Selected",
+	locale: {
+		"de-DE": "Ausgewählt",
+		"en-US": "Selected",
+		"es-ES": "Seleccionado",
+		"fr-FR": "Sélectionné",
+		"it-IT": "Selezionato",
+		"ja-JP": "選択済み",
+		"ko-KR": "선택됨",
+		"nl-NL": "Geselecteerd",
+		"pl-PL": "Wybrane",
+		"pt-BR": "Selecionado",
+		"ru-RU": "Выбранные",
+		"sv-SE": "Urval",
+		"tr-TR": "Seçilen",
+		"zh-CN": "已选择",
+		"zh-TW": "已選取"
+	}
+};
+var Object_Listbox_Alternative = {
+	id: "Object.Listbox.Alternative",
+	locale: {
+		"de-DE": "Alternative",
+		"en-US": "Alternative",
+		"es-ES": "Alternativo",
+		"fr-FR": "Alternatif",
+		"it-IT": "Alternativo",
+		"ja-JP": "代替",
+		"ko-KR": "대체 항목",
+		"nl-NL": "Alternatief",
+		"pl-PL": "Alternatywne",
+		"pt-BR": "Alternativo",
+		"ru-RU": "Альтернативные",
+		"sv-SE": "Alternativ",
+		"tr-TR": "Alternatif",
+		"zh-CN": "可选",
+		"zh-TW": "替代選項"
+	}
+};
+var Object_Listbox_Optional = {
+	id: "Object.Listbox.Optional",
+	locale: {
+		"de-DE": "Optional",
+		"en-US": "Optional",
+		"es-ES": "Opcional",
+		"fr-FR": "Facultatif",
+		"it-IT": "Opzionale",
+		"ja-JP": "オプション",
+		"ko-KR": "선택 사항",
+		"nl-NL": "Optioneel",
+		"pl-PL": "Opcjonalne",
+		"pt-BR": "Opcional",
+		"ru-RU": "Дополнительные",
+		"sv-SE": "Valfritt",
+		"tr-TR": "İsteğe bağlı",
+		"zh-CN": "可选",
+		"zh-TW": "選用"
+	}
+};
+var Object_Listbox_SelectedExcluded = {
+	id: "Object.Listbox.SelectedExcluded",
+	locale: {
+		"de-DE": "Ausgeschlossen ausgewählt",
+		"en-US": "Selected excluded",
+		"es-ES": "Seleccionado excluido",
+		"fr-FR": "Sélectionné exclu",
+		"it-IT": "Selezionato escluso",
+		"ja-JP": "選択された除外値",
+		"ko-KR": "제외 항목 선택됨",
+		"nl-NL": "Geselecteerde uitgesloten",
+		"pl-PL": "Wybrane wykluczone",
+		"pt-BR": "Excluído selecionado",
+		"ru-RU": "Выбранные исключенные элементы",
+		"sv-SE": "Urval uteslutet",
+		"tr-TR": "Seçili hariç tutulan",
+		"zh-CN": "已排除选择",
+		"zh-TW": "已選取排除值"
+	}
+};
+var Object_Listbox_Locked = {
+	id: "Object.Listbox.Locked",
+	locale: {
+		"de-DE": "Gesperrt",
+		"en-US": "Locked",
+		"es-ES": "Bloqueado",
+		"fr-FR": "Verrouillé",
+		"it-IT": "Bloccato",
+		"ja-JP": "ロック済み",
+		"ko-KR": "잠김",
+		"nl-NL": "Vergrendeld",
+		"pl-PL": "Zablokowane",
+		"pt-BR": "Bloqueado",
+		"ru-RU": "Заблокированные",
+		"sv-SE": "Låst",
+		"tr-TR": "Kilitli",
+		"zh-CN": "已锁定",
+		"zh-TW": "已鎖定"
+	}
+};
+var Object_Listbox_Excluded = {
+	id: "Object.Listbox.Excluded",
+	locale: {
+		"de-DE": "Ausgeschlossen",
+		"en-US": "Excluded",
+		"es-ES": "Excluido",
+		"fr-FR": "Exclu",
+		"it-IT": "Escluso",
+		"ja-JP": "除外済み",
+		"ko-KR": "제외됨",
+		"nl-NL": "Uitgesloten",
+		"pl-PL": "Wykluczone",
+		"pt-BR": "Excluído",
+		"ru-RU": "Исключенные",
+		"sv-SE": "Uteslutet",
+		"tr-TR": "Hariç tutulan",
+		"zh-CN": "已排除",
+		"zh-TW": "已排除"
+	}
+};
+var Object_Listbox_ExcludedLock = {
+	id: "Object.Listbox.ExcludedLock",
+	locale: {
+		"de-DE": "Ausgeschlossene Sperre",
+		"en-US": "Excluded lock",
+		"es-ES": "Bloqueo excluido",
+		"fr-FR": "Exclu verrouillé",
+		"it-IT": "Blocco escluso",
+		"ja-JP": "除外されたロック",
+		"ko-KR": "제외된 잠금",
+		"nl-NL": "Uitsluitingsvergrendeling",
+		"pl-PL": "Wykluczone zablokowane",
+		"pt-BR": "Bloqueado excluído",
+		"ru-RU": "Блокировать исключенные элементы",
+		"sv-SE": "Uteslutet låst",
+		"tr-TR": "Hariç tutulan kilit",
+		"zh-CN": "已排除锁定",
+		"zh-TW": "已排除鎖定"
+	}
+};
+var Listbox_ScreenReader_SelectionMenu_WithAccSelMenu = {
+	id: "Listbox.ScreenReader.SelectionMenu.WithAccSelMenu",
+	locale: {
+		"de-DE": "Drücken Sie gleichzeitig die Umschalt- und die Tabulatortaste, um den Fokus in das Auswahlmenü zu setzen.",
+		"en-US": "Press Shift plus Tab to set focus on the selections menu.",
+		"es-ES": "Pulse Mayús + Tabulador para establecer el foco en el menú de selecciones.",
+		"fr-FR": "Appuyez sur Maj + Tab pour mettre le focus sur le menu de sélections.",
+		"it-IT": "Premere insieme i tasti MAIUSC+TAB per evidenziare il menu di selezione.",
+		"ja-JP": "Shift キー + Tab キーを押して、選択メニューで焦点を設定します。",
+		"ko-KR": "선택 메뉴에 초점을 설정하려면 Shift+Tab을 누르십시오.",
+		"nl-NL": "Druk op Shift + Tab om de focus in te stellen op het selectiemenu.",
+		"pl-PL": "Naciśnij Shift i Tab, aby ustawić ostrość na menu selekcji.",
+		"pt-BR": "Pressione Shift + Tab para definir o foco sobre o menu de seleções.",
+		"ru-RU": "Нажмите сочетание клавиш \"Shift + Tab\" для установки фокуса на меню выбора.",
+		"sv-SE": "Tryck på Skift plus Tabb när du vill ställa in fokus på urvalsmenyn.",
+		"tr-TR": "Odağı seçim menüsüne ayarlamak için Shift ve Sekme tuşlarına birlikte basın.",
+		"zh-CN": "按下 Shift 加 Tab 以将焦点设置在选择菜单上。",
+		"zh-TW": "按下 Shift 加 Tab 以在選項功能表上設定焦點。"
+	}
+};
+var Listbox_ScreenReader_SearchThenSelectionsMenu_WithAccSelMenu = {
+	id: "Listbox.ScreenReader.SearchThenSelectionsMenu.WithAccSelMenu",
+	locale: {
+		"de-DE": "Drücken Sie die Umschalttaste zusammen mit der Tabulatortaste, um den Fokus in die Suchleiste zu setzen, und dann erneut beide Tasten, um den Fokus in das Auswahlmenü zu setzen.",
+		"en-US": "Press Shift plus Tab to set focus on the search bar, then Shift plus Tab again to set focus on the selections menu.",
+		"es-ES": "Pulse Mayús + Tabulador para establecer el foco en la barra de búsqueda, luego Mayús + Tabulador nuevamente para establecer el foco en el menú de selecciones.",
+		"fr-FR": "Appuyez sur Maj + Tab pour définir le focus sur la barre de recherche, puis de nouveau sur Maj + Tab pour définir le focus sur le menu de sélections.",
+		"it-IT": "Premere MAIUSC+TAB per impostare lo stato attivo sulla barra di ricerca, quindi premere nuovamente MAIUSC+TAB per impostare lo stato attivo sul menu selezioni.",
+		"ja-JP": "Shift + Tab を押して検索バーにフォーカスを設定し、Shift + Tab をもう一度押して選択メニューにフォーカスを設定します。",
+		"ko-KR": "Shift+Tab을 눌러 검색 막대에 초점을 맞춘 다음 Shift+Tab을 다시 눌러 선택 메뉴에 초점을 맞추십시오.",
+		"nl-NL": "Druk op Shift + Tab om de focus in te stellen op de zoekbalk, druk vervolgens nogmaals op Shift + Tab om de focus in te stellen op het selectiemenu.",
+		"pl-PL": "Naciśnij Shift i Tab, aby ustawić ostrość na pasek wyszukiwania. Następnie ponownie użyj tej kombinacji klawiszy, aby ustawić ostrość na menu selekcji.",
+		"pt-BR": "Pressione Shift + Tab para definir o foco na barra de pesquisa e Shift + Tab novamente para definir o foco no menu de seleções.",
+		"ru-RU": "Нажмите сочетание клавиш \"Shift + Tab\" для установки фокуса на панель поиска. Затем нажмите сочетание клавиш \"Shift + Tab\" снова, чтобы установить фокус на меню выборки.",
+		"sv-SE": "Tryck på Skift plus Tabb för att ställa in fokus på sökfältet, sedan Skift plus Tabb igen för att ställa in fokus på urvalsmenyn.",
+		"tr-TR": "Odağı arama çubuğuna ayarlamak için Shift ve Sekme tuşlarına birlikte basın, ardından bu tuşlara birlikte tekrar basarak odağı seçim menüsüne ayarlayın.",
+		"zh-CN": "按 Shift+Tab 在搜索栏上设置焦点，然后再次按 Shift+Tab 在“选择”菜单上设置焦点。",
+		"zh-TW": "按下 Shift 加 Tab 鍵以設定搜尋列上的焦點，然後再次按下 Shift 加 Tab 鍵，以設定選項功能表上的焦點。"
+	}
+};
+var ScreenReader_ZeroSelected = {
+	id: "ScreenReader.ZeroSelected",
+	locale: {
+		"de-DE": "Es sind keine Werte ausgewählt.",
+		"en-US": "No values are selected.",
+		"es-ES": "No se ha seleccionado ningún valor.",
+		"fr-FR": "Aucune valeur n'a été sélectionnée.",
+		"it-IT": "Nessun valore selezionato.",
+		"ja-JP": "値が選択されていません。",
+		"ko-KR": "선택된 값이 없습니다.",
+		"nl-NL": "Geen waarden geselecteerd.",
+		"pl-PL": "Brak wybranych wartości.",
+		"pt-BR": "Nenhum valor selecionado.",
+		"ru-RU": "Значения не выбраны.",
+		"sv-SE": "Inga värden är valda.",
+		"tr-TR": "Seçilen değer yok.",
+		"zh-CN": "未选择值。",
+		"zh-TW": "沒有選取任何值。"
+	}
+};
+var ScreenReader_OneSelected = {
+	id: "ScreenReader.OneSelected",
+	locale: {
+		"de-DE": "Es ist ein Wert ausgewählt.",
+		"en-US": "There is one selected value.",
+		"es-ES": "Hay un valor seleccionado.",
+		"fr-FR": "Une valeur a été sélectionnée.",
+		"it-IT": "È presente un valore selezionato.",
+		"ja-JP": "値が 1 つ選択されています。",
+		"ko-KR": "하나의 값이 선택되었습니다.",
+		"nl-NL": "Er is één waarde geselecteerd.",
+		"pl-PL": "Jest jedna wybrana wartość.",
+		"pt-BR": "Há um valor selecionado.",
+		"ru-RU": "Выбрано одно значение.",
+		"sv-SE": "Ett värde är valt.",
+		"tr-TR": "Seçilen bir değer var.",
+		"zh-CN": "存在一个已选择的值。",
+		"zh-TW": "有一個選取的值。"
+	}
+};
+var ScreenReader_ManySelected = {
+	id: "ScreenReader.ManySelected",
+	locale: {
+		"de-DE": "Es sind {0} Werte ausgewählt.",
+		"en-US": "There are {0} selected values.",
+		"es-ES": "Hay {0} valores seleccionados.",
+		"fr-FR": "{0} valeurs ont été sélectionnées.",
+		"it-IT": "Sono presenti {0} valori selezionati.",
+		"ja-JP": "値が {0} つ選択されています。",
+		"ko-KR": "{0}개의 값이 선택되었습니다.",
+		"nl-NL": "Er zijn {0} waarden geselecteerd.",
+		"pl-PL": "Wybranych wartości: {0}",
+		"pt-BR": "Há {0} valores selecionados.",
+		"ru-RU": "Выбраны значения: {0}.",
+		"sv-SE": "{0} värden är valda.",
+		"tr-TR": "Seçilen {0} değer var.",
+		"zh-CN": "存在 {0} 个已选择的值。",
+		"zh-TW": "有 {0} 個選取的值。"
+	}
+};
 var all = {
 	Cancel: Cancel$1,
 	CurrentSelections_All: CurrentSelections_All,
@@ -1691,7 +1931,19 @@ var all = {
 	Visualization_Invalid_Dimension: Visualization_Invalid_Dimension,
 	Visualization_Invalid_Measure: Visualization_Invalid_Measure,
 	Visualization_LayoutError: Visualization_LayoutError,
-	Visualization_UnfulfilledCalculationCondition: Visualization_UnfulfilledCalculationCondition
+	Visualization_UnfulfilledCalculationCondition: Visualization_UnfulfilledCalculationCondition,
+	Object_Listbox_Selected: Object_Listbox_Selected,
+	Object_Listbox_Alternative: Object_Listbox_Alternative,
+	Object_Listbox_Optional: Object_Listbox_Optional,
+	Object_Listbox_SelectedExcluded: Object_Listbox_SelectedExcluded,
+	Object_Listbox_Locked: Object_Listbox_Locked,
+	Object_Listbox_Excluded: Object_Listbox_Excluded,
+	Object_Listbox_ExcludedLock: Object_Listbox_ExcludedLock,
+	Listbox_ScreenReader_SelectionMenu_WithAccSelMenu: Listbox_ScreenReader_SelectionMenu_WithAccSelMenu,
+	Listbox_ScreenReader_SearchThenSelectionsMenu_WithAccSelMenu: Listbox_ScreenReader_SearchThenSelectionsMenu_WithAccSelMenu,
+	ScreenReader_ZeroSelected: ScreenReader_ZeroSelected,
+	ScreenReader_OneSelected: ScreenReader_OneSelected,
+	ScreenReader_ManySelected: ScreenReader_ManySelected
 };
 function appLocaleFn(language) {
@@ -3967,7 +4219,7 @@ function resolveProps(defaultProps, props) {
   return output;
 }
-function composeClasses(slots, getUtilityClass, classes) {
+function composeClasses(slots, getUtilityClass, classes = undefined) {
   const output = {};
   Object.keys(slots).forEach(
   // `Objet.keys(slots)` can't be wider than `T` because we infer `T` from `slots`.
@@ -3975,7 +4227,10 @@ function composeClasses(slots, getUtilityClass, classes) {
   slot => {
     output[slot] = slots[slot].reduce((acc, key) => {
       if (key) {
-        acc.push(getUtilityClass(key));
+        const utilityClass = getUtilityClass(key);
+        if (utilityClass !== '') {
+          acc.push(utilityClass);
+        }
         if (classes && classes[key]) {
           acc.push(classes[key]);
         }
@@ -6217,6 +6472,11 @@ function unstable_createStyleFunctionSx() {
     if (val == null) {
       return null;
     }
+    if (themeKey === 'typography' && val === 'inherit') {
+      return {
+        [prop]: val
+      };
+    }
     const themeMapping = getPath$1(theme, themeKey) || {};
     if (style) {
       return style(props);
@@ -7537,7 +7797,14 @@ function createTypography(palette, typography) {
     body2: buildVariant(fontWeightRegular, 14, 1.43, 0.15),
     button: buildVariant(fontWeightMedium, 14, 1.75, 0.4, caseAllCaps),
     caption: buildVariant(fontWeightRegular, 12, 1.66, 0.4),
-    overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps)
+    overline: buildVariant(fontWeightRegular, 12, 2.66, 1, caseAllCaps),
+    inherit: {
+      fontFamily: 'inherit',
+      fontWeight: 'inherit',
+      fontSize: 'inherit',
+      lineHeight: 'inherit',
+      letterSpacing: 'inherit'
+    }
   };
   return deepmerge(_extends$4({
     htmlFontSize,
@@ -8064,7 +8331,7 @@ function create$3(definition) {
   return cache[key];
 }
-const NEBULA_VERSION_HASH = "757e" ;
+const NEBULA_VERSION_HASH = "64ea" ;
 ClassNameGenerator$1.configure(componentName => {
   return "njs-".concat(NEBULA_VERSION_HASH, "-").concat(componentName.replace('Mui', ''));
 });
@@ -8272,7 +8539,7 @@ function boot(_ref2) {
   const appRef = React__default.createRef();
   const element = document.createElement('div');
   element.style.display = 'none';
-  element.setAttribute('data-nebulajs-version', "4.0.0-alpha.8" );
+  element.setAttribute('data-nebulajs-version', "4.0.0-alpha.9" );
   element.setAttribute('data-app-id', app.id);
   document.body.appendChild(element);
   const root = client.createRoot(element);
@@ -9494,8 +9761,9 @@ function useTempKeyboard(_ref) {
       const c = containerRef.current;
       const searchField = c === null || c === void 0 ? void 0 : c.querySelector('.search input');
       const lastSelectedRow = c === null || c === void 0 ? void 0 : c.querySelector('.value.last-focused');
-      const fieldElement = c === null || c === void 0 ? void 0 : c.querySelector('.value.selector, .value, .ActionsToolbar-item button');
-      const elementToFocus = searchField || lastSelectedRow || fieldElement;
+      const firstRowElement = c === null || c === void 0 ? void 0 : c.querySelector('.value.selector, .value');
+      const confirmButton = c === null || c === void 0 ? void 0 : c.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm');
+      const elementToFocus = searchField || lastSelectedRow || firstRowElement || confirmButton;
       elementToFocus === null || elementToFocus === void 0 ? void 0 : elementToFocus.setAttribute('tabIndex', 0);
       elementToFocus === null || elementToFocus === void 0 ? void 0 : elementToFocus.focus();
     },
@@ -9699,7 +9967,7 @@ function getListboxInlineKeyboardNavigation(_ref2) {
       // 3. Blur row and focus the listbox container.
       keyboard.blur();
       const c = currentTarget.closest('.listbox-container');
-      c.setAttribute('tabIndex', 0);
+      c.setAttribute('tabIndex', -1);
       c === null || c === void 0 ? void 0 : c.focus();
     }
   };
@@ -9907,7 +10175,7 @@ const ellipsis = {
 const iconWidth = 24; // tick and lock icon width in px
 const RowColRoot = styled$1('div', {
-  shouldForwardProp: prop => !['flexBasisProp', 'isGridMode', 'isGridCol', 'dense', 'frequencyWidth'].includes(prop)
+  shouldForwardProp: prop => !['flexBasisProp', 'isGridMode', 'isGridCol', 'dense', 'frequencyWidth', 'direction'].includes(prop)
 })(_ref2 => {
   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 {
@@ -9916,7 +10184,8 @@ const RowColRoot = styled$1('div', {
     isGridMode,
     isGridCol,
     dense,
-    frequencyWidth
+    frequencyWidth,
+    direction
   } = _ref2;
   return {
     '&:focus': {
@@ -10029,7 +10298,7 @@ const RowColRoot = styled$1('div', {
       justifyContent: 'flex-end'
     }, ellipsis), {}, {
       flex: "0 1 ".concat(frequencyWidth, "px"),
-      textAlign: 'right',
+      textAlign: direction === 'rtl' ? 'left' : 'right',
       paddingLeft: '2px'
     }),
     ["&.".concat(rowColClasses.barContainer)]: {
@@ -10062,7 +10331,7 @@ const RowColRoot = styled$1('div', {
       }
     },
     ["& .".concat(rowColClasses.barWithCheckbox)]: {
-      left: barWithCheckboxLeftPadPx,
+      left: direction === 'rtl' ? barPadPx : barWithCheckboxLeftPadPx,
       width: "calc(100% - ".concat(barWithCheckboxLeftPadPx + barPadPx, "px)")
     },
     ["& .".concat(rowColClasses.barSelectedWithCheckbox)]: {
@@ -10508,21 +10777,23 @@ function getGridItemSizes(_ref) {
 }
 const ItemGrid = styled$1(Grid, {
-  shouldForwardProp: prop => !['dataLayout', 'layoutOrder', 'itemPadding', 'cellPaddingRight'].includes(prop)
+  shouldForwardProp: prop => !['dataLayout', 'layoutOrder', 'itemPadding', 'cellPaddingRight', 'direction'].includes(prop)
 })(_ref => {
   let {
     dataLayout,
     layoutOrder,
     itemPadding,
-    cellPaddingRight
+    cellPaddingRight,
+    direction
   } = _ref;
+  const att = "padding".concat(direction === 'rtl' ? 'Left' : 'Right');
   return {
     ["&.".concat(rowColClasses.fieldRoot)]: _objectSpread2(_objectSpread2({}, getGridItemSizes({
       dataLayout,
       layoutOrder,
       itemPadding
     })), {}, {
-      paddingRight: cellPaddingRight ? '8px' : undefined
+      [att]: cellPaddingRight ? '8px' : undefined
     })
   };
 });
@@ -10791,6 +11062,7 @@ function RowColumn(_ref) {
     isGridMode: dataLayout === 'grid',
     dense: dense,
     frequencyWidth: frequencyWidth,
+    direction: direction,
     "data-testid": "listbox.item"
   }, /*#__PURE__*/React__default.createElement(ItemGrid, {
     role: "row",
@@ -10818,7 +11090,8 @@ function RowColumn(_ref) {
     onTouchEnd: onTouchEnd,
     onContextMenu: preventContextMenu,
     tabIndex: isFirstElement && keyboard.innerTabStops ? 0 : -1,
-    "data-n": cell === null || cell === void 0 ? void 0 : cell.qElemNumber
+    "data-n": cell === null || cell === void 0 ? void 0 : cell.qElemNumber,
+    direction: direction
   }, (cell === null || cell === void 0 ? void 0 : cell.qFrequency) && /*#__PURE__*/React__default.createElement(Histogram, {
     qFrequency: cell === null || cell === void 0 ? void 0 : cell.qFrequency,
     histogram: histogram,
@@ -13820,13 +14093,16 @@ const Item = React__default.forwardRef((_ref, ref) => {
   } = useActionState(item);
   if (hidden) return null;
   const spacing = Number.parseInt(theme.spacing(0.5), 10);
-  const handleKeyDown = item.keyboardAction ? e => ['Enter', ' ', 'Spacebar'].includes(e.key) && item.keyboardAction() : null;
+  const keyboardAction = item.keyboardAction || item.action;
+  const handleKeyDown = keyboardAction ? e => ['Enter'].includes(e.key) && keyboardAction() : null;
+  const handleKeyUp = keyboardAction ? e => [' ', 'Spacebar'].includes(e.key) && keyboardAction() : null;
   const btnId = "actions-toolbar-".concat(item.key);
   return /*#__PURE__*/React__default.createElement(IconButton, {
     ref: !addAnchor ? ref : null,
     title: item.label,
     onClick: item.action,
     onKeyDown: handleKeyDown,
+    onKeyUp: handleKeyUp,
     disabled: disabled,
     style: style,
     className: [ActionElement.className, btnId].join(' '),
@@ -13892,8 +14168,8 @@ function useDefaultSelectionActions(_ref) {
       onCancel();
       api.cancel();
     },
-    keyboardAction: e => {
-      onKeyDeactivate(e);
+    keyboardAction: () => {
+      onKeyDeactivate();
       onCancel();
       api.cancel();
     },
@@ -13907,8 +14183,8 @@ function useDefaultSelectionActions(_ref) {
       onConfirm();
       api.confirm();
     },
-    keyboardAction: e => {
-      onKeyDeactivate(e);
+    keyboardAction: () => {
+      onKeyDeactivate();
       onConfirm();
       api.confirm();
     },
@@ -13938,6 +14214,7 @@ const StyledPopover$1 = styled$1(Popover)(_ref => {
 function MoreItem(_ref2) {
   let {
     item,
+    autoFocus,
     onActionClick = () => {}
   } = _ref2;
   const {
@@ -13950,6 +14227,7 @@ function MoreItem(_ref2) {
     onActionClick();
   };
   return !hidden ? /*#__PURE__*/React__default.createElement(MenuItem, {
+    autoFocus: autoFocus,
     title: item.label,
     onClick: handleClick,
     disabled: disabled,
@@ -13970,6 +14248,7 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
     onCloseOrActionClick = () => {}
   } = _ref3;
   const showActions = actions.length > 0;
+  const autoFocusIndex = actions.findIndex(action => !action.disabled);
   return showActions && /*#__PURE__*/React__default.createElement(StyledPopover$1
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _extends$6({}, popoverProps, {
@@ -14009,6 +14288,7 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
   React__default.createElement(MoreItem, {
     key: ix,
     item: item,
+    autoFocus: ix === autoFocusIndex,
     onActionClick: onCloseOrActionClick
   }))));
 });
@@ -14032,7 +14312,8 @@ function getActionsKeyDownHandler(_ref) {
   let {
     keyboardNavigation,
     focusHandler,
-    getEnabledButton
+    getEnabledButton,
+    selections
   } = _ref;
   const handleActionsKeyDown = evt => {
     const {
@@ -14072,6 +14353,14 @@ function getActionsKeyDownHandler(_ref) {
           }
         }
         break;
+      case KEYS.ESCAPE:
+        if (selections) {
+          selections.onCancel();
+          selections.api.cancel();
+          evt.preventDefault();
+          evt.stopPropagation();
+        }
+        break;
     }
   };
   return handleActionsKeyDown;
@@ -14213,8 +14502,9 @@ function ActionsToolbar(_ref3) {
   const handleActionsKeyDown = useMemo$1(() => getActionsKeyDownHandler({
     keyboardNavigation,
     focusHandler,
-    getEnabledButton
-  }), [keyboardNavigation, focusHandler, getEnabledButton]);
+    getEnabledButton,
+    selections
+  }), [keyboardNavigation, focusHandler, getEnabledButton, selections]);
   useEffect$1(() => () => {
     setShowMoreItems(false);
   }, [popover.show, show, selections.show]);
@@ -16396,7 +16686,6 @@ const addListboxTheme = themeApi => {
   };
 };
-/* eslint-disable no-nested-ternary */
 function showToolbarDetached(_ref) {
   var _containerRef$current, _containerRef$current2, _titleRef$current$cli, _titleRef$current, _titleRef$current2, _titleRef$current3;
   let {
@@ -16411,11 +16700,7 @@ function showToolbarDetached(_ref) {
   const notSufficientSpace = containerWidth < contentWidth + actionToolbarWidth;
   const isTruncated = (titleRef === null || titleRef === void 0 ? void 0 : (_titleRef$current2 = titleRef.current) === null || _titleRef$current2 === void 0 ? void 0 : _titleRef$current2.scrollWidth) > (titleRef === null || titleRef === void 0 ? void 0 : (_titleRef$current3 = titleRef.current) === null || _titleRef$current3 === void 0 ? void 0 : _titleRef$current3.offsetWidth);
   const isDetached = !!(notSufficientSpace | isTruncated);
-  const reasonDetached = isDetached ? notSufficientSpace ? 'noSpace' : 'truncated' : '';
-  return {
-    isDetached,
-    reasonDetached
-  };
+  return isDetached;
 }
 function getListboxActionProps(_ref) {
@@ -16425,7 +16710,8 @@ function getListboxActionProps(_ref) {
     containerRef,
     isLocked,
     listboxSelectionToolbarItems,
-    selections
+    selections,
+    keyboard
   } = _ref;
   return {
     show: showToolbar && !isDetached,
@@ -16447,8 +16733,12 @@ function getListboxActionProps(_ref) {
     selections: {
       show: showToolbar,
       api: selections,
-      onConfirm: () => {},
-      onCancel: () => {}
+      onConfirm: () => {
+        keyboard === null || keyboard === void 0 ? void 0 : keyboard.focus();
+      },
+      onCancel: () => {
+        keyboard === null || keyboard === void 0 ? void 0 : keyboard.focus();
+      }
     }
   };
 }
@@ -16477,20 +16767,18 @@ const classes$4 = {
   listboxWrapper: "".concat(PREFIX$4, "-listboxWrapper")
 };
 const StyledGrid$3 = styled$1(Grid, {
-  shouldForwardProp: p => !['containerPadding', 'hasIcon'].includes(p)
+  shouldForwardProp: p => !['containerPadding'].includes(p)
 })(_ref => {
   var _theme$listBox$backgr, _theme$listBox;
   let {
     theme,
-    containerPadding,
-    hasIcon
+    containerPadding
   } = _ref;
   return {
     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: 'flex',
-      width: "calc(100% - ".concat(hasIcon ? BUTTON_ICON_WIDTH : 0, "px)")
+      display: 'flex'
     },
     ["& .".concat(classes$4.screenReaderOnly)]: {
       position: 'absolute',
@@ -16716,7 +17004,8 @@ function ListBoxInline(_ref4) {
     containerRef,
     isLocked,
     listboxSelectionToolbarItems,
-    selections
+    selections,
+    keyboard
   });
   const shouldAutoFocus = searchVisible && search === 'toggle';
   const showSearchIcon = searchEnabled !== false && search === 'toggle';
@@ -16725,10 +17014,7 @@ function ListBoxInline(_ref4) {
   const iconsWidth = (showSearchOrLockIcon ? BUTTON_ICON_WIDTH : 0) + (isDrillDown ? ICON_WIDTH + ICON_PADDING : 0); // Drill-down icon needs padding right so there is space between the icon and the title
   const headerPaddingLeft = CELL_PADDING_LEFT - (showSearchOrLockIcon ? ICON_PADDING : 0);
   const headerPaddingRight = isRtl ? CELL_PADDING_LEFT - (showIcons ? ICON_PADDING : 0) : 0;
-  const {
-    isDetached,
-    reasonDetached
-  } = showToolbarDetached({
+  const isDetached = showToolbarDetached({
     containerRef,
     titleRef,
     iconsWidth
@@ -16793,35 +17079,21 @@ function ListBoxInline(_ref4) {
     onKeyDown: handleKeyDown,
     onMouseEnter: handleOnMouseEnter,
     onMouseLeave: handleOnMouseLeave,
-    ref: containerRef,
-    hasIcon: showIcons
+    ref: containerRef
   }, showToolbarWithTitle && /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     container: true,
-    style: {
-      padding: theme.spacing(1),
-      paddingLeft: "".concat(headerPaddingLeft, "px"),
-      paddingRight: "".concat(headerPaddingRight, "px")
-    },
-    sx: {
-      flexDirection: isRtl ? 'row-reverse' : 'row'
-    },
-    wrap: "nowrap"
-  }, /*#__PURE__*/React__default.createElement(Grid, {
-    item: true,
-    container: true,
-    height: headerHeight,
-    sx: {
-      flexDirection: isRtl ? 'row-reverse' : 'row'
-    },
+    minHeight: headerHeight,
+    flexDirection: isRtl ? 'row-reverse' : 'row',
+    marginY: 1,
+    paddingLeft: "".concat(headerPaddingLeft, "px"),
+    paddingRight: "".concat(headerPaddingRight, "px"),
     wrap: "nowrap"
   }, showIcons && /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
-    sx: {
-      display: 'flex',
-      alignItems: 'center',
-      width: iconsWidth
-    }
+    container: true,
+    alignItems: "center",
+    width: iconsWidth
   }, isLocked ? lockIconComp : showSearchIcon && searchIconComp, isDrillDown && /*#__PURE__*/React__default.createElement(DrillDownIcon, {
     tabIndex: -1,
     title: translator.get('Listbox.DrillDown'),
@@ -16831,22 +17103,17 @@ function ListBoxInline(_ref4) {
     }
   })), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
-    sx: {
-      justifyContent: isRtl ? 'flex-end' : 'flex-start'
-    },
+    xs: true,
+    minWidth: 0 // needed to text-overflow see: https://css-tricks.com/flexbox-truncated-text/
+    ,
+    justifyContent: isRtl ? 'flex-end' : 'flex-start',
     className: classes$4.listBoxHeader
   }, /*#__PURE__*/React__default.createElement(Title, {
     variant: "h6",
-    sx: {
-      width: isPopover && reasonDetached === 'noSpace' ? '60px' : undefined
-    },
     noWrap: true,
     ref: titleRef,
     title: layout.title
-  }, layout.title))), /*#__PURE__*/React__default.createElement(Grid, {
-    item: true,
-    xs: true
-  }), /*#__PURE__*/React__default.createElement(Grid, {
+  }, layout.title)), /*#__PURE__*/React__default.createElement(Grid, {
     item: true
   }, /*#__PURE__*/React__default.createElement(ActionsToolbar, _extends$6({
     direction: direction
@@ -19946,7 +20213,7 @@ function viz() {
     id: model.id,
     /**
      * This visualizations Enigma model, a representation of the generic object.
-     * @type {string}
+     * @type {EngineAPI.IGenericObject}
      */
     model,
     /**
@@ -20095,14 +20362,17 @@ async function init(model, optional, halo, initialError) {
  */
 /**
- * @interface CreateConfig
- * @description Rendering configuration for creating and rendering a new object
- * @extends BaseConfig
- * @property {string} type
- * @property {string=} version
- * @property {(Field[])=} fields
- * @property {boolean} [extendProperties=false] Whether to deeply extend properties or not. If false then subtrees will be overwritten.
- * @property {EngineAPI.IGenericObjectProperties=} properties
+ * @interface RenderConfig
+ * @description Configuration for rendering a visualisation, either creating or fetching an existing object.
+ * @property {HTMLElement} element Target html element to render in to
+ * @property {object=} options Options passed into the visualisation
+ * @property {Plugin[]} [plugins] plugins passed into the visualisation
+ * @property {string=} id For existing objects: Engine identifier of object to render
+ * @property {string=} type For creating objects: Type of visualisation to render
+ * @property {string=} version For creating objects: Version of visualization to render
+ * @property {(Field[])=} fields For creating objects: Data fields to use
+ * @property {boolean=} [extendProperties=false] For creating objects: Whether to deeply extend properties or not. If false then subtrees will be overwritten.
+ * @property {EngineAPI.IGenericObjectProperties=} properties For creating objects: Explicit properties to set
  * @example
  * // A config for Creating objects:
  * const createConfig = {
@@ -20117,6 +20387,12 @@ async function init(model, optional, halo, initialError) {
  *   }
  * };
  * nebbie.render(createConfig);
+ * // A config for rendering an existing object:
+ * const createConfig = {
+ *   id: 'jG5LP',
+ *   element: document.querySelector('.line'),
+ * };
+ * nebbie.render(createConfig);
  */
 async function createSessionObject(_ref, halo) {
   let {
@@ -20175,6 +20451,71 @@ async function createSessionObject(_ref, halo) {
   }, halo, error, onDestroy);
 }
+/**
+ * @typedef {string | EngineAPI.INxDimension | EngineAPI.INxMeasure | LibraryField} Field
+ */
+/**
+ * @interface CreateConfig
+ * @description Rendering configuration for creating and rendering a new object
+ * @property {string} type
+ * @property {string=} version
+ * @property {(Field[])=} fields
+ * @property {EngineAPI.IGenericObjectProperties=} properties
+ */
+async function createObject(_ref, halo, generateOnly) {
+  let {
+    type,
+    version,
+    fields,
+    properties,
+    extendProperties /* , options, plugins, element */
+  } = _ref;
+  let mergedProps = {};
+  // let error;
+  try {
+    const t = halo.types.get({
+      name: type,
+      version
+    });
+    mergedProps = await t.initialProperties(properties, extendProperties);
+    const sn = await t.supernova();
+    if (fields) {
+      populateData({
+        sn,
+        properties: mergedProps,
+        fields
+      }, halo);
+    }
+    if (properties && sn && sn.qae.properties.onChange) {
+      sn.qae.properties.onChange.call({}, mergedProps);
+    }
+  } catch (e) {
+    // error = e;
+    // minimal dummy object properties to allow it to be created
+    // and rendered with the error
+    if (!generateOnly) {
+      mergedProps = {
+        qInfo: {
+          qType: type
+        },
+        visualization: type
+      };
+    } else {
+      mergedProps = null;
+    }
+    // console.error(e); // eslint-disable-line
+  }
+  if (!generateOnly) {
+    const model = await halo.app.createObject(mergedProps);
+    modelStore.set(model.id, model);
+    return model;
+  }
+  return mergedProps;
+}
 async function getObject$1(_ref, halo) {
   let {
     id,
@@ -20519,21 +20860,6 @@ async function initSheet(model, optional, halo, initialError) {
   return api;
 }
-/**
- * @interface BaseConfig
- * @description Basic rendering configuration for rendering an object
- * @property {HTMLElement} element
- * @property {object=} options
- * @property {Plugin[]} [plugins]
- */
-/**
- * @interface GetConfig
- * @description Rendering configuration for rendering an existing object
- * @extends BaseConfig
- * @property {string} id
- */
 async function getObject(_ref, halo) {
   let {
     id,
@@ -21973,7 +22299,6 @@ function onTakeSnapshot(cb) {
  * @ignore
  * @example
  * import { onContextMenu } from '@nebula.js/stardust';
  * onContextMenu((menu, event) => {
  *  menu.addItem(item, index);
  * });
@@ -22733,1603 +23058,1350 @@ 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 () {};
-	}
-	// 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;
-	  // 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();
-	}
-	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
-	  }
-	}
-	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
-	  }
-	}
-	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 = 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.major = major;
-	function major (a, loose) {
-	  return new SemVer(a, loose).major
-	}
+  // 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;
-	exports.minor = minor;
-	function minor (a, loose) {
-	  return new SemVer(a, loose).minor
-	}
+    // 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');
+    }
-	exports.patch = patch;
-	function patch (a, loose) {
-	  return new SemVer(a, loose).patch
-	}
+    // 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);
+    }
-	exports.compare = compare;
-	function compare (a, b, loose) {
-	  return new SemVer(a, loose).compare(new SemVer(b, loose))
-	}
+    // 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);
+  };
-	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
-	  })
-	}
+  // 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
+    }
+  }
-	// ^ --> * (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(' ')
-	}
+  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 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
-	  })
-	}
+    // 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;
-	function replaceXRanges (comp, options) {
-	  debug('replaceXRanges', comp, options);
-	  return comp.split(/\s+/).map(function (comp) {
-	    return replaceXRange(comp, options)
-	  }).join(' ')
-	}
+    // 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);
+          });
+        });
+      });
+    });
+  };
-	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
-	  })
-	}
+  // 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;
+  }
-	// 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], '')
-	}
+  // 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(' ');
+    });
+  }
-	// 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()
-	}
+  // 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;
+    });
+  }
-	// 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
-	}
+  // ^ --> * (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.satisfies = satisfies;
-	function satisfies (version, range, options) {
-	  try {
-	    range = new Range(range, options);
-	  } catch (er) {
-	    return false
-	  }
-	  return range.test(version)
-	}
+      // 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.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
-	}
+  // 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();
+  }
-	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
-	}
+  // 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.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
-	}
+      // 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.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 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 ">"');
+    }
-	// 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)
-	}
+    // If it satisifes the range it is not outside
+    if (satisfies(version, range, options)) {
+      return false;
+    }
-	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
-	}
+    // From now on, variable terms are as if we're in "gtr" mode.
+    // but note that everything is flipped for the "ltr" function.
-	exports.prerelease = prerelease;
-	function prerelease (version, options) {
-	  var parsed = parse(version, options);
-	  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-	}
+    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.intersects = intersects;
-	function intersects (r1, r2, options) {
-	  r1 = new Range(r1, options);
-	  r2 = new Range(r2, options);
-	  return r1.intersects(r2)
-	}
+      // 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.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));
+      // 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 = {};
@@ -24753,8 +24825,9 @@ function nuked() {
     const api = /** @lends Embed# */{
       /**
        * Renders a visualization or sheet into an HTMLElement.
+       * Visualizations can either be existing objects or created on the fly.
        * Support for sense sheets is experimental.
-       * @param {CreateConfig | GetConfig} cfg - The render configuration.
+       * @param {RenderConfig} cfg The render configuration.
        * @returns {Promise<Viz|Sheet>} A controller to the rendered visualization or sheet.
        * @example
        * // render from existing object
@@ -24777,6 +24850,37 @@ function nuked() {
         }
         return createSessionObject(cfg, halo);
       },
+      /**
+       * Creates a visualization model
+       * @param {CreateConfig} cfg The create configuration.
+       * @experimental
+       * @returns {Promise<EngineAPI.IGenericObject>} An engima model
+       * @example
+       * // create a barchart in the app and return the model
+       * const model = await n.create({
+       *     type: 'barchart',
+       *     fields: ['Product', { qLibraryId: 'u378hn', type: 'measure' }],
+       *     properties: { showTitle: true }
+       *   }
+       * );
+       */
+      create: async cfg => createObject(cfg, halo, false),
+      /**
+       * Generates properties for a visualization object
+       * @param {CreateConfig} cfg The create configuration.
+       * @experimental
+       * @returns {Promise<object>} The objects properties
+       * @example
+       * // generate properties for a barchart
+       * const properties = await n.create({
+       *     type: 'barchart',
+       *     fields: ['Product', { qLibraryId: 'u378hn', type: 'measure' }],
+       *     properties: { showTitle: true }
+       *   },
+       *   true
+       * );
+       */
+      generateProperties: async cfg => createObject(cfg, halo, true),
       /**
        * Updates the current context of this embed instance.
        * Use this when you want to change some part of the current context, like theme.