Typed: add constraints to models

build.gradle.kts

@@ -17,8 +17,6 @@ plugins {
 val assertId = libs.plugins.assert.get().pluginId
 val spotlessId = libs.plugins.spotless.get().pluginId
 val publishId = libs.plugins.publish.get().pluginId
-val koverId = libs.plugins.kover.get().pluginId
-
 
 dependencies {
   kover(projects.parser)
@@ -27,8 +25,6 @@ dependencies {
 }
 
 subprojects {
-  apply(plugin = koverId)
-
   apply(plugin = assertId)
   @Suppress("OPT_IN_USAGE")
   configure<PowerAssertGradleExtension> {

generation/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
   alias(libs.plugins.dokka)
+  id(libs.plugins.kover.get().pluginId)
 }
 
 kotlin { compilerOptions.freeCompilerArgs.add("-Xcontext-receivers") }

parser/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
   alias(libs.plugins.dokka)
+  id(libs.plugins.kover.get().pluginId)
 }
 
 kotlin {

parser/src/commonMain/kotlin/io/github/nomisrev/openapi/Schema.kt

@@ -43,10 +43,7 @@ public data class Schema(
   val deprecated: Boolean? = null,
   val maxProperties: Int? = null,
   val minProperties: Int? = null,
-  /**
-   * Unlike JSON Schema this value MUST conform to the defined type for this parameter. Note: is
-   * ignored for required parameters.
-   */
+  /** Unlike JSON Schema this value MUST conform to the defined type for this parameter. */
   val default: DefaultValue? = null,
   val type: Type? = null,
   val format: String? = null,

typed/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
   alias(libs.plugins.dokka)
+  id(libs.plugins.kover.get().pluginId)
 }
 
 kotlin {

typed/src/commonMain/kotlin/io/github/nomisrev/openapi/Constraints.kt

@@ -0,0 +1,50 @@
+package io.github.nomisrev.openapi
+
+data class NumberConstraint(
+  val exclusiveMinimum: Boolean,
+  val minimum: Double,
+  val exclusiveMaximum: Boolean,
+  val maximum: Double,
+  val multipleOf: Double?
+) {
+  constructor(
+    schema: Schema
+  ) : this(
+    schema.exclusiveMinimum ?: false,
+    schema.minimum ?: Double.NEGATIVE_INFINITY,
+    schema.exclusiveMaximum ?: false,
+    schema.maximum ?: Double.POSITIVE_INFINITY,
+    schema.multipleOf
+  )
+}
+
+data class TextConstraint(val maxLength: Int, val minLength: Int, val pattern: String?) {
+  constructor(
+    schema: Schema
+  ) : this(schema.maxLength ?: Int.MAX_VALUE, schema.minLength ?: 0, schema.pattern)
+}
+
+data class CollectionConstraint(
+  val minItems: Int,
+  val maxItems: Int,
+) {
+  constructor(
+    schema: Schema
+  ) : this(
+    schema.minItems ?: 0,
+    schema.maxItems ?: Int.MAX_VALUE,
+  )
+}
+
+// TODO `not` is not supported yet
+data class ObjectConstraint(
+  val minProperties: Int,
+  val maxProperties: Int,
+) {
+  constructor(
+    schema: Schema
+  ) : this(
+    schema.minProperties ?: 0,
+    schema.maxProperties ?: Int.MAX_VALUE,
+  )
+}

typed/src/commonMain/kotlin/io/github/nomisrev/openapi/Model.kt

@@ -3,7 +3,6 @@
 import io.ktor.http.ContentType
 import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
 
 data class Route(
@@ -129,16 +128,26 @@
   val description: String?
 
   sealed interface Primitive : Model {
-    data class Int(val default: kotlin.Int?, override val description: kotlin.String?) : Primitive
-
-    data class Double(val default: kotlin.Double?, override val description: kotlin.String?) :
-      Primitive
+    data class Int(
+      val default: kotlin.Int?,
+      override val description: kotlin.String?,
+      val bounds: NumberConstraint
+    ) : Primitive
+
+    data class Double(
+      val default: kotlin.Double?,
+      override val description: kotlin.String?,
+      val bounds: NumberConstraint
+    ) : Primitive
 
     data class Boolean(val default: kotlin.Boolean?, override val description: kotlin.String?) :
       Primitive
 
-    data class String(val default: kotlin.String?, override val description: kotlin.String?) :
-      Primitive
+    data class String(
+      val default: kotlin.String?,
+      override val description: kotlin.String?,
+      val bounds: TextConstraint
+    ) : Primitive
 
     data class Unit(override val description: kotlin.String?) : Primitive
 
@@ -150,6 +159,8 @@
         is String -> default?.let { "\"$it\"" }
         is Unit -> null
       }
+
+    companion object
   }
 
   data class OctetStream(override val description: String?) : Model
@@ -158,32 +169,40 @@
 
   sealed interface Collection : Model {
     val inner: Model
+    val bounds: CollectionConstraint
 
     data class List(
       override val inner: Model,
       val default: kotlin.collections.List<String>?,
-      override val description: String?
+      override val description: String?,
+      override val bounds: CollectionConstraint
     ) : Collection
 
     data class Set(
       override val inner: Model,
       val default: kotlin.collections.List<String>?,
-      override val description: String?
+      override val description: String?,
+      override val bounds: CollectionConstraint
     ) : Collection
 
-    data class Map(override val inner: Model, override val description: String?) : Collection {
-      val key = Primitive.String(null, null)
+    data class Map(
+      override val inner: Model,
+      override val description: String?,
+      override val bounds: CollectionConstraint
+    ) : Collection {
+      val key = Primitive.String(null, null, TextConstraint(Int.MAX_VALUE, 0, null))
     }
+
+    companion object
   }
 
-  @Serializable
   data class Object(
     val context: NamingContext,
     override val description: String?,
     val properties: List<Property>,
-    val inline: List<Model>
+    val inline: List<Model>,
+    val constraint: ObjectConstraint?
   ) : Model {
-    @Serializable
     data class Property(
       val baseName: String,
       val model: Model,
@@ -195,6 +214,8 @@
       val isNullable: Boolean,
       val description: String?
     )
+
+    companion object
   }
 
   data class Union(
@@ -228,4 +249,6 @@
       override val description: String?
     ) : Enum
   }
+
+  companion object
 }

typed/src/commonMain/kotlin/io/github/nomisrev/openapi/OpenAPITransformer.kt

@@ -200,15 +200,25 @@
           Type.Basic.Array -> collection(context)
           Type.Basic.Boolean ->
             Primitive.Boolean(default("Boolean", String::toBooleanStrictOrNull), description)
-          Type.Basic.Integer -> Primitive.Int(default("Integer", String::toIntOrNull), description)
+          Type.Basic.Integer ->
+            Primitive.Int(
+              default("Integer", String::toIntOrNull),
+              description,
+              NumberConstraint(this)
+            )
           Type.Basic.Number ->
-            Primitive.Double(default("Number", String::toDoubleOrNull), description)
+            Primitive.Double(
+              default("Number", String::toDoubleOrNull),
+              description,
+              NumberConstraint(this)
+            )
           Type.Basic.String ->
             if (format == "binary") Model.OctetStream(description)
             else
               Primitive.String(
                 default("String", String::toString) { it.joinToString() },
-                description
+                description,
+                TextConstraint(this)
               )
           Type.Basic.Object -> toObject(context)
           Type.Basic.Null -> TODO("Schema.Type.Basic.Null")
@@ -398,7 +408,8 @@
             is Resolved.Value -> NamingContext.Nested(Named(name), context)
           }
         nestedModel(resolved, pContext)
-      }
+      },
+      ObjectConstraint(this)
     )
   }
 
@@ -429,8 +440,9 @@
         }
         null -> null
       }
-    return if (uniqueItems == true) Collection.Set(inner.value, default, description)
-    else Collection.List(inner.value, default, description)
+    return if (uniqueItems == true)
+      Collection.Set(inner.value, default, description, CollectionConstraint(this))
+    else Collection.List(inner.value, default, description, CollectionConstraint(this))
   }
 
   fun Schema.toEnum(context: NamingContext, enums: List<String>): Enum.Closed {
@@ -673,7 +685,14 @@
           response.isEmpty() ->
             Pair(
               statusCode,
-              Route.ReturnType(Primitive.String(null, response.description), response.extensions)
+              Route.ReturnType(
+                Primitive.String(
+                  null,
+                  response.description,
+                  TextConstraint(Int.MAX_VALUE, 0, null)
+                ),
+                response.extensions
+              )
             )
           else ->
             throw IllegalStateException("OpenAPI requires at least 1 valid response. $response")