Merge pull request #246 from rabbitmq/enhance-erlang_package-resolution

Enhance erlang package resolution

Author: HoloRin

BUILD.thoas

@@ -16,36 +16,26 @@ erlc_opts(
 )
 
 erlang_bytecode(
-    name = "ebin_thoas_beam",
-    srcs = ["src/thoas.erl"],
-    outs = ["ebin/thoas.beam"],
-    app_name = "thoas",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_thoas_decode_beam",
-    srcs = ["src/thoas_decode.erl"],
-    outs = ["ebin/thoas_decode.beam"],
-    app_name = "thoas",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_thoas_encode_beam",
-    srcs = ["src/thoas_encode.erl"],
-    outs = ["ebin/thoas_encode.beam"],
+    name = "other_beam",
+    srcs = [
+        "src/thoas.erl",
+        "src/thoas_decode.erl",
+        "src/thoas_encode.erl",
+    ],
+    outs = [
+        "ebin/thoas.beam",
+        "ebin/thoas_decode.beam",
+        "ebin/thoas_encode.beam",
+    ],
+    hdrs = [],
     app_name = "thoas",
+    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
-    srcs = [
-        "ebin/thoas.beam",
-        "ebin/thoas_decode.beam",
-        "ebin/thoas_encode.beam",
-    ],
+    srcs = [":other_beam"],
 )
 
 filegroup(

MODULE.bazel

@@ -33,16 +33,17 @@ erlang_package = use_extension(
     "erlang_package",
 )
 erlang_package.hex_package(
-    name = "thoas",
+    name = "thoas_rules_erlang",
+    pkg = "thoas",
     build_file = "@rules_erlang//:BUILD.thoas",
-    sha256 = "442296847aca11db8d25180693d7ca3073d6d7179f66952f07b16415306513b6",
-    version = "0.4.0",
+    sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
+    version = "1.0.0",
 )
 use_repo(
     erlang_package,
     "getopt_src",
     "xref_runner_src",
-    "thoas",
+    "thoas_rules_erlang",
 )
 
 erlang_config_extension = use_extension(

bzlmod/extensions.bzl

@@ -13,6 +13,7 @@ load(
 )
 load(
     ":semver.bzl",
+    "compatible",
     "lt",
     "version_from_string",
 )
@@ -227,24 +228,45 @@ def _newest(a, b):
             b_version = b.version,
             b_module = b.module.name,
         ))
-    elif lt(a_version, b_version):
+    if not compatible(a_version, b_version):
+        fail("Version {dep_name}@{a_version} (required by {a_module}) & {dep_name}@{b_version} (required by {b_module}) cannot be resolved (major version mismatch)".format(
+            dep_name = a.name,
+            a_version = a.version,
+            a_module = a.module.name,
+            b_version = b.version,
+            b_module = b.module.name,
+        ))
+    if lt(a_version, b_version):
         return b
     else:
         return a
 
-def _resolve_local(packages):
+def _dedupe_by_version(packages):
+    by_version = {}
+    for p in packages:
+        by_version[p.version] = p
+    return by_version.values()
+
+def _resolve_local(ctx, packages):
     deduped = []
     packages_by_name = {}
     for p in packages:
         if p.name in packages_by_name:
             packages_by_name[p.name].append(p)
         else:
             packages_by_name[p.name] = [p]
-    for (_, dupes) in packages_by_name.items():
+    for (name, dupes) in packages_by_name.items():
         p = dupes[0]
         for dupe in dupes[1:]:
             p = _newest(p, dupe)
         deduped.append(p)
+        filtered_dupes = _dedupe_by_version(dupes)
+        if len(filtered_dupes) > 1:
+            log(ctx, "Multiple versions of {} requested ({}), selecting {}".format(
+                name,
+                ", ".join([p.version for p in filtered_dupes]),
+                p.version,
+            ))
     return deduped
 
 def _erlang_package(ctx):
@@ -290,7 +312,7 @@ def _erlang_package(ctx):
                 dep = dep,
             ))
 
-    deduped = _resolve_local(packages)
+    deduped = _resolve_local(ctx, packages)
 
     resolved = _resolve_hex_pm(ctx, deduped)
 

bzlmod/semver.bzl

@@ -45,3 +45,6 @@ def lt(a, b):
 
 def eq(a, b):
     return a.major == b.major and a.minor == b.minor and a.patch == b.patch
+
+def compatible(a, b):
+    return a.major == b.major

gazelle/erl_attrs_to_json/BUILD.bazel

@@ -4,7 +4,7 @@ load("//:escript.bzl", "escript_archive")
 APP_NAME = "erl_attrs_to_json"
 APP_VERSION = "1.0.0"
 
-DEPS = ["@thoas//:erlang_app"]
+DEPS = ["@thoas_rules_erlang//:erlang_app"]
 
 erlang_app(
     name = "erlang_app",

internal_deps.bzl

@@ -68,8 +68,9 @@ filegroup(
 """,
     )
     hex_archive(
-        name = "thoas",
-        version = "0.4.0",
-        sha256 = "442296847aca11db8d25180693d7ca3073d6d7179f66952f07b16415306513b6",
+        name = "thoas_rules_erlang",
+        package_name = "thoas",
+        version = "1.0.0",
+        sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
         build_file = "@rules_erlang//:BUILD.thoas",
     )

test/BUILD.thoas

@@ -16,36 +16,26 @@ erlc_opts(
 )
 
 erlang_bytecode(
-    name = "ebin_thoas_beam",
-    srcs = ["src/thoas.erl"],
-    outs = ["ebin/thoas.beam"],
-    app_name = "thoas",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_thoas_decode_beam",
-    srcs = ["src/thoas_decode.erl"],
-    outs = ["ebin/thoas_decode.beam"],
-    app_name = "thoas",
-    erlc_opts = "//:erlc_opts",
-)
-
-erlang_bytecode(
-    name = "ebin_thoas_encode_beam",
-    srcs = ["src/thoas_encode.erl"],
-    outs = ["ebin/thoas_encode.beam"],
+    name = "other_beam",
+    srcs = [
+        "src/thoas.erl",
+        "src/thoas_decode.erl",
+        "src/thoas_encode.erl",
+    ],
+    outs = [
+        "ebin/thoas.beam",
+        "ebin/thoas_decode.beam",
+        "ebin/thoas_encode.beam",
+    ],
+    hdrs = [],
     app_name = "thoas",
+    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
-    srcs = [
-        "ebin/thoas.beam",
-        "ebin/thoas_decode.beam",
-        "ebin/thoas_encode.beam",
-    ],
+    srcs = [":other_beam"],
 )
 
 filegroup(

test/MODULE.bazel

@@ -5,7 +5,7 @@ module(
 
 bazel_dep(
     name = "platforms",
-    version = "0.0.6",
+    version = "0.0.7",
 )
 bazel_dep(
     name = "rules_go",
@@ -61,8 +61,8 @@ erlang_package = use_extension(
 erlang_package.hex_package(
     name = "thoas",
     build_file = "@//:BUILD.thoas",
-    sha256 = "442296847aca11db8d25180693d7ca3073d6d7179f66952f07b16415306513b6",
-    version = "0.4.0",
+    sha256 = "fc763185b932ecb32a554fb735ee03c3b6b1b31366077a2427d2a97f3bd26735",
+    version = "1.0.0",
 )
 use_repo(
     erlang_package,