Implement hierarchical configuration.

Author: FilipDolnik

SKIE/acceptance-tests

@@ -1,12 +1,12 @@
 package co.touchlab.skie.plugin.analytics
 
 import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.configuration.TypedSkieConfiguration
+import co.touchlab.skie.configuration.UntypedSkieConfigurationData
 import co.touchlab.skie.util.directory.SkieBuildDirectory
 
 class AnalyticsCollector(
     private val skieBuildDirectory: SkieBuildDirectory,
-    private val skieConfiguration: TypedSkieConfiguration<SkieConfigurationFlag>,
+    private val skieConfiguration: UntypedSkieConfigurationData<SkieConfigurationFlag>,
 ) {
 
     fun collectAsync(producers: List<AnalyticsProducer>) {

SKIE/common/analytics/src/commonMain/kotlin/co/touchlab/skie/plugin/analytics/AnalyticsCollector.kt

@@ -20,26 +20,43 @@ interface ConfigurationKey<T> {
 
     val skieRuntimeValue: T
 
-    fun getAnnotationValue(configurationTarget: ConfigurationTarget): T?
+    val isInheritable: kotlin.Boolean
+        get() = false
+
+    fun hasAnnotationValue(configurationTarget: ConfigurationTarget): kotlin.Boolean
+
+    fun getAnnotationValue(configurationTarget: ConfigurationTarget): T
 
     fun deserialize(value: kotlin.String?): T
 
     fun serialize(value: T): kotlin.String? =
         value?.toString()
 
-    interface String : ConfigurationKey<kotlin.String> {
+    interface NonOptional<T : Any> : ConfigurationKey<T> {
+
+        override fun hasAnnotationValue(configurationTarget: ConfigurationTarget): kotlin.Boolean =
+            findAnnotationValue(configurationTarget) != null
+
+        fun findAnnotationValue(configurationTarget: ConfigurationTarget): T?
+
+        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): T =
+            findAnnotationValue(configurationTarget)
+                ?: throw IllegalStateException("Target $configurationTarget does not have an annotation value.")
+    }
+
+    interface String : NonOptional<kotlin.String> {
 
         override fun deserialize(value: kotlin.String?): kotlin.String =
             value.throwIfNull()
     }
 
-    interface Boolean : ConfigurationKey<kotlin.Boolean> {
+    interface Boolean : NonOptional<kotlin.Boolean> {
 
         override fun deserialize(value: kotlin.String?): kotlin.Boolean =
             value.throwIfNull().toBooleanStrict()
     }
 
-    interface Int : ConfigurationKey<kotlin.Int> {
+    interface Int : NonOptional<kotlin.Int> {
 
         override fun deserialize(value: kotlin.String?): kotlin.Int =
             value.throwIfNull().toInt()

SKIE/common/configuration/api/src/commonMain/kotlin/co/touchlab/skie/configuration/ConfigurationKey.kt

@@ -0,0 +1,32 @@
+package co.touchlab.skie.configuration
+
+interface ConfigurationScope {
+
+    interface Root : ConfigurationScope
+
+    interface Module : ConfigurationScope
+
+    interface Package : ConfigurationScope
+
+    interface File : ConfigurationScope
+
+    interface Class : ConfigurationScope
+
+    interface Constructor : ConfigurationScope
+
+    interface SimpleFunction : ConfigurationScope
+
+    interface Property : ConfigurationScope
+
+    interface ValueParameter : ConfigurationScope
+
+    interface Function : SimpleFunction, Constructor
+
+    interface CallableDeclaration : Function, Property
+
+    interface AllExceptCallableDeclarations : Root, Module, Package, File, Class
+
+    interface AllExceptConstructorsAndProperties : AllExceptCallableDeclarations, SimpleFunction
+
+    interface All : AllExceptConstructorsAndProperties, CallableDeclaration, ValueParameter
+}

SKIE/common/configuration/api/src/commonMain/kotlin/co/touchlab/skie/configuration/ConfigurationScope.kt

@@ -4,10 +4,6 @@ import kotlin.reflect.KClass
 
 interface ConfigurationTarget {
 
-    val fqName: String
-
-    val belongsToSkieRuntime: Boolean
-
     fun <T : Annotation> hasAnnotation(kClass: KClass<T>): Boolean
 
     fun <T : Annotation> findAnnotation(kClass: KClass<T>): T?

SKIE/common/configuration/api/src/commonMain/kotlin/co/touchlab/skie/configuration/ConfigurationTarget.kt

@@ -1,6 +1,6 @@
 package co.touchlab.skie.configuration
 
-interface TypedSkieConfiguration<FLAGS> {
+interface UntypedSkieConfigurationData<FLAGS> {
 
     val enabledConfigurationFlags: Set<FLAGS>
 

SKIE/common/configuration/api/src/commonMain/kotlin/co/touchlab/skie/configuration/TypedSkieConfiguration.kt renamed to SKIE/common/configuration/api/src/commonMain/kotlin/co/touchlab/skie/configuration/UntypedSkieConfigurationData.kt

@@ -11,13 +11,13 @@ object ClassInterop {
      *
      * (Both Kotlin compiler and SKIE rename classes to avoid name conflicts.)
      */
-    object StableTypeAlias : ConfigurationKey.Boolean {
+    object StableTypeAlias : ConfigurationKey.Boolean, ConfigurationScope.AllExceptCallableDeclarations {
 
         override val defaultValue: Boolean = false
 
         override val skieRuntimeValue: Boolean = true
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
             when {
                 configurationTarget.hasAnnotation<ClassInterop.StableTypeAlias.Enabled>() -> true
                 configurationTarget.hasAnnotation<ClassInterop.StableTypeAlias.Disabled>() -> false
@@ -31,12 +31,14 @@ object ClassInterop {
      * However, external Obj-C classes with custom bindings (for example generated by the cinterop tool) must be configured manually.
      * Without knowing the Framework name, SKIE cannot reference such a class in the generated code.
      */
-    object CInteropFrameworkName : ConfigurationKey.OptionalString {
+    object CInteropFrameworkName : ConfigurationKey.OptionalString, ConfigurationScope.AllExceptCallableDeclarations {
 
         override val defaultValue: String? = null
 
         override val skieRuntimeValue: String? = null
 
+        override fun hasAnnotationValue(configurationTarget: ConfigurationTarget): Boolean = false
+
         override fun getAnnotationValue(configurationTarget: ConfigurationTarget): String? = null
     }
 }

SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/ClassInterop.kt

@@ -4,27 +4,27 @@ import co.touchlab.skie.configuration.annotations.DefaultArgumentInterop
 
 object DefaultArgumentInterop {
 
-    object Enabled : ConfigurationKey.Boolean {
+    object Enabled : ConfigurationKey.Boolean, ConfigurationScope.All {
 
         override val defaultValue: Boolean = false
 
         override val skieRuntimeValue: Boolean = false
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
             when {
                 configurationTarget.hasAnnotation<DefaultArgumentInterop.Enabled>() -> true
                 configurationTarget.hasAnnotation<DefaultArgumentInterop.Disabled>() -> false
                 else -> null
             }
     }
 
-    object MaximumDefaultArgumentCount : ConfigurationKey.Int {
+    object MaximumDefaultArgumentCount : ConfigurationKey.Int, ConfigurationScope.All {
 
         override val defaultValue: Int = 5
 
         override val skieRuntimeValue: Int = 5
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Int? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Int? =
             configurationTarget.findAnnotation<DefaultArgumentInterop.MaximumDefaultArgumentCount>()?.count
     }
 }

SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/DefaultArgumentInterop.kt

@@ -7,13 +7,13 @@ object EnumInterop {
     /**
      * If true, the interop code is generated for the given enum.
      */
-    object Enabled : ConfigurationKey.Boolean {
+    object Enabled : ConfigurationKey.Boolean, ConfigurationScope.AllExceptCallableDeclarations {
 
         override val defaultValue: Boolean = true
 
         override val skieRuntimeValue: Boolean = true
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
             when {
                 configurationTarget.hasAnnotation<EnumInterop.Enabled>() -> true
                 configurationTarget.hasAnnotation<EnumInterop.Disabled>() -> false
@@ -51,13 +51,13 @@ object EnumInterop {
      *   case none
      * ```
      */
-    object LegacyCaseName : ConfigurationKey.Boolean {
+    object LegacyCaseName : ConfigurationKey.Boolean, ConfigurationScope.AllExceptCallableDeclarations {
 
         override val defaultValue: Boolean = false
 
         override val skieRuntimeValue: Boolean = false
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
             when {
                 configurationTarget.hasAnnotation<EnumInterop.LegacyCaseName.Enabled>() -> true
                 configurationTarget.hasAnnotation<EnumInterop.LegacyCaseName.Disabled>() -> false

SKIE/common/configuration/declaration/src/commonMain/kotlin/co/touchlab/skie/configuration/EnumInterop.kt

@@ -7,13 +7,13 @@ object ExperimentalFeatures {
     /**
      * If true, enables experimental features which might not be fully implemented yet which may cause compilation problems.
      */
-    object Enabled : ConfigurationKey.Boolean {
+    object Enabled : ConfigurationKey.Boolean, ConfigurationScope.All {
 
         override val defaultValue: Boolean = false
 
         override val skieRuntimeValue: Boolean = true
 
-        override fun getAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
+        override fun findAnnotationValue(configurationTarget: ConfigurationTarget): Boolean? =
             when {
                 configurationTarget.hasAnnotation<ExperimentalFeatures.Enabled>() -> true
                 configurationTarget.hasAnnotation<ExperimentalFeatures.Disabled>() -> false