build: migrate to in-repo ts_project with strict deps (#64306)

alan-agius4 · AndrewKushnir · commit 9af3cf7b0b58 · 2025-10-09T10:00:31.000-07:00
This commit migrates the vscode-ng-language-service to use the in-repo `ts_project` macro, which has strict dependency checking enabled. This improves build-time dependency validation and helps ensure that all dependencies are explicitly declared. As part of this change, redundant `tsconfig.json` files have been removed in favor of a centralized configuration, and `jasmine_test` rules have been updated to the standard macro. A minor code adjustment in `server/src/session.ts` was also made to improve error handling. PR Close #64306
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -78,6 +78,9 @@ def _determine_tsconfig(testonly):
     if native.package_name().startswith("tools"):
         return "//tools:tsconfig_test" if testonly else "//tools:tsconfig_build"
 
+    if native.package_name().startswith("vscode-ng-language-service"):
+        return "//vscode-ng-language-service:tsconfig_test" if testonly else "//vscode-ng-language-service:tsconfig_build"
+
     fail("Failing... a tsconfig value must be provided.")
 
 def ts_project(
diff --git a/vscode-ng-language-service/BUILD.bazel b/vscode-ng-language-service/BUILD.bazel
@@ -14,11 +14,20 @@ js_library(
 )
 
 ts_config(
-    name = "tsconfig",
+    name = "tsconfig_build",
     src = "tsconfig.json",
     visibility = ["//visibility:public"],
 )
 
+ts_config(
+    name = "tsconfig_test",
+    src = "tsconfig-test.json",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":tsconfig_build",
+    ],
+)
+
 expand_template_rule(
     name = "package_json_expanded",
     out = "package_expanded.json",
diff --git a/vscode-ng-language-service/client/BUILD.bazel b/vscode-ng-language-service/client/BUILD.bazel
@@ -1,15 +1,4 @@
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    visibility = ["//vscode-ng-language-service/client:__subpackages__"],
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/common:tsconfig",
-    ],
-)
 
 esbuild(
     name = "index",
diff --git a/vscode-ng-language-service/client/src/BUILD.bazel b/vscode-ng-language-service/client/src/BUILD.bazel
@@ -1,11 +1,8 @@
-load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "src",
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service/client:tsconfig",
     visibility = [
         "//vscode-ng-language-service/client:__subpackages__",
     ],
diff --git a/vscode-ng-language-service/client/src/tests/BUILD.bazel b/vscode-ng-language-service/client/src/tests/BUILD.bazel
@@ -1,21 +1,10 @@
-load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/client:tsconfig",
-    ],
-)
+load("@devinfra//bazel/jasmine:jasmine.bzl", "jasmine_test")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "tests",
+    testonly = True,
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = ":tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
         "//vscode-ng-language-service:node_modules/@types/vscode",
diff --git a/vscode-ng-language-service/client/src/tests/tsconfig.json b/vscode-ng-language-service/client/src/tests/tsconfig.json
diff --git a/vscode-ng-language-service/client/src/tests/tsconfig.tsbuildinfo b/vscode-ng-language-service/client/src/tests/tsconfig.tsbuildinfo
diff --git a/vscode-ng-language-service/client/tsconfig.json b/vscode-ng-language-service/client/tsconfig.json
diff --git a/vscode-ng-language-service/common/BUILD.bazel b/vscode-ng-language-service/common/BUILD.bazel
@@ -1,23 +1,8 @@
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    visibility = [
-        "//vscode-ng-language-service/client:__subpackages__",
-        "//vscode-ng-language-service/common:__subpackages__",
-        "//vscode-ng-language-service/integration:__subpackages__",
-        "//vscode-ng-language-service/server:__subpackages__",
-    ],
-    deps = ["//vscode-ng-language-service:tsconfig"],
-)
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "common",
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = ":tsconfig",
     visibility = [
         "//vscode-ng-language-service/client:__subpackages__",
         "//vscode-ng-language-service/common:__subpackages__",
diff --git a/vscode-ng-language-service/common/tests/BUILD.bazel b/vscode-ng-language-service/common/tests/BUILD.bazel
@@ -1,21 +1,10 @@
-load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/common:tsconfig",
-    ],
-)
+load("@devinfra//bazel/jasmine:jasmine.bzl", "jasmine_test")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "tests",
+    testonly = True,
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = ":tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
         "//vscode-ng-language-service/common",
