chore: prep for 3.14.2 release

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -6,12 +6,26 @@
 
 ### Changed
 
+- Route generation with parameters doesn`t add parameters to the path.
+
 ### Remove
 
 ---
 
 ## Released
 
+## [3.14.2] - May 8rd, 2023
+
+### Changed
+
+- Fixed bug where routes were not resolving when a parameter was declared via the ktor SDK
+
+## [3.14.1] - April 28th, 2023
+
+### Changed
+
+- Generating enrichments for generic classes no longer throws the `Slugs should not be generated for field enrichments` error.
+
 ## [3.14.0] - April 6th, 2023
 
 ### Added

core/src/main/kotlin/io/bkbn/kompendium/core/plugin/NotarizedRoute.kt

@@ -86,6 +86,7 @@ object NotarizedRoute {
         ?: it
     }
     .replace(Regex("/\\(.+\\)"), "")
+    .replace(Regex("/\\[.+\\]"), "")
 
   fun Route.collectAuthMethods() = toString()
     .split("/")

core/src/test/kotlin/io/bkbn/kompendium/core/KompendiumTest.kt

@@ -11,6 +11,7 @@ import io.bkbn.kompendium.core.util.defaultAuthConfig
 import io.bkbn.kompendium.core.util.defaultField
 import io.bkbn.kompendium.core.util.defaultParameter
 import io.bkbn.kompendium.core.util.doubleConstraints
+import io.bkbn.kompendium.core.util.enrichedGenericResponse
 import io.bkbn.kompendium.core.util.enrichedComplexGenericType
 import io.bkbn.kompendium.core.util.enrichedNestedCollection
 import io.bkbn.kompendium.core.util.enrichedSimpleRequest
@@ -66,6 +67,7 @@ import io.bkbn.kompendium.core.util.stringContentEncodingConstraints
 import io.bkbn.kompendium.core.util.stringPatternConstraints
 import io.bkbn.kompendium.core.util.topLevelNullable
 import io.bkbn.kompendium.core.util.trailingSlash
+import io.bkbn.kompendium.core.util.paramWrapper
 import io.bkbn.kompendium.core.util.unbackedFieldsResponse
 import io.bkbn.kompendium.core.util.withOperationId
 import io.bkbn.kompendium.json.schema.definition.TypeDefinition
@@ -151,6 +153,9 @@ class KompendiumTest : DescribeSpec({
     it("Can notarize a route with a trailing slash") {
       openApiTestAllSerializers("T0015__trailing_slash.json") { trailingSlash() }
     }
+    it("Can notarize a route with a parameter") {
+      openApiTestAllSerializers("T0068__param_wrapper.json") { paramWrapper() }
+    }
   }
   describe("Exceptions") {
     it("Can add an exception status code to a response") {
@@ -452,6 +457,9 @@ class KompendiumTest : DescribeSpec({
     it("Can enrich a complex generic type") {
       openApiTestAllSerializers("T0057__enriched_complex_generic_type.json") { enrichedComplexGenericType() }
     }
+    it("Can enrich a generic object") {
+      openApiTestAllSerializers("T0067__enriched_generic_object.json") { enrichedGenericResponse() }
+    }
   }
   describe("Constraints") {
     it("Can apply constraints to an int field") {

core/src/test/kotlin/io/bkbn/kompendium/core/util/Enrichment.kt

@@ -6,6 +6,7 @@ import io.bkbn.kompendium.core.fixtures.NestedComplexItem
 import io.bkbn.kompendium.core.fixtures.TestCreatedResponse
 import io.bkbn.kompendium.core.fixtures.TestResponse
 import io.bkbn.kompendium.core.fixtures.TestSimpleRequest
+import io.bkbn.kompendium.core.fixtures.GenericObject
 import io.bkbn.kompendium.core.metadata.GetInfo
 import io.bkbn.kompendium.core.metadata.PostInfo
 import io.bkbn.kompendium.core.plugin.NotarizedRoute
@@ -135,3 +136,33 @@ fun Routing.enrichedComplexGenericType() {
     }
   }
 }
+
+fun Routing.enrichedGenericResponse() {
+  route("/example") {
+    install(NotarizedRoute()) {
+      get = GetInfo.builder {
+        summary(TestModules.defaultPathSummary)
+        description(TestModules.defaultPathDescription)
+        response {
+          responseType(
+            enrichment = TypeEnrichment("generic") {
+              GenericObject<TestSimpleRequest>::data {
+                description = "A simple description"
+                typeEnrichment = TypeEnrichment("simple") {
+                  TestSimpleRequest::a {
+                    description = "A simple description"
+                  }
+                  TestSimpleRequest::b {
+                    deprecated = true
+                  }
+                }
+              }
+            }
+          )
+          description("A good response")
+          responseCode(HttpStatusCode.Created)
+        }
+      }
+    }
+  }
+}

core/src/test/kotlin/io/bkbn/kompendium/core/util/RouteParsing.kt

@@ -14,6 +14,7 @@ import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.install
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.route
+import io.ktor.server.routing.param
 
 fun Routing.simplePathParsing() {
   route("/this") {
@@ -100,3 +101,32 @@ fun Routing.trailingSlash() {
     }
   }
 }
+
+fun Routing.paramWrapper() {
+  route("/test") {
+    param("a") {
+      param("b") {
+        param("c") {
+          install(NotarizedRoute()) {
+            parameters = listOf(
+              Parameter(
+                name = "test",
+                `in` = Parameter.Location.query,
+                schema = TypeDefinition.STRING
+              )
+            )
+            get = GetInfo.builder {
+              summary(defaultPathSummary)
+              description(defaultPathDescription)
+              response {
+                description(defaultResponseDescription)
+                responseCode(HttpStatusCode.OK)
+                responseType<TestResponse>()
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

core/src/test/resources/T0067__enriched_generic_object.json

@@ -0,0 +1,91 @@
+{
+  "openapi": "3.1.0",
+  "jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema",
+  "info": {
+    "title": "Test API",
+    "version": "1.33.7",
+    "description": "An amazing, fully-ish 😉 generated API spec",
+    "termsOfService": "https://example.com",
+    "contact": {
+      "name": "Homer Simpson",
+      "url": "https://gph.is/1NPUDiM",
+      "email": "chunkylover53@aol.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "https://github.com/bkbnio/kompendium/blob/main/LICENSE"
+    }
+  },
+  "servers": [
+    {
+      "url": "https://myawesomeapi.com",
+      "description": "Production instance of my API"
+    },
+    {
+      "url": "https://staging.myawesomeapi.com",
+      "description": "Where the fun stuff happens"
+    }
+  ],
+  "paths": {
+    "/example": {
+      "get": {
+        "tags": [],
+        "summary": "Great Summary!",
+        "description": "testing more",
+        "parameters": [],
+        "responses": {
+          "201": {
+            "description": "A good response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GenericObject-TestSimpleRequest-generic"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "parameters": []
+    }
+  },
+  "webhooks": {},
+  "components": {
+    "schemas": {
+      "GenericObject-TestSimpleRequest-generic": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "$ref": "#/components/schemas/TestSimpleRequest-simple",
+            "description": "A simple description"
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
+      "TestSimpleRequest-simple": {
+        "type": "object",
+        "properties": {
+          "a": {
+            "type": "string",
+            "description": "A simple description"
+          },
+          "b": {
+            "type": "number",
+            "format": "int32",
+            "deprecated": true
+          }
+        },
+        "required": [
+          "a",
+          "b"
+        ]
+      }
+    },
+    "securitySchemes": {}
+  },
+  "security": [],
+  "tags": []
+}

core/src/test/resources/T0068__param_wrapper.json

@@ -0,0 +1,82 @@
+{
+  "openapi": "3.1.0",
+  "jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema",
+  "info": {
+    "title": "Test API",
+    "version": "1.33.7",
+    "description": "An amazing, fully-ish 😉 generated API spec",
+    "termsOfService": "https://example.com",
+    "contact": {
+      "name": "Homer Simpson",
+      "url": "https://gph.is/1NPUDiM",
+      "email": "chunkylover53@aol.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "https://github.com/bkbnio/kompendium/blob/main/LICENSE"
+    }
+  },
+  "servers": [
+    {
+      "url": "https://myawesomeapi.com",
+      "description": "Production instance of my API"
+    },
+    {
+      "url": "https://staging.myawesomeapi.com",
+      "description": "Where the fun stuff happens"
+    }
+  ],
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [],
+        "summary": "Great Summary!",
+        "description": "testing more",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "A Successful Endeavor",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TestResponse"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "parameters": [
+        {
+          "name": "test",
+          "in": "query",
+          "schema": {
+            "type": "string"
+          },
+          "required": true,
+          "deprecated": false
+        }
+      ]
+    }
+  },
+  "webhooks": {},
+  "components": {
+    "schemas": {
+      "TestResponse": {
+        "type": "object",
+        "properties": {
+          "c": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "c"
+        ]
+      }
+    },
+    "securitySchemes": {}
+  },
+  "security": [],
+  "tags": []
+}

core/src/testFixtures/kotlin/io/bkbn/kompendium/core/fixtures/TestModels.kt

@@ -180,6 +180,10 @@ data class SerialNameObject(
   val camelCaseName: String
 )
 
+data class GenericObject<T>(
+  val data: T
+)
+
 enum class Color {
   RED,
   GREEN,

docs/SUMMARY.md

@@ -1,13 +1,13 @@
 # Summary 
 
 * [Introduction](index.md)
-* [Helpers](helpers/index.md)
-  * [Protobuf java converter](helpers/protobuf_java_converter.md)
-* [Concepts](concepts/index.md)
-  * [Enrichment](concepts/enrichment.md)
 * [Plugins](plugins/index.md)
   * [Notarized Application](plugins/notarized_application.md)
   * [Notarized Route](plugins/notarized_route.md)
   * [Notarized Locations](plugins/notarized_locations.md)
   * [Notarized Resources](plugins/notarized_resources.md)
+* [Concepts](concepts/index.md)
+  * [Enrichment](concepts/enrichment.md)
+* [Helpers](helpers/index.md)
+  * [Protobuf java converter](helpers/protobuf_java_converter.md)
 * [The Playground](playground.md)

gradle.properties

@@ -1,5 +1,5 @@
 # Kompendium
-project.version=3.14.0
+project.version=3.14.2
 # Kotlin
 kotlin.code.style=official
 # Gradle
@@ -9,6 +9,6 @@ org.gradle.jvmargs=-Xmx2000m
 org.gradle.parallel=true
 
 # Dependencies
-ktorVersion=2.2.4
-kotestVersion=5.5.5
+ktorVersion=2.3.0
+kotestVersion=5.6.1
 detektVersion=1.22.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt

@@ -133,8 +133,8 @@ object SimpleObjectHandler {
       ?: error("This indicates a bug in Kompendium, please open a GitHub issue")
     return SchemaGenerator.fromTypeToSchema(type, cache, schemaConfigurator, propEnrichment?.typeEnrichment).let {
       if (it.isOrContainsObjectOrEnumDef()) {
-        cache[type.getSlug(propEnrichment)] = it
-        ReferenceDefinition(type.getReferenceSlug(propEnrichment))
+        cache[type.getSlug(propEnrichment?.typeEnrichment)] = it
+        ReferenceDefinition(type.getReferenceSlug(propEnrichment?.typeEnrichment))
       } else {
         it
       }

json-schema/src/test/kotlin/io/bkbn/kompendium/json/schema/SchemaGeneratorTest.kt

@@ -7,11 +7,12 @@ import io.bkbn.kompendium.core.fixtures.ObjectWithEnum
 import io.bkbn.kompendium.core.fixtures.SerialNameObject
 import io.bkbn.kompendium.core.fixtures.SimpleEnum
 import io.bkbn.kompendium.core.fixtures.SlammaJamma
-import io.bkbn.kompendium.core.fixtures.TestHelpers.getFileSnapshot
 import io.bkbn.kompendium.core.fixtures.TestResponse
 import io.bkbn.kompendium.core.fixtures.TestSimpleRequest
 import io.bkbn.kompendium.core.fixtures.TransientObject
 import io.bkbn.kompendium.core.fixtures.UnbackedObject
+import io.bkbn.kompendium.core.fixtures.GenericObject
+import io.bkbn.kompendium.core.fixtures.TestHelpers.getFileSnapshot
 import io.bkbn.kompendium.enrichment.TypeEnrichment
 import io.bkbn.kompendium.json.schema.definition.JsonSchema
 import io.kotest.assertions.json.shouldEqualJson
@@ -62,6 +63,9 @@ class SchemaGeneratorTest : DescribeSpec({
     it("Can generate the schema for object with SerialName annotation") {
       jsonSchemaTest<SerialNameObject>("T0020__serial_name_object.json")
     }
+    it("Can generate the schema for object with generic property") {
+      jsonSchemaTest<GenericObject<TestSimpleRequest>>("T0024__generic_object.json")
+    }
   }
   describe("Enums") {
     it("Can generate the schema for a simple enum") {
@@ -135,6 +139,24 @@ class SchemaGeneratorTest : DescribeSpec({
         }
       )
     }
+    it("Can properly assign a reference to a generic object") {
+      jsonSchemaTest<GenericObject<TestSimpleRequest>>(
+        snapshotName = "T0025__enrichment_generic_object.json",
+        enrichment = TypeEnrichment("generic") {
+          GenericObject<TestSimpleRequest>::data {
+            description = "This is a generic param"
+            typeEnrichment = TypeEnrichment("simple") {
+              TestSimpleRequest::a {
+                description = "This is a simple description"
+              }
+              TestSimpleRequest::b {
+                deprecated = true
+              }
+            }
+          }
+        }
+      )
+    }
   }
 }) {
   companion object {

json-schema/src/test/resources/T0024__generic_object.json

@@ -0,0 +1,11 @@
+{
+  "type": "object",
+  "properties": {
+    "data": {
+      "$ref": "#/components/schemas/TestSimpleRequest"
+    }
+  },
+  "required": [
+    "data"
+  ]
+}

json-schema/src/test/resources/T0025__enrichment_generic_object.json

@@ -0,0 +1,12 @@
+{
+  "type": "object",
+  "properties": {
+    "data": {
+      "description": "This is a generic param",
+      "$ref": "#/components/schemas/TestSimpleRequest-simple"
+    }
+  },
+  "required": [
+    "data"
+  ]
+}

locations/build.gradle.kts

@@ -22,8 +22,8 @@ dependencies {
   // IMPLEMENTATION
 
   implementation(projects.kompendiumCore)
-  implementation("io.ktor:ktor-server-core:2.2.4")
-  implementation("io.ktor:ktor-server-locations:2.2.4")
+  implementation("io.ktor:ktor-server-core:2.3.0")
+  implementation("io.ktor:ktor-server-locations:2.3.0")
 
   // TESTING
 

protobuf-java-converter/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
 
   implementation(projects.kompendiumJsonSchema)
-  implementation("com.google.protobuf:protobuf-java:3.22.2")
+  implementation("com.google.protobuf:protobuf-java:3.22.3")
   implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20")
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 

resources/build.gradle.kts

@@ -22,8 +22,8 @@ dependencies {
   // IMPLEMENTATION
 
   implementation(projects.kompendiumCore)
-  implementation("io.ktor:ktor-server-core:2.2.4")
-  implementation("io.ktor:ktor-server-resources:2.2.4")
+  implementation("io.ktor:ktor-server-core:2.3.0")
+  implementation("io.ktor:ktor-server-resources:2.3.0")
 
   // TESTING