fix: add support for swc_version_from to bzlmod extension (#298)

Author: walkerburgin

docs/repositories.md

@@ -0,0 +1 @@
+node_modules

e2e/smoke/.bazelignore

@@ -0,0 +1,4 @@
+# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
+# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
+# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
+hoist=false

e2e/smoke/.npmrc

@@ -6,9 +6,20 @@ local_path_override(
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
 
+bazel_dep(name = "aspect_rules_js", version = "2.0.0")
+
+npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
+npm.npm_translate_lock(
+    name = "npm",
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
+    verify_node_modules_ignored = "//:.bazelignore",
+)
+use_repo(npm, "npm")
+
 # Optional: specify a custom swc toolchain instead of the default
 swc = use_extension("@aspect_rules_swc//swc:extensions.bzl", "swc", dev_dependency = True)
 swc.toolchain(
     name = "swc",
-    swc_version = "v1.3.78",
+    swc_version_from = "@npm//:@swc/core/resolved.json",
 )

e2e/smoke/MODULE.bazel

@@ -0,0 +1,5 @@
+{
+    "devDependencies": {
+        "@swc/core": "~1.11.0"
+    }
+}

e2e/smoke/package.json

@@ -5,8 +5,7 @@ load(":repositories.bzl", "swc_register_toolchains")
 swc_toolchain = tag_class(attrs = {
     "name": attr.string(doc = "Base name for generated repositories"),
     "swc_version": attr.string(doc = "Explicit version of @swc/core. If provided, the package.json is not read."),
-    # TODO: support this variant
-    # "swc_version_from": attr.string(doc = "Location of package.json which may have a version for @swc/core."),
+    "swc_version_from": attr.label(doc = "Location of package.json which may have a version for @swc/core."),
 })
 
 default_repository = "swc"
@@ -23,7 +22,7 @@ def _toolchain_extension(module_ctx):
                     # Prioritize the root-most registration of the default toolchain version and
                     # ignore any further registrations (modules are processed breadth-first)
                     continue
-                if toolchain.swc_version == registrations[toolchain.name]:
+                if toolchain.swc_version == registrations[toolchain.name].swc_version and toolchain.swc_version_from == registrations[toolchain.name].swc_version_from:
                     # No problem to register a matching toolchain twice
                     continue
                 fail("Multiple conflicting toolchains declared for name {} ({} and {}".format(
@@ -32,11 +31,16 @@ def _toolchain_extension(module_ctx):
                     registrations[toolchain.name],
                 ))
             else:
-                registrations[toolchain.name] = toolchain.swc_version
-    for name, swc_version in registrations.items():
+                registrations[toolchain.name] = struct(
+                    swc_version = toolchain.swc_version,
+                    swc_version_from = toolchain.swc_version_from,
+                )
+
+    for name, registration in registrations.items():
         swc_register_toolchains(
             name = name,
-            swc_version = swc_version,
+            swc_version = registration.swc_version,
+            swc_version_from = registration.swc_version_from,
             register = False,
         )
 

e2e/smoke/pnpm-lock.yaml

@@ -71,7 +71,11 @@ def _determine_version(rctx):
 
     json_path = rctx.path(rctx.attr.swc_version_from)
     p = json.decode(rctx.read(json_path))
-    if "devDependencies" in p.keys() and _NPM_PKG in p["devDependencies"]:
+
+    # Allow use of "resolved.json", see https://github.com/aspect-build/rules_js/pull/1221
+    if "$schema" in p.keys() and p["$schema"] == "https://docs.aspect.build/rules/aspect_rules_js/docs/npm_translate_lock":
+        v = p["version"]
+    elif "devDependencies" in p.keys() and _NPM_PKG in p["devDependencies"]:
         v = p["devDependencies"][_NPM_PKG]
     elif "dependencies" in p.keys() and _NPM_PKG in p["dependencies"]:
         v = p["dependencies"][_NPM_PKG]
@@ -147,8 +151,15 @@ def swc_register_toolchains(name, swc_version = None, swc_version_from = None, r
 
     Args:
         name: base name for all created repos; we recommend `swc`
-        swc_version_from: label of a json file (typically `package.json`) which declares an exact `@swc/core` version
-            in a dependencies or devDependencies property.
+        swc_version_from: label of a json file which declares an `@swc/core` version.
+
+            This may be a `package.json` file, with "@swc/core" in the dependencies or
+            devDependencies property, and the version exactly specified.
+
+            With rules_js v1.32.0 or greater, it may also be a `resolved.json` file
+            produced by `npm_translate_lock`, such as
+            `@npm//path/to/linked:@swc/core/resolved.json`
+
             Exactly one of `swc_version` or `swc_version_from` must be set.
         swc_version: version of the swc project, from https://github.com/swc-project/swc/releases
             Exactly one of `swc_version` or `swc_version_from` must be set.