chore(NA): splits types from code on @kbn/config-schema (#120385)

* chore(NA): splits types from code on @kbn/config-schema * chore(NA): expose needed type * chore(NA): fix api changes * chore(NA): expose needed type
elastic · Dec 3, 2021 · 9d6955c · 9d6955c
1 parent 6434762
commit 9d6955c
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -565,6 +565,7 @@
     "@types/kbn__apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module_types",
     "@types/kbn__cli-dev-mode": "link:bazel-bin/packages/kbn-cli-dev-mode/npm_module_types",
     "@types/kbn__config": "link:bazel-bin/packages/kbn-config/npm_module_types",
+    "@types/kbn__config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module_types",
     "@types/kbn__crypto": "link:bazel-bin/packages/kbn-crypto/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",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -84,6 +84,7 @@ filegroup(
       "//packages/kbn-apm-utils:build_types",
       "//packages/kbn-cli-dev-mode:build_types",
       "//packages/kbn-config:build_types",
+      "//packages/kbn-config-schema:build_types",
       "//packages/kbn-crypto:build_types",
       "//packages/kbn-i18n:build_types",
       "//packages/kbn-i18n-react:build_types",

diff --git a/packages/kbn-cli-dev-mode/BUILD.bazel b/packages/kbn-cli-dev-mode/BUILD.bazel
@@ -49,7 +49,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-config:npm_module_types",
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-dev-utils",
   "//packages/kbn-logging",
   "//packages/kbn-optimizer",

diff --git a/packages/kbn-config-schema/BUILD.bazel b/packages/kbn-config-schema/BUILD.bazel
@@ -1,9 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
-load("//src/dev/bazel:index.bzl", "jsts_transpiler")
+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_BASE_NAME = "kbn-config-schema"
 PKG_REQUIRE_NAME = "@kbn/config-schema"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__config-schema"
 
 SOURCE_FILES = glob([
   "src/**/*.ts",
@@ -72,7 +73,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = RUNTIME_DEPS + [":target_node", ":tsc_types"],
+  deps = RUNTIME_DEPS + [":target_node"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
@@ -91,3 +92,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"],
+)
diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@kbn/config-schema",
   "main": "./target_node/index.js",
-  "types": "./target_types/index.d.ts",
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "private": true

diff --git a/packages/kbn-config-schema/src/index.ts b/packages/kbn-config-schema/src/index.ts
@@ -49,7 +49,7 @@ import {
   StreamType,
 } from './types';
 
-export type { TypeOf, Props, NullableProps };
+export type { AnyType, ConditionalType, TypeOf, Props, NullableProps };
 export { ObjectType, Type };
 export { ByteSizeValue } from './byte_size_value';
 export { SchemaTypeError, ValidationError } from './errors';

diff --git a/packages/kbn-config/BUILD.bazel b/packages/kbn-config/BUILD.bazel
@@ -46,7 +46,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/elastic-safer-lodash-set",
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-logging",
   "//packages/kbn-std",
   "//packages/kbn-utility-types",

diff --git a/packages/kbn-es-query/BUILD.bazel b/packages/kbn-es-query/BUILD.bazel
@@ -32,7 +32,6 @@ NPM_MODULE_EXTRA_FILES = [
 
 RUNTIME_DEPS = [
   "//packages/kbn-utility-types",
-  "//packages/kbn-config-schema",
   "//packages/kbn-i18n",
   "@npm//@elastic/elasticsearch",
   "@npm//load-json-file",

diff --git a/packages/kbn-io-ts-utils/BUILD.bazel b/packages/kbn-io-ts-utils/BUILD.bazel
@@ -45,7 +45,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "@npm//fp-ts",
   "@npm//io-ts",
   "@npm//tslib",

diff --git a/packages/kbn-optimizer/BUILD.bazel b/packages/kbn-optimizer/BUILD.bazel
@@ -63,7 +63,7 @@ RUNTIME_DEPS = [
 
 TYPES_DEPS = [
   "//packages/kbn-config:npm_module_types",
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-dev-utils",
   "//packages/kbn-std",
   "//packages/kbn-ui-shared-deps-npm",

diff --git a/packages/kbn-server-http-tools/BUILD.bazel b/packages/kbn-server-http-tools/BUILD.bazel
@@ -37,7 +37,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-crypto:npm_module_types",
   "@npm//@hapi/hapi",
   "@npm//@hapi/hoek",

diff --git a/packages/kbn-server-route-repository/BUILD.bazel b/packages/kbn-server-route-repository/BUILD.bazel
@@ -36,7 +36,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "//packages/kbn-io-ts-utils",
   "@npm//@hapi/boom",
   "@npm//fp-ts",

diff --git a/packages/kbn-utils/BUILD.bazel b/packages/kbn-utils/BUILD.bazel
@@ -31,7 +31,7 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-config-schema",
+  "//packages/kbn-config-schema:npm_module_types",
   "@npm//load-json-file",
   "@npm//tslib",
   "@npm//@types/jest",

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -11,7 +11,7 @@ import Boom from '@hapi/boom';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { CliArgs } from '@kbn/config';
 import type { ClientOptions } from '@elastic/elasticsearch/lib/client';
-import { ConditionalType } from '@kbn/config-schema/target_types/types';
+import { ConditionalType } from '@kbn/config-schema';
 import { ConfigDeprecation } from '@kbn/config';
 import { ConfigDeprecationContext } from '@kbn/config';
 import { ConfigDeprecationFactory } from '@kbn/config';

diff --git a/yarn.lock b/yarn.lock
@@ -5824,6 +5824,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__config-schema@link:bazel-bin/packages/kbn-config-schema/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/kbn__config@link:bazel-bin/packages/kbn-config/npm_module_types":
   version "0.0.0"
   uid ""