diff --git a/vscode-ng-language-service/common/tests/tsconfig.json b/vscode-ng-language-service/common/tests/tsconfig.json
diff --git a/vscode-ng-language-service/common/tests/tsconfig.tsbuildinfo b/vscode-ng-language-service/common/tests/tsconfig.tsbuildinfo
diff --git a/vscode-ng-language-service/common/tsconfig.json b/vscode-ng-language-service/common/tsconfig.json
diff --git a/vscode-ng-language-service/integration/BUILD.bazel b/vscode-ng-language-service/integration/BUILD.bazel
@@ -1,16 +1,8 @@
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig-test",
-    src = "tsconfig-test.json",
-    visibility = ["//vscode-ng-language-service/integration:__subpackages__"],
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-    ],
-)
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "integration",
+    testonly = True,
     srcs = [
         "test_constants.ts",
     ],
@@ -23,9 +15,6 @@ ts_project(
         "//vscode-ng-language-service/integration/project:node_modules/@angular/core",
         "//vscode-ng-language-service/server:index",
     ],
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service:tsconfig",
     visibility = ["//vscode-ng-language-service/integration:__subpackages__"],
     deps = [
         "//vscode-ng-language-service:node_modules/@types/node",
diff --git a/vscode-ng-language-service/integration/e2e/BUILD.bazel b/vscode-ng-language-service/integration/e2e/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "e2e",
@@ -8,11 +8,7 @@ ts_project(
     data = [
         "//vscode-ng-language-service:node_modules/jasmine",
         "//vscode-ng-language-service:node_modules/jasmine-reporters",
-        "//vscode-ng-language-service:node_modules/xvfb",
     ],
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service:tsconfig",
     visibility = [
         "//vscode-ng-language-service/integration:__subpackages__",
     ],
@@ -22,6 +18,7 @@ ts_project(
         "//vscode-ng-language-service:node_modules/@types/node",
         "//vscode-ng-language-service:node_modules/@types/vscode",
         "//vscode-ng-language-service:node_modules/@vscode/test-electron",
+        "//vscode-ng-language-service:node_modules/xvfb",
         "//vscode-ng-language-service/integration",
     ],
 )
diff --git a/vscode-ng-language-service/integration/lsp/BUILD.bazel b/vscode-ng-language-service/integration/lsp/BUILD.bazel
@@ -10,7 +10,6 @@ ts_project(
         "//vscode-ng-language-service/integration",
         "//vscode-ng-language-service/server:index",
     ],
-    tsconfig = "//vscode-ng-language-service/integration:tsconfig-test",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
         "//vscode-ng-language-service:node_modules/@types/node",
diff --git a/vscode-ng-language-service/server/BUILD.bazel b/vscode-ng-language-service/server/BUILD.bazel
@@ -1,22 +1,10 @@
 load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template_rule")
 load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages(name = "node_modules")
 
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    visibility = [
-        "//vscode-ng-language-service/server:__subpackages__",
-    ],
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-    ],
-)
-
 esbuild(
     name = "banner",
     config = {
diff --git a/vscode-ng-language-service/server/src/BUILD.bazel b/vscode-ng-language-service/server/src/BUILD.bazel
@@ -1,11 +1,8 @@
-load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "src",
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service/server:tsconfig",
     visibility = [
         "//vscode-ng-language-service/server:__subpackages__",
     ],
diff --git a/vscode-ng-language-service/server/src/session.ts b/vscode-ng-language-service/server/src/session.ts
@@ -948,7 +948,7 @@ export class Session {
         this.isProjectLoading = false;
         this.connection.sendNotification(ProjectLoadingFinish);
       }
-      if (error.stack) {
+      if (error instanceof Error && error.stack) {
         this.error(error.stack);
       }
       throw error;
diff --git a/vscode-ng-language-service/server/src/tests/BUILD.bazel b/vscode-ng-language-service/server/src/tests/BUILD.bazel
@@ -1,23 +1,13 @@
-load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
-
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    deps = [
-        "//vscode-ng-language-service:tsconfig",
-        "//vscode-ng-language-service/server:tsconfig",
-    ],
-)
+load("@devinfra//bazel/jasmine:jasmine.bzl", "jasmine_test")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "tests",
+    testonly = True,
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = ":tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
+        "//vscode-ng-language-service/server:node_modules/typescript",
         "//vscode-ng-language-service/server/src",
     ],
 )
