[bazel] Switch to custom closure_js_deps rule

.bazelignore

@@ -22,6 +22,7 @@ dotnet/src/webdriver/obj
 java/build/production
 java/client/build
 java/server/build
+javascript/atoms/node_modules
 javascript/grid-ui/node_modules
 javascript/selenium-webdriver/node_modules
 node_modules

MODULE.bazel

@@ -66,6 +66,7 @@ npm.npm_translate_lock(
     data = [
         "@//:package.json",
         "@//:pnpm-workspace.yaml",
+        "@//javascript/atoms:package.json",
         "@//javascript/grid-ui:package.json",
         "@//javascript/selenium-webdriver:package.json",
     ],

javascript/atoms/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
-load("//javascript:defs.bzl", "closure_test_suite")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//javascript:defs.bzl", "closure_js_deps", "closure_test_suite")
 
 package(default_visibility = ["//visibility:public"])
 

javascript/atoms/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "selenium-atoms",
+  "version": "1.0.0",
+  "private": true,
+  "description": "Build tools for Selenium Browser Automation Atoms",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SeleniumHQ/selenium.git"
+  },
+  "devDependencies": {
+    "google-closure-deps": "^20230802.0.0"
+  }
+}

javascript/chrome-driver/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
-load("//javascript:defs.bzl", "closure_fragment", "closure_lang_file", "closure_test_suite")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//javascript:defs.bzl", "closure_fragment", "closure_js_deps", "closure_lang_file", "closure_test_suite")
 
 closure_js_library(
     name = "lib",

javascript/defs.bzl

@@ -1,9 +1,11 @@
+load("//javascript/private:closure_js_deps.bzl", _closure_js_deps = "closure_js_deps")
 load("//javascript/private:fragment.bzl", _closure_fragment = "closure_fragment")
 load("//javascript/private:header.bzl", _closure_lang_file = "closure_lang_file")
 load("//javascript/private:mocha_test.bzl", _mocha_test = "mocha_test")
 load("//javascript/private:test_suite.bzl", _closure_test_suite = "closure_test_suite")
 
 closure_fragment = _closure_fragment
+closure_js_deps = _closure_js_deps
 closure_lang_file = _closure_lang_file
 closure_test_suite = _closure_test_suite
 mocha_test = _mocha_test

javascript/ie-driver/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
-load("//javascript:defs.bzl", "closure_fragment", "closure_lang_file")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//javascript:defs.bzl", "closure_fragment", "closure_js_deps", "closure_lang_file")
 
 closure_js_deps(
     name = "deps",

javascript/private/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@npm//javascript/atoms:google-closure-deps/package_json.bzl", closure_bin = "bin")
 load("@rules_python//python:defs.bzl", "py_binary")
 
 py_binary(
@@ -9,3 +10,8 @@ py_binary(
         "//visibility:public",
     ],
 )
+
+closure_bin.closure_make_deps_binary(
+    name = "closure_make_deps",
+    visibility = ["//javascript:__subpackages__"],
+)

javascript/private/closure_js_deps.bzl

@@ -0,0 +1,117 @@
+ClosureJsSrcsInfo = provider(fields = ["files"])
+
+def _closure_js_srcs_aspect_impl(target, ctx):
+    """Aspect to collect transitive .js source files from closure_js_library targets."""
+    direct = []
+    if ctx.rule.kind == "closure_js_library" and hasattr(ctx.rule.attr, "srcs"):
+        for s in ctx.rule.attr.srcs:
+            for f in s.files.to_list():
+                # Only include .js files from the main workspace, not external repos
+                if f.extension == "js" and not f.owner.workspace_name:
+                    direct.append(f)
+
+    trans = []
+    for d in getattr(ctx.rule.attr, "deps", []):
+        if ClosureJsSrcsInfo in d:
+            trans.append(d[ClosureJsSrcsInfo].files)
+
+    return [ClosureJsSrcsInfo(files = depset(direct = direct, transitive = trans))]
+
+closure_js_srcs_aspect = aspect(
+    implementation = _closure_js_srcs_aspect_impl,
+    attr_aspects = ["deps"],
+)
+
+def _collect_srcs_impl(ctx):
+    """Rule to collect all transitive JS sources from closure_js_library deps."""
+    trans = []
+    for d in ctx.attr.deps:
+        if ClosureJsSrcsInfo in d:
+            trans.append(d[ClosureJsSrcsInfo].files)
+    all_files = depset(transitive = trans)
+    return [
+        DefaultInfo(files = all_files),
+        ClosureJsSrcsInfo(files = all_files),
+    ]
+
+collect_closure_js_srcs = rule(
+    implementation = _collect_srcs_impl,
+    attrs = {
+        "deps": attr.label_list(aspects = [closure_js_srcs_aspect]),
+    },
+    provides = [ClosureJsSrcsInfo],
+)
+
+def _closure_js_deps_wrapper_impl(ctx):
+    """Wrapper rule that adds runfiles to the generated deps.js file."""
+    deps_file = ctx.file.deps_file
+    srcs_depset = ctx.attr.srcs_collector[ClosureJsSrcsInfo].files
+
+    return [
+        DefaultInfo(
+            files = depset([deps_file]),
+            runfiles = ctx.runfiles(
+                files = [deps_file],
+                transitive_files = srcs_depset,
+            ),
+        ),
+    ]
+
+_closure_js_deps_wrapper = rule(
+    implementation = _closure_js_deps_wrapper_impl,
+    attrs = {
+        "deps_file": attr.label(allow_single_file = True, mandatory = True),
+        "srcs_collector": attr.label(mandatory = True),
+    },
+)
+
+def closure_js_deps(name, deps = [], testonly = None, **kwargs):
+    """Generate a deps.js file from closure_js_library dependencies.
+
+    This macro replaces the old closure_js_deps rule from rules_closure by using
+    the closure-make-deps binary from the google-closure-deps npm package.
+
+    Args:
+        name: Name of the target. The output will be 'deps.js'.
+        deps: List of closure_js_library targets to analyze for dependencies.
+    """
+
+    srcs_collector = name + "_closure_srcs"
+    collect_closure_js_srcs(
+        name = srcs_collector,
+        deps = deps,
+        testonly = testonly,
+        visibility = ["//visibility:private"],
+    )
+
+    deps_genrule = name + "_genrule"
+    native.genrule(
+        name = deps_genrule,
+        srcs = [":" + srcs_collector],
+        outs = ["deps.js"],
+        cmd = """
+            export BAZEL_BINDIR=$(BINDIR) && \\
+            ln -sf . _main && \\
+            FILES="" && \\
+            for f in $(SRCS); do \\
+                FILES="$$FILES --file $$(pwd)/_main/$$f"; \\
+            done && \\
+            $(location //javascript/private:closure_make_deps) \\
+                --closure-path $$(pwd)/external/com_google_javascript_closure_library/closure \\
+                --no-validate \\
+                $$FILES \\
+                > $@
+        """,
+        tools = ["//javascript/private:closure_make_deps"],
+        testonly = testonly,
+        visibility = ["//visibility:private"],
+    )
+
+    # Use the wrapper rule to add runfiles to the generated deps.js
+    _closure_js_deps_wrapper(
+        name = name,
+        deps_file = deps_genrule,
+        srcs_collector = ":" + srcs_collector,
+        testonly = testonly,
+        **kwargs
+    )

javascript/webdriver/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
-load("//javascript:defs.bzl", "closure_test_suite")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//javascript:defs.bzl", "closure_js_deps", "closure_test_suite")
 
 closure_js_library(
     name = "http",

javascript/webdriver/atoms/inject/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_deps", "closure_js_library")
-load("//javascript:defs.bzl", "closure_fragment")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//javascript:defs.bzl", "closure_fragment", "closure_js_deps")
 
 package(
     default_visibility = [

pnpm-workspace.yaml

@@ -1,3 +1,4 @@
 packages:
+  - 'javascript/atoms'
   - 'javascript/grid-ui'
   - 'javascript/selenium-webdriver'