Fix FileArgument being 'default' too instead of only PlainFile in the…

… json schema Minor code improvements
viash-io · Jul 3, 2023 · 9a8ee81 · 9a8ee81
1 parent d22b02f
commit 9a8ee81
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/main/scala/io/viash/ViashExport.scala b/src/main/scala/io/viash/ViashExport.scala
@@ -40,7 +40,7 @@ object ViashExport {
   }
 
   def exportConfigSchema(output: Option[Path], format: String): Unit = {
-    val data = CollectedSchemas.getJson.asJson
+    val data = CollectedSchemas.getJson
     val str = data.toFormattedString(format)
     if (output.isDefined) {
       Files.write(output.get, str.getBytes())

diff --git a/src/main/scala/io/viash/helpers/circe/RichJson.scala b/src/main/scala/io/viash/helpers/circe/RichJson.scala
@@ -238,6 +238,7 @@ class RichJson(json: Json) {
 
   private val yamlPrinter = YamlPrinter(
     preserveOrder = true,
+    dropNullKeys = true,
     mappingStyle = YamlPrinter.FlowStyle.Block,
     splitLines = true,
     stringStyle = YamlPrinter.StringStyle.DoubleQuoted

diff --git a/src/main/scala/io/viash/schemas/CollectedSchemas.scala b/src/main/scala/io/viash/schemas/CollectedSchemas.scala
@@ -109,7 +109,7 @@ object CollectedSchemas {
     (allMembers, baseClasses)
   }
 
-  val schemaClasses = List(
+  lazy val schemaClasses = List(
     getMembers[Config](),
     getMembers[ViashProject](),
     getMembers[Info](),
@@ -193,9 +193,7 @@ object CollectedSchemas {
 
   def getKeyFromParamList(data: List[ParameterSchema]): String = data.find(p => p.name == "__this__").get.`type`
 
-  def getJson: Json = {
-    data.asJson
-  }
+  def getJson: Json = data.asJson
 
   private def getNonAnnotated(members: Map[String,List[MemberInfo]], classes: List[Symbol]): List[String] = {
     val issueMembers = members

diff --git a/src/main/scala/io/viash/schemas/JsonSchema.scala b/src/main/scala/io/viash/schemas/JsonSchema.scala
@@ -189,7 +189,7 @@ object JsonSchema {
       !(
         p.`type`.startsWith("Option[") ||
         p.default.isDefined ||
-        (p.name == "type" && subclass == Some("file")) // Custom exception, file resources are "kind of" default
+        (p.name == "type" && thisParameter.`type` == "PlainFile") // Custom exception, file resources are "kind of" default
       ))
     val requiredJson = required.map(p => Json.fromString(p.name))
 

diff --git a/src/test/scala/io/viash/e2e/export/MainExportSuite.scala b/src/test/scala/io/viash/e2e/export/MainExportSuite.scala
@@ -31,7 +31,7 @@ class MainExportSuite extends AnyFunSuite{
       "export", "config_schema"
     )
 
-    assert(stdout.startsWith("Config:"))
+    assert(stdout.startsWith("""- - name: "__this__""""))
     assert(stdout.contains("""type: "OneOrMore[String]""""))
   }