Get JSCompiler to compile some TS code

WORKSPACE

@@ -16,8 +16,8 @@ workspace(name = "build_bazel_rules_typescript")
 
 git_repository(
     name = "build_bazel_rules_nodejs",
+    commit = "1a3a0dea51c0e53a2871fbfaba3be178a308a7a3",
     remote = "https://github.com/bazelbuild/rules_nodejs",
-    tag = "0.2.2",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
@@ -33,12 +33,22 @@ node_repositories(package_json = ["//:package.json"])
 
 http_archive(
     name = "io_bazel_rules_go",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.7.1/rules_go-0.7.1.tar.gz",
     sha256 = "341d5eacef704415386974bc82a1783a8b7ffbff2ab6ba02375e1ca20d9b031c",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.7.1/rules_go-0.7.1.tar.gz",
 )
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
 
 go_rules_dependencies()
 
 go_register_toolchains()
+
+git_repository(
+    name = "io_bazel_rules_closure",
+    commit = "172f84fe96e07214fa7337b081648d4a61b45b93",
+    remote = "https://github.com/bazelbuild/rules_closure",
+)
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
+
+closure_repositories()

examples/closure_compiled/BUILD.bazel

@@ -0,0 +1,40 @@
+# Copyright 2017 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+package(default_visibility = ["//visibility:public"])
+
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary")
+load("//:defs.bzl", "ts_library")
+
+ts_library(
+    name = "child",
+    srcs = [
+        "greeter.ts",
+        "declarations.d.ts",
+    ],
+)
+
+ts_library(
+    name = "parent",
+    srcs = ["main.ts"],
+    deps = [":child"],
+)
+
+closure_js_binary(
+    name = "closure_compiled",
+    deps = [":parent"],
+    defs = [
+        "--jscomp_off=reportUnknownTypes",
+    ],
+)

examples/closure_compiled/declarations.d.ts

@@ -0,0 +1,3 @@
+declare function someDeclaredFunction(s: string): string;
+
+declare const someDeclaredString: string;

examples/closure_compiled/greeter.ts

@@ -0,0 +1,6 @@
+export class Greeter {
+  private greeting = 'hello, world' + someDeclaredFunction(someDeclaredString);
+  greet() {
+    return this.greeting;
+  }
+}

examples/closure_compiled/main.ts

@@ -0,0 +1,3 @@
+import {Greeter} from './greeter';
+
+console.log(new Greeter().greet());

internal/build_defs.bzl

@@ -14,6 +14,7 @@
 
 """TypeScript rules.
 """
+
 # pylint: disable=unused-argument
 # pylint: disable=missing-docstring
 load(":common/compilation.bzl", "COMMON_ATTRIBUTES", "compile_ts", "ts_providers_dict_to_struct")
@@ -25,17 +26,11 @@ def _compile_action(ctx, inputs, outputs, config_file_path):
   externs_files = []
   non_externs_files = []
   for output in outputs:
-    if output.basename.endswith(".externs.js"):
-      externs_files.append(output)
-    elif output.basename.endswith(".es5.MF"):
+    if output.basename.endswith(".es5.MF"):
       ctx.file_action(output, content="")
     else:
       non_externs_files.append(output)
 
-  # TODO(plf): For now we mock creation of files other than {name}.js.
-  for externs_file in externs_files:
-    ctx.file_action(output=externs_file, content="")
-
   action_inputs = inputs + [f for f in ctx.files.node_modules
                             if f.path.endswith(".ts") or f.path.endswith(".json")]
   if ctx.file.tsconfig:
@@ -65,7 +60,6 @@ def _compile_action(ctx, inputs, outputs, config_file_path):
       },
   )
 
-
 def _devmode_compile_action(ctx, inputs, outputs, config_file_path):
   _compile_action(ctx, inputs, outputs, config_file_path)
 
