From deabda76a76060682ddfa194b2af9bb36bf7d52b Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 21 Dec 2021 04:35:30 +0000
Subject: [PATCH] chore(NA): splits types from code on
 @kbn/securitysolutio-utils (#121694)

---
 package.json                                  |  1 +
 packages/BUILD.bazel                          |  1 +
 .../BUILD.bazel                               |  2 +-
 .../BUILD.bazel                               |  4 ++-
 .../kbn-securitysolution-utils/BUILD.bazel    | 27 +++++++++++++++----
 .../kbn-securitysolution-utils/package.json   |  1 -
 yarn.lock                                     |  4 +++
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index adcad1bb4fe2..f2a40b4ae564 100644
--- a/package.json
+++ b/package.json
@@ -593,6 +593,7 @@
     "@types/kbn__securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module_types",
     "@types/kbn__securitysolution-rules": "link:bazel-bin/packages/kbn-securitysolution-rules/npm_module_types",
     "@types/kbn__securitysolution-t-grid": "link:bazel-bin/packages/kbn-securitysolution-t-grid/npm_module_types",
+    "@types/kbn__securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module_types",
     "@types/license-checker": "15.0.0",
     "@types/listr": "^0.14.0",
     "@types/loader-utils": "^1.1.3",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index efaf54098000..dfe7768e2ad1 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -111,6 +111,7 @@ filegroup(
       "//packages/kbn-securitysolution-list-hooks:build_types",
       "//packages/kbn-securitysolution-rules:build_types",
       "//packages/kbn-securitysolution-t-grid:build_types",
+      "//packages/kbn-securitysolution-utils:build_types",
   ],
 )
 
diff --git a/packages/kbn-securitysolution-list-hooks/BUILD.bazel b/packages/kbn-securitysolution-list-hooks/BUILD.bazel
index a82b9249dd6c..d45f6258615f 100644
--- a/packages/kbn-securitysolution-list-hooks/BUILD.bazel
+++ b/packages/kbn-securitysolution-list-hooks/BUILD.bazel
@@ -45,7 +45,7 @@ TYPES_DEPS = [
   "//packages/kbn-securitysolution-list-api:npm_module_types",
   "//packages/kbn-securitysolution-list-constants:npm_module_types",
   "//packages/kbn-securitysolution-list-utils",
-  "//packages/kbn-securitysolution-utils",
+  "//packages/kbn-securitysolution-utils:npm_module_types",
   "@npm//@types/jest",
   "@npm//@types/node",
   "@npm//@types/react",
diff --git a/packages/kbn-securitysolution-list-utils/BUILD.bazel b/packages/kbn-securitysolution-list-utils/BUILD.bazel
index 363bb49f7c47..fedb8e70a0cb 100644
--- a/packages/kbn-securitysolution-list-utils/BUILD.bazel
+++ b/packages/kbn-securitysolution-list-utils/BUILD.bazel
@@ -36,6 +36,7 @@ RUNTIME_DEPS = [
   "//packages/kbn-securitysolution-list-constants",
   "//packages/kbn-securitysolution-utils",
   "@npm//lodash",
+  "@npm//uuid",
 ]
 
 TYPES_DEPS = [
@@ -44,11 +45,12 @@ TYPES_DEPS = [
   "//packages/kbn-securitysolution-io-ts-list-types:npm_module_types",
   "//packages/kbn-securitysolution-io-ts-utils",
   "//packages/kbn-securitysolution-list-constants:npm_module_types",
-  "//packages/kbn-securitysolution-utils",
+  "//packages/kbn-securitysolution-utils:npm_module_types",
   "@npm//@elastic/elasticsearch",
   "@npm//@types/jest",
   "@npm//@types/lodash",
   "@npm//@types/node",
+  "@npm//@types/uuid",
 ]
 
 jsts_transpiler(
diff --git a/packages/kbn-securitysolution-utils/BUILD.bazel b/packages/kbn-securitysolution-utils/BUILD.bazel
index c3d6b92044ef..d22e31daacd5 100644
--- a/packages/kbn-securitysolution-utils/BUILD.bazel
+++ b/packages/kbn-securitysolution-utils/BUILD.bazel
@@ -1,10 +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-securitysolution-utils"
-
 PKG_REQUIRE_NAME = "@kbn/securitysolution-utils"
+TYPES_PKG_REQUIRE_NAME = "@types/kbn__securitysolution-utils"
 
 SOURCE_FILES = glob(
   [
@@ -72,7 +72,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 +91,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-securitysolution-utils/package.json b/packages/kbn-securitysolution-utils/package.json
index 98f19e33d379..8f347972f831 100644
--- a/packages/kbn-securitysolution-utils/package.json
+++ b/packages/kbn-securitysolution-utils/package.json
@@ -4,6 +4,5 @@
   "description": "security solution utilities to use across plugins such lists, security_solution, cases, etc...",
   "license": "SSPL-1.0 OR Elastic License 2.0",
   "main": "./target_node/index.js",
-  "types": "./target_types/index.d.ts",
   "private": true
 }
diff --git a/yarn.lock b/yarn.lock
index c9b32c009329..c769e5d86d62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5936,6 +5936,10 @@
   version "0.0.0"
   uid ""
 
+"@types/kbn__securitysolution-utils@link:bazel-bin/packages/kbn-securitysolution-utils/npm_module_types":
+  version "0.0.0"
+  uid ""
+
 "@types/keyv@*":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7"