diff --git a/vscode-ng-language-service/server/tsconfig.json b/vscode-ng-language-service/server/tsconfig.json
diff --git a/vscode-ng-language-service/syntaxes/BUILD.bazel b/vscode-ng-language-service/syntaxes/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 load("@aspect_rules_js//js:defs.bzl", "js_library", "js_run_binary")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
 
 js_run_binary(
     name = "build",
@@ -40,18 +39,8 @@ js_library(
     visibility = ["//vscode-ng-language-service/syntaxes:__subpackages__"],
 )
 
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
-    visibility = ["//vscode-ng-language-service/syntaxes:__subpackages__"],
-    deps = ["//vscode-ng-language-service:tsconfig"],
-)
-
 filegroup(
     name = "npm_files",
-    srcs = glob(
-        ["*.json"],
-        exclude = ["tsconfig.json"],
-    ),
+    srcs = glob(["*.json"]),
     visibility = ["//vscode-ng-language-service:__pkg__"],
 )
diff --git a/vscode-ng-language-service/syntaxes/src/BUILD.bazel b/vscode-ng-language-service/syntaxes/src/BUILD.bazel
@@ -1,12 +1,9 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "src",
     srcs = glob(["*.ts"]),
-    declaration = True,
-    source_map = True,
-    tsconfig = "//vscode-ng-language-service/syntaxes:tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/node",
     ],
diff --git a/vscode-ng-language-service/syntaxes/test/BUILD.bazel b/vscode-ng-language-service/syntaxes/test/BUILD.bazel
@@ -1,19 +1,18 @@
-load("@aspect_rules_jasmine//jasmine:defs.bzl", "jasmine_test")
-load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
+load("@devinfra//bazel/jasmine:jasmine.bzl", "jasmine_test")
+load("//tools:defaults.bzl", "ts_config", "ts_project")
 
 ts_config(
     name = "tsconfig",
     src = "tsconfig.json",
     visibility = ["//vscode-ng-language-service/syntaxes:__subpackages__"],
-    deps = ["//vscode-ng-language-service:tsconfig"],
+    deps = ["//vscode-ng-language-service:tsconfig_build"],
 )
 
 ts_project(
     name = "tests",
+    testonly = True,
     srcs = glob(["*.ts"]),
-    declaration = True,
     resolve_json_module = True,
-    source_map = True,
     tsconfig = ":tsconfig",
     deps = [
         "//vscode-ng-language-service:node_modules/@types/jasmine",
diff --git a/vscode-ng-language-service/tsconfig-test.json b/vscode-ng-language-service/tsconfig-test.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "types": ["node", "jasmine"]
   }
diff --git a/vscode-ng-language-service/tsconfig.json b/vscode-ng-language-service/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2017",
     "module": "commonjs",
     "moduleResolution": "node",
+    "types": ["node"],
     "sourceMap": true,
     "strict": true,
     "esModuleInterop": true,
