Skip to content

Fix error on "./samtw compile samt.yaml" #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Fix error on "./samtw compile samt.yaml" #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion samt-config/src/main/kotlin/tools/samt/config/SamtConfigurationParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package tools.samt.config
import com.charleskorn.kaml.*
import kotlinx.serialization.SerializationException
import java.nio.file.Path
import kotlin.io.path.Path
import kotlin.io.path.exists
import kotlin.io.path.inputStream
import tools.samt.common.DiagnosticSeverity as CommonDiagnosticSeverity
Expand Down Expand Up @@ -37,7 +38,8 @@ object SamtConfigurationParser {
SamtConfiguration()
}

val projectDirectory = path.parent
// a single component relative path like "samt.yaml" will return null as parent, fallback to working directory
val projectDirectory = path.parent ?: Path("")

return CommonSamtConfiguration(
source = projectDirectory.resolve(parsedConfiguration.source).normalize(),
Expand Down
31 changes: 28 additions & 3 deletions samt-config/src/test/kotlin/tools/samt/config/SamtConfigurationParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package tools.samt.config

import com.charleskorn.kaml.YamlException
import org.junit.jupiter.api.assertThrows
import kotlin.io.path.Path
import kotlin.io.path.exists
import kotlin.io.path.isDirectory
import kotlin.io.path.*
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals
Expand Down Expand Up @@ -143,4 +141,31 @@ class SamtConfigurationParserTest {
exception.message
)
}

@Test
fun `single component relative path works`() {
val configPath = Path("samt-minimal.yaml")
try {
testDirectory.resolve("samt-minimal.yaml").copyTo(configPath, overwrite = true)
val samtConfiguration = SamtConfigurationParser.parseConfiguration(configPath)
assertEquals(
tools.samt.common.SamtConfiguration(
source = Path("src"),
plugins = emptyList(),
generators = listOf(
tools.samt.common.SamtGeneratorConfiguration(
name = "samt-kotlin-ktor",
output = Path("out"),
options = mapOf(
"addPrefixToKotlinPackage" to "com.company.samt.generated",
)
)
)
),
samtConfiguration
)
} finally {
configPath.deleteIfExists()
}
}
}