fix: transitive bzlmod usage of rules_ts

jbedard · jbedard · commit 5db3d0f0c086 · 2025-08-08T17:49:04.000-07:00
diff --git a/e2e/bzlmodules/.bazelignore b/e2e/bzlmodules/.bazelignore
@@ -0,0 +1,3 @@
+module_a
+module_b
+module_c
diff --git a/e2e/bzlmodules/BUILD.bazel b/e2e/bzlmodules/BUILD.bazel
@@ -0,0 +1,10 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+
+build_test(
+    name = "module-tests",
+    targets = [
+        "@module_a//:content",
+        # "@module_b//:all",
+        "@module_c//:module_a_content_tar",
+    ],
+)
diff --git a/e2e/bzlmodules/MODULE.bazel b/e2e/bzlmodules/MODULE.bazel
@@ -0,0 +1,24 @@
+# The root module must do the override despite not directly using the module
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../..",
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.8.1")
+bazel_dep(name = "module_a")
+local_path_override(
+    module_name = "module_a",
+    path = "./module_a",
+)
+
+# bazel_dep(name = "module_b")
+# local_path_override(
+#     module_name = "module_b",
+#     path = "./module_b",
+# )
+
+bazel_dep(name = "module_c")
+local_path_override(
+    module_name = "module_c",
+    path = "./module_c",
+)
diff --git a/e2e/bzlmodules/WORKSPACE b/e2e/bzlmodules/WORKSPACE
diff --git a/e2e/bzlmodules/module_a/.bazelrc b/e2e/bzlmodules/module_a/.bazelrc
@@ -0,0 +1,2 @@
+#common --@aspect_rules_ts//ts:skipLibCheck=always
+common --@aspect_rules_ts//ts:default_to_tsc_transpiler
diff --git a/e2e/bzlmodules/module_a/BUILD.bazel b/e2e/bzlmodules/module_a/BUILD.bazel
@@ -0,0 +1,16 @@
+load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
+
+ts_config(
+    name = "tsconfig",
+    src = "tsconfig.json",
+)
+
+ts_project(
+    name = "content",
+    srcs = ["content.ts"],
+    declaration = True,
+    declaration_map = True,
+    source_map = True,
+    tsconfig = ":tsconfig",
+    visibility = ["//visibility:public"],
+)
diff --git a/e2e/bzlmodules/module_a/MODULE.bazel b/e2e/bzlmodules/module_a/MODULE.bazel
@@ -0,0 +1,13 @@
+module(name = "module_a")
+
+bazel_dep(name = "aspect_rules_ts", version = "0.0.0")
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../../..",
+)
+
+rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
+rules_ts_ext.deps(
+    ts_version_from = "//:package.json",
+)
+use_repo(rules_ts_ext, "npm_typescript")
diff --git a/e2e/bzlmodules/module_a/WORKSPACE b/e2e/bzlmodules/module_a/WORKSPACE
diff --git a/e2e/bzlmodules/module_a/content.ts b/e2e/bzlmodules/module_a/content.ts
@@ -0,0 +1 @@
+export const CONTENT = 'content'
diff --git a/e2e/bzlmodules/module_a/package.json b/e2e/bzlmodules/module_a/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "module_a",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "packageManager": "pnpm@10.14.0",
+    "dependencies": {
+        "typescript": "5.8.3"
+    }
+}
diff --git a/e2e/bzlmodules/module_a/pnpm-lock.yaml b/e2e/bzlmodules/module_a/pnpm-lock.yaml
diff --git a/e2e/bzlmodules/module_a/tsconfig.json b/e2e/bzlmodules/module_a/tsconfig.json
@@ -0,0 +1,43 @@
+{
+    // Visit https://aka.ms/tsconfig to read more about this file
+    "compilerOptions": {
+        // File Layout
+        // "rootDir": "./src",
+        // "outDir": "./dist",
+
+        // Environment Settings
+        // See also https://aka.ms/tsconfig/module
+        "module": "nodenext",
+        "target": "esnext",
+        "types": [],
+        // For nodejs:
+        // "lib": ["esnext"],
+        // "types": ["node"],
+        // and npm install -D @types/node
+
+        // Other Outputs
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+
+        // Stricter Typechecking Options
+        "noUncheckedIndexedAccess": true,
+        "exactOptionalPropertyTypes": true,
+
+        // Style Options
+        // "noImplicitReturns": true,
+        // "noImplicitOverride": true,
+        // "noUnusedLocals": true,
+        // "noUnusedParameters": true,
+        // "noFallthroughCasesInSwitch": true,
+        // "noPropertyAccessFromIndexSignature": true,
+
+        // Recommended Options
+        "strict": true,
+        "jsx": "react-jsx",
+        "isolatedModules": true,
+        "noUncheckedSideEffectImports": true,
+        "moduleDetection": "force",
+        "skipLibCheck": true
+    }
+}
diff --git a/e2e/bzlmodules/module_b/.bazelrc b/e2e/bzlmodules/module_b/.bazelrc
@@ -0,0 +1,2 @@
+common --@aspect_rules_ts//ts:skipLibCheck=always
+common --@aspect_rules_ts//ts:default_to_tsc_transpiler
diff --git a/e2e/bzlmodules/module_b/BUILD.bazel b/e2e/bzlmodules/module_b/BUILD.bazel
@@ -0,0 +1,17 @@
+load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
+
+ts_config(
+    name = "tsconfig",
+    src = "tsconfig.json",
+)
+
+ts_project(
+    name = "consumer",
+    srcs = ["consumer.ts"],
+    declaration = True,
+    declaration_map = True,
+    source_map = True,
+    tsconfig = ":tsconfig",
+    visibility = ["//visibility:public"],
+    deps = ["@module_a//:content"],
+)
diff --git a/e2e/bzlmodules/module_b/MODULE.bazel b/e2e/bzlmodules/module_b/MODULE.bazel
@@ -0,0 +1,19 @@
+module(name = "module_b")
+
+bazel_dep(name = "aspect_rules_ts", version = "0.0.0")
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../../..",
+)
+
+rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
+rules_ts_ext.deps(
+    ts_version_from = "//:package.json",
+)
+use_repo(rules_ts_ext, "npm_typescript")
+
+bazel_dep(name = "module_a")
+local_path_override(
+    module_name = "module_a",
+    path = "../module_a",
+)
diff --git a/e2e/bzlmodules/module_b/WORKSPACE b/e2e/bzlmodules/module_b/WORKSPACE
diff --git a/e2e/bzlmodules/module_b/consumer.ts b/e2e/bzlmodules/module_b/consumer.ts
@@ -0,0 +1,3 @@
+import { CONTENT } from '../module_a/content'
+
+console.log(CONTENT)
diff --git a/e2e/bzlmodules/module_b/package.json b/e2e/bzlmodules/module_b/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "module_b",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "packageManager": "pnpm@10.14.0",
+    "dependencies": {
+        "typescript": "5.8.3"
+    }
+}
diff --git a/e2e/bzlmodules/module_b/pnpm-lock.yaml b/e2e/bzlmodules/module_b/pnpm-lock.yaml
diff --git a/e2e/bzlmodules/module_b/tsconfig.json b/e2e/bzlmodules/module_b/tsconfig.json
@@ -0,0 +1,43 @@
+{
+    // Visit https://aka.ms/tsconfig to read more about this file
+    "compilerOptions": {
+        // File Layout
+        // "rootDir": "./src",
+        // "outDir": "./dist",
+
+        // Environment Settings
+        // See also https://aka.ms/tsconfig/module
+        "module": "nodenext",
+        "target": "esnext",
+        "types": [],
+        // For nodejs:
+        // "lib": ["esnext"],
+        // "types": ["node"],
+        // and npm install -D @types/node
+
+        // Other Outputs
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+
+        // Stricter Typechecking Options
+        "noUncheckedIndexedAccess": true,
+        "exactOptionalPropertyTypes": true,
+
+        // Style Options
+        // "noImplicitReturns": true,
+        // "noImplicitOverride": true,
+        // "noUnusedLocals": true,
+        // "noUnusedParameters": true,
+        // "noFallthroughCasesInSwitch": true,
+        // "noPropertyAccessFromIndexSignature": true,
+
+        // Recommended Options
+        "strict": true,
+        "jsx": "react-jsx",
+        "isolatedModules": true,
+        "noUncheckedSideEffectImports": true,
+        "moduleDetection": "force",
+        "skipLibCheck": true
+    }
+}
diff --git a/e2e/bzlmodules/module_c/.bazelrc b/e2e/bzlmodules/module_c/.bazelrc
@@ -0,0 +1,3 @@
+# Doesn't work because this module does not depend on aspect_rules_ts.
+# common --@aspect_rules_ts//ts:skipLibCheck=always
+# common --@aspect_rules_ts//ts:default_to_tsc_transpiler
diff --git a/e2e/bzlmodules/module_c/.bazelversion b/e2e/bzlmodules/module_c/.bazelversion
@@ -0,0 +1 @@
+8.x
diff --git a/e2e/bzlmodules/module_c/BUILD.bazel b/e2e/bzlmodules/module_c/BUILD.bazel
@@ -0,0 +1,7 @@
+load("@tar.bzl", "tar")
+
+tar(
+    name = "module_a_content_tar",
+    srcs = ["@module_a//:content"],
+    visibility = ["//visibility:public"],
+)
diff --git a/e2e/bzlmodules/module_c/MODULE.bazel b/e2e/bzlmodules/module_c/MODULE.bazel
@@ -0,0 +1,13 @@
+module(name = "module_c")
+
+bazel_dep(name = "tar.bzl", version = "0.4.0")
+bazel_dep(name = "module_a")
+local_path_override(
+    module_name = "module_a",
+    path = "../module_a",
+)
+
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../../../",
+)
diff --git a/e2e/bzlmodules/module_c/WORKSPACE b/e2e/bzlmodules/module_c/WORKSPACE
diff --git a/ts/BUILD.bazel b/ts/BUILD.bazel
@@ -8,53 +8,6 @@ exports_files(
     visibility = ["//visibility:public"],
 )
 
