use data_runfiles instead

Author: dbanetto

examples/BUILD

@@ -120,24 +120,24 @@ jsonnet_to_json_test(
 jsonnet_library(
     name = "code_library_lib",
     srcs = ["code_library.libsonnet"],
+    data = [":test_str_files"],
     deps = [":workflow"],
-    data = [":test_str_files"]
 )
 
 jsonnet_to_json_test(
     name = "extvar_code_library_test",
     size = "small",
     src = "extvar_code_library.jsonnet",
-    ext_code_libraries = { ":code_library_lib": "codefile" },
+    ext_code_libraries = {":code_library_lib": "codefile"},
     golden = "extvar_files_library_golden.json",
 )
 
 jsonnet_to_json_test(
     name = "tla_code_library_test",
     size = "small",
     src = "tla_code_library.jsonnet",
-    tla_code_libraries = { ":code_library_lib": "tla_code" },
     golden = "tla_code_library_golden.json",
+    tla_code_libraries = {":code_library_lib": "tla_code"},
 )
 
 jsonnet_to_json_test(

jsonnet/jsonnet.bzl

@@ -91,7 +91,7 @@ def _setup_deps(deps, tla_code_libraries = {}, ext_code_libraries = {}):
 def _jsonnet_library_impl(ctx):
     """Implementation of the jsonnet_library rule."""
     depinfo = _setup_deps(ctx.attr.deps)
-    sources = depset(ctx.files.srcs + ctx.files.data, transitive = [depinfo.transitive_sources])
+    sources = depset(ctx.files.srcs, transitive = [depinfo.transitive_sources])
     imports = depset(
         _get_import_paths(ctx.label, ctx.files.srcs, ctx.attr.imports, False),
         transitive = [depinfo.imports],
@@ -297,9 +297,15 @@ def _jsonnet_to_json_impl(ctx):
         outputs.append(compiled_json)
         command += [ctx.file.src.path, "-o", compiled_json.path]
 
-    transitive_data = depset(transitive = [dep.data_runfiles.files for dep in ctx.attr.deps] +
-                                          [l.files for l in jsonnet_tla_code_files.keys()] +
-                                          [l.files for l in jsonnet_tla_str_files.keys()])
+    transitive_data = depset(
+        transitive =
+            [dep.data_runfiles.files for dep in ctx.attr.deps] +
+            [l.files for l in jsonnet_tla_code_files.keys()] +
+            [l.files for l in jsonnet_tla_str_files.keys()] +
+            [l[DefaultInfo].data_runfiles.files for l in jsonnet_tla_code_libraries.keys()] +
+            [l[DefaultInfo].data_runfiles.files for l in jsonnet_ext_code_libraries.keys()],
+    )
+
     # NB(sparkprime): (1) transitive_data is never used, since runfiles is only
     # used when .files is pulled from it.  (2) This makes sense - jsonnet does
     # not need transitive dependencies to be passed on the commandline. It
@@ -502,7 +508,9 @@ def _jsonnet_to_json_test_impl(ctx):
     transitive_data = depset(
         transitive = [dep.data_runfiles.files for dep in ctx.attr.deps] +
                      [l.files for l in jsonnet_tla_code_files.keys()] +
-                     [l.files for l in jsonnet_tla_str_files.keys()],
+                     [l.files for l in jsonnet_tla_str_files.keys()] +
+                     [l[DefaultInfo].data_runfiles.files for l in jsonnet_tla_code_libraries.keys()] +
+                     [l[DefaultInfo].data_runfiles.files for l in jsonnet_ext_code_libraries.keys()],
     )
 
     test_inputs = (