chore(NA): moving @kbn/utility-types into bazel (#97151)

* chore(NA): moving @kbn/utility-types into bazel * chore(NA): solve ts config errors
elastic · Apr 15, 2021 · 2bb97f2 · 2bb97f2
1 parent 82b7082
commit 2bb97f2
Show file tree

Hide file tree

Showing 21 changed files with 128 additions and 22 deletions.
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -65,4 +65,5 @@ yarn kbn watch-bazel
 - @kbn/apm-utils
 - @kbn/config-schema
 - @kbn/tinymath
+- @kbn/utility-types
 
diff --git a/package.json b/package.json
@@ -141,7 +141,7 @@
     "@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath/npm_module",
     "@kbn/ui-framework": "link:packages/kbn-ui-framework",
     "@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps",
-    "@kbn/utility-types": "link:packages/kbn-utility-types",
+    "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module",
     "@kbn/utils": "link:packages/kbn-utils",
     "@loaders.gl/core": "^2.3.1",
     "@loaders.gl/json": "^2.3.1",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -7,5 +7,6 @@ filegroup(
       "//packages/kbn-apm-utils:build",
       "//packages/kbn-config-schema:build",
       "//packages/kbn-tinymath:build",
+      "//packages/kbn-utility-types:build",
   ],
 )
diff --git a/packages/kbn-utility-types/BUILD.bazel b/packages/kbn-utility-types/BUILD.bazel
@@ -0,0 +1,80 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+
+PKG_BASE_NAME = "kbn-utility-types"
+PKG_REQUIRE_NAME = "@kbn/utility-types"
+
+SOURCE_FILES = glob([
+  "jest/index.ts",
+  "index.ts"
+])
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "jest/package.json",
+  "package.json",
+  "README.md",
+]
+
+SRC_DEPS = [
+  "@npm//utility-types",
+]
+
+TYPES_DEPS = [
+  "@npm//@types/node",
+  "@npm//@types/jest",
+]
+
+DEPS = SRC_DEPS + TYPES_DEPS
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+  ],
+)
+
+ts_project(
+  name = "tsc",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = DEPS,
+  declaration = True,
+  declaration_map = True,
+  incremental = True,
+  out_dir = "target",
+  source_map = True,
+  root_dir = ".",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_BASE_NAME,
+  srcs = [],
+  deps = [":tsc"] + DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = [
+    ":%s" % PKG_BASE_NAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-utility-types/package.json b/packages/kbn-utility-types/package.json
@@ -9,10 +9,6 @@
     "devOnly": false
   },
   "scripts": {
-    "build": "../../node_modules/.bin/tsc",
-    "kbn:bootstrap": "../../node_modules/.bin/tsc",
-    "kbn:watch": "../../node_modules/.bin/tsc --watch",
-    "test": "../../node_modules/.bin/tsd",
-    "clean": "../../node_modules/.bin/del target"
+    "test": "../../node_modules/.bin/tsd tsd_tests"
   }
 }
diff --git a/packages/kbn-utility-types/tsconfig.json b/packages/kbn-utility-types/tsconfig.json
@@ -1,12 +1,12 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "incremental": false,
+    "incremental": true,
     "outDir": "./target",
-    "declarationDir": "./target",
     "stripInternal": true,
     "declaration": true,
     "declarationMap": true,
+    "rootDir": "./",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-utility-types",
     "types": [
@@ -17,6 +17,6 @@
   "include": [
     "index.ts",
     "jest/**/*",
-    "test-d/**/*"
+    "tsd_tests/**/*"
   ]
 }
