Fix exports in web_library (#611)

bazelbuild · Mar 18, 2024 · 4d1627d · 4d1627d
1 parent 915f770
commit 4d1627d
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/closure/webfiles/web_library.bzl b/closure/webfiles/web_library.bzl
@@ -19,8 +19,10 @@ load(
     "WebFilesInfo",
     "create_argfile",
     "difference",
+    "extract_providers",
     "long_path",
     "unfurl",
+    "collect_runfiles",
 )
 
 def _web_library(ctx):
@@ -40,12 +42,12 @@ def _web_library(ctx):
         fail("when \"*\" is suppressed no other items should be present")
 
     # process what came before
-    deps = unfurl(ctx.attr.deps, provider = WebFilesInfo)
+    deps = unfurl(extract_providers(ctx.attr.deps, provider = WebFilesInfo))
     webpaths = []
     manifests = []
     for dep in deps:
-        webpaths.append(dep[WebFilesInfo].webpaths)
-        manifests += [dep[WebFilesInfo].manifests]
+        webpaths.append(dep.webpaths)
+        manifests.append(dep.manifests)
 
     # process what comes now
     new_webpaths = []
@@ -103,13 +105,11 @@ def _web_library(ctx):
         args.append(category)
     inputs.extend(ctx.files.srcs)
     for dep in deps:
-        inputs.append(dep[WebFilesInfo].dummy)
-        for f in dep.files.to_list():
-            inputs.append(f)
-        direct_manifests += [dep[WebFilesInfo].manifest]
-        inputs.append(dep[WebFilesInfo].manifest)
+        inputs.append(dep.dummy)
+        direct_manifests.append(dep.manifest)
+        inputs.append(dep.manifest)
         args.append("--direct_dep")
-        args.append(dep[WebFilesInfo].manifest.path)
+        args.append(dep.manifest.path)
     for man in difference(manifests, depset(direct_manifests)):
         inputs.append(man)
         args.append("--transitive_dep")
@@ -147,30 +147,26 @@ def _web_library(ctx):
         ),
     )
 
-    transitive_runfiles = depset(
-        transitive = [ctx.attr.server.data_runfiles.files] +
-                     [dep.data_runfiles.files for dep in deps],
-    )
-
     return [
         DefaultInfo(
             files = depset([ctx.outputs.executable, ctx.outputs.dummy]),
-            runfiles = ctx.runfiles(
+            runfiles = collect_runfiles(
+                ctx,
                 files = ctx.files.srcs + ctx.files.data + [
                     manifest,
                     params_file,
                     ctx.outputs.executable,
                     ctx.outputs.dummy,
                 ],
-                transitive_files = transitive_runfiles,
+                extra_runfiles_attrs = ["server", "exports"],
             ),
         ),
         WebFilesInfo(
             manifest = manifest,
             manifests = manifests,
             webpaths = depset(transitive = webpaths),
             dummy = ctx.outputs.dummy,
-            exports = unfurl(ctx.attr.exports),
+            exports = unfurl(extract_providers(ctx.attr.exports, WebFilesInfo)),
         ),
     ]