Merge branch 'main' into eui-60.0.0

Author: kibanamachine

package.json

@@ -918,7 +918,7 @@
     "chai": "3.5.0",
     "chance": "1.0.18",
     "chokidar": "^3.4.3",
-    "chromedriver": "^102.0.0",
+    "chromedriver": "^103.0.0",
     "clean-webpack-plugin": "^3.0.0",
     "cmd-shim": "^2.1.0",
     "compression-webpack-plugin": "^4.0.0",
@@ -1046,7 +1046,7 @@
     "resolve": "^1.22.0",
     "rxjs-marbles": "^5.0.6",
     "sass-loader": "^10.2.0",
-    "selenium-webdriver": "^4.2.0",
+    "selenium-webdriver": "^4.3.0",
     "shelljs": "^0.8.4",
     "simple-git": "1.116.0",
     "sinon": "^7.4.2",

packages/kbn-es-query/grammar/grammar.peggy

@@ -12,7 +12,7 @@
   const buildFunctionNode = nodeTypes.function.buildNodeWithArgumentNodes;
   const buildLiteralNode = nodeTypes.literal.buildNode;
   const buildWildcardNode = nodeTypes.wildcard.buildNode;
-  const { wildcardSymbol } = nodeTypes.wildcard;
+  const { KQL_WILDCARD_SYMBOL } = nodeTypes.wildcard;
 }
 
 start
