Allow disable koin exported definitions (KOIN_EXPORT_DEFINITIONS arg) if we want to only filter definitions assembled in modules only

Author: arnaudgiuliani

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

@@ -74,13 +74,17 @@ class BuilderProcessor(
             moduleList
         )
 
-        //TODO Build Proxy
+        val doExportDefinitions = doExportDefinitions()
+        if (!doExportDefinitions && defaultModule.definitions.isNotEmpty()){
+            logger.warn("Skip definitions export ...")
+            defaultModule.definitions.clear()
+        }
+
         val monitoredDefinitions = (moduleList+defaultModule).flatMap { it.definitions }.filter { it.isMonitored }.filterIsInstance<KoinMetaData.Definition.ClassDefinition>()
         koinCodeGenerator.generateProxies(monitoredDefinitions)
 
         logger.logging("Generate code ...")
-        // TODO Attach proxy if monitored
-        koinCodeGenerator.generateModules(moduleList, defaultModule, isDefaultModuleActive())
+        koinCodeGenerator.generateModules(moduleList, defaultModule, isDefaultModuleActive(), doExportDefinitions)
         koinCodeGenerator.generateApplications(applications)
 
         val isConfigCheckActive = isConfigCheckActive()
@@ -148,7 +152,6 @@ class BuilderProcessor(
         return option
     }
 
-    //TODO Disable by default in 2.2?
     private fun isDefaultModuleActive(): Boolean {
         return options.getOrDefault(KOIN_DEFAULT_MODULE.name, "false") == true.toString()
     }
@@ -160,6 +163,10 @@ class BuilderProcessor(
     private fun getCustomGenerationPackage(): String? {
         return options.getOrDefault(KOIN_GENERATION_PACKAGE.name, null)
     }
+
+    private fun doExportDefinitions(): Boolean {
+        return options.getOrDefault(KOIN_EXPORT_DEFINITIONS.name, "true") == true.toString()
+    }
 }
 
 class BuilderProcessorProvider : SymbolProcessorProvider {

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

@@ -29,5 +29,6 @@ enum class KspOptions {
     KOIN_LOG_TIMES,
     KOIN_DEFAULT_MODULE,
     KOIN_GENERATION_PACKAGE,
-    KOIN_USE_COMPOSE_VIEWMODEL
+    KOIN_USE_COMPOSE_VIEWMODEL,
+    KOIN_EXPORT_DEFINITIONS
 }

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

@@ -16,7 +16,6 @@
 package org.koin.compiler.generator
 
 import com.google.devtools.ksp.processing.CodeGenerator
-import com.google.devtools.ksp.processing.Resolver
 import org.koin.compiler.metadata.KoinMetaData
 import org.koin.compiler.metadata.tag.TagResolver
 

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

@@ -16,17 +16,17 @@
 package org.koin.compiler.generator
 
 import com.google.devtools.ksp.processing.CodeGenerator
-import com.google.devtools.ksp.processing.Resolver
 import org.koin.compiler.metadata.KoinMetaData
 import org.koin.compiler.metadata.tag.KoinTagWriter
 import org.koin.compiler.metadata.tag.TagResolver
 
 class DefaultModuleWriter(
     codeGenerator: CodeGenerator,
-    tagResolver : TagResolver,
+    tagResolver: TagResolver,
     defaultModule: KoinMetaData.Module,
-    generateDefaultModule: Boolean
-) : ModuleWriter(codeGenerator, defaultModule, tagResolver) {
+    generateDefaultModule: Boolean,
+    doExportDefinitions: Boolean
+) : ModuleWriter(codeGenerator, defaultModule, tagResolver, doExportDefinitions) {
 
     val hashContent = defaultModule.definitions.map { it.label }.sorted().joinToString()
     override val fileName : String = "KoinDefault-${KoinTagWriter.hashContent(hashContent)}"

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

@@ -20,7 +20,6 @@ import com.google.devtools.ksp.processing.KSPLogger
 import org.koin.compiler.metadata.KoinMetaData
 import org.koin.compiler.metadata.camelCase
 import org.koin.compiler.metadata.tag.TagResolver
-import kotlin.concurrent.thread
 
 class KoinCodeGenerator(
     val codeGenerator: CodeGenerator,
@@ -36,7 +35,8 @@ class KoinCodeGenerator(
     fun generateModules(
         moduleList: List<KoinMetaData.Module>,
         defaultModule: KoinMetaData.Module,
-        generateDefaultModule : Boolean
+        generateDefaultModule: Boolean,
+        doExportDefinitions: Boolean
     ) {
         logger.info("generate ${moduleList.size} modules ...")
 
@@ -58,13 +58,14 @@ class KoinCodeGenerator(
         }
 
         if (defaultModule.definitions.isNotEmpty()) {
-            generateDefaultFile(defaultModule, generateDefaultModule)
+            generateDefaultFile(defaultModule, generateDefaultModule, doExportDefinitions)
         }
     }
 
     private fun generateDefaultFile(
         defaultModule: KoinMetaData.Module,
-        generateDefaultModule: Boolean
+        generateDefaultModule: Boolean,
+        doExportDefinitions: Boolean
     ) {
         logger.info("generate default file ...")
 
@@ -76,7 +77,7 @@ class KoinCodeGenerator(
                 LOGGER.warn("Generating 'defaultModule' with ${defaultModule.definitions.size} definitions")
             }
             defaultModule.setCurrentDefinitionsToExternals()
-            DefaultModuleWriter(codeGenerator, tagResolver, defaultModule, generateDefaultModule).writeModule(isViewModelMPActive)
+            DefaultModuleWriter(codeGenerator, tagResolver, defaultModule, generateDefaultModule, doExportDefinitions).writeModule(isViewModelMPActive)
         }
     }
 

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

@@ -16,7 +16,6 @@
 package org.koin.compiler.generator
 
 import com.google.devtools.ksp.processing.CodeGenerator
-import com.google.devtools.ksp.processing.Resolver
 import org.koin.compiler.generator.DefinitionWriter.Companion.CREATED_AT_START
 import org.koin.compiler.generator.DefinitionWriter.Companion.TAB
 import org.koin.compiler.generator.KoinCodeGenerator.Companion.LOGGER
@@ -31,7 +30,8 @@ import org.koin.compiler.type.clearPackageSymbols
 abstract class ModuleWriter(
     codeGenerator: CodeGenerator,
     val module: KoinMetaData.Module,
-    val tagResolver : TagResolver
+    val tagResolver: TagResolver,
+    val doExportDefinitions: Boolean = true
 ) : AbstractFileWriter(codeGenerator) {
 
     open val hasExternalDefinitions: Boolean = false
@@ -53,8 +53,15 @@ abstract class ModuleWriter(
         }
 
         if (hasExternalDefinitions) {
+            if (!doExportDefinitions){
+                writeln("// Definitions export skipped")
+                writeln("/*")
+            }
             writeExternalDefinitionImports()
             writeExternalDefinitions()
+            if (!doExportDefinitions){
+                writeln("*/")
+            }
         }
 
         writeEmptyLine()