diff --git a/packages/kbn-utility-types/tsd_tests/empty.d.ts b/packages/kbn-utility-types/tsd_tests/empty.d.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.
+ */
+
+// This is just an empty mock file to provide a workaround to run tsd correctly isolated
diff --git a/packages/kbn-utility-types/tsd_tests/package.json b/packages/kbn-utility-types/tsd_tests/package.json
@@ -0,0 +1,9 @@
+{
+  "types": "empty.d.ts",
+  "tsd": {
+    "directory": "test_d",
+    "compilerOptions": {
+      "rootDir": "../"
+    }
+  }
+}
diff --git a/...bn-utility-types/test-d/method_keys_of.ts → ...-types/tsd_tests/test_d/method_keys_of.ts b/...bn-utility-types/test-d/method_keys_of.ts → ...-types/tsd_tests/test_d/method_keys_of.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectType } from 'tsd';
-import { MethodKeysOf } from '../index';
+import { MethodKeysOf } from '../../index';
 
 class Test {
   public name: string = '';

diff --git a/...n-utility-types/test-d/public_contract.ts → ...types/tsd_tests/test_d/public_contract.ts b/...n-utility-types/test-d/public_contract.ts → ...types/tsd_tests/test_d/public_contract.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectType } from 'tsd';
-import { PublicContract } from '../index';
+import { PublicContract } from '../../index';
 
 class Test {
   public str: string = '';

diff --git a/...s/kbn-utility-types/test-d/public_keys.ts → ...ity-types/tsd_tests/test_d/public_keys.ts b/...s/kbn-utility-types/test-d/public_keys.ts → ...ity-types/tsd_tests/test_d/public_keys.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectType } from 'tsd';
-import { PublicKeys } from '../index';
+import { PublicKeys } from '../../index';
 
 class Test {
   public str: string = '';

diff --git a/...utility-types/test-d/public_methods_of.ts → ...pes/tsd_tests/test_d/public_methods_of.ts b/...utility-types/test-d/public_methods_of.ts → ...pes/tsd_tests/test_d/public_methods_of.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable, expectNotAssignable } from 'tsd';
-import { PublicMethodsOf } from '../index';
+import { PublicMethodsOf } from '../../index';
 
 class Test {
   public name: string = '';

diff --git a/...n-utility-types/test-d/shallow_promise.ts → ...types/tsd_tests/test_d/shallow_promise.ts b/...n-utility-types/test-d/shallow_promise.ts → ...types/tsd_tests/test_d/shallow_promise.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectType } from 'tsd';
-import { ShallowPromise } from '../index';
+import { ShallowPromise } from '../../index';
 
 type P1 = ShallowPromise<string>;
 type P2 = ShallowPromise<ShallowPromise<string>>;

diff --git a/...ity-types/test-d/union_to_intersection.ts → ...tsd_tests/test_d/union_to_intersection.ts b/...ity-types/test-d/union_to_intersection.ts → ...tsd_tests/test_d/union_to_intersection.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable } from 'tsd';
-import { UnionToIntersection } from '../index';
+import { UnionToIntersection } from '../../index';
 
 type INTERSECTED = UnionToIntersection<{ foo: 'bar' } | { baz: 'qux' }>;
 

diff --git a/...utility-types/test-d/unwrap_observable.ts → ...pes/tsd_tests/test_d/unwrap_observable.ts b/...utility-types/test-d/unwrap_observable.ts → ...pes/tsd_tests/test_d/unwrap_observable.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable } from 'tsd';
-import { UnwrapObservable, ObservableLike } from '../index';
+import { UnwrapObservable, ObservableLike } from '../../index';
 
 type STRING = UnwrapObservable<ObservableLike<string>>;
 

diff --git a/...bn-utility-types/test-d/unwrap_promise.ts → ...-types/tsd_tests/test_d/unwrap_promise.ts b/...bn-utility-types/test-d/unwrap_promise.ts → ...-types/tsd_tests/test_d/unwrap_promise.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable } from 'tsd';
-import { UnwrapPromise } from '../index';
+import { UnwrapPromise } from '../../index';
 
 type STRING = UnwrapPromise<Promise<string>>;
 type TUPLE = UnwrapPromise<Promise<[number, number]>>;

diff --git a/packages/kbn-utility-types/test-d/values.ts → ...-utility-types/tsd_tests/test_d/values.ts b/packages/kbn-utility-types/test-d/values.ts → ...-utility-types/tsd_tests/test_d/values.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable } from 'tsd';
-import { Values } from '../index';
+import { Values } from '../../index';
 
 // Arrays
 type STRING = Values<string[]>;

diff --git a/...ages/kbn-utility-types/test-d/writable.ts → ...tility-types/tsd_tests/test_d/writable.ts b/...ages/kbn-utility-types/test-d/writable.ts → ...tility-types/tsd_tests/test_d/writable.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import { expectAssignable } from 'tsd';
-import { Writable } from '../index';
+import { Writable } from '../../index';
 
 type WritableArray = Writable<readonly string[]>;
 expectAssignable<WritableArray>(['1']);

diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
@@ -6,7 +6,7 @@
  */
 
 import { ElasticsearchClient } from 'kibana/server';
-import { DeeplyMockedKeys } from 'packages/kbn-utility-types/target/jest';
+import { DeeplyMockedKeys } from '@kbn/utility-types/target/jest';
 import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
 import {
   AlertServiceContract,

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/transform.test.ts
@@ -19,7 +19,7 @@ jest.mock('./common', () => {
 });
 
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
-import type { DeeplyMockedKeys } from 'packages/kbn-utility-types/target/jest';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/target/jest';
 import type { ElasticsearchClient, SavedObject, SavedObjectsClientContract } from 'kibana/server';
 
 import { ElasticsearchAssetType } from '../../../../types';

diff --git a/yarn.lock b/yarn.lock
@@ -2752,7 +2752,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/utility-types@link:packages/kbn-utility-types":
+"@kbn/utility-types@link:bazel-bin/packages/kbn-utility-types/npm_module":
   version "0.0.0"
   uid ""