Move src/core/types/elasticsearch to @kbn/es-types (#140522)

* create empty package

* move types to packages

* [CI] Auto-commit changed files from 'node scripts/generate codeowners'

* start fixing imports

* fix more imports

* fix inline import

* add apm-ui as owners

* [CI] Auto-commit changed files from 'node scripts/generate codeowners'

* fix new usages

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>

.github/CODEOWNERS

@@ -853,6 +853,7 @@ packages/kbn-es @elastic/kibana-operations
 packages/kbn-es-archiver @elastic/kibana-operations
 packages/kbn-es-errors @elastic/kibana-core
 packages/kbn-es-query @elastic/kibana-app-services
+packages/kbn-es-types @elastic/kibana-core @elastic/apm-ui
 packages/kbn-eslint-config @elastic/kibana-operations
 packages/kbn-eslint-plugin-disable @elastic/kibana-operations
 packages/kbn-eslint-plugin-eslint @elastic/kibana-operations

package.json

@@ -300,6 +300,7 @@
     "@kbn/ebt-tools": "link:bazel-bin/packages/kbn-ebt-tools",
     "@kbn/es-errors": "link:bazel-bin/packages/kbn-es-errors",
     "@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
+    "@kbn/es-types": "link:bazel-bin/packages/kbn-es-types",
     "@kbn/field-types": "link:bazel-bin/packages/kbn-field-types",
     "@kbn/flot-charts": "link:bazel-bin/packages/kbn-flot-charts",
     "@kbn/handlebars": "link:bazel-bin/packages/kbn-handlebars",
@@ -1010,6 +1011,7 @@
     "@types/kbn__es-archiver": "link:bazel-bin/packages/kbn-es-archiver/npm_module_types",
     "@types/kbn__es-errors": "link:bazel-bin/packages/kbn-es-errors/npm_module_types",
     "@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
+    "@types/kbn__es-types": "link:bazel-bin/packages/kbn-es-types/npm_module_types",
     "@types/kbn__eslint-plugin-disable": "link:bazel-bin/packages/kbn-eslint-plugin-disable/npm_module_types",
     "@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
     "@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",

packages/BUILD.bazel

@@ -198,6 +198,7 @@ filegroup(
     "//packages/kbn-es-archiver:build",
     "//packages/kbn-es-errors:build",
     "//packages/kbn-es-query:build",
+    "//packages/kbn-es-types:build",
     "//packages/kbn-eslint-config:build",
     "//packages/kbn-eslint-plugin-disable:build",
     "//packages/kbn-eslint-plugin-eslint:build",
@@ -506,6 +507,7 @@ filegroup(
     "//packages/kbn-es-archiver:build_types",
     "//packages/kbn-es-errors:build_types",
     "//packages/kbn-es-query:build_types",
+    "//packages/kbn-es-types:build_types",
     "//packages/kbn-eslint-plugin-disable:build_types",
     "//packages/kbn-eslint-plugin-imports:build_types",
     "//packages/kbn-field-types:build_types",

packages/kbn-es-types/BUILD.bazel

@@ -0,0 +1,107 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config")
+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_DIRNAME = "kbn-es-types"
+PKG_REQUIRE_NAME = "@kbn/es-types"
+
+SOURCE_FILES = glob(
+  [
+    "**/*.ts",
+  ],
+  exclude = [
+    "**/*.config.js",
+    "**/*.mock.*",
+    "**/*.test.*",
+    "**/*.stories.*",
+    "**/__snapshots__/**",
+    "**/integration_tests/**",
+    "**/mocks/**",
+    "**/scripts/**",
+    "**/storybook/**",
+    "**/test_fixtures/**",
+    "**/test_helpers/**",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+RUNTIME_DEPS = [
+]
+
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+  "@npm//utility-types",
+  "@npm//@elastic/elasticsearch",
+]
+
+jsts_transpiler(
+  name = "target_node",
+  srcs = SRCS,
+  build_pkg_name = package_name(),
+)
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+    "//:tsconfig.bazel.json",
+  ],
+)
+
+ts_project(
+  name = "tsc_types",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = TYPES_DEPS,
+  declaration = True,
+  declaration_map = True,
+  emit_declaration_only = True,
+  out_dir = "target_types",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_DIRNAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = RUNTIME_DEPS + [":target_node"],
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [":" + PKG_DIRNAME],
+)
+
+filegroup(
+  name = "build",
+  srcs = [":npm_module"],
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm_types(
+  name = "npm_module_types",
+  srcs = SRCS,
+  deps = [":tsc_types"],
+  package_name = PKG_REQUIRE_NAME,
+  tsconfig = ":tsconfig",
+  visibility = ["//visibility:public"],
+)
+
+filegroup(
+  name = "build_types",
+  srcs = [":npm_module_types"],
+  visibility = ["//visibility:public"],
+)

packages/kbn-es-types/README.md

@@ -0,0 +1,3 @@
+# @kbn/es-types
+
+This package contains 'missing' types for the `@elastic/elasticsearch` client.

packages/kbn-es-types/index.ts

@@ -0,0 +1,20 @@
+/*
+ * 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 type {
+  AggregationOptionsByType,
+  ESSearchOptions,
+  SearchHit,
+  ESSearchResponse,
+  ESSearchRequest,
+  ESSourceOptions,
+  InferSearchResponseOf,
+  AggregationResultOf,
+  ESFilter,
+  MaybeReadonlyArray,
+} from './src';

packages/kbn-es-types/jest.config.js

@@ -0,0 +1,13 @@
+/*
+ * 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.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-es-types'],
+};

packages/kbn-es-types/kibana.jsonc

@@ -0,0 +1,7 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/es-types",
+  "owner": ["@elastic/kibana-core", "@elastic/apm-ui"],
+  "runtimeDeps": [],
+  "typeDeps": [],
+}

packages/kbn-es-types/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "@kbn/es-types",
+  "private": true,
+  "version": "1.0.0",
+  "main": "./target_node/index.js",
+  "author": "Kibana Core",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}

src/core/types/elasticsearch/search.ts → packages/kbn-es-types/src/search.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ValuesType, UnionToIntersection } from 'utility-types';
+import type { ValuesType, UnionToIntersection } from 'utility-types';
 import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 interface AggregationsAggregationContainer extends Record<string, any> {

packages/kbn-es-types/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.bazel.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "target_types",
+    "stripInternal": false,
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+  ]
+}

src/plugins/unified_field_list/common/utils/field_stats_utils.ts

@@ -9,7 +9,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import DateMath from '@kbn/datemath';
 import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
-import type { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import type { ESSearchResponse } from '@kbn/es-types';
 import type { FieldStatsResponse } from '../types';
 import { getFieldExampleBuckets, canProvideExamplesForField } from './field_examples_calculator';
 

x-pack/plugins/aiops/server/routes/queries/get_filters.ts

@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import { ESFilter } from '@kbn/core/types/elasticsearch';
+import type { ESFilter } from '@kbn/es-types';
 
 import type { AiopsExplainLogRateSpikesSchema } from '../../../common/api/explain_log_rate_spikes';
 

x-pack/plugins/apm/public/components/shared/kuery_bar/get_bool_filter.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ESFilter } from '@kbn/core/types/elasticsearch';
+import type { ESFilter } from '@kbn/es-types';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,

x-pack/plugins/apm/public/utils/test_helpers.tsx

@@ -19,10 +19,7 @@ import { Moment } from 'moment-timezone';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
-import {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/es-types';
 import { APMConfig } from '../../server';
 import { MockApmPluginContextWrapper } from '../context/apm_plugin/mock_apm_plugin_context';
 import { UrlParamsProvider } from '../context/url_params_context/url_params_context';

x-pack/plugins/apm/scripts/shared/get_es_client.ts

@@ -7,10 +7,7 @@
 
 import { Client } from '@elastic/elasticsearch';
 import type { ClientOptions } from '@elastic/elasticsearch/lib/client';
-import {
-  ESSearchResponse,
-  ESSearchRequest,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchResponse, ESSearchRequest } from '@kbn/es-types';
 
 export type ESClient = ReturnType<typeof getEsClient>;
 

x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts

@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/es-types';
 import { Setup } from '../helpers/setup_request';
 
 interface SharedFields {

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts

@@ -8,10 +8,7 @@
 import { merge } from 'lodash';
 import { Logger, SavedObjectsClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/es-types';
 import { ApmIndicesConfig } from '../../../routes/settings/apm_indices/get_apm_indices';
 import { tasks } from './tasks';
 import { APMDataTelemetry } from '../types';

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts

@@ -14,10 +14,7 @@ import type {
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { ValuesType } from 'utility-types';
 import { ElasticsearchClient, KibanaRequest } from '@kbn/core/server';
-import {
-  ESSearchRequest,
-  InferSearchResponseOf,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, InferSearchResponseOf } from '@kbn/es-types';
 import { unwrapEsResponse } from '@kbn/observability-plugin/server';
 import { omit } from 'lodash';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/unpack_processor_events.ts

@@ -6,7 +6,7 @@
  */
 
 import { uniq, defaultsDeep, cloneDeep } from 'lodash';
-import { ESSearchRequest, ESFilter } from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, ESFilter } from '@kbn/es-types';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
 import { PROCESSOR_EVENT } from '../../../../../common/elasticsearch_fieldnames';
 import { ApmIndicesConfig } from '../../../../routes/settings/apm_indices/get_apm_indices';

x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts

@@ -7,10 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { unwrapEsResponse } from '@kbn/observability-plugin/server';
-import {
-  ESSearchResponse,
-  ESSearchRequest,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchResponse, ESSearchRequest } from '@kbn/es-types';
 import { APMRouteHandlerResources } from '../../../../routes/typings';
 import {
   callAsyncWithDebug,

x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts

@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import {
+import type {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '@kbn/core/types/elasticsearch';
+} from '@kbn/es-types';
 import { FAAS_COLDSTART } from '../../../common/elasticsearch_fieldnames';
 
 export const getColdstartAggregation = () => ({

x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts

@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import {
+import type {
   AggregationOptionsByType,
   AggregationResultOf,
-} from '@kbn/core/types/elasticsearch';
+} from '@kbn/es-types';
 import { EVENT_OUTCOME } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
 

x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts

@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import {
-  ESSearchRequest,
-  ESSearchResponse,
-} from '@kbn/core/types/elasticsearch';
+import type { ESSearchRequest, ESSearchResponse } from '@kbn/es-types';
 import { RuleExecutorServices } from '@kbn/alerting-plugin/server';
 
 export async function alertingEsClient<TParams extends ESSearchRequest>({

x-pack/plugins/apm/server/routes/alerts/register_anomaly_alert_type.ts

@@ -14,7 +14,7 @@ import {
   ALERT_SEVERITY,
 } from '@kbn/rule-data-utils';
 import { compact } from 'lodash';
-import { ESSearchResponse } from '@kbn/core/types/elasticsearch';
+import type { ESSearchResponse } from '@kbn/es-types';
 import { KibanaRequest } from '@kbn/core/server';
 import { termQuery } from '@kbn/observability-plugin/server';
 import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';

x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts

@@ -8,7 +8,7 @@
 import { Unionize } from 'utility-types';
 import { euiLightVars as theme } from '@kbn/ui-theme';
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { AggregationOptionsByType } from '@kbn/core/types/elasticsearch';
+import type { AggregationOptionsByType } from '@kbn/es-types';
 import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
 import { getVizColorForIndex } from '../../../common/viz_colors';