Restructure ModuleBuilder dependencies, move into new module

DrewCarlson · Oct 27, 2024 · b732d2e · b732d2e
1 parent 23a7cba
commit b732d2e
Show file tree

Hide file tree

Showing 25 changed files with 247 additions and 76 deletions.
diff --git a/ktpack-cli/build.gradle.kts b/ktpack-cli/build.gradle.kts
@@ -29,9 +29,11 @@ kotlin {
                 implementation(project(":ktpack-internal:git"))
                 implementation(project(":ktpack-internal:github"))
                 implementation(project(":ktpack-internal:gradle"))
+                implementation(project(":ktpack-internal:manifest-loader"))
                 implementation(project(":ktpack-internal:maven"))
                 implementation(project(":ktpack-internal:webserver"))
                 implementation(project(":ktpack-internal:models"))
+                implementation(project(":ktpack-internal:module-builder"))
                 implementation(project(":ktpack-internal:platform"))
                 implementation(project(":ktpack-internal:toolchains"))
                 implementation(libs.ksubprocess)

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/CliContext.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/CliContext.kt
@@ -2,16 +2,16 @@ package ktpack
 
 import com.github.ajalt.mordant.terminal.Terminal
 import io.ktor.client.HttpClient
+import ktpack.compilation.BuildContext
+import ktpack.compilation.dependencies.MavenDependencyResolver
 import ktpack.compilation.tools.DokkaCli
-import ktpack.manifest.ManifestToml
+import ktpack.manifest.ManifestLoader
 import ktpack.toolchain.jdk.JdkInstalls
 import ktpack.toolchain.kotlin.KotlincInstalls
 import ktpack.toolchain.nodejs.NodejsInstalls
 import ktpack.util.GitCli
 
-const val MANIFEST_FILENAME = "pack.toml"
-
-interface CliContext {
+interface CliContext : ManifestLoader {
 
     /**
      * When true, print the full stacktrace in the case of an uncaught
@@ -33,7 +33,15 @@ interface CliContext {
     val dokka: DokkaCli
     val gitCli: GitCli
 
-    fun updateConfig(body: KtpackUserConfig.() -> KtpackUserConfig)
+    fun createBuildContext(): BuildContext {
+        return BuildContext(
+            manifestLoader = this,
+            resolver = MavenDependencyResolver(http),
+            jdk = jdkInstalls,
+            kotlinc = kotlinInstalls,
+            debug = debug,
+        )
+    }
 
-    fun loadManifestToml(filePath: String = MANIFEST_FILENAME): ManifestToml
+    fun updateConfig(body: KtpackUserConfig.() -> KtpackUserConfig)
 }
diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/BuildCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/BuildCommand.kt
@@ -37,11 +37,15 @@ class BuildCommand : CliktCommand() {
         .flag()
 
     override fun run() = runBlocking {
-        val manifest = context.loadManifestToml()
+        val manifest = context.load()
         val module = manifest.module
         val output =
             manifest.module.output ?: KtpackSourceCollector(Path(workingDirectory, "src")).getDefaultOutput(userTarget)
-        val moduleBuilder = ModuleBuilder(manifest, context, workingDirectory)
+        val moduleBuilder = ModuleBuilder(
+            manifest = manifest,
+            modulePath = workingDirectory,
+            context = context.createBuildContext()
+        )
 
         logger.i {
             "{} {} v{} ({})".format(
@@ -110,7 +114,7 @@ class BuildCommand : CliktCommand() {
             is ArtifactResult.ProcessError -> {
                 logger.i { "${failed("Failed")} failed to compile selected target(s)" }
                 if (!artifact.message.isNullOrBlank()) {
-                    logger.i(artifact.message)
+                    logger.i(artifact.message!!)
                 }
                 exitProcess(1)
             }

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/CheckCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/CheckCommand.kt
@@ -4,6 +4,7 @@ import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.arguments.*
 import kotlinx.coroutines.runBlocking
 import ktpack.*
+import ktpack.manifest.MANIFEST_FILENAME
 
 class CheckCommand : CliktCommand() {
 
@@ -18,7 +19,7 @@ class CheckCommand : CliktCommand() {
     private val context by requireObject<CliContext>()
 
     override fun run() = runBlocking {
-        val packageConf = context.loadManifestToml(filePath)
+        val packageConf = context.load(filePath)
         // TODO: Validate all package properties
         println(packageConf)
     }

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/CleanCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/CleanCommand.kt
@@ -26,8 +26,12 @@ class CleanCommand : CliktCommand() {
 
     override fun run() = runBlocking {
         val userTarget = userTarget
-        val manifestToml = context.loadManifestToml()
-        val moduleBuilder = ModuleBuilder(manifestToml, context, workingDirectory)
+        val manifest = context.load()
+        val moduleBuilder = ModuleBuilder(
+            manifest = manifest,
+            modulePath = workingDirectory,
+            context = context.createBuildContext()
+        )
 
         val dependencyTree = moduleBuilder.resolveRootDependencyTree(
             KotlinTarget.entries,

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/DependenciesCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/DependenciesCommand.kt
@@ -45,8 +45,12 @@ class DependenciesCommand : CliktCommand() {
         .multiple(DependencyScope.entries)
 
     override fun run(): Unit = runBlocking {
-        val packageConf = context.loadManifestToml()
-        val moduleBuilder = ModuleBuilder(packageConf, context, workingDirectory)
+        val manifest = context.load()
+        val moduleBuilder = ModuleBuilder(
+            manifest = manifest,
+            modulePath = workingDirectory,
+            context = context.createBuildContext()
+        )
 
         val tree = moduleBuilder.resolveRootDependencyTree(listOfNotNull(target), scopes)
 

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/DocCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/DocCommand.kt
@@ -39,7 +39,7 @@ class DocCommand : CliktCommand(name = "doc") {
         .default(9543)
 
     override fun run(): Unit = runBlocking {
-        val manifest = context.loadManifestToml()
+        val manifest = context.load()
         val jdk = checkNotNull(context.jdkInstalls.getDefaultJdk())
         val dokkaVersion = manifest.docs.version ?: context.config.dokkaVersion
         val docOutputDir = Path(workingDirectory, "out", "docs").toString()

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/InitCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/InitCommand.kt
@@ -4,7 +4,7 @@ import co.touchlab.kermit.Logger
 import com.github.ajalt.clikt.core.*
 import kotlinx.io.files.Path
 import ktpack.CliContext
-import ktpack.MANIFEST_FILENAME
+import ktpack.manifest.MANIFEST_FILENAME
 import ktpack.util.exists
 import ktpack.util.failed
 import ktpack.util.forClass

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/KtpackCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/KtpackCommand.kt
@@ -12,21 +12,22 @@ import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.serialization.kotlinx.json.*
 import kotlinx.io.files.Path
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import ktpack.*
 import ktpack.compilation.dependencies.MavenDependencyResolver
 import ktpack.compilation.tools.DokkaCli
+import ktpack.manifest.DefaultManifestLoader
+import ktpack.manifest.ManifestLoader
 import ktpack.toolchain.kotlin.KotlincInstalls
-import ktpack.manifest.ManifestToml
-import ktpack.manifest.toml
 import ktpack.toolchain.jdk.JdkInstalls
 import ktpack.toolchain.nodejs.NodejsInstalls
 import ktpack.util.*
 
 class KtpackCommand(
     override val term: Terminal,
-) : CliktCommand(), CliContext {
+) : CliktCommand(),
+    CliContext,
+    ManifestLoader by DefaultManifestLoader() {
 
     override fun help(context: Context): String {
         return context.theme.info("A simple tool for building and publishing Kotlin software.")
@@ -83,15 +84,6 @@ class KtpackCommand(
         configPath.writeString(encodedConfig, ::logError)
     }
 
-    override fun loadManifestToml(filePath: String): ManifestToml {
-        val path = Path(filePath).let { path ->
-            Path(workingDirectory, path.toString()).resolve()
-        }
-        check(path.exists()) { "No $MANIFEST_FILENAME file found in '${path.parent}'" }
-        return toml.decodeFromString<ManifestToml>(path.readString())
-            .resolveDependencyShorthand()
-    }
-
     override val http: HttpClient by lazy {
         HttpClient {
             install(ContentNegotiation) {

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/NewCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/NewCommand.kt
@@ -11,8 +11,8 @@ import kotlinx.io.files.Path
 import kotlinx.serialization.encodeToString
 import ktpack.CliContext
 import ktpack.Ktpack
-import ktpack.MANIFEST_FILENAME
 import ktpack.configuration.KotlinTarget
+import ktpack.manifest.MANIFEST_FILENAME
 import ktpack.manifest.ManifestToml
 import ktpack.manifest.ModuleToml
 import ktpack.manifest.toml

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/RunCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/RunCommand.kt
@@ -50,13 +50,17 @@ class RunCommand : CliktCommand() {
         .default(9543)
 
     override fun run(): Unit = runBlocking {
-        val manifest = context.loadManifestToml()
+        val manifest = context.load()
+        val targetBin = targetBin ?: manifest.module.name
         val output = manifest.module.output
             ?: OutputToml.BinCommon.Bin(
                 targets = PlatformUtils.getHostSupportedTargets(),
             )
-        val moduleBuilder = ModuleBuilder(manifest, context, workingDirectory)
-        val targetBin = targetBin ?: manifest.module.name
+        val moduleBuilder = ModuleBuilder(
+            manifest = manifest,
+            modulePath = workingDirectory,
+            context = context.createBuildContext()
+        )
 
         logger.i {
             val name = manifest.module.name

diff --git a/ktpack-cli/src/commonMain/kotlin/ktpack/commands/TestCommand.kt b/ktpack-cli/src/commonMain/kotlin/ktpack/commands/TestCommand.kt
@@ -41,8 +41,12 @@ class TestCommand : CliktCommand() {
         .multiple(listOf(PlatformUtils.getHostTarget()))
 
     override fun run(): Unit = runBlocking {
-        val manifest = context.loadManifestToml()
-        val moduleBuilder = ModuleBuilder(manifest, context, workingDirectory)
+        val manifest = context.load()
+        val moduleBuilder = ModuleBuilder(
+            manifest = manifest,
+            modulePath = workingDirectory,
+            context = context.createBuildContext()
+        )
 
         userTargets.forEach { target ->
             buildAndRunTests(manifest, moduleBuilder, target)

diff --git a/ktpack-cli/src/commonTest/kotlin/ktpack/TestCliContext.kt b/ktpack-cli/src/commonTest/kotlin/ktpack/TestCliContext.kt
@@ -8,6 +8,7 @@ import kotlinx.io.files.Path
 import kotlinx.serialization.decodeFromString
 import ktpack.compilation.dependencies.MavenDependencyResolver
 import ktpack.compilation.tools.DokkaCli
+import ktpack.manifest.MANIFEST_FILENAME
 import ktpack.toolchain.kotlin.KotlincInstalls
 import ktpack.manifest.ManifestToml
 import ktpack.manifest.toml
@@ -53,7 +54,7 @@ class TestCliContext : CliContext {
         config = config.run(body)
     }
 
-    override fun loadManifestToml(filePath: String): ManifestToml {
+    override fun load(filePath: String): ManifestToml {
         val path = Path(filePath).resolve()
         check(path.exists()) {
             "No $MANIFEST_FILENAME file found in '${path.parent}'"

diff --git a/...Main/kotlin/ktpack/util/MeasureSeconds.kt → ...Main/kotlin/ktpack/util/MeasureSeconds.kt b/...Main/kotlin/ktpack/util/MeasureSeconds.kt → ...Main/kotlin/ktpack/util/MeasureSeconds.kt
diff --git a/ktpack-internal/manifest-loader/build.gradle.kts b/ktpack-internal/manifest-loader/build.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+    id("internal-lib")
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":ktpack-internal:platform"))
+                implementation(project(":ktpack-internal:models"))
+            }
+        }
+
+        commonTest {
+            dependencies {
+                implementation(project(":ktpack-internal:test-utils"))
+                implementation(libs.coroutines.test)
+            }
+        }
+    }
+}
diff --git a/...k-internal/manifest-loader/src/commonMain/kotlin/ktpack/manifest/DefaultManifestLoader.kt b/...k-internal/manifest-loader/src/commonMain/kotlin/ktpack/manifest/DefaultManifestLoader.kt
@@ -0,0 +1,24 @@
+package ktpack.manifest
+
+import kotlinx.io.files.Path
+import kotlinx.serialization.decodeFromString
+import ktpack.util.exists
+import ktpack.util.readString
+import ktpack.util.resolve
+import ktpack.util.workingDirectory
+
+class DefaultManifestLoader : ManifestLoader {
+
+    override fun load(filePath: String): ManifestToml {
+        val path = Path(filePath).let { path ->
+            if (path.isAbsolute) {
+                path
+            } else {
+                Path(workingDirectory, path.toString()).resolve()
+            }
+        }
+        check(path.exists()) { "No $MANIFEST_FILENAME file found in '${path.parent}'" }
+        return toml.decodeFromString<ManifestToml>(path.readString())
+            .resolveDependencyShorthand()
+    }
+}
diff --git a/ktpack-internal/manifest-loader/src/commonMain/kotlin/ktpack/manifest/ManifestLoader.kt b/ktpack-internal/manifest-loader/src/commonMain/kotlin/ktpack/manifest/ManifestLoader.kt
@@ -0,0 +1,10 @@
+package ktpack.manifest
+
+const val MANIFEST_FILENAME = "pack.toml"
+
+interface ManifestLoader {
+
+    fun load(
+        filePath: String = MANIFEST_FILENAME
+    ): ManifestToml
+}
diff --git a/ktpack-internal/module-builder/build.gradle.kts b/ktpack-internal/module-builder/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    id("internal-lib")
+}
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":ktpack-internal:platform"))
+                implementation(project(":ktpack-internal:models"))
+                implementation(project(":ktpack-internal:manifest-loader"))
+                implementation(project(":ktpack-internal:dependency-resolver"))
+                implementation(project(":ktpack-internal:toolchains"))
+                implementation(libs.ksubprocess)
+                implementation(libs.semver)
+            }
+        }
+
+        commonTest {
+            dependencies {
+                implementation(project(":ktpack-internal:test-utils"))
+                implementation(libs.coroutines.test)
+            }
+        }
+    }
+}
diff --git a/...tlin/ktpack/compilation/ArtifactResult.kt → ...tlin/ktpack/compilation/ArtifactResult.kt b/...tlin/ktpack/compilation/ArtifactResult.kt → ...tlin/ktpack/compilation/ArtifactResult.kt
diff --git a/ktpack-internal/module-builder/src/commonMain/kotlin/ktpack/compilation/BuildContext.kt b/ktpack-internal/module-builder/src/commonMain/kotlin/ktpack/compilation/BuildContext.kt
@@ -0,0 +1,14 @@
+package ktpack.compilation
+
+import ktpack.compilation.dependencies.MavenDependencyResolver
+import ktpack.manifest.ManifestLoader
+import ktpack.toolchain.jdk.JdkInstalls
+import ktpack.toolchain.kotlin.KotlincInstalls
+
+class BuildContext(
+    manifestLoader: ManifestLoader,
+    val resolver: MavenDependencyResolver,
+    val jdk: JdkInstalls,
+    val kotlinc: KotlincInstalls,
+    val debug: Boolean
+) : ManifestLoader by manifestLoader