fixing processor

verify class declaration binding ok

check module includes

verif message

wip - verify includes

rename

clean up licence dates

add verify option

wip

wip - compile safety

compiler/koin-annotations/src/commonMain/kotlin/org/koin/android/annotation/AndroidAnnotations.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-annotations/src/commonMain/kotlin/org/koin/core/annotation/CoreAnnotations.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/BuilderProcessor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,29 @@
  */
 package org.koin.compiler
 
-import appendText
 import com.google.devtools.ksp.processing.*
 import com.google.devtools.ksp.symbol.KSAnnotated
+import org.koin.compiler.KspOptions.KOIN_CONFIG_CHECK
 import org.koin.compiler.generator.KoinGenerator
-import org.koin.compiler.generator.getFile
 import org.koin.compiler.metadata.KoinMetaData
 import org.koin.compiler.scanner.KoinMetaDataScanner
+import org.koin.compiler.verify.KoinConfigVerification
 
 class BuilderProcessor(
     codeGenerator: CodeGenerator,
-    private val logger: KSPLogger
+    private val logger: KSPLogger,
+    private val options: Map<String, String>
 ) : SymbolProcessor {
 
     private val koinCodeGenerator = KoinGenerator(codeGenerator, logger)
     private val koinMetaDataScanner = KoinMetaDataScanner(logger)
+    private val koinConfigVerification = KoinConfigVerification(codeGenerator, logger)
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
         logger.logging("Scanning symbols ...")
+
+        //TODO Handle allowDefaultModule option
+
         val invalidSymbols = koinMetaDataScanner.scanSymbols(resolver)
         if (invalidSymbols.isNotEmpty()) {
             logger.logging("Invalid symbols found (${invalidSymbols.size}), waiting for next round")
@@ -41,7 +46,8 @@ class BuilderProcessor(
 
         val defaultModule = KoinMetaData.Module(
             packageName = "",
-            name = "defaultModule"
+            name = "defaultModule",
+            isDefault = true
         )
 
         logger.logging("Scan metadata ...")
@@ -50,49 +56,24 @@ class BuilderProcessor(
         logger.logging("Generate code ...")
         koinCodeGenerator.generateModules(moduleList, defaultModule)
 
-        //TODO Use argument here to activate this part
-        val genSize = koinCodeGenerator.codeGenerator.generatedFile.size
-
-        val ignored = listOf("kotlin.Lazy", "kotlin.Any")
-        (moduleList + defaultModule).map { module ->
-            module.definitions.forEach { def ->
-                val label = def.label
-                val cn = label.first().toString().toUpperCase() + label.takeLast(label.length - 1)
-                val file = koinCodeGenerator.codeGenerator.getFile(fileName = cn)
-                file.appendText("package org.koin.ksp.generated")
-                def.bindings.forEach { d ->
-                    val cn = d.simpleName.asString()
-                    file.appendText("\nclass KoinDef$cn")
-                }
-                if (genSize == 0) {
-                    def.parameters.forEach { param ->
-                        if (param is KoinMetaData.ConstructorParameter.Dependency) {
-                            val p = param.type.declaration.qualifiedName?.asString()
-//                            logger.warn("$label look at dependency => $p")
-                            if (p !in ignored && p != null) {
-                                val d =
-                                    resolver.getKSNameFromString("org.koin.ksp.generated.KoinDef" + param.type.declaration.simpleName.asString())
-//                                logger.warn("ksn => ${d.asString()}")
-                                val dc = resolver.getClassDeclarationByName(d)
-                                if (dc != null) {
-//                                    logger.warn("ks => $it")
-                                } else {
-                                    logger.error("$label need dependency type '$p', but is not found. Check your Koin configuration to add the right definition or type binding.")
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+        if (isVerificationActivated()) {
+            logger.warn("[Experimental] Koin Configuration Check ...")
+            koinConfigVerification.verifyDefinitionDeclarations(moduleList + defaultModule, resolver)
+            koinConfigVerification.verifyModuleIncludes(moduleList + defaultModule, resolver)
         }
         return emptyList()
     }
+
+    private fun isVerificationActivated(): Boolean {
+        return options[KOIN_CONFIG_CHECK] == true.toString()
+    }
 }
 
+
 class BuilderProcessorProvider : SymbolProcessorProvider {
     override fun create(
         environment: SymbolProcessorEnvironment
     ): SymbolProcessor {
-        return BuilderProcessor(environment.codeGenerator, environment.logger)
+        return BuilderProcessor(environment.codeGenerator, environment.logger, environment.options)
     }
-}
+}

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/KspOptions.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.koin.compiler
+
+object KspOptions {
+    const val KOIN_CONFIG_CHECK = "KOIN_CONFIG_CHECK"
+}

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/DefinitionGenerationExt.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/KoinGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/ModuleGenerationExt.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/Templates.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/Utils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/metadata/AnnotationMetadata.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/metadata/KoinMetaData.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ sealed class KoinMetaData {
         val componentScan: ComponentScan? = null,
         val includes : List<KSDeclaration>? = null,
         val visibility: Visibility = Visibility.PUBLIC,
+        val isDefault : Boolean = false
     ) : KoinMetaData() {
 
         fun packageName(separator : String) : String{

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/ClassComponentScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/FunctionComponentScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/FunctionScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/KoinMetaDataScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ class KoinMetaDataScanner(
         val alreadyExists = foundModule.definitions.contains(definition)
         if (!alreadyExists) {
             if (foundModule == defaultModule) {
-                logger.warn("adding ${definition.label} to default module")
+                logger.warn("No module found for '$definitionPackage.${definition.label}'. Definition is added to 'defaultModule'")
             }
             foundModule.definitions.add(definition)
         } else {

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/KspExt.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/ModuleScanner.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.