@elastic/eui 61.0.0 → 62.0.2

package/optimize/es/components/datagrid/body/header/data_grid_header_cell.js

@@ -10,12 +10,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * Side Public License, v 1.
  */
 import classnames from 'classnames';
-import React, { useContext, useState, useRef, useCallback } from 'react';
+import React, { useContext, useState, useRef, useCallback, useMemo } from 'react';
 import { tabbable } from 'tabbable';
 import { keys } from '../../../../services';
 import { useGeneratedHtmlId } from '../../../../services/accessibility';
 import { EuiScreenReaderOnly } from '../../../accessibility';
-import { useEuiI18n, EuiI18n } from '../../../i18n';
+import { EuiI18n } from '../../../i18n';
 import { EuiIcon } from '../../../icon';
 import { EuiListGroup } from '../../../list_group';
 import { EuiPopover } from '../../../popover';
@@ -43,9 +43,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var width = columnWidths[id] || defaultColumnWidth;
   var columnType = schema[id] ? schema[id].columnType : null;
   var classes = classnames(_defineProperty({}, "euiDataGridHeaderCell--".concat(columnType), columnType));
-  var actionButtonAriaLabel = useEuiI18n('euiDataGridHeaderCell.headerActions', 'Header actions');
-  var ariaProps = {};
-  var screenReaderId = useGeneratedHtmlId();
 
   var _useContext = useContext(DataGridFocusContext),
       setFocusedCell = _useContext.setFocusedCell,
@@ -54,37 +51,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
   var _useContext2 = useContext(DataGridSortingContext),
       sorting = _useContext2.sorting;
 
-  var sortString;
-
-  if (sorting) {
-    var sortedColumnIds = new Set(sorting.columns.map(function (_ref2) {
-      var id = _ref2.id;
-      return id;
-    }));
-
-    if (sortedColumnIds.has(id)) {
-      if (sorting.columns.length === 1) {
-        var sortDirection = sorting.columns[0].direction;
-        var sortValue = 'other';
-
-        if (sortDirection === 'asc') {
-          sortValue = 'ascending';
-        }
-
-        if (sortDirection === 'desc') {
-          sortValue = 'descending';
-        }
-
-        ariaProps['aria-sort'] = sortValue;
-      } else {
-        sortString = sorting.columns.map(function (col) {
-          return "Sorted by ".concat(col.id, " ").concat(col.direction);
-        }).join(' then ');
-        ariaProps['aria-describedby'] = screenReaderId;
-      }
-    }
-  }
-
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       isPopoverOpen = _useState2[0],
@@ -104,31 +70,39 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     setFocusedCell: setFocusedCell
   });
   var showColumnActions = columnActions && columnActions.length > 0;
-  var sortedColumn = sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
-    return col.id === id;
+
+  var _useSortingUtils = useSortingUtils({
+    sorting: sorting,
+    id: id,
+    showColumnActions: showColumnActions
+  }),
+      sortingArrow = _useSortingUtils.sortingArrow,
+      ariaSort = _useSortingUtils.ariaSort,
+      sortingScreenReaderText = _useSortingUtils.sortingScreenReaderText;
+
+  var sortingAriaId = useGeneratedHtmlId({
+    prefix: 'euiDataGridCellHeader',
+    suffix: 'sorting'
   });
