Address PR feedback, drop host runtime

Author: guw

e2e/smoke/defs.bzl

@@ -4,7 +4,7 @@ def _my_nodejs_impl(ctx):
     if ctx.attr.toolchain:
         nodeinfo = ctx.attr.toolchain[platform_common.ToolchainInfo].nodeinfo
     else:
-        nodeinfo = ctx.toolchains["@rules_nodejs//nodejs:runtime_toolchain_type"].nodeinfo
+        nodeinfo = ctx.toolchains["@rules_nodejs//nodejs:toolchain_type"].nodeinfo
     ctx.actions.run(
         inputs = [ctx.file.entry_point],
         executable = nodeinfo.node,
@@ -20,5 +20,5 @@ my_nodejs = rule(
         "out": attr.output(),
         "toolchain": attr.label(),
     },
-    toolchains = ["@rules_nodejs//nodejs:runtime_toolchain_type"],
+    toolchains = ["@rules_nodejs//nodejs:toolchain_type"],
 )

nodejs/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//nodejs/private:nodejs_toolchains_repo.bzl", "PLATFORMS")
 load("//nodejs/private:user_build_settings.bzl", "user_args")
-load(":node_toolchain_alias.bzl", "node_host_runtime_alias", "node_runtime_alias", "node_toolchain_alias")
+load(":node_toolchain_alias.bzl", "node_runtime_alias", "node_toolchain_alias")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -45,12 +45,11 @@ toolchain_type(name = "toolchain_type")
 toolchain_type(name = "runtime_toolchain_type")
 
 # Points to toolchain[":runtime_toolchain_type"]
+# Use this for executing and packaging Node applications for target platform (eg., js_binary, js_test or js_image_oci).
 node_runtime_alias(name = "current_node_runtime")
 
-# Host configuration of ":current_node_runtime"
-node_host_runtime_alias(name = "current_host_node_runtime")
-
 # Points to toolchain[":toolchain_type"]
+# Use this for tools (eg., when action execution is needed).
 node_toolchain_alias(name = "current_node_toolchain")
 
 # The platforms that are supported by the Node toolchains.

nodejs/node_toolchain_alias.bzl

@@ -15,7 +15,6 @@
 """Node toolchain aliases using toolchain resolution."""
 
 load(":semantics.bzl", "semantics")
-load(":toolchain.bzl", "NodeInfo")
 
 def _node_runtime_alias(ctx):
     """Implementation of node_runtime_alias using toolchain resolution."""
@@ -35,47 +34,17 @@ node_runtime_alias = rule(
     toolchains = [semantics.NODE_RUNTIME_TOOLCHAIN],
 )
 
-def _node_host_runtime_alias(ctx):
-    """Implementation of node_host_runtime_alias using toolchain resolution."""
-    runtime = ctx.attr._runtime
-    toolchain = runtime[NodeInfo]
-    template_variable_info = runtime[platform_common.TemplateVariableInfo]
-    default_info = runtime[DefaultInfo]
-    toolchain_info = platform_common.ToolchainInfo(nodeinfo = toolchain)
-    return [
-        toolchain,
-        template_variable_info,
-        toolchain_info,
-        default_info,
-    ]
-
-node_host_runtime_alias = rule(
-    implementation = _node_host_runtime_alias,
-    attrs = {
-        "_runtime": attr.label(
-            default = Label("//nodejs:current_node_runtime"),
-            providers = [
-                NodeInfo,
-                platform_common.TemplateVariableInfo,
-            ],
-            cfg = "exec",
-        ),
-    },
-    provides = [
-        NodeInfo,
-        platform_common.TemplateVariableInfo,
-        platform_common.ToolchainInfo,
-    ],
-)
-
 def _node_toolchain_alias(ctx):
     """An implementation of node_toolchain_alias using toolchain resolution."""
     toolchain_info = ctx.toolchains[semantics.NODE_TOOLCHAIN_TYPE]
     toolchain = toolchain_info.nodeinfo
-
+    template_variable_info = toolchain_info.template_variables
+    default_info = toolchain_info.default
     return [
         toolchain_info,
         toolchain,
+        template_variable_info,
+        default_info,
     ]
 
 node_toolchain_alias = rule(

nodejs/private/nodejs_toolchains_repo.bzl

@@ -96,7 +96,7 @@ See https://github.com/bazel-contrib/rules_nodejs/issues/3795.
 toolchain(
     name = "{platform}_toolchain",
     exec_compatible_with = {compatible_with},
-    target_compatible_with = {compatible_with}, # https://github.com/bazel-contrib/rules_nodejs/issues/3854
+    target_compatible_with = {compatible_with}, # prevent Node from this toolchain being bundled by js_image_oci to incompatible target platforms (https://github.com/bazel-contrib/rules_nodejs/issues/3854)
     toolchain = "@{user_node_repository_name}_{platform}//:toolchain",
     toolchain_type = "@rules_nodejs//nodejs:toolchain_type",
 )

nodejs/semantics.bzl

@@ -13,18 +13,21 @@
 # limitations under the License.
 """Rules NodeJS Semantics"""
 
+_NODE_TOOLCHAIN_TYPE = Label("//nodejs:toolchain_type")
+_NODE_RUNTIME_TOOLCHAIN_TYPE = Label("//nodejs:runtime_toolchain_type")
+
 def _find_node_toolchain(ctx):
-    return ctx.toolchains["@rules_nodejs//nodejs:toolchain_type"].nodeinfo
+    return ctx.toolchains[_NODE_TOOLCHAIN_TYPE].nodeinfo
 
 def _find_node_runtime_toolchain(ctx):
-    return ctx.toolchains["@rules_nodejs//nodejs:runtime_toolchain_type"].nodeinfo
+    return ctx.toolchains[_NODE_RUNTIME_TOOLCHAIN_TYPE].nodeinfo
 
 semantics = struct(
-    NODE_TOOLCHAIN_LABEL = "@rules_nodejs//nodejs:current_node_toolchain",
-    NODE_TOOLCHAIN_TYPE = "@rules_nodejs//nodejs:toolchain_type",
-    NODE_TOOLCHAIN = config_common.toolchain_type("@rules_nodejs//nodejs:toolchain_type", mandatory = True),
+    NODE_TOOLCHAIN_LABEL = Label("//nodejs:current_node_toolchain"),
+    NODE_TOOLCHAIN_TYPE = _NODE_TOOLCHAIN_TYPE,
+    NODE_TOOLCHAIN = config_common.toolchain_type(_NODE_TOOLCHAIN_TYPE, mandatory = True),
     find_node_toolchain = _find_node_toolchain,
-    NODE_RUNTIME_TOOLCHAIN_TYPE = "@rules_nodejs//nodejs:runtime_toolchain_type",
-    NODE_RUNTIME_TOOLCHAIN = config_common.toolchain_type("@rules_nodejs//nodejs:runtime_toolchain_type", mandatory = True),
+    NODE_RUNTIME_TOOLCHAIN_TYPE = _NODE_RUNTIME_TOOLCHAIN_TYPE,
+    NODE_RUNTIME_TOOLCHAIN = config_common.toolchain_type(_NODE_RUNTIME_TOOLCHAIN_TYPE, mandatory = True),
     find_node_runtime_toolchain = _find_node_runtime_toolchain,
 )