-_skip_lib_check_selection_required = """
-
-######## Required Typecheck Performance Selection ########
-
-TypeScript's type-checking exposes a flag `--skipLibCheck`:
-https://www.typescriptlang.org/tsconfig#skipLibCheck
-
-Using this flag saves substantial time during type-checking.
-Rather than doing a full check of all d.ts files, TypeScript will only type-check the code you
-specifically refer to in your app's source code.
-We recommend this for most rules_ts users.
-
-HOWEVER this performance improvement comes at the expense of type-system accuracy. 
-For example, two packages could define two copies of the same type in an inconsistent way.
-If you publish a library from your repository, your incorrect types may result in errors for your users.
-
-You must choose exactly one of the following flags:
-
-1. To choose the faster performance put this in /.bazelrc:
-
-    # passes an argument `--skipLibCheck` to *every* spawn of tsc
-    # Bazel 6.4 or greater: 'common' means 'any command that supports this flag'
-    common --@aspect_rules_ts//ts:skipLibCheck=always
-
-    # Between Bazel 6.0 and 6.3, you need all of this, to avoid discarding the analysis cache:
-    build --@aspect_rules_ts//ts:skipLibCheck=always
-    fetch --@aspect_rules_ts//ts:skipLibCheck=always
-    query --@aspect_rules_ts//ts:skipLibCheck=always
-
-    # Before Bazel 6.0, only the 'build' and 'fetch' lines work.
-
-2. To choose more correct typechecks, put this in /.bazelrc:
-
-    # honor the setting of `skipLibCheck` in the tsconfig.json file
-    # Bazel 6.4 or greater: 'common' means 'any command that supports this flag'
-    common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
-
-    # Between Bazel 6.0 and 6.3, you need all of this, to avoid discarding the analysis cache:
-    build --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
-    fetch --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
-    query --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
-
-    # Before Bazel 6.0, only the 'build' and 'fetch' lines work.
-
-##########################################################
-"""
-
 # Users can enable with --@aspect_rules_ts//ts:skipLibCheck=always
 string_flag(
     # Note: this name is chosen to be searchable when users look for "skipLibCheck" in their repo,
@@ -144,10 +97,10 @@ options(
     }),
     skip_lib_check = select(
         {
-            "@aspect_rules_ts//ts:skip_lib_check.always": True,
-            "@aspect_rules_ts//ts:skip_lib_check.honor_tsconfig": False,
+            "@aspect_rules_ts//ts:skip_lib_check.always": "always",
+            "@aspect_rules_ts//ts:skip_lib_check.honor_tsconfig": "honor_tsconfig",
+            "//conditions:default": "",
         },
-        no_match_error = _skip_lib_check_selection_required,
     ),
     supports_workers = select({
         ":supports_workers_flag": True,
diff --git a/ts/private/options.bzl b/ts/private/options.bzl
diff --git a/ts/private/ts_project.bzl b/ts/private/ts_project.bzl

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#common --@aspect_rules_ts//ts:skipLibCheck=always`
	`2`	`+common --@aspect_rules_ts//ts:default_to_tsc_transpiler`