fix: overridding tsconfig outDir via ts_project(tsconfig) dict

Author: jbedard

examples/out_dir/BUILD.bazel

@@ -31,6 +31,41 @@ ts_project(
     tsconfig = {},
 )
 
+ts_project(
+    name = "out_dir-tsconfig-foo",
+    srcs = ["main.ts"],
+    declaration = True,
+    declaration_map = True,
+    out_dir = "tsconfig-foo",
+    tsconfig = "tsconfig-outdir-foo.json",
+)
+
+ts_project(
+    name = "out_dir-tsconfig-foo-overriden-to-dot",
+    srcs = ["main2.ts"],
+    declaration = True,
+    declaration_map = True,
+    extends = "tsconfig-outdir-foo.json",
+    tsconfig = {
+        "compilerOptions": {
+            "outDir": ".",
+        },
+    },
+)
+
+ts_project(
+    name = "out_dir-tsconfig-foo-overriden-to-dotslash-bar",
+    srcs = ["main2.ts"],
+    declaration = True,
+    declaration_map = True,
+    extends = "tsconfig-outdir-foo.json",
+    tsconfig = {
+        "compilerOptions": {
+            "outDir": "./bar",
+        },
+    },
+)
+
 ts_project(
     name = "out_dir-declaration_dir",
     srcs = ["main.ts"],
@@ -44,13 +79,31 @@ ts_project(
 build_test(
     name = "test",
     targets = [
-        # outputs specified by the tsconfig attr
+        # outputs specified by the tsconfig attr dict
         ":out_dir-params-dot",
         "main.js",
         "main.d.ts",
         "main.d.ts.map",
 
-        # outputs specified by the tsconfig attr
+        # outputs specified by the tsconfig attr dict
+        ":out_dir-tsconfig-foo",
+        "tsconfig-foo/main.js",
+        "tsconfig-foo/main.d.ts",
+        "tsconfig-foo/main.d.ts.map",
+
+        # outputs specified by the tsconfig attr file but overriden to '.' by tsconfig attr dict
+        ":out_dir-tsconfig-foo-overriden-to-dot",
+        "main2.js",
+        "main2.d.ts",
+        "main2.d.ts.map",
+
+        # outputs specified by the tsconfig attr file but overriden to 'bar' by tsconfig attr dict
+        ":out_dir-tsconfig-foo-overriden-to-dotslash-bar",
+        "bar/main2.js",
+        "bar/main2.d.ts",
+        "bar/main2.d.ts.map",
+
+        # outputs specified by the tsconfig attr file
         ":out_dir-tsconfig",
         "tsconfig/main.js",
         "tsconfig/main.d.ts",

examples/out_dir/main2.ts

@@ -0,0 +1 @@
+console.log('hello world')

examples/out_dir/tsconfig-outdir-foo.json

@@ -0,0 +1,7 @@
+{
+    "compilerOptions": {
+        "declaration": true,
+        "declarationMap": true,
+        "outDir": "tsconfig-foo"
+    }
+}

ts/defs.bzl

@@ -302,10 +302,14 @@ def ts_project(
         resolve_json_module = compiler_options.setdefault("resolveJsonModule", resolve_json_module)
 
         # These options are always passed on the tsc command line so don't include them
-        # in the tsconfig. At best they're redundant, but at worst we'll have a conflict
-        out_dir = compiler_options.pop("outDir", out_dir)
-        declaration_dir = compiler_options.pop("declarationDir", declaration_dir)
-        root_dir = compiler_options.pop("rootDir", root_dir)
+        # in the tsconfig if not already present. At best they're redundant, but at worst
+        # they will (minorly) differ from an extended config and we'll have a conflict.
+        #
+        # For example: an extended tsconfig contains `outDir:"foo"`, but within bazel we
+        # want to override to `outDir: "."`.
+        out_dir = compiler_options.get("outDir", out_dir)
+        declaration_dir = compiler_options.get("declarationDir", declaration_dir)
+        root_dir = compiler_options.get("rootDir", root_dir)
 
         # When generating a tsconfig.json and we set rootDir we need to add the exclude field,
         # because of these tickets (validation for not generated tsconfig is also present elsewhere):
@@ -540,6 +544,8 @@ def _invoke_custom_transpiler(type_str, transpiler, transpile_target_name, srcs,
         fail("%s attribute should be a rule/macro or a skylib partial. Got %s" % (type_str, type(transpiler)))
 
 def _clean_dir_arg(p):
-    if not p or p == "." or p == "./":
+    if p == None or p == "":
         return None
+    if p == "." or p == "./":
+        return "."
     return p.removeprefix("./")

ts/private/ts_lib.bzl

@@ -242,7 +242,7 @@ def _to_out_path(f, out_dir, root_dir):
 
     if root_dir:
         f = f.removeprefix(root_dir + "/")
-    if out_dir:
+    if out_dir and out_dir != ".":
         f = out_dir + "/" + f
     return f