Improved build rules

Author: alxmrs

third_party/java/arcs/build_defs/build_defs.bzl

@@ -44,10 +44,10 @@ arcs_kt_native_library = _arcs_kt_native_library
 
 arcs_kt_particles = _arcs_kt_particles
 
-arcs_kt_schema = _arcs_kt_schema
-
 arcs_kt_plan = _arcs_kt_plan
 
+arcs_kt_schema = _arcs_kt_schema
+
 arcs_manifest = _arcs_manifest
 
 arcs_manifest_bundle = _arcs_manifest_bundle

third_party/java/arcs/build_defs/internal/kotlin.bzl

@@ -27,7 +27,7 @@ load(
     "//third_party/java/arcs/build_defs/internal:kotlin_wasm_annotations.bzl",
     "kotlin_wasm_annotations",
 )
-load("//third_party/java/arcs/build_defs/internal:util.bzl", "output_name")
+load("//third_party/java/arcs/build_defs/internal:util.bzl", "replace_arcs_suffix")
 load("//tools/build_defs/android:rules.bzl", "android_local_test")
 load(
     "//tools/build_defs/kotlin:rules.bzl",
@@ -278,7 +278,7 @@ def arcs_kt_plan(name, src, deps = [], out = None, visibility = None):
       out: the name of the output artifact (a Kotlin file).
       visibility: list of visibilities
     """
-    outs = [out] if out != None else [output_name(name, ".kt")]
+    outs = [out] if out != None else [replace_arcs_suffix(src, ".kt")]
 
     sigh_command(
         name = name,

third_party/java/arcs/build_defs/internal/manifest.bzl

@@ -1,7 +1,7 @@
 """Arcs manifest bundling rules."""
 
 load("//third_party/java/arcs/build_defs:sigh.bzl", "sigh_command")
-load("//third_party/java/arcs/build_defs/internal:util.bzl", "output_name")
+load("//third_party/java/arcs/build_defs/internal:util.bzl", "replace_arcs_suffix")
 
 def arcs_manifest(name, srcs, deps = [], visibility = None):
     """Bundles .arcs manifest files with their particle implementations.
@@ -50,7 +50,7 @@ def arcs_manifest_json(name, srcs = [], deps = [], out = None, visibility = None
       out: the name of the output artifact (a JSON file).
       visibility: list of visibilities
     """
-    outs = [out] if out != None else [output_name(name, ".json")]
+    outs = [out] if out != None else [replace_arcs_suffix(name, ".json")]
 
     sigh_command(
         name = name,
@@ -73,7 +73,7 @@ def arcs_manifest_proto(name, src, deps = [], out = None, visibility = None):
       out: the name of the output artifact (a proto file).
       visibility: list of visibilities
     """
-    outs = [out] if out != None else [output_name(name, ".pb.bin")]
+    outs = [out] if out != None else [replace_arcs_suffix(name, ".pb.bin")]
 
     sigh_command(
         name = name,

third_party/java/arcs/build_defs/internal/schemas.bzl

@@ -4,7 +4,7 @@ Rules are re-exported in build_defs.bzl -- use those instead.
 """
 
 load("//third_party/java/arcs/build_defs:sigh.bzl", "sigh_command")
-load("//third_party/java/arcs/build_defs/internal:util.bzl", "output_name")
+load("//third_party/java/arcs/build_defs/internal:util.bzl", "replace_arcs_suffix")
 load(":kotlin.bzl", "ARCS_SDK_DEPS", "arcs_kt_library")
 
 def _run_schema2wasm(
@@ -52,7 +52,7 @@ def arcs_cc_schema(name, src, deps = [], out = None, package = "arcs"):
         name = name + "_genrule",
         src = src,
         deps = deps,
-        out = out or output_name(src, ".h"),
+        out = out or replace_arcs_suffix(src, ".h"),
         language_flag = "--cpp",
         language_name = "C++",
         wasm = False,
@@ -72,8 +72,8 @@ def arcs_kt_schema(name, srcs, deps = [], package = "arcs.sdk"):
     for src in srcs:
         for wasm in [True, False]:
             ext = "wasm" if wasm else "jvm"
-            genrule_name = output_name(src, "_genrule_" + ext)
-            out = output_name(src, "_GeneratedSchemas.%s.kt" % ext)
+            genrule_name = replace_arcs_suffix(src, "_genrule_" + ext)
+            out = replace_arcs_suffix(src, "_GeneratedSchemas.%s.kt" % ext)
             outs.append(out)
             _run_schema2wasm(
                 name = genrule_name,

third_party/java/arcs/build_defs/internal/util.bzl

@@ -1,7 +1,7 @@
 """Shared utilities for Arcs internal rules"""
 
-def output_name(src, suffix = ""):
-    """Cleans up the given file name, and replaces the .arcs extension."""
+def replace_arcs_suffix(src, suffix = ""):
+    """Cleans up the given file name, and replaces the .arcs extension with the provided suffix."""
 
     # For references to files in other build targets, extract the filename:
     #   //src/wasm/tests:manifest.arcs -> manifest.arcs