Fix three prettify formatting regressions from 1.12.0

Remove commas between aggregate fields (RIDDL grammar makes them
optional and original models don't use them), keep "} with {" on
same line for types with metadata by trimming trailing newline
before emitMetaData, and preserve relative include paths by using
url.path instead of url.toExternalForm.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: reid-spencer

passes/jvm-native/src/test/scala/com/ossuminc/riddl/passes/RiddlTest.scala

@@ -170,6 +170,44 @@ class RiddlTest extends AbstractTestingBasis {
           indexIndent must be > ofIndent
     }
 
+    "not insert commas between aggregate fields" in {
+      val input =
+        """domain foo is {
+          |  context bar is {
+          |    record Baz is {
+          |      x: String
+          |      y: Integer
+          |    }
+          |  }
+          |}""".stripMargin
+      val rpi = RiddlParserInput(input, "")
+      Riddl.parse(rpi) match
+        case Left(messages) => fail(messages.format)
+        case Right(root) =>
+          val output = Riddl.toRiddlText(root)
+          output must not include ","
+    }
+
+    "keep } with { on same line for types" in {
+      val input =
+        """domain foo is {
+          |  context bar is {
+          |    record Baz is {
+          |      x: String
+          |    } with {
+          |      briefly "A record"
+          |    }
+          |  }
+          |}""".stripMargin
+      val rpi = RiddlParserInput(input, "")
+      Riddl.parse(rpi) match
+        case Left(messages) => fail(messages.format)
+        case Right(root) =>
+          val output = Riddl.toRiddlText(root)
+          output must include ("} with {")
+          output must not include ("}\n with {")
+    }
+
     "preserve include structure in multi-file mode" in {
       val includePath = "language/input/includes/domainIncludes.riddl"
       val includeUrl = PathUtils.urlFromCwdPath(Path.of(includePath))
@@ -191,6 +229,7 @@ class RiddlTest extends AbstractTestingBasis {
             // The main file should contain an include directive
             val mainContent = state.filesAsString
             mainContent must include("include")
+            mainContent must not include "file://"
       }
       Await.result(future, 10.seconds)
     }

passes/shared/src/main/scala/com/ossuminc/riddl/passes/prettify/PrettifyVisitor.scala

@@ -37,7 +37,9 @@ class PrettifyVisitor(options: PrettifyPass.Options)(using PlatformContext) exte
   def closeType(typ: Type, parents: Parents): Unit =
     state.withCurrent { rfe =>
       if typ.metadata.isEmpty then rfe.nl
-      else rfe.emitMetaData(typ.metadata)
+      else
+        rfe.trimTrailingNewline()
+        rfe.emitMetaData(typ.metadata)
     }
 
   def openDomain(domain: Domain, parents: Parents): Unit = open(domain)
@@ -414,7 +416,7 @@ class PrettifyVisitor(options: PrettifyPass.Options)(using PlatformContext) exte
     state.withCurrent { (rfe: RiddlFileEmitter) =>
       if !state.flatten then
         val url = include.origin
-        rfe.addLine(s"""include "${url.toExternalForm}"""")
+        rfe.addLine(s"""include "${url.path}"""")
         val outputURL = state.toDestination(url)
         val newRFE = RiddlFileEmitter(outputURL)
         state.pushFile(newRFE)

passes/shared/src/main/scala/com/ossuminc/riddl/passes/prettify/RiddlFileEmitter.scala

@@ -134,6 +134,13 @@ case class RiddlFileEmitter(url: URL)(using PlatformContext) extends FileBuilder
   private def emitULIDAttachment(a: ULIDAttachment): this.type =
     addIndent("attachment " + a.id.format).add(s" is \"${a.ulid.toString}\"")
 
+  def trimTrailingNewline(): this.type =
+    if sb.length >= new_line.length &&
+       sb.substring(sb.length - new_line.length) == new_line
+    then sb.setLength(sb.length - new_line.length)
+    this
+  end trimTrailingNewline
+
   def emitString(s: String_): this.type = {
     (s.min, s.max) match {
       case (Some(n), Some(x)) => this.add(s"String($n,$x)")
@@ -200,18 +207,9 @@ case class RiddlFileEmitter(url: URL)(using PlatformContext) extends FileBuilder
             .nl
       case Some(_) =>
         this.add("{").nl.incr
-        val lastIdx = of.size - 1
-        of.zipWithIndex.foreach { case (f, idx) =>
+        of.foreach { f =>
           add(spc).emitField(f)
-          if idx < lastIdx then
-            if f.metadata.nonEmpty then
-              // metadata ended with }\n; insert comma before trailing newline
-              sb.insert(sb.length - new_line.length, ",")
-            else
-              add(",").nl
-          else
-            // last field — no comma
-            if f.metadata.isEmpty then nl
+          if f.metadata.isEmpty then nl
         }
         decr.addIndent("}").nl
     }