Merge branch 'main' into kertal-pr-2021-12-17-discover-unskip-functional

package.json

@@ -575,6 +575,7 @@
     "@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
     "@types/kbn__i18n": "link:bazel-bin/packages/kbn-i18n/npm_module_types",
     "@types/kbn__i18n-react": "link:bazel-bin/packages/kbn-i18n-react/npm_module_types",
+    "@types/kbn__interpreter": "link:bazel-bin/packages/kbn-interpreter/npm_module_types",
     "@types/kbn__mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module_types",
     "@types/kbn__monaco": "link:bazel-bin/packages/kbn-monaco/npm_module_types",
     "@types/kbn__optimizer": "link:bazel-bin/packages/kbn-optimizer/npm_module_types",

packages/BUILD.bazel

@@ -93,6 +93,7 @@ filegroup(
       "//packages/kbn-field-types:build_types",
       "//packages/kbn-i18n:build_types",
       "//packages/kbn-i18n-react:build_types",
+      "//packages/kbn-interpreter:build_types",
       "//packages/kbn-mapbox-gl:build_types",
       "//packages/kbn-monaco:build_types",
       "//packages/kbn-optimizer:build_types",

packages/kbn-interpreter/BUILD.bazel

@@ -1,10 +1,11 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
 load("@npm//peggy:index.bzl", "peggy")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
 
 PKG_BASE_NAME = "kbn-interpreter"
 PKG_REQUIRE_NAME = "@kbn/interpreter"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__interpreter"
 
 SOURCE_FILES = glob(
   [
@@ -22,7 +23,6 @@ filegroup(
 )
 
 NPM_MODULE_EXTRA_FILES = [
-  "common/package.json",
   "package.json",
 ]
 
@@ -31,6 +31,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
+  "@npm//tslib",
   "@npm//@types/jest",
   "@npm//@types/lodash",
   "@npm//@types/node",
@@ -84,7 +85,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES + [":grammar"],
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
@@ -103,3 +104,20 @@ filegroup(
   ],
   visibility = ["//visibility:public"],
 )
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = TYPES_PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [
+    ":npm_module_types",
+  ],
+  visibility = ["//visibility:public"],
+)

packages/kbn-interpreter/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@kbn/interpreter",
-  "private": "true",
+  "main": "./target_node/index.js",
   "version": "1.0.0",
-  "license": "SSPL-1.0 OR Elastic License 2.0"
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "private": true
 }