@@ -189,7 +189,7 @@ Value "value"
   / value:UnquotedLiteral {
     if (value.type === 'cursor') return value;
 
-    if (!allowLeadingWildcards && value.type === 'wildcard' && nodeTypes.wildcard.hasLeadingWildcard(value)) {
+    if (!allowLeadingWildcards && nodeTypes.wildcard.isNode(value) && nodeTypes.wildcard.hasLeadingWildcard(value)) {
       error('Leading wildcards are disabled. See query:allowLeadingWildcards in Advanced Settings.');
     }
 
@@ -248,7 +248,7 @@ UnquotedLiteral
     if (sequence === 'null') return buildLiteralNode(null);
     if (sequence === 'true') return buildLiteralNode(true);
     if (sequence === 'false') return buildLiteralNode(false);
-    if (chars.includes(wildcardSymbol)) return buildWildcardNode(sequence);
+    if (chars.includes(KQL_WILDCARD_SYMBOL)) return buildWildcardNode(sequence);
     return buildLiteralNode(sequence);
   }
 
@@ -261,7 +261,7 @@ UnquotedCharacter
   / !SpecialCharacter !Keyword !Cursor char:. { return char; }
 
 Wildcard
-  = '*' { return wildcardSymbol; }
+  = '*' { return KQL_WILDCARD_SYMBOL; }
 
 OptionalSpace
   = &{ return parseCursor; } prefix:Space* cursor:Cursor suffix:Space* {

packages/kbn-es-query/src/kuery/ast/ast.ts

@@ -10,7 +10,7 @@ import { JsonObject } from '@kbn/utility-types';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { nodeTypes } from '../node_types';
 import { KQLSyntaxError } from '../kuery_syntax_error';
-import { KueryNode, KueryParseOptions, KueryQueryOptions } from '../types';
+import type { KqlContext, KueryNode, KueryParseOptions, KueryQueryOptions } from '../types';
 
 import { parse as parseKuery } from '../grammar';
 import { DataViewBase } from '../..';
@@ -68,7 +68,7 @@ export const toElasticsearchQuery = (
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context?: Record<string, any>
+  context?: KqlContext
 ): JsonObject => {
   if (!node || !node.type || !nodeTypes[node.type]) {
     return toElasticsearchQuery(nodeTypes.function.buildNode('and', []), indexPattern);

packages/kbn-es-query/src/kuery/functions/and.ts

@@ -7,7 +7,8 @@
  */
 
 import * as ast from '../ast';
-import { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { KqlContext } from '../types';
 
 export function buildNodeParams(children: KueryNode[]) {
   return {
@@ -19,7 +20,7 @@ export function toElasticsearchQuery(
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context: Record<string, any> = {}
+  context: KqlContext = {}
 ) {
   const { filtersInMustClause } = config;
   const children = node.arguments || [];

packages/kbn-es-query/src/kuery/functions/exists.test.ts

@@ -9,6 +9,7 @@
 import { nodeTypes } from '../node_types';
 import { fields } from '../../filters/stubs';
 import { DataViewBase } from '../..';
+import { KQL_NODE_TYPE_LITERAL } from '../node_types/literal';
 
 jest.mock('../grammar');
 
@@ -39,7 +40,7 @@ describe('kuery functions', () => {
           arguments: [arg],
         } = exists.buildNodeParams('response');
 
-        expect(arg).toHaveProperty('type', 'literal');
+        expect(arg).toHaveProperty('type', KQL_NODE_TYPE_LITERAL);
         expect(arg).toHaveProperty('value', 'response');
       });
     });

packages/kbn-es-query/src/kuery/functions/exists.ts

@@ -7,8 +7,9 @@
  */
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { DataViewFieldBase, DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { DataViewFieldBase, DataViewBase, KueryNode, KueryQueryOptions } from '../..';
 import * as literal from '../node_types/literal';
+import type { KqlContext } from '../types';
 
 export function buildNodeParams(fieldName: string) {
   return {
@@ -20,7 +21,7 @@ export function toElasticsearchQuery(
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context: Record<string, any> = {}
+  context: KqlContext = {}
 ): estypes.QueryDslQueryContainer {
   const {
     arguments: [fieldNameArg],

packages/kbn-es-query/src/kuery/functions/is.test.ts

@@ -12,6 +12,8 @@ import { fields } from '../../filters/stubs';
 import * as is from './is';
 import { DataViewBase } from '../..';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { KQL_NODE_TYPE_WILDCARD } from '../node_types/wildcard';
+import { KQL_NODE_TYPE_LITERAL } from '../node_types/literal';
 
 jest.mock('../grammar');
 
@@ -32,9 +34,9 @@ describe('kuery functions', () => {
           arguments: [fieldName, value],
         } = is.buildNodeParams('response', 200);
 
-        expect(fieldName).toHaveProperty('type', 'literal');
+        expect(fieldName).toHaveProperty('type', KQL_NODE_TYPE_LITERAL);
         expect(fieldName).toHaveProperty('value', 'response');
-        expect(value).toHaveProperty('type', 'literal');
+        expect(value).toHaveProperty('type', KQL_NODE_TYPE_LITERAL);
         expect(value).toHaveProperty('value', 200);
       });
 
@@ -43,8 +45,8 @@ describe('kuery functions', () => {
           arguments: [fieldName, value],
         } = is.buildNodeParams('machine*', 'win*');
 
-        expect(fieldName).toHaveProperty('type', 'wildcard');
-        expect(value).toHaveProperty('type', 'wildcard');
+        expect(fieldName).toHaveProperty('type', KQL_NODE_TYPE_WILDCARD);
+        expect(value).toHaveProperty('type', KQL_NODE_TYPE_WILDCARD);
       });
 
       test('should default to a non-phrase query', () => {

packages/kbn-es-query/src/kuery/functions/is.ts

@@ -12,10 +12,10 @@ import { getPhraseScript } from '../../filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings, getDataViewFieldSubtypeNested } from '../../utils';
 import { getFullFieldNameNode } from './utils/get_full_field_name_node';
-import { DataViewBase, KueryNode, DataViewFieldBase, KueryQueryOptions } from '../..';
+import type { DataViewBase, KueryNode, DataViewFieldBase, KueryQueryOptions } from '../..';
+import type { KqlContext } from '../types';
 
 import * as ast from '../ast';
-
 import * as literal from '../node_types/literal';
 import * as wildcard from '../node_types/wildcard';
 
@@ -42,15 +42,14 @@ export function toElasticsearchQuery(
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context: Record<string, any> = {}
+  context: KqlContext = {}
 ): estypes.QueryDslQueryContainer {
   const {
     arguments: [fieldNameArg, valueArg, isPhraseArg],
   } = node;
 
-  const isExistsQuery = valueArg.type === 'wildcard' && valueArg.value === wildcard.wildcardSymbol;
-  const isAllFieldsQuery =
-    fieldNameArg.type === 'wildcard' && fieldNameArg.value === wildcard.wildcardSymbol;
+  const isExistsQuery = wildcard.isNode(valueArg) && wildcard.isLoneWildcard(valueArg);
+  const isAllFieldsQuery = wildcard.isNode(fieldNameArg) && wildcard.isLoneWildcard(fieldNameArg);
   const isMatchAllQuery = isExistsQuery && isAllFieldsQuery;
 
   if (isMatchAllQuery) {
@@ -65,7 +64,7 @@ export function toElasticsearchQuery(
   const value = !isUndefined(valueArg) ? ast.toElasticsearchQuery(valueArg) : valueArg;
   const type = isPhraseArg.value ? 'phrase' : 'best_fields';
   if (fullFieldNameArg.value === null) {
-    if (valueArg.type === 'wildcard') {
+    if (wildcard.isNode(valueArg)) {
       return {
         query_string: {
           query: wildcard.toQueryStringQuery(valueArg),
@@ -106,7 +105,7 @@ export function toElasticsearchQuery(
       // Wildcards can easily include nested and non-nested fields. There isn't a good way to let
       // users handle this themselves so we automatically add nested queries in this scenario.
       const subTypeNested = getDataViewFieldSubtypeNested(field);
-      if (!(fullFieldNameArg.type === 'wildcard') || !subTypeNested?.nested || context?.nested) {
+      if (!wildcard.isNode(fullFieldNameArg) || !subTypeNested?.nested || context?.nested) {
         return query;
       } else {
         return {
@@ -143,7 +142,7 @@ export function toElasticsearchQuery(
           },
         }),
       ];
-    } else if (valueArg.type === 'wildcard') {
+    } else if (wildcard.isNode(valueArg)) {
       return [
         ...accumulator,
         wrapWithNestedQuery({

packages/kbn-es-query/src/kuery/functions/nested.ts

@@ -9,7 +9,8 @@
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import * as ast from '../ast';
 import * as literal from '../node_types/literal';
-import { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { KqlContext } from '../types';
 
 export function buildNodeParams(path: any, child: any) {
   const pathNode =
@@ -23,7 +24,7 @@ export function toElasticsearchQuery(
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context: Record<string, any> = {}
+  context: KqlContext = {}
 ): estypes.QueryDslQueryContainer {
   const [path, child] = node.arguments;
   const stringPath = ast.toElasticsearchQuery(path) as unknown as string;

packages/kbn-es-query/src/kuery/functions/not.ts

@@ -8,7 +8,8 @@
 
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import * as ast from '../ast';
-import { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { DataViewBase, KueryNode, KueryQueryOptions } from '../..';
+import type { KqlContext } from '../types';
 
 export function buildNodeParams(child: KueryNode) {
   return {
@@ -20,7 +21,7 @@ export function toElasticsearchQuery(
   node: KueryNode,
   indexPattern?: DataViewBase,
   config: KueryQueryOptions = {},
-  context: Record<string, any> = {}
+  context: KqlContext = {}
 ): estypes.QueryDslQueryContainer {
   const [argument] = node.arguments;