chore: allow DirectoryPathInfo to vary bazel_lib vs aspect_bazel_lib (#2421)

During the migration users will have a mix of both.

For example rules_ts uses this provider, and can't switch to bazel_lib
unless there's a release of its dependencies that permits either.

Author: alexeagle

MODULE.bazel

@@ -8,9 +8,10 @@ module(
 
 # Lower-bounds (minimum) versions for direct runtime dependencies.
 # Do not bump these unless rules_js requires a newer version to function.
-bazel_dep(name = "aspect_bazel_lib", version = "2.16.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.16.0")  # TODO(alexeagle): remove
 bazel_dep(name = "aspect_tools_telemetry", version = "0.2.8")
 bazel_dep(name = "bazel_features", version = "1.9.0")
+bazel_dep(name = "bazel_lib", version = "3.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "platforms", version = "0.0.5")
 bazel_dep(name = "rules_nodejs", version = "6.3.0")

docs/js_binary.md

@@ -35,6 +35,7 @@ bzl_library(
         "@aspect_bazel_lib//lib:expand_make_vars",
         "@aspect_bazel_lib//lib:paths",
         "@aspect_bazel_lib//lib:windows_utils",
+        "@bazel_lib//lib:directory_path",
         "@bazel_skylib//lib:dicts",
     ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []),
 )

js/private/BUILD.bazel

@@ -16,9 +16,10 @@ js_binary(
 """
 
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "COPY_FILE_TO_BIN_TOOLCHAINS")
-load("@aspect_bazel_lib//lib:directory_path.bzl", "DirectoryPathInfo")
+load("@aspect_bazel_lib//lib:directory_path.bzl", _LegacyDirectoryPathInfo = "DirectoryPathInfo")
 load("@aspect_bazel_lib//lib:expand_make_vars.bzl", "expand_locations", "expand_variables")
 load("@aspect_bazel_lib//lib:windows_utils.bzl", "create_windows_native_launcher_script")
+load("@bazel_lib//lib:directory_path.bzl", "DirectoryPathInfo")
 load(":bash.bzl", "BASH_INITIALIZE_RUNFILES")
 load(":js_helpers.bzl", "LOG_LEVELS", "envs_for_log_level", "gather_runfiles")
 
@@ -107,10 +108,10 @@ _ATTRS = {
         This is the module referenced by the `require.main` property in the runtime.
 
         This must be a target that provides a single file or a `DirectoryPathInfo`
-        from `@aspect_bazel_lib//lib::directory_path.bzl`.
+        from `@bazel_lib//lib::directory_path.bzl`.
         
         See https://github.com/bazel-contrib/bazel-lib/blob/main/docs/directory_path.md
-        for more info on creating a target that provides a `DirectoryPathInfo`.
+        for more info on creating a target that provides a `Info`.
         """,
         mandatory = True,
     ),
@@ -507,11 +508,12 @@ def _create_launcher(ctx, log_prefix_rule_set, log_prefix_rule, fixed_args = [],
     else:
         nodeinfo = ctx.toolchains["@rules_nodejs//nodejs:toolchain_type"].nodeinfo
 
-    if DirectoryPathInfo in ctx.attr.entry_point:
-        entry_point = ctx.attr.entry_point[DirectoryPathInfo].directory
+    directory_path_provider = DirectoryPathInfo if DirectoryPathInfo in ctx.attr.entry_point else _LegacyDirectoryPathInfo
+    if directory_path_provider in ctx.attr.entry_point:
+        entry_point = ctx.attr.entry_point[directory_path_provider].directory
         entry_point_path = "/".join([
-            ctx.attr.entry_point[DirectoryPathInfo].directory.short_path,
-            ctx.attr.entry_point[DirectoryPathInfo].path,
+            ctx.attr.entry_point[directory_path_provider].directory.short_path,
+            ctx.attr.entry_point[directory_path_provider].path,
         ])
     else:
         if len(ctx.files.entry_point) != 1:

js/private/js_binary.bzl

@@ -32,6 +32,13 @@ def rules_js_dependencies():
         url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.16.0/bazel-lib-v2.16.0.tar.gz",
     )
 
+    http_archive(
+        name = "bazel_lib",
+        sha256 = "6fd3b1e1a38ca744f9664be4627ced80895c7d2ee353891c172f1ab61309c933",
+        strip_prefix = "bazel-lib-3.0.0",
+        url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0/bazel-lib-v3.0.0.tar.gz",
+    )
+
     http_archive(
         name = "aspect_tools_telemetry_report",
         sha256 = "fea3bc2f9b7896ab222756c27147b1f1b8f489df8114e03d252ffff475f8bce6",