packages/kbn-interpreter/src/common/lib/ast.from_expression.test.js

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 import { getType } from './get_type';
 
 describe('ast fromExpression', () => {

packages/kbn-interpreter/src/common/lib/ast.to_expression.test.js

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { toExpression } from '@kbn/interpreter/common';
+import { toExpression } from '@kbn/interpreter';
 
 describe('ast toExpression', () => {
   describe('single expression', () => {

packages/kbn-interpreter/src/index.ts

@@ -0,0 +1,9 @@
+/*
+ * 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 * from './common';

packages/kbn-telemetry-tools/src/tools/serializer.test.ts

@@ -156,4 +156,14 @@ describe('getDescriptor', () => {
       prop2: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
     });
   });
+
+  it('serializes OmitIndexedAccessType', () => {
+    const usageInterface = usageInterfaces.get('OmitIndexedAccessType')!;
+    const descriptor = getDescriptor(usageInterface, tsProgram);
+    expect(descriptor).toEqual({
+      prop3: { kind: ts.SyntaxKind.StringKeyword, type: 'StringKeyword' },
+      prop4: { kind: ts.SyntaxKind.StringLiteral, type: 'StringLiteral' },
+      prop5: { kind: ts.SyntaxKind.FirstLiteralToken, type: 'FirstLiteralToken' },
+    });
+  });
 });

packages/kbn-telemetry-tools/src/tools/serializer.ts

@@ -7,7 +7,7 @@
  */
 
 import * as ts from 'typescript';
-import { uniqBy, pick } from 'lodash';
+import { uniqBy, pick, omit } from 'lodash';
 import {
   getResolvedModuleSourceFile,
   getIdentifierDeclarationFromSource,
@@ -236,6 +236,12 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
       const pickPropNames = getConstraints(node.typeArguments![1], program);
       return pick(parentDescriptor, pickPropNames);
     }
+    // Support `Omit<SOMETHING, 'prop1' | 'prop2'>`
+    if (symbolName === 'Omit') {
+      const parentDescriptor = getDescriptor(node.typeArguments![0], program);
+      const omitPropNames = getConstraints(node.typeArguments![1], program);
+      return omit(parentDescriptor, omitPropNames);
+    }
 
     const declaration = (symbol?.getDeclarations() || [])[0];
     if (declaration) {

src/fixtures/telemetry_collectors/constants.ts

@@ -65,3 +65,4 @@ export type RecordWithKnownProps = Record<MappedTypeProps, number>;
 export type RecordWithKnownAllProps = Record<MappedTypeAllProps, number>;
 
 export type IndexedAccessType = Pick<WithUnion, 'prop1' | 'prop2'>;
+export type OmitIndexedAccessType = Omit<WithUnion, 'prop1' | 'prop2'>;

src/plugins/expressions/common/ast/format.ts

@@ -9,7 +9,7 @@
 import { ExpressionAstExpression, ExpressionAstArgument } from './types';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { toExpression } = require('@kbn/interpreter/common');
+const { toExpression } = require('@kbn/interpreter');
 
 export function format<T extends ExpressionAstExpression | ExpressionAstArgument>(
   ast: T,

src/plugins/expressions/common/ast/parse.ts

@@ -9,7 +9,7 @@
 import { ExpressionAstExpression, ExpressionAstArgument } from './types';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { parse: parseRaw } = require('@kbn/interpreter/common');
+const { parse: parseRaw } = require('@kbn/interpreter');
 
 export function parse<E extends string, S extends 'expression' | 'argument'>(
   expression: E,

src/plugins/presentation_util/public/components/expression_input/autocomplete.ts

@@ -8,7 +8,7 @@
 
 import { uniq } from 'lodash';
 // @ts-expect-error untyped library
-import { parse } from '@kbn/interpreter/common';
+import { parse } from '@kbn/interpreter';
 import {
   ExpressionAstExpression,
   ExpressionAstFunction,

x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getType } from '@kbn/interpreter/common';
+import { getType } from '@kbn/interpreter';
 import {
   ExpressionFunctionDefinition,
   Datatable,

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts

@@ -8,7 +8,7 @@
 import { toExpression } from './embeddable';
 import { EmbeddableInput } from '../../../../types';
 import { decode } from '../../../../common/lib/embeddable_dataurl';
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 
 describe('toExpression', () => {
   describe('by-reference embeddable input', () => {

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts

@@ -7,7 +7,7 @@
 
 import { toExpression } from './lens';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
-import { fromExpression, Ast } from '@kbn/interpreter/common';
+import { fromExpression, Ast } from '@kbn/interpreter';
 import { chartPluginMock } from 'src/plugins/charts/public/mocks';
 
 const baseEmbeddableInput = {

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { toExpression as toExpressionString } from '@kbn/interpreter/common';
+import { toExpression as toExpressionString } from '@kbn/interpreter';
 import { PaletteRegistry } from 'src/plugins/charts/public';
 import { SavedLensInput } from '../../../functions/external/saved_lens';
 

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { toExpression } from './map';
-import { fromExpression, Ast } from '@kbn/interpreter/common';
+import { fromExpression, Ast } from '@kbn/interpreter';
 
 const baseSavedMapInput = {
   id: 'elementId',

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { toExpression } from './visualization';
-import { fromExpression, Ast } from '@kbn/interpreter/common';
+import { fromExpression, Ast } from '@kbn/interpreter';
 
 const baseInput = {
   id: 'elementId',

x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fromExpression, toExpression, Ast } from '@kbn/interpreter/common';
+import { fromExpression, toExpression, Ast } from '@kbn/interpreter';
 import { get } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';

x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/time_filter.tsx

@@ -9,7 +9,7 @@ import { EuiSuperDatePicker, OnTimeChangeProps, EuiSuperDatePickerCommonRange }
 import React from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 import { UnitStrings } from '../../../../../i18n/units';
 
 const { quickRanges: strings } = UnitStrings;

x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx

@@ -7,7 +7,7 @@
 
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { toExpression } from '@kbn/interpreter/common';
+import { toExpression } from '@kbn/interpreter';
 import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
 import { KibanaThemeProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';

x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js

@@ -9,7 +9,7 @@ import React, { useState, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { EuiSelect, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { sortBy } from 'lodash';
-import { getType } from '@kbn/interpreter/common';
+import { getType } from '@kbn/interpreter';
 import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component';
 import { ArgumentStrings } from '../../../../i18n';
 import { SimpleMathFunction } from './simple_math_function';

x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getType } from '@kbn/interpreter/common';
+import { getType } from '@kbn/interpreter';
 import { ExpressionAstArgument, ExpressionAstFunction } from 'src/plugins/expressions';
 import { identifyPalette, ColorPalette, identifyPartialPalette } from '../../../../common/lib';
 import { ArgumentStrings } from '../../../../i18n';

x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js

@@ -9,7 +9,7 @@ import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { EuiTextArea, EuiButton, EuiButtonEmpty, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { fromExpression, toExpression } from '@kbn/interpreter/common';
+import { fromExpression, toExpression } from '@kbn/interpreter';
 
 const strings = {
   getApplyButtonLabel: () =>

x-pack/plugins/canvas/public/components/asset_manager/asset.tsx

@@ -9,7 +9,7 @@ import { Dispatch } from 'redux';
 import { connect } from 'react-redux';
 import { set } from '@elastic/safer-lodash-set';
 
-import { fromExpression, toExpression } from '@kbn/interpreter/common';
+import { fromExpression, toExpression } from '@kbn/interpreter';
 
 // @ts-expect-error untyped local
 import { elementsRegistry } from '../../lib/elements_registry';

x-pack/plugins/canvas/public/components/element_content/element_content.tsx

@@ -11,7 +11,7 @@ import { omitBy, isNil } from 'lodash';
 import Style from 'style-it';
 
 import { ExpressionRenderer } from 'src/plugins/expressions';
-import { getType } from '@kbn/interpreter/common';
+import { getType } from '@kbn/interpreter';
 import { Loading } from '../loading';
 import { RenderWithFn } from '../render_with_fn';
 // @ts-expect-error Untyped local

x-pack/plugins/canvas/public/components/expression/index.tsx

@@ -7,7 +7,7 @@
 
 import React, { FC, useState, useCallback, useMemo, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 import { useExpressionsService } from '../../services';
 import { getSelectedPage, getSelectedElement } from '../../state/selectors/workpad';
 // @ts-expect-error

x-pack/plugins/canvas/public/components/function_form/index.tsx

@@ -7,7 +7,7 @@
 
 import React, { useCallback } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { Ast } from '@kbn/interpreter/common';
+import { Ast } from '@kbn/interpreter';
 import deepEqual from 'react-fast-compare';
 import {
   ExpressionAstExpression,

x-pack/plugins/canvas/public/components/function_form_list/index.js

@@ -7,7 +7,7 @@
 
 import { compose, withProps } from 'recompose';
 import { get } from 'lodash';
-import { toExpression } from '@kbn/interpreter/common';
+import { toExpression } from '@kbn/interpreter';
 import { interpretAst } from '../../lib/run_interpreter';
 import { modelRegistry, viewRegistry, transformRegistry } from '../../expression_types';
 import { FunctionFormList as Component } from './function_form_list';

x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts

@@ -7,7 +7,7 @@
 
 import { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 import { CANVAS_APP } from '../../../../common/lib';
 import { decode, encode } from '../../../../common/lib/embeddable_dataurl';
 import { CanvasElement, CanvasPage } from '../../../../types';
@@ -60,7 +60,7 @@ export const useIncomingEmbeddable = (selectedPage: CanvasPage) => {
         const updatedInput = { ...originalInput, ...incomingInput };
 
         const expression = `embeddable config="${encode(updatedInput)}"
-  type="${type}" 
+  type="${type}"
 | render`;
 
         dispatch(
@@ -77,7 +77,7 @@ export const useIncomingEmbeddable = (selectedPage: CanvasPage) => {
         dispatch(selectToplevelNodes([embeddableId]));
       } else {
         const expression = `embeddable config="${encode(incomingInput)}"
-  type="${type}" 
+  type="${type}"
 | render`;
         dispatch(addElement(selectedPage.id, { expression }));
       }

x-pack/plugins/canvas/public/components/workpad_filters/hooks/use_canvas_filters.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fromExpression } from '@kbn/interpreter/common';
+import { fromExpression } from '@kbn/interpreter';
 import { shallowEqual, useSelector } from 'react-redux';
 import { State } from '../../../../types';
 import { getFiltersByGroups } from '../../../lib/filter';

x-pack/plugins/canvas/public/expression_types/arg.ts

@@ -7,7 +7,7 @@
 
 import { merge } from 'lodash';
 import { createElement } from 'react';
-import { Ast } from '@kbn/interpreter/common';
+import { Ast } from '@kbn/interpreter';
 // @ts-expect-error unconverted components
 import { ArgForm } from '../components/arg_form';
 import { argTypeRegistry } from './arg_type_registry';

x-pack/plugins/canvas/public/expression_types/arg_type_registry.ts

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { Registry } from '@kbn/interpreter/common';
+import { Registry } from '@kbn/interpreter';
 import { ArgType, ArgTypeProps } from './arg_type';
 
 class ArgTypeRegistry extends Registry<ArgTypeProps, ArgType> {