feat: allow definition of alternative typescript repositories (#675)

e2e/external_dep/BUILD

@@ -12,6 +12,16 @@ ts_project(
     visibility = ["//visibility:public"],
 )
 
+# Demonstrate how to use a different typescript where required
+# Picks up TypeScript 3.9.9 defined in MODULE.bazel
+ts_project(
+    name = "lib.ts3",
+    srcs = ["lib.ts"],
+    composite = True,
+    out_dir = "ts3_out",
+    tsc = "@npm_typescript3//:tsc",
+)
+
 build_test(
     name = "test",
     targets = [":lib"],

e2e/external_dep/MODULE.bazel

@@ -16,4 +16,10 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 
 rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True)
 rules_ts_ext.deps()
-use_repo(rules_ts_ext, "npm_typescript")
+
+# Example demonstrating that you can also have a second typescript version
+rules_ts_ext.deps(
+    name = "npm_typescript3",
+    ts_version = "3.9.9",
+)
+use_repo(rules_ts_ext, "npm_typescript", "npm_typescript3")

e2e/external_dep/WORKSPACE

@@ -7,6 +7,11 @@ load("@aspect_rules_ts//ts:repositories.bzl", "LATEST_TYPESCRIPT_VERSION", "rule
 
 rules_ts_dependencies(ts_version = LATEST_TYPESCRIPT_VERSION)
 
+rules_ts_dependencies(
+    name = "npm_typescript3",
+    ts_version = "3.9.9",
+)
+
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()

ts/extensions.bzl

@@ -12,6 +12,7 @@ def _extension_impl(module_ctx):
             if not ts_version and not attr.ts_version_from:
                 ts_version = LATEST_TYPESCRIPT_VERSION
             npm_dependencies(
+                name = attr.name,
                 ts_version = ts_version,
                 ts_version_from = attr.ts_version_from,
                 ts_integrity = attr.ts_integrity,
@@ -22,6 +23,7 @@ ext = module_extension(
     implementation = _extension_impl,
     tag_classes = {
         "deps": tag_class(attrs = {
+            "name": attr.string(default = "npm_typescript"),
             "ts_version": attr.string(),
             "ts_version_from": attr.label(),
             "ts_integrity": attr.string(),

ts/private/npm_repositories.bzl

@@ -78,13 +78,13 @@ http_archive_version = repository_rule(
 )
 
 # buildifier: disable=function-docstring
-def npm_dependencies(ts_version_from = None, ts_version = None, ts_integrity = None, bzlmod = False):
+def npm_dependencies(name = "npm_typescript", ts_version_from = None, ts_version = None, ts_integrity = None, bzlmod = False):
     if (ts_version and ts_version_from) or (not ts_version_from and not ts_version):
         fail("""Exactly one of 'ts_version' or 'ts_version_from' must be set.""")
 
     maybe(
         http_archive_version,
-        name = "npm_typescript",
+        name = name,
         bzlmod = bzlmod,
         version = ts_version,
         version_from = ts_version_from,

ts/repositories.bzl

@@ -49,12 +49,13 @@ def rules_ts_bazel_dependencies():
         url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.2.0/rules_nodejs-v6.2.0.tar.gz",
     )
 
-def rules_ts_dependencies(ts_version_from = None, ts_version = None, ts_integrity = None):
+def rules_ts_dependencies(name = "npm_typescript", ts_version_from = None, ts_version = None, ts_integrity = None):
     """Dependencies needed by users of rules_ts.
 
     To skip fetching the typescript package, call `rules_ts_bazel_dependencies` instead.
 
     Args:
+        name: name of the resulting external repository containing the TypeScript compiler.
         ts_version_from: label of a json file which declares a typescript version.
 
             This may be a `package.json` file, with "typescript" in the dependencies or
@@ -76,6 +77,7 @@ def rules_ts_dependencies(ts_version_from = None, ts_version = None, ts_integrit
     rules_ts_bazel_dependencies()
 
     npm_dependencies(
+        name = name,
         ts_version_from = ts_version_from,
         ts_version = ts_version,
         ts_integrity = ts_integrity,