Add common smithy traits into protocol definition

Author: ghostbuster91

build.sbt

@@ -96,7 +96,10 @@ val smithy = projectMatrix
   .enablePlugins(SmithyTraitCodegenPlugin)
   .settings(
     name := "jsonrpclib-smithy",
-    commonJvmSettings
+    commonJvmSettings,
+    smithyTraitCodegenDependencies := List(Dependencies.alloy.core),
+    smithyTraitCodegenJavaPackage := "jsonrpclib",
+    smithyTraitCodegenNamespace := "jsonrpclib"
   )
 
 lazy val buildTimeProtocolDependency =

modules/smithy/src/main/resources/META-INF/smithy/jsonrpclib.smithy

@@ -7,6 +7,16 @@ namespace jsonrpclib
 @protocolDefinition(traits: [
     jsonRequest
     jsonNotification
+    smithy.api#jsonName
+    smithy.api#length
+    smithy.api#pattern
+    smithy.api#range
+    smithy.api#required
+    smithy.api#timestampFormat
+    alloy#uuidFormat
+    alloy#discriminated
+    alloy#nullable
+    alloy#untagged
 ])
 @trait(selector: "service")
 structure jsonRPC {

project/Dependencies.scala

@@ -0,0 +1,8 @@
+import sbt.*
+
+object Dependencies {
+  val alloy = new {
+    val version = "0.3.20"
+    val core = "com.disneystreaming.alloy" % "alloy-core" % version
+  }
+}

project/SmithyTraitCodegen.scala

@@ -18,11 +18,17 @@ object SmithyTraitCodegen {
 
   import BasicJsonProtocol.*
 
-  case class Args(targetDir: os.Path, smithySourcesDir: PathRef, dependencies: List[PathRef])
+  case class Args(
+      javaPackage: String,
+      smithyNamespace: String,
+      targetDir: os.Path,
+      smithySourcesDir: PathRef,
+      dependencies: List[PathRef]
+  )
   object Args {
 
     // format: off
-    private type ArgsDeconstructed = os.Path :*: PathRef :*: List[PathRef] :*: LNil
+    private type ArgsDeconstructed = String :*: String :*: os.Path :*: PathRef :*: List[PathRef] :*: LNil
     // format: on
 
     private implicit val pathFormat: JsonFormat[os.Path] =
@@ -31,17 +37,23 @@ object SmithyTraitCodegen {
     implicit val argsIso =
       LList.iso[Args, ArgsDeconstructed](
         { args: Args =>
-          ("targetDir", args.targetDir) :*:
+          ("javaPackage", args.javaPackage) :*:
+            ("smithyNamespace", args.smithyNamespace) :*:
+            ("targetDir", args.targetDir) :*:
             ("smithySourcesDir", args.smithySourcesDir) :*:
             ("dependencies", args.dependencies) :*:
             LNil
         },
         {
-          case (_, targetDir) :*:
+          case (_, javaPackage) :*:
+              (_, smithyNamespace) :*:
+              (_, targetDir) :*:
               (_, smithySourcesDir) :*:
               (_, dependencies) :*:
               LNil =>
             Args(
+              javaPackage = javaPackage,
+              smithyNamespace = smithyNamespace,
               targetDir = targetDir,
               smithySourcesDir = smithySourcesDir,
               dependencies = dependencies
@@ -100,8 +112,8 @@ object SmithyTraitCodegen {
       .settings(
         ObjectNode
           .builder()
-          .withMember("package", "jsonrpclib")
-          .withMember("namespace", "jsonrpclib")
+          .withMember("package", args.javaPackage)
+          .withMember("namespace", args.smithyNamespace)
           .withMember("header", ArrayNode.builder.build())
           .withMember("excludeTags", ArrayNode.builder.withValue("nocodegen").build())
           .build()

project/SmithyTraitCodegenPlugin.scala

@@ -13,16 +13,38 @@ object SmithyTraitCodegenPlugin extends AutoPlugin {
   override def trigger: PluginTrigger = noTrigger
   override def requires: Plugins = JvmPlugin
 
+  object autoImport {
+    val smithyTraitCodegenJavaPackage =
+      settingKey[String]("The java target package where the generated smithy traits will be created")
+    val smithyTraitCodegenNamespace = settingKey[String]("The smithy namespace where the traits are defined")
+    val smithyTraitCodegenDependencies = settingKey[List[ModuleID]]("Dependencies to be added into codegen model")
+  }
+  import autoImport.*
+
   override def projectSettings: Seq[Setting[?]] =
     Seq(
       Keys.generateSmithyTraits := Def.task {
         import sbt.util.CacheImplicits.*
         val s = (Compile / streams).value
         val logger = sLog.value
+
+        val report = update.value
+        val dependencies = smithyTraitCodegenDependencies.value
+        val jars =
+          dependencies.flatMap(m =>
+            report.matching(moduleFilter(organization = m.organization, name = m.name, revision = m.revision))
+          )
+        require(
+          jars.size == dependencies.size,
+          "Not all dependencies required for smithy-trait-codegen have been found"
+        )
+
         val args = SmithyTraitCodegen.Args(
+          javaPackage = smithyTraitCodegenJavaPackage.value,
+          smithyNamespace = smithyTraitCodegenNamespace.value,
           targetDir = os.Path((Compile / target).value),
           smithySourcesDir = PathRef((Compile / resourceDirectory).value / "META-INF" / "smithy"),
-          dependencies = List.empty
+          dependencies = jars.map(PathRef(_)).toList
         )
         val cachedCodegen =
           Tracked.inputChanged[SmithyTraitCodegen.Args, SmithyTraitCodegen.Output](
@@ -54,7 +76,7 @@ object SmithyTraitCodegenPlugin extends AutoPlugin {
         val codegenOutput = (Compile / Keys.generateSmithyTraits).value
         cleanCopy(source = codegenOutput.metaDir, target = (Compile / resourceManaged).value)
       }.taskValue,
-      libraryDependencies += "software.amazon.smithy" % "smithy-model" % "1.56.0"
+      libraryDependencies ++= smithyTraitCodegenDependencies.value
     )
 
   private def cleanCopy(source: File, target: File) = {