feat(typescript): support for declarationdir on ts_project

packages/typescript/internal/ts_project.bzl

@@ -11,6 +11,7 @@ _DEFAULT_TSC = (
 
 _ATTRS = {
     "args": attr.string_list(),
+    "declarationdir": attr.string(),
     "deps": attr.label_list(providers = [DeclarationInfo]),
     "extends": attr.label_list(allow_files = [".json"]),
     "outdir": attr.string(),
@@ -63,7 +64,9 @@ def _ts_project_impl(ctx):
     if len(ctx.outputs.typings_outs) > 0:
         arguments.add_all([
             "--declarationDir",
-            _join(ctx.bin_dir.path, ctx.label.package, ctx.attr.outdir),
+            (
+                _join(ctx.bin_dir.path, ctx.label.package, ctx.attr.declarationdir) if ctx.attr.declarationdir else _join(ctx.bin_dir.path, ctx.label.package, ctx.attr.outdir)
+            ),
         ])
 
     # When users report problems, we can ask them to re-build with
@@ -115,7 +118,7 @@ def _ts_project_impl(ctx):
     if ctx.outputs.buildinfo_out:
         outputs.append(ctx.outputs.buildinfo_out)
     runtime_outputs = depset(json_outs + ctx.outputs.js_outs + ctx.outputs.map_outs)
-    typings_outputs = ctx.outputs.typings_outs + [s for s in ctx.files.srcs if s.path.endswith(".d.ts")]
+    typings_outputs = ctx.outputs.typings_outs + ctx.outputs.typing_maps_outs + [s for s in ctx.files.srcs if s.path.endswith(".d.ts")]
 
     if len(outputs) > 0:
         run_node(
@@ -230,6 +233,7 @@ def ts_project_macro(
         emit_declaration_only = False,
         tsc = None,
         validate = True,
+        declarationdir = None,
         outdir = None,
         rootdir = None,
         **kwargs):
@@ -357,6 +361,9 @@ def ts_project_macro(
 
         validate: boolean; whether to check that the tsconfig settings match the attributes.
 
+        declarationdir: a string specifying a subdirectory under the bazel-out folder where generated declaration
+            outputs are written.
+
         outdir: a string specifying a subdirectory under the bazel-out folder where outputs are written.
             Note that Bazel always requires outputs be written under a subdirectory matching the input package,
             so if your rule appears in path/to/my/package/BUILD.bazel and outdir = "foo" then the .js files
@@ -402,19 +409,22 @@ def ts_project_macro(
         )
         extra_deps.append("_validate_%s_options" % name)
 
+    typings_outdir = declarationdir if declarationdir else outdir
+
     ts_project(
         name = name,
         srcs = srcs,
         args = args,
         deps = deps + extra_deps,
         tsconfig = tsconfig,
         extends = extends,
+        declarationdir = declarationdir,
         outdir = outdir,
         rootdir = rootdir,
         js_outs = _out_paths(srcs, outdir, rootdir, ".js") if not emit_declaration_only else [],
         map_outs = _out_paths(srcs, outdir, rootdir, ".js.map") if source_map and not emit_declaration_only else [],
-        typings_outs = _out_paths(srcs, outdir, rootdir, ".d.ts") if declaration or composite else [],
-        typing_maps_outs = _out_paths(srcs, outdir, rootdir, ".d.ts.map") if declaration_map else [],
+        typings_outs = _out_paths(srcs, typings_outdir, rootdir, ".d.ts") if declaration or composite else [],
+        typing_maps_outs = _out_paths(srcs, typings_outdir, rootdir, ".d.ts.map") if declaration_map else [],
         buildinfo_out = tsconfig[:-5] + ".tsbuildinfo" if composite or incremental else None,
         tsc = tsc,
         **kwargs

packages/typescript/test/ts_project/declarationdir/BUILD.bazel

@@ -0,0 +1,36 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
+load("//packages/typescript:index.bzl", "ts_project")
+
+# Ensure that subdir/a.ts produces outDir/a.js and outDir/a.d.ts
+SRCS = [
+    "subdir/a.ts",
+]
+
+ts_project(
+    name = "tsconfig",
+    srcs = SRCS,
+    declaration = True,
+    declaration_map = True,
+    outdir = "out",
+    rootdir = "subdir",
+    source_map = True,
+)
+
+filegroup(
+    name = "types",
+    srcs = [":tsconfig"],
+    output_group = "types",
+)
+
+nodejs_test(
+    name = "test",
+    data = [
+        ":tsconfig",
+        ":types",
+    ],
+    entry_point = "verify.js",
+    templated_args = [
+        "$(locations :types)",
+        "$(locations :tsconfig)",
+    ],
+)

packages/typescript/test/ts_project/declarationdir/subdir/a.ts

@@ -0,0 +1 @@
+export const a: string = 'hello';

packages/typescript/test/ts_project/declarationdir/tsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+        "types": []
+    }
+}

packages/typescript/test/ts_project/declarationdir/verify.js

@@ -0,0 +1,8 @@
+const assert = require('assert');
+
+const types_files = process.argv.slice(2, 4);
+const code_files = process.argv.slice(4, 6);
+assert.ok(types_files.some(f => f.endsWith('declarationdir/out/a.d.ts')), 'Missing a.d.ts');
+assert.ok(types_files.some(f => f.endsWith('declarationdir/out/a.d.ts.map')), 'Missing a.d.ts.map');
+assert.ok(code_files.some(f => f.endsWith('declarationdir/out/a.js')), 'Missing a.js');
+assert.ok(code_files.some(f => f.endsWith('declarationdir/out/a.js.map')), 'Missing a.js.map');

packages/typescript/test/ts_project/declarationdir_with_value/BUILD.bazel

@@ -0,0 +1,37 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
+load("//packages/typescript:index.bzl", "ts_project")
+
+# Ensure that subdir/a.ts produces outDir/a.js and declarationDir/a.d.ts
+SRCS = [
+    "subdir/a.ts",
+]
+
+ts_project(
+    name = "tsconfig",
+    srcs = SRCS,
+    declaration = True,
+    declaration_map = True,
+    declarationdir = "out/types",
+    outdir = "out/code",
+    rootdir = "subdir",
+    source_map = True,
+)
+
+filegroup(
+    name = "types",
+    srcs = [":tsconfig"],
+    output_group = "types",
+)
+
+nodejs_test(
+    name = "test",
+    data = [
+        ":tsconfig",
+        ":types",
+    ],
+    entry_point = "verify.js",
+    templated_args = [
+        "$(locations :types)",
+        "$(locations :tsconfig)",
+    ],
+)

packages/typescript/test/ts_project/declarationdir_with_value/subdir/a.ts

@@ -0,0 +1 @@
+export const a: string = 'hello';

packages/typescript/test/ts_project/declarationdir_with_value/tsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "declaration": true,
+        "declarationMap": true,
+        "types": []
+    }
+}

packages/typescript/test/ts_project/declarationdir_with_value/verify.js

@@ -0,0 +1,15 @@
+const assert = require('assert');
+
+const types_files = process.argv.slice(2, 4);
+const code_files = process.argv.slice(4, 6);
+assert.ok(
+    types_files.some(f => f.endsWith('declarationdir_with_value/out/types/a.d.ts')),
+    'Missing a.d.ts');
+assert.ok(
+    types_files.some(f => f.endsWith('declarationdir_with_value/out/types/a.d.ts.map')),
+    'Missing a.d.ts.map');
+assert.ok(
+    code_files.some(f => f.endsWith('declarationdir_with_value/out/code/a.js')), 'Missing a.js');
+assert.ok(
+    code_files.some(f => f.endsWith('declarationdir_with_value/out/code/a.js.map')),
+    'Missing a.js.map');