@@ -114,7 +108,6 @@ def tsc_wrapped_tsconfig(ctx,
 # ts_library   #
 # ************ #
 
-
 def _ts_library_impl(ctx):
   """Implementation of ts_library.
 
@@ -132,33 +125,35 @@ def _ts_library_impl(ctx):
 ts_library = rule(
     _ts_library_impl,
     attrs = dict(COMMON_ATTRIBUTES, **{
-        "srcs":
-            attr.label_list(
-                allow_files=FileType([
-                    ".ts",
-                    ".tsx",
-                ]),
-                mandatory=True,),
+        "srcs": attr.label_list(
+            allow_files = FileType([
+                ".ts",
+                ".tsx",
+            ]),
+            mandatory = True,
+        ),
 
         # TODO(alexeagle): reconcile with google3: ts_library rules should
         # be portable across internal/external, so we need this attribute
         # internally as well.
-        "tsconfig":
-            attr.label(allow_files = True, single_file = True),
-        "compiler":
-            attr.label(
-                default=get_tsc(),
-                single_file=False,
-                allow_files=True,
-                executable=True,
-                cfg="host"),
+        "tsconfig": attr.label(
+            allow_files = True,
+            single_file = True,
+        ),
+        "compiler": attr.label(
+            default = get_tsc(),
+            single_file = False,
+            allow_files = True,
+            executable = True,
+            cfg = "host",
+        ),
         "supports_workers": attr.bool(default = True),
         # @// is special syntax for the "main" repository
         # The default assumes the user specified a target "node_modules" in their
         # root BUILD file.
         "node_modules": attr.label(default = Label("@//:node_modules")),
     }),
     outputs = {
-        "tsconfig": "%{name}_tsconfig.json"
-    }
+        "tsconfig": "%{name}_tsconfig.json",
+    },
 )

internal/common/compilation.bzl

@@ -17,6 +17,7 @@
 
 load(":common/module_mappings.bzl", "module_mappings_aspect")
 load(":common/json_marshal.bzl", "json_marshal")
+load("@io_bazel_rules_closure//closure/private:defs.bzl", "collect_js")
 
 BASE_ATTRIBUTES = dict()
 
@@ -33,7 +34,7 @@ COMMON_ATTRIBUTES = dict(BASE_ATTRIBUTES, **{
         cfg = "data",
     ),
     # TODO(evanm): make this the default and remove the option.
-    "runtime": attr.string(default="browser"),
+    "runtime": attr.string(default = "browser"),
     # Used to determine module mappings
     "module_name": attr.string(),
     "module_root": attr.string(),
@@ -53,12 +54,11 @@ COMMON_ATTRIBUTES = dict(BASE_ATTRIBUTES, **{
     # "diagnostic:regexp", e.g. "TS1234:failed to quizzle the .* wobble".
     # Useful to test for expected compilation errors.
     "expected_diagnostics": attr.string_list(),
-
 })
 
 COMMON_OUTPUTS = {
     # Allow the tsconfig.json to be generated without running compile actions.
-    "tsconfig": "%{name}_tsconfig.json"
+    "tsconfig": "%{name}_tsconfig.json",
 }
 
 # TODO(plf): Enforce this at analysis time.
@@ -123,7 +123,6 @@ def _outputs(ctx, label):
     declarations = declaration_files,
   )
 
-
 def compile_ts(ctx,
                is_library,
                extra_dts_files=[],
@@ -292,6 +291,22 @@ def compile_ts(ctx,
   if not is_library:
     files += depset(tsickle_externs)
 
+  rerooted_es6_sources = []
+  for source in es6_sources:
+    root = source.dirname
+
+    file_path = "%s/%s" % (root, source.basename.replace(".closure", ""))
+    rooted_file = ctx.actions.declare_file(file_path)
+
+    ctx.actions.expand_template(
+        output = rooted_file,
+        template = source,
+        substitutions = {}
+    )
+    rerooted_es6_sources.append(rooted_file)
+
+  js = collect_js(ctx, ctx.attr.deps)
+
   return {
       "files": files,
       "runfiles": ctx.runfiles(
@@ -301,6 +316,14 @@ def compile_ts(ctx,
           collect_default=True,
           collect_data=True,
       ),
+      # All of the subproviders below are considered optional and MUST be
+      # accessed using getattr(x, y, default). See collect_js() in
+      # @io_bazel_rules_closure//closure/private/defs.bzl.
+      "closure_js_library": struct(
+          # NestedSet<File> of all JavaScript source File artifacts in the
+          # transitive closure. These files MUST be JavaScript.
+          srcs= js.srcs + rerooted_es6_sources,
+      ),
       # TODO(martinprobst): Prune transitive deps, only re-export what's needed.
       "typescript": {
           "declarations": declarations,

internal/tsc_wrapped/tsc_wrapped.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import * as tsickle from 'tsickle';
 import * as ts from 'typescript';
 
 import {PLUGIN as tsetsePlugin} from '../tsetse/runner';
@@ -128,6 +129,25 @@ function runOneBuild(
     return false;
   }
 
+  const emitResults: tsickle.EmitResult[] =
+      program.getSourceFiles()
+          .filter(isCompilationTarget)
+          .map(
+              file => tsickle.emitWithTsickle(
+                  program, compilerHost, (compilerHost as ts.CompilerHost),
+                  options, file));
+
+  const emitResult = tsickle.mergeEmitResults(emitResults);
+
+  let externs = '/** @externs */';
+  if (bazelOpts.tsickleGenerateExterns) {
+    externs += tsickle.getGeneratedExterns(emitResult.externs);
+  }
+
+  if (bazelOpts.tsickleExternsPath) {
+    fs.writeFileSync(bazelOpts.tsickleExternsPath, externs);
+  }
+
   for (const sf of program.getSourceFiles().filter(isCompilationTarget)) {
     const emitResult = program.emit(
         sf, /*writeFile*/ undefined,