feat: Add support for extends (#11)

* extends working

* fix inputs

* Add jsonPayload

* refactor

* update snapshot

* use inline i/o (#12)

* Use inline i/o shapes

* Resolve todos

---------

Co-authored-by: ghostbuster91 <ghostbuster91@users.noreply.github.com>

* Apply review comments

* Add tests from TopologicalSort

* Add mixed type of cycle

* Use ModelDiff for better assertions

* Regenerate lsp.smithy

---------

Co-authored-by: ghostbuster91 <ghostbuster91@users.noreply.github.com>
Co-authored-by: Jakub Kozłowski <kubukoz@gmail.com>

Author: ghostbuster91

build.sc

@@ -10,7 +10,9 @@ import smithytraitcodegen.SmithyTraitCodegenPlugin
 
 import $meta._
 
-val jsonrpcVersion = "0.0.8+39-109d210f-SNAPSHOT"
+val jsonrpcVersion     = "0.0.8+41-0a28e99d-SNAPSHOT"
+val langoustineVersion = "0.0.24"
+val smithyVersion      = "1.57.1"
 
 trait CommonScalaModule extends ScalaModule with ScalafixModule {
   override def repositoriesTask: Task[Seq[Repository]] = T.task {
@@ -54,9 +56,10 @@ object lspSmithy extends CommonScalaModule with SmithyTraitCodegenPlugin.SmithyT
   def mainClass = Some("org.scala.abusers.lspsmithy.main")
 
   def ivyDeps = Agg(
-    ivy"tech.neander::langoustine-meta::0.0.23",
+    ivy"tech.neander::langoustine-meta::$langoustineVersion",
     ivy"com.lihaoyi::os-lib:0.11.4",
-    ivy"software.amazon.smithy:smithy-model:1.57.1",
+    ivy"software.amazon.smithy:smithy-model:$smithyVersion",
+    ivy"software.amazon.smithy:smithy-diff:$smithyVersion",
     ivy"tech.neander:jsonrpclib-smithy:$jsonrpcVersion",
     ivy"com.disneystreaming.alloy:alloy-core:0.3.20",
   )
@@ -83,7 +86,8 @@ object exampleClientSmithy extends CommonScalaModule with Smithy4sModule {
     super.smithy4sInputDirs() ++ Seq(PathRef(millSourcePath / os.up / "target"))
   }
   override def ivyDeps = Agg(
-    ivy"com.disneystreaming.smithy4s::smithy4s-core:${smithy4sVersion()}"
+    ivy"com.disneystreaming.smithy4s::smithy4s-core:${smithy4sVersion()}",
+    ivy"tech.neander::jsonrpclib-smithy4s:$jsonrpcVersion",
   )
 }
 
@@ -105,8 +109,8 @@ object exampleClient extends CommonScalaModule with Smithy4sModule {
 
 object dummyServer extends CommonScalaModule {
   override def ivyDeps = Agg(
-    ivy"tech.neander::langoustine-lsp::0.0.24",
-    ivy"tech.neander::langoustine-app::0.0.24",
+    ivy"tech.neander::langoustine-lsp::$langoustineVersion",
+    ivy"tech.neander::langoustine-app::$langoustineVersion",
   )
 
 }

exampleClient/src/org/scala/abusers/example/SmithyClientMain.scala

@@ -38,7 +38,11 @@ object SmithyClientMain extends IOApp.Simple {
       rp <- Stream.resource(
         Processes[IO]
           .spawn(
-            fs2.io.process.ProcessBuilder("java", "-jar", serverJar)
+            fs2.io.process.ProcessBuilder(
+              "java",
+              "-jar",
+              serverJar,
+            )
           )
       )
       // Creating a channel that will be used to communicate to the server
@@ -48,16 +52,35 @@ object SmithyClientMain extends IOApp.Simple {
       // Creating stubs to talk to the remote server
       server: ExampleLspServer[IO] = ClientStub(ExampleLspServer, fs2Channel)
       _ <- Stream(())
-        .concurrently(fs2Channel.output.through(lsp.encodeMessages).through(rp.stdin))
-        .concurrently(rp.stdout.through(lsp.decodeMessages).through(fs2Channel.inputOrBounce))
+        .concurrently(
+          fs2Channel.output
+            // .evalTap(IO.println)
+            .through(lsp.encodeMessages)
+            // .through(lsp.decodePayloads)
+            // .evalTap(IO.println)
+            // .through(lsp.encodePayloads)
+            .through(rp.stdin)
+        )
+        .concurrently(
+          rp.stdout
+            // .through(lsp.decodePayloads)
+            // .evalTap(IO.println(_))
+            // .through(lsp.encodePayloads)
+            .through(lsp.decodeMessages)
+            .through(fs2Channel.inputOrBounce)
+        )
         .concurrently(rp.stderr.through(fs2.io.stderr[IO]))
 
       ////////////////////////////////////////////////////////
       /////// INTERACTION
       ////////////////////////////////////////////////////////
       result1 <- Stream.eval(
         server.initializeOp(
-          InitializeParams()
+          InitializeParams(
+            processId = IntegerOrNULL.case0(1),
+            rootUri = DocumentUriOrNULL.case0("/bin/"),
+            capabilities = ClientCapabilities(),
+          )
         )
       )
       _ <- log(s"Client received $result1")

lspSmithy/src/org/scala/abusers/lspsmithy/GenerateSmithy.scala

@@ -5,6 +5,7 @@ import langoustine.meta.MetaModel
 import software.amazon.smithy.model.shapes.SmithyIdlModelSerializer
 import upickle.default.*
 
+import java.nio.file.Paths
 import scala.io.Source
 import scala.jdk.CollectionConverters.*
 
@@ -19,7 +20,8 @@ def main() = {
   val targetDir = os.Path(sys.env("TARGET_PATH"))
   os.remove.all(targetDir)
 
-  for (path, content) <- outputMap do
-    val outputPath = targetDir / path.toString
+  outputMap.get(Paths.get("lsp.smithy")).foreach { content =>
+    val outputPath = targetDir / "lsp.smithy"
     os.write.over(outputPath, content, createFolders = true)
+  }
 }