-  var sortingArrow = sortedColumn ? ___EmotionJSX(EuiIcon, {
-    type: sortedColumn.direction === 'asc' ? 'sortUp' : 'sortDown',
-    color: "text",
-    className: "euiDataGridHeaderCell__sortingArrow",
-    "data-test-subj": "dataGridHeaderCellSortingIcon-".concat(id)
-  }) : null;
-  return ___EmotionJSX(EuiDataGridHeaderCellWrapper, _extends({
+  var actionsAriaId = useGeneratedHtmlId({
+    prefix: 'euiDataGridCellHeader',
+    suffix: 'actions'
+  });
+  return ___EmotionJSX(EuiDataGridHeaderCellWrapper, {
     id: id,
     index: index,
     width: width,
     headerIsInteractive: headerIsInteractive,
-    className: classes
-  }, ariaProps), column.isResizable !== false && width != null ? ___EmotionJSX(EuiDataGridColumnResizer, {
+    className: classes,
+    "aria-sort": ariaSort
+  }, column.isResizable !== false && width != null ? ___EmotionJSX(EuiDataGridColumnResizer, {
     columnId: id,
     columnWidth: width,
     setColumnWidth: setColumnWidth
-  }) : null, sortString && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("div", {
-    id: screenReaderId
-  }, sortString)), !showColumnActions ? ___EmotionJSX(React.Fragment, null, sortingArrow, ___EmotionJSX("div", {
+  }) : null, !showColumnActions ? ___EmotionJSX(React.Fragment, null, sortingArrow, ___EmotionJSX("div", {
     className: "euiDataGridHeaderCell__content",
     title: displayAsText || id
-  }, display || displayAsText || id)) : ___EmotionJSX(EuiPopover, _extends({
+  }, display || displayAsText || id), sortingScreenReaderText && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", null, sortingScreenReaderText))) : ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiPopover, _extends({
     className: "eui-fullWidth",
     anchorClassName: "eui-fullWidth",
     panelPaddingSize: "none",
@@ -140,7 +114,8 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
         setIsPopoverOpen(function (isPopoverOpen) {
           return !isPopoverOpen;
         });
-      }
+      },
+      "aria-describedby": "".concat(sortingAriaId, " ").concat(actionsAriaId)
     }, sortingArrow, ___EmotionJSX("div", {
       className: "euiDataGridHeaderCell__content",
       title: displayAsText || id
@@ -149,7 +124,6 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
       type: "arrowDown",
       size: "s",
       color: "text",
-      "aria-label": actionButtonAriaLabel,
       "data-test-subj": "dataGridHeaderCellActionButton-".concat(id)
     })),
     isOpen: isPopoverOpen,
@@ -160,7 +134,129 @@ export var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     listItems: columnActions,
     gutterSize: "none",
     "data-test-subj": "dataGridHeaderCellActionGroup-".concat(id)
-  })));
+  })), ___EmotionJSX("p", {
+    id: sortingAriaId,
+    hidden: true
+  }, sortingScreenReaderText), ___EmotionJSX("p", {
+    id: actionsAriaId,
+    hidden: true
+  }, ___EmotionJSX(EuiI18n, {
+    token: "euiDataGridHeaderCell.headerActions",
+    default: "Click to view column header actions"
+  }))));
+};
+/**
+ * Column sorting utility helpers
+ */
+
+export var useSortingUtils = function useSortingUtils(_ref2) {
+  var _sorting$columns;
+
+  var sorting = _ref2.sorting,
+      id = _ref2.id,
+      showColumnActions = _ref2.showColumnActions;
+  var sortedColumn = useMemo(function () {
+    return sorting === null || sorting === void 0 ? void 0 : sorting.columns.find(function (col) {
+      return col.id === id;
+    });
+  }, [sorting, id]);
+  var isColumnSorted = !!sortedColumn;
+  var hasOnlyOneSort = (sorting === null || sorting === void 0 ? void 0 : (_sorting$columns = sorting.columns) === null || _sorting$columns === void 0 ? void 0 : _sorting$columns.length) === 1;
+  /**
+   * Arrow icon
+   */
+
+  var sortingArrow = isColumnSorted ? ___EmotionJSX(EuiIcon, {
+    type: sortedColumn.direction === 'asc' ? 'sortUp' : 'sortDown',
+    color: "text",
+    className: "euiDataGridHeaderCell__sortingArrow",
+    "data-test-subj": "dataGridHeaderCellSortingIcon-".concat(id)
+  }) : null;
+  /**
+   * aria-sort attribute - should only be used when a single column is being sorted
+   * @see https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-sort
+   * @see https://www.w3.org/WAI/ARIA/apg/example-index/table/sortable-table.html
+   * @see https://github.com/w3c/aria/issues/283 for potential future multi-column usage
+   */
+
+  var ariaSort = // eslint-disable-next-line no-nested-ternary
+  isColumnSorted && hasOnlyOneSort ? sorting.columns[0].direction === 'asc' ? 'ascending' : 'descending' : undefined;
+  /**
+   * Sorting status - screen reader text
+   */
+
+  var sortingScreenReaderText = useMemo(function () {
+    var _sorting$columns2;
+
+    if (!isColumnSorted) return null;
+    if (!showColumnActions && hasOnlyOneSort) return null; // in this scenario, the `aria-sort` attribute will be used by screen readers
+
+    return ___EmotionJSX(React.Fragment, null, sorting === null || sorting === void 0 ? void 0 : (_sorting$columns2 = sorting.columns) === null || _sorting$columns2 === void 0 ? void 0 : _sorting$columns2.map(function (_ref3, index) {
+      var columnId = _ref3.id,
+          direction = _ref3.direction;
+
+      if (hasOnlyOneSort) {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingSingle",
+            default: "Sorted ascending",
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingSingle",
+            default: "Sorted descending",
+            key: index
+          });
+        }
+      } else if (index === 0) {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingFirst",
+            default: "Sorted by {columnId}, ascending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingFirst",
+            default: "Sorted by {columnId}, descending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        }
+      } else {
+        if (direction === 'asc') {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByAscendingMultiple",
+            default: ", then sorted by {columnId}, ascending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        } else {
+          return ___EmotionJSX(EuiI18n, {
+            token: "euiDataGridHeaderCell.sortedByDescendingMultiple",
+            default: ", then sorted by {columnId}, descending",
+            values: {
+              columnId: columnId
+            },
+            key: index
+          });
+        }
+      }
+    }), ".");
+  }, [isColumnSorted, showColumnActions, hasOnlyOneSort, sorting]);
+  return {
+    sortingArrow: sortingArrow,
+    ariaSort: ariaSort,
+    sortingScreenReaderText: sortingScreenReaderText
+  };
 };
 /**
  * Add keyboard arrow navigation to the cell actions popover

package/optimize/es/components/error_boundary/error_boundary.js

@@ -5,7 +5,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-var _excluded = ["children", "data-test-subj"];
+var _excluded = ["className", "children", "data-test-subj", "theme"];
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -23,16 +23,18 @@ import classNames from 'classnames';
 import { EuiTitle } from '../title';
 import { EuiCodeBlock } from '../code';
 import { EuiI18n } from '../i18n';
+import { withEuiTheme } from '../../services';
+import { euiErrorBoundaryStyles } from './error_boundary.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
-export var EuiErrorBoundary = /*#__PURE__*/function (_Component) {
-  _inherits(EuiErrorBoundary, _Component);
+export var _EuiErrorBoundary = /*#__PURE__*/function (_Component) {
+  _inherits(_EuiErrorBoundary, _Component);
 
-  var _super = _createSuper(EuiErrorBoundary);
+  var _super = _createSuper(_EuiErrorBoundary);
 
-  function EuiErrorBoundary(props) {
+  function _EuiErrorBoundary(props) {
     var _this;
 
-    _classCallCheck(this, EuiErrorBoundary);
+    _classCallCheck(this, _EuiErrorBoundary);
 
     _this = _super.call(this, props);
     var errorState = {
@@ -43,7 +45,7 @@ export var EuiErrorBoundary = /*#__PURE__*/function (_Component) {
     return _this;
   }
 
-  _createClass(EuiErrorBoundary, [{
+  _createClass(_EuiErrorBoundary, [{
     key: "componentDidCatch",
     value: function componentDidCatch(_ref) {
       var message = _ref.message,
@@ -63,16 +65,20 @@ export var EuiErrorBoundary = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this$props = this.props,
+          className = _this$props.className,
           children = _this$props.children,
           _dataTestSubj = _this$props['data-test-subj'],
+          theme = _this$props.theme,
           rest = _objectWithoutProperties(_this$props, _excluded);
 
       var dataTestSubj = classNames('euiErrorBoundary', _dataTestSubj);
+      var styles = euiErrorBoundaryStyles(theme);
 
       if (this.state.hasError) {
         // You can render any custom fallback UI
         return ___EmotionJSX("div", _extends({
-          className: "euiErrorBoundary",
+          css: styles.euiErrorBoundary,
+          className: classNames('euiErrorBoundary', className),
           "data-test-subj": dataTestSubj
         }, rest), ___EmotionJSX(EuiCodeBlock, null, ___EmotionJSX(EuiTitle, {
           size: "xs"
@@ -86,5 +92,6 @@ export var EuiErrorBoundary = /*#__PURE__*/function (_Component) {
     }
   }]);
 
-  return EuiErrorBoundary;
-}(Component);
+  return _EuiErrorBoundary;
+}(Component);
+export var EuiErrorBoundary = withEuiTheme(_EuiErrorBoundary);

package/optimize/es/components/error_boundary/error_boundary.styles.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { css } from '@emotion/react';
+import { logicalCSS } from '../../global_styling';
+import { transparentize } from '../../services';
+export var euiErrorBoundaryStyles = function euiErrorBoundaryStyles(_ref) {
+  var euiTheme = _ref.euiTheme;
+  var color1 = transparentize(euiTheme.colors.danger, 0.25);
+  var color2 = transparentize(euiTheme.colors.danger, 0.05);
+  return {
+    euiErrorBoundary: /*#__PURE__*/css("background-image:repeating-linear-gradient(\n        45deg,\n        ", color1, ",\n        ", color1, " 1px,\n        ", color2, " 1px,\n        ", color2, " 19px\n      );background-size:54px 54px;", logicalCSS('padding-horizontal', euiTheme.size.base), ";", logicalCSS('padding-vertical', euiTheme.size.base), ";;label:euiErrorBoundary;")
+  };
+};

package/optimize/es/components/filter_group/filter_button.js

@@ -69,7 +69,9 @@ export var EuiFilterButton = function EuiFilterButton(_ref) {
   var badgeContent = showBadge && ___EmotionJSX(EuiNotificationBadge, {
     className: "euiFilterButton__notification",
     "aria-label": hasActiveFilters ? activeBadgeLabel : availableBadgeLabel,
-    color: isDisabled || !hasActiveFilters ? 'subdued' : 'accent'
+    color: isDisabled || !hasActiveFilters ? 'subdued' : 'accent',
+    role: "marquee" // https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/marquee_role
+
   }, badgeCount);
 
   var dataText;

package/optimize/es/components/focus_trap/focus_trap.js

@@ -52,6 +52,7 @@ export var EuiFocusTrap = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "preventFocusExit", false);
 
     _defineProperty(_assertThisInitialized(_this), "setInitialFocus", function (initialFocus) {
+      if (!initialFocus) return;
       var node = findElementBySelectorOrRef(initialFocus);
       if (!node) return; // `data-autofocus` is part of the 'react-focus-on' API
 

package/optimize/es/components/form/form.styles.js

@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+export var euiFormMaxWidth = function euiFormMaxWidth(_ref) {
+  var euiTheme = _ref.euiTheme;
+  return "".concat(euiTheme.base * 25, "px");
+};

package/optimize/es/components/icon/assets/tokenMetricCounter.js

@@ -0,0 +1,34 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["title", "titleId"];
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// THIS IS A GENERATED FILE. DO NOT MODIFY MANUALLY. @see scripts/compile-icons.js
+import * as React from 'react';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+
+var EuiIconTokenMetricCounter = function EuiIconTokenMetricCounter(_ref) {
+  var title = _ref.title,
+      titleId = _ref.titleId,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  return ___EmotionJSX("svg", _extends({
+    xmlns: "http://www.w3.org/2000/svg",
+    width: 16,
+    height: 16,
+    viewBox: "0 0 16 16",
+    "aria-labelledby": titleId
+  }, props), title ? ___EmotionJSX("title", {
+    id: titleId
+  }, title) : null, ___EmotionJSX("path", {
+    d: "M11 3a1 1 0 00-1 1v1H9a1 1 0 000 2h1v1a1 1 0 102 0V7h1a1 1 0 100-2h-1V4a1 1 0 00-1-1zM5 7a1 1 0 00-1 1v1H3a1 1 0 000 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2H6V8a1 1 0 00-1-1z"
+  }));
+};
+
+export var icon = EuiIconTokenMetricCounter;

package/optimize/es/components/icon/assets/tokenMetricGauge.js

@@ -0,0 +1,34 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["title", "titleId"];
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// THIS IS A GENERATED FILE. DO NOT MODIFY MANUALLY. @see scripts/compile-icons.js
+import * as React from 'react';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+
+var EuiIconTokenMetricGauge = function EuiIconTokenMetricGauge(_ref) {
+  var title = _ref.title,
+      titleId = _ref.titleId,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  return ___EmotionJSX("svg", _extends({
+    xmlns: "http://www.w3.org/2000/svg",
+    width: 16,
+    height: 16,
+    viewBox: "0 0 16 16",
+    "aria-labelledby": titleId
+  }, props), title ? ___EmotionJSX("title", {
+    id: titleId
+  }, title) : null, ___EmotionJSX("path", {
+    d: "M5 4h-.5a.5.5 0 010-1h1a.5.5 0 01.5.5v9a.5.5 0 01-.5.5h-1a.5.5 0 010-1H5v-2h-.5a.5.5 0 010-1H5V7h-.5a.5.5 0 010-1H5V4zm3 1a1 1 0 00-1 1v6a1 1 0 001 1h2a1 1 0 001-1V6a1 1 0 00-1-1H8z"
+  }));
+};
+
+export var icon = EuiIconTokenMetricGauge;

package/optimize/es/components/icon/icon_map.js

@@ -406,55 +406,57 @@ export var typeToPathMap = {
   workplaceSearchApp: 'app_workplace_search',
   wrench: 'wrench',
   // Token Icon Imports
+  tokenAlias: 'tokenAlias',
+  tokenAnnotation: 'tokenAnnotation',
+  tokenArray: 'tokenArray',
+  tokenBinary: 'tokenBinary',
+  tokenBoolean: 'tokenBoolean',
   tokenClass: 'tokenClass',
-  tokenProperty: 'tokenProperty',
+  tokenCompletionSuggester: 'tokenCompletionSuggester',
+  tokenConstant: 'tokenConstant',
+  tokenDate: 'tokenDate',
+  tokenDenseVector: 'tokenDenseVector',
+  tokenElement: 'tokenElement',
   tokenEnum: 'tokenEnum',
-  tokenVariable: 'tokenVariable',
-  tokenMethod: 'tokenMethod',
-  tokenAnnotation: 'tokenAnnotation',
+  tokenEnumMember: 'tokenEnumMember',
+  tokenEvent: 'tokenEvent',
   tokenException: 'tokenException',
-  tokenInterface: 'tokenInterface',
-  tokenParameter: 'tokenParameter',
   tokenField: 'tokenField',
-  tokenElement: 'tokenElement',
+  tokenFile: 'tokenFile',
+  tokenFlattened: 'tokenFlattened',
   tokenFunction: 'tokenFunction',
-  tokenBoolean: 'tokenBoolean',
-  tokenString: 'tokenString',
-  tokenArray: 'tokenArray',
-  tokenNumber: 'tokenNumber',
-  tokenConstant: 'tokenConstant',
-  tokenObject: 'tokenObject',
-  tokenEvent: 'tokenEvent',
+  tokenGeo: 'tokenGeo',
+  tokenHistogram: 'tokenHistogram',
+  tokenInterface: 'tokenInterface',
+  tokenIP: 'tokenIP',
+  tokenJoin: 'tokenJoin',
   tokenKey: 'tokenKey',
-  tokenNull: 'tokenNull',
-  tokenStruct: 'tokenStruct',
-  tokenPackage: 'tokenPackage',
-  tokenOperator: 'tokenOperator',
-  tokenEnumMember: 'tokenEnumMember',
-  tokenRepo: 'tokenRepo',
-  tokenSymbol: 'tokenSymbol',
-  tokenFile: 'tokenFile',
+  tokenKeyword: 'tokenKeyword',
+  tokenMethod: 'tokenMethod',
+  tokenMetricCounter: 'tokenMetricCounter',
+  tokenMetricGauge: 'tokenMetricGauge',
   tokenModule: 'tokenModule',
   tokenNamespace: 'tokenNamespace',
-  tokenDate: 'tokenDate',
-  tokenIP: 'tokenIP',
   tokenNested: 'tokenNested',
-  tokenAlias: 'tokenAlias',
-  tokenShape: 'tokenShape',
-  tokenGeo: 'tokenGeo',
-  tokenRange: 'tokenRange',
-  tokenBinary: 'tokenBinary',
-  tokenJoin: 'tokenJoin',
+  tokenNull: 'tokenNull',
+  tokenNumber: 'tokenNumber',
+  tokenObject: 'tokenObject',
+  tokenOperator: 'tokenOperator',
+  tokenPackage: 'tokenPackage',
+  tokenParameter: 'tokenParameter',
   tokenPercolator: 'tokenPercolator',
-  tokenFlattened: 'tokenFlattened',
+  tokenProperty: 'tokenProperty',
+  tokenRange: 'tokenRange',
   tokenRankFeature: 'tokenRankFeature',
   tokenRankFeatures: 'tokenRankFeatures',
-  tokenKeyword: 'tokenKeyword',
+  tokenRepo: 'tokenRepo',
+  tokenSearchType: 'tokenSearchType',
+  tokenShape: 'tokenShape',
+  tokenString: 'tokenString',
+  tokenStruct: 'tokenStruct',
+  tokenSymbol: 'tokenSymbol',
   tokenTag: 'tokenTag',
-  tokenCompletionSuggester: 'tokenCompletionSuggester',
-  tokenDenseVector: 'tokenDenseVector',
   tokenText: 'tokenText',
   tokenTokenCount: 'tokenTokenCount',
-  tokenSearchType: 'tokenSearchType',
-  tokenHistogram: 'tokenHistogram'
+  tokenVariable: 'tokenVariable'
 };