Fix schema regex and generation

znsio · Dec 13, 2024 · 8d32e1a · 8d32e1a
1 parent 816bff6
commit 8d32e1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/core/src/main/kotlin/io/specmatic/core/examples/server/ExamplesInteractiveServer.kt b/core/src/main/kotlin/io/specmatic/core/examples/server/ExamplesInteractiveServer.kt
@@ -232,6 +232,7 @@ class ExamplesInteractiveServer(
     override fun close() {
         server.stop(0, 0)
     }
+
     fun extractBreadcrumbs(input: String): List<String> {
         val breadCrumbPrefix = ">> "
 
@@ -242,8 +243,6 @@ class ExamplesInteractiveServer(
         return breadcrumbs
     }
 
-
-
     fun getJsonNodeLineNumbersUsingJsonPath(
         jsonFilePath: String,
         jsonPaths: List<String>,
@@ -398,9 +397,15 @@ class ExamplesInteractiveServer(
                 val examplesDir = getExamplesDirPath(contractFile).also { if (it.exists()) it.mkdirs() }
                 val allExistingExamples = examplesDir.getExamplesFromDir()
 
+                val schemaExamples = emptyList<TableRow>().withSchemaExamples(feature, examplesDir.getSchemaExamplesWithValidation(feature)).flatMap {
+                    if (it.example != null) {
+                        listOf(ExamplePathInfo(path = it.example, created = false, status = ExampleGenerationStatus.EXISTED))
+                    } else generateForSchemaBased(contractFile, it.rawPath, it.method)
+                }
+
                 val allExamples = feature.scenarios.flatMap { scenario ->
                     generateAndLogScenarioExamples(contractFile, feature, scenario, allExistingExamples, allowOnlyMandatoryKeysInJSONObject)
-                }
+                }.plus(schemaExamples)
 
                 generationSummary(contractFile, allExamples).map { it.path }
             } catch (e: StackOverflowError) {

diff --git a/core/src/main/kotlin/io/specmatic/core/examples/server/SchemaExample.kt b/core/src/main/kotlin/io/specmatic/core/examples/server/SchemaExample.kt
@@ -8,7 +8,7 @@ import java.io.File
 
 data class SchemaExample(val json: Value, val file: File) {
     companion object {
-        val SCHEMA_IDENTIFIER_REGEX = Regex("^resource\\.(.*)\\.example\\.json$")
+        val SCHEMA_IDENTIFIER_REGEX = Regex("^resource(?:\\.(\\w+))?\\.(\\w+)\\.example\\.json\$")
 
         fun toSchemaExampleFileName(parentPattern: String, patternName: String): String {
             if (patternName.isBlank()) return "resource.$parentPattern.example.json"