Code review

elastic · Feb 6, 2020 · 0b78487 · 0b78487
1 parent 0f55c77
commit 0b78487
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/plugins/data/common/es_query/kuery/node_types/function.ts b/src/plugins/data/common/es_query/kuery/node_types/function.ts
@@ -40,7 +40,7 @@ export function buildNode(functionName: FunctionName, ...args: any[]) {
 // Mainly only useful in the grammar where we'll already have real argument nodes in hand
 export function buildNodeWithArgumentNodes(
   functionName: FunctionName,
-  ...args: any[]
+  args: any[]
 ): FunctionTypeBuildNode {
   if (_.isUndefined(functions[functionName])) {
     throw new Error(`Unknown function "${functionName}"`);

diff --git a/src/plugins/data/common/es_query/kuery/node_types/literal.ts b/src/plugins/data/common/es_query/kuery/node_types/literal.ts
@@ -19,15 +19,13 @@
 
 import { LiteralTypeBuildNode } from './types';
 
-type LiteralNodeValue = null | boolean | number | string;
-
-export function buildNode(value: LiteralNodeValue): LiteralTypeBuildNode {
+export function buildNode(value: LiteralTypeBuildNode['value']): LiteralTypeBuildNode {
   return {
     type: 'literal',
     value,
   };
 }
 
-export function toElasticsearchQuery(node: LiteralTypeBuildNode): LiteralNodeValue {
+export function toElasticsearchQuery(node: LiteralTypeBuildNode): LiteralTypeBuildNode['value'] {
   return node.value;
 }
diff --git a/src/plugins/data/common/es_query/kuery/node_types/types.ts b/src/plugins/data/common/es_query/kuery/node_types/types.ts
@@ -22,7 +22,7 @@
  */
 
 import { IIndexPattern } from '../../../index_patterns';
-import { JsonValue } from '..';
+import { JsonValue, KueryNode } from '..';
 
 export type FunctionName =
   | 'is'
@@ -37,7 +37,7 @@ export type FunctionName =
 
 interface FunctionType {
   buildNode: (functionName: FunctionName, ...args: any[]) => FunctionTypeBuildNode;
-  buildNodeWithArgumentNodes: (functionName: FunctionName, ...args: any[]) => FunctionTypeBuildNode;
+  buildNodeWithArgumentNodes: (functionName: FunctionName, args: any[]) => FunctionTypeBuildNode;
   toElasticsearchQuery: (
     node: any,
     indexPattern?: IIndexPattern,
@@ -75,7 +75,7 @@ export interface NamedArgTypeBuildNode {
 }
 
 interface WildcardType {
-  buildNode: (value: string) => WildcardTypeBuildNode;
+  buildNode: (value: string) => WildcardTypeBuildNode | KueryNode;
   test: (node: any, string: string) => boolean;
   toElasticsearchQuery: (node: any) => string;
   toQueryStringQuery: (node: any) => string;

diff --git a/src/plugins/data/common/es_query/kuery/node_types/wildcard.ts b/src/plugins/data/common/es_query/kuery/node_types/wildcard.ts
@@ -19,6 +19,7 @@
 
 import { fromLiteralExpression } from '../ast/ast';
 import { WildcardTypeBuildNode } from './types';
+import { KueryNode } from '..';
 
 export const wildcardSymbol = '@kuery-wildcard@';
 
@@ -32,9 +33,9 @@ function escapeQueryString(str: string) {
   return str.replace(/[+-=&|><!(){}[\]^"~*?:\\/]/g, '\\$&'); // $& means the whole matched string
 }
 
-export function buildNode(value: string): WildcardTypeBuildNode {
+export function buildNode(value: string): WildcardTypeBuildNode | KueryNode {
   if (!value.includes(wildcardSymbol)) {
-    return (fromLiteralExpression(value) as unknown) as WildcardTypeBuildNode;
+    return fromLiteralExpression(value);
   }
 
   return {