Cleanup starlark_library.bzl

Author: pcj

rules/starlark_library.bzl

@@ -1,29 +1,25 @@
-"""starlark_library.bzl is a thin wrapper over bzl_library."""
+"""starlark_library.bzl is similar to bzl_library but also provides load statement foreach file."""
 
 load("@bazel_skylib//:bzl_library.bzl", "StarlarkLibraryInfo")
 
 StarlarkLibraryFileInfo = provider(
     "Information on contained Starlark rules.",
     fields = {
+        "bazelignore": "List[str] value of ctx.attr.bazelignore",
+        "bazelversion": "str: the value of ctx.attr.bazelversion",
+        "deps": "DepSet[StarlarkLibraryFileInfo]: deps of this file",
         "label": "The label of the target rule",
-        "repo_name": "The original (non-canonical) repo (workspace!) name",
-        "srcs": "List of .bzl files",
         "loads": "load statements per .bzl file",
-        "deps": "DepSet[StarlarkLibraryFileInfo]: deps of this file",
+        "srcs": "List of .bzl files",
         "transitive_deps": "DepSet[StarlarkLibraryFileInfo]: transitive deps of this file",
-        "bazelignore": "List[str] value of ctx.attr.bazelignore",
-        "bazelversion": "str: the value of ctx.attr.bazelversion",
     },
 )
 
 def _starlark_library_impl(ctx):
-    deps = [d[StarlarkLibraryFileInfo] for d in ctx.attr.deps]
     srcs = ctx.files.srcs
+    deps = [d[StarlarkLibraryFileInfo] for d in ctx.attr.deps]
     transitive_srcs = depset(srcs, order = "postorder", transitive = [d.transitive_srcs for d in deps])
-
-    # loads = {}
-    # for k, v in ctx.attr.loads.items():
-    #     loads[Label(k)] = v
+    transitive_deps = depset(deps, order = "postorder", transitive = [d.transitive_deps for d in deps])
 
     return [
         DefaultInfo(
@@ -34,39 +30,36 @@ def _starlark_library_impl(ctx):
             transitive_srcs = transitive_srcs,
         ),
         StarlarkLibraryFileInfo(
-            label = ctx.label,
-            repo_name = ctx.attr.repo_name,
-            srcs = srcs,
-            loads = ctx.attr.loads,
             bazelignore = ctx.attr.bazelignore,
             bazelversion = ctx.attr.bazelversion,
-            transitive_deps = depset(deps, transitive = [d.transitive_deps for d in deps]),
+            deps = deps,
+            label = ctx.label,
+            loads = ctx.attr.loads,
+            srcs = srcs,
+            transitive_deps = transitive_deps,
         ),
     ]
 
 starlark_library = rule(
     implementation = _starlark_library_impl,
     attrs = {
-        "repo_name": attr.string(
-            mandatory = True,
+        "bazelignore": attr.string_list(
+            doc = "contents of the .bazelignore file, if present",
         ),
-        "srcs": attr.label_list(
-            doc = "label for the .bzl file",
-            allow_files = True,
+        "bazelversion": attr.string(
+            doc = "contents of the .bazelversion file, if present",
         ),
         "loads": attr.string_list_dict(
             doc = "load per file",
         ),
+        "srcs": attr.label_list(
+            doc = "label for the .bzl file",
+            allow_files = True,
+        ),
         "deps": attr.label_list(
             doc = "list of starlark_library rule dependencies.  These can be ",
             providers = [StarlarkLibraryFileInfo],
         ),
-        "bazelignore": attr.string_list(
-            doc = "contents of the .bazelignore file, if present",
-        ),
-        "bazelversion": attr.string(
-            doc = "contents of the .bazelversion file, if present",
-        ),
     },
     doc = "",
     provides = [DefaultInfo, StarlarkLibraryInfo, StarlarkLibraryFileInfo],