Ability to explicitly specify output files in apple_core_data_model rule

apple/internal/resource_actions/datamodel.bzl

@@ -109,6 +109,7 @@ def generate_datamodels(
         datamodel_path,
         input_files,
         output_dir,
+        outputs,
         platform_prerequisites,
         xctoolrunner,
         swift_version = None):
@@ -119,6 +120,7 @@ def generate_datamodels(
         datamodel_path: The path to the directory containing the datamodels.
         input_files: The list of files to process for the given datamodel.
         output_dir: The output directory reference where generated datamodel classes will be.
+        outputs: The list of generated datamodel files or the directory containing those files.
         platform_prerequisites: Struct containing information on the platform being targeted.
         xctoolrunner: A files_to_run for the wrapper around the "xcrun" tool.
         swift_version: (optional) Target Swift version for generated datamodel classes.
@@ -136,9 +138,9 @@ def generate_datamodels(
         args.add("--swift-version", swift_version)
 
     args.add(xctoolrunner_support.prefixed_path(datamodel_path))
-    args.add(xctoolrunner_support.prefixed_path(output_dir.path))
+    args.add(xctoolrunner_support.prefixed_path(output_dir))
 
-    args.add("--xctoolrunner_assert_nonempty_dir", output_dir.path)
+    args.add("--xctoolrunner_assert_nonempty_dir", output_dir)
 
     apple_support.run(
         actions = actions,
@@ -147,6 +149,6 @@ def generate_datamodels(
         executable = xctoolrunner,
         inputs = input_files,
         mnemonic = "MomGenerate",
-        outputs = [output_dir],
+        outputs = outputs,
         xcode_config = platform_prerequisites.xcode_version_config,
     )

apple/internal/resource_rules/apple_core_data_model.bzl

@@ -85,8 +85,13 @@ def _apple_core_data_model_impl(ctx):
         ["xcdatamodeld"],
         attr = "datamodels",
     )
+    output_file_groups = group_files_by_directory(
+        ctx.outputs.outs,
+        ["coredata.sources"],
+        attr = "sources",
+    )
 
-    output_files = []
+    output_files = list(ctx.outputs.outs)
     for datamodel_path, files in datamodel_groups.items():
         datamodel_name = paths.replace_extension(
             paths.basename(datamodel_path),
@@ -97,20 +102,24 @@ def _apple_core_data_model_impl(ctx):
             datamodel_name.lower(),
             ctx.label.name,
         )
-        output_dir = actions.declare_directory(dir_name)
+        output_dir_path = "{}/{}/{}".format(ctx.genfiles_dir.path, ctx.label.package, dir_name)
+        data_model_outputs = output_file_groups.get(output_dir_path, depset()).to_list()
+        if len(data_model_outputs) == 0:
+            output_dir = actions.declare_directory(dir_name)
+            data_model_outputs.append(output_dir)
+            output_files.append(output_dir)
 
         resource_actions.generate_datamodels(
             actions = actions,
             datamodel_path = datamodel_path,
             input_files = files.to_list(),
-            output_dir = output_dir,
+            output_dir = output_dir_path,
+            outputs = data_model_outputs,
             platform_prerequisites = platform_prerequisites,
             swift_version = swift_version,
             xctoolrunner = apple_mac_toolchain_info.xctoolrunner,
         )
 
-        output_files.append(output_dir)
-
     return [DefaultInfo(files = depset(output_files))]
 
 apple_core_data_model = rule(
@@ -127,6 +136,12 @@ apple_core_data_model = rule(
             "swift_version": attr.string(
                 doc = "Target Swift version for generated classes.",
             ),
+            "outs": attr.output_list(
+                doc = """
+An optional list of expected output files. If not empty, the rule will
+return these files individually rather than returning a directory.
+""",
+            ),
         },
     ),
     fragments = ["apple"],

doc/rules-resources.md

@@ -30,7 +30,7 @@ targets (i.e. `apple_resource_bundle` and `apple_resource_group`) through the
 ## apple_core_data_model
 
 <pre>
-apple_core_data_model(<a href="#apple_core_data_model-name">name</a>, <a href="#apple_core_data_model-srcs">srcs</a>, <a href="#apple_core_data_model-swift_version">swift_version</a>)
+apple_core_data_model(<a href="#apple_core_data_model-name">name</a>, <a href="#apple_core_data_model-srcs">srcs</a>, <a href="#apple_core_data_model-outs">outs</a>, <a href="#apple_core_data_model-swift_version">swift_version</a>)
 </pre>
 
 This rule takes a Core Data model definition from a .xcdatamodeld bundle
@@ -44,6 +44,7 @@ dependency to a swift_library target.
 | :------------- | :------------- | :------------- | :------------- | :------------- |
 | <a id="apple_core_data_model-name"></a>name |  A unique name for this target.   | <a href="https://bazel.build/concepts/labels#target-names">Name</a> | required |  |
 | <a id="apple_core_data_model-srcs"></a>srcs |  -   | <a href="https://bazel.build/concepts/labels">List of labels</a> | required |  |
+| <a id="apple_core_data_model-outs"></a>outs |  An optional list of expected output files. If not empty, the rule will return these files individually rather than returning a directory.   | List of labels | optional |  `[]`  |
 | <a id="apple_core_data_model-swift_version"></a>swift_version |  Target Swift version for generated classes.   | String | optional |  `""`  |
 
 

test/starlark_tests/apple_core_data_model_tests.bzl

@@ -61,6 +61,17 @@ def apple_core_data_model_test_suite(name):
         tags = [name],
     )
 
+    # Test outputs a list of files rather than directories
+    analysis_target_outputs_test(
+        name = "{}_outputs_explicit_swift_files_test".format(name),
+        target_under_test = "//test/starlark_tests/targets_under_test/apple:explicit_outs_data_model",
+        expected_outputs = [
+            "swift_datamodel.explicit_outs_data_model.coredata.sources/Item+CoreDataProperties.swift",
+            "swift_datamodel.explicit_outs_data_model.coredata.sources/swift_datamodel+CoreDataModel.swift",
+        ],
+        tags = [name],
+    )
+
     # Test registered actions and mnemonics for Obj-C and Swift data models.
     analysis_target_actions_test(
         name = "{}_actions_swift_test".format(name),

test/starlark_tests/targets_under_test/apple/BUILD

@@ -254,6 +254,18 @@ apple_core_data_model(
     tags = common.fixture_tags,
 )
 
+apple_core_data_model(
+    name = "explicit_outs_data_model",
+    srcs = [
+        "//test/starlark_tests/resources:swift_datamodel",
+    ],
+    outs = [
+        "swift_datamodel.explicit_outs_data_model.coredata.sources/Item+CoreDataProperties.swift",
+        "swift_datamodel.explicit_outs_data_model.coredata.sources/swift_datamodel+CoreDataModel.swift",
+    ],
+    tags = common.fixture_tags,
+)
+
 objc_library(
     name = "fmwk_lib",
     srcs = [