From 78f6752598daae736c3a22e2b1cde0bc54ec5bca Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Thu, 8 May 2025 17:42:39 +0300
Subject: [PATCH] Module templates refactoring

---
 .../api/module/CreateModuleScope.kt           |  2 +-
 .../db/sql_skeleton_0/api/module/Module.kt    | 37 ++++++++++++--
 .../api/module/ModuleTemplate.kt              | 51 -------------------
 .../api/module/UpgradeModuleScope.kt          |  4 +-
 4 files changed, 35 insertions(+), 59 deletions(-)
 delete mode 100644 src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleTemplate.kt

diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt
index d695241..059b11f 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/CreateModuleScope.kt
@@ -22,7 +22,7 @@ public interface CreateModuleScope<mUE : Any, RUNTIME_KEY : Any> {
 
 	public fun moduleScopedObject(namespace: Namespace<mUE, RUNTIME_KEY> = this.rootNs, name: String): ModuleScopedObject<mUE, RUNTIME_KEY>
 
-	public fun <mUE : Any> substituteModule(rootNs: Namespace<mUE, RUNTIME_KEY>, template: ModuleTemplate<mUE>): Module<mUE, RUNTIME_KEY>
+	public fun <mUE : Any> substituteModule(rootNs: Namespace<mUE, RUNTIME_KEY>, template: Module.Template<mUE>): Module<mUE, RUNTIME_KEY>
 
 	public fun namespace(parent: Namespace<mUE, RUNTIME_KEY>, name: String): Namespace<mUE, RUNTIME_KEY>
 
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt
index 5707451..58eaad3 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/Module.kt
@@ -2,13 +2,12 @@ package ru.landgrafhomyak.db.sql_skeleton_0.api.module
 
 import kotlin.jvm.JvmName
 import ru.landgrafhomyak.db.sql_skeleton_0.api.DebugApi
-import ru.landgrafhomyak.db.sql_skeleton_0.api.queries._Statement
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.Executor
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.Table
-import ru.landgrafhomyak.db.sql_skeleton_0.api.table.TableConstructor
+import ru.landgrafhomyak.db.sql_skeleton_0.api.LowLevelApi
+import ru.landgrafhomyak.db.sql_skeleton_0.api.queries.QueriesCompiler
+import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.Transaction
 
 
-public interface Module<mUE : Any, RUNTIME_KEY: Any> {
+public interface Module<mUE : Any, RUNTIME_KEY : Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
 	@get:JvmName("uExt")
 	public val uExt: mUE
@@ -22,4 +21,32 @@ public interface Module<mUE : Any, RUNTIME_KEY: Any> {
 	@Suppress("INAPPLICABLE_JVM_NAME")
 	@get:JvmName("getParent")
 	public val parent: Module<*, RUNTIME_KEY>?
+
+	public interface Constructor<mUE : Any, RUNTIME_KEY : Any> {
+		@Suppress("INAPPLICABLE_JVM_NAME")
+		@get:JvmName("versionKey")
+		public val versionKey: String
+
+		public fun createSchema(context: CreateModuleScope<mUE, RUNTIME_KEY>): mUE
+
+		public suspend fun initData(ext: mUE, compiler: QueriesCompiler<RUNTIME_KEY>, transaction: Transaction<RUNTIME_KEY>) {}
+	}
+
+	public interface Upgrade<omUE : Any, nmUE : Any, RUNTIME_KEY : Any> {
+		@Suppress("INAPPLICABLE_JVM_NAME")
+		@get:JvmName("versionKey")
+		public val versionKey: String
+
+		public fun upgradeSchema(context: UpgradeModuleScope<nmUE, omUE, RUNTIME_KEY>): nmUE
+
+		public suspend fun upgradeData(ext: nmUE, compiler: QueriesCompiler<RUNTIME_KEY>, transaction: Transaction<RUNTIME_KEY>) {}
+	}
+
+	public interface Template<@Suppress("unused") mUE : Any> {
+		@LowLevelApi
+		public fun <RUNTIME_KEY : Any> getConstructor(): Constructor<*, RUNTIME_KEY>
+
+		@LowLevelApi
+		public fun <RUNTIME_KEY : Any> getUpgrade(version: String): Upgrade<*, *, RUNTIME_KEY>?
+	}
 }
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleTemplate.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleTemplate.kt
deleted file mode 100644
index 86e5d88..0000000
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/ModuleTemplate.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package ru.landgrafhomyak.db.sql_skeleton_0.api.module
-
-import kotlin.jvm.JvmName
-import ru.landgrafhomyak.db.sql_skeleton_0.api.runtime.Transaction
-
-public interface ModuleTemplate<@Suppress("unused") mUE : Any> {
-	public interface VersionsInitializer<UE : Any> {
-		public fun createModuleTemplates(context: Scope): UE
-
-		public interface Scope {
-			public fun <nmUE : Any> createTemplate(
-				constructor: ModuleConstructor<nmUE>,
-			): ModuleTemplate<nmUE>
-
-			public fun <omUE : Any, nmUE : Any> upgradeTemplate(
-				oldModule: ModuleTemplate<omUE>,
-				upgrade: ModuleUpgrade<omUE, nmUE>,
-			): ModuleTemplate<nmUE>
-
-			public fun <omUE : Any, nmUE : Any> upgradeTemplateAndMerge(
-				oldModule: ModuleTemplate<omUE>,
-				upgrade: ModuleUpgrade<omUE, nmUE>,
-				mergeTo: ModuleTemplate<nmUE>
-			): ModuleTemplate<nmUE>
-		}
-	}
-
-	public interface ModuleConstructor<mUE : Any> {
-		@Suppress("INAPPLICABLE_JVM_NAME")
-		@get:JvmName("versionKey")
-		public val versionKey: String
-
-		public fun createSchema(context: CreateModuleScope): mUE
-
-		public suspend fun initData(ext: mUE, transaction: Transaction) {}
-	}
-
-	public interface ModuleUpgrade<omUE : Any, nmUE : Any> {
-		@Suppress("INAPPLICABLE_JVM_NAME")
-		@get:JvmName("versionKey")
-		public val versionKey: String
-
-		public fun upgradeSchema(context: UpgradeModuleScope<omUE>): nmUE
-
-		public suspend fun upgradeData(ext: nmUE, transaction: Transaction) {}
-	}
-
-	@Suppress("INAPPLICABLE_JVM_NAME")
-	@get:JvmName("getVersionKey")
-	public val versionKey: String
-}
\ No newline at end of file
diff --git a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt
index 7667f9c..c7c1f0b 100644
--- a/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt
+++ b/src/commonMain/kotlin/ru/landgrafhomyak/db/sql_skeleton_0/api/module/UpgradeModuleScope.kt
@@ -56,8 +56,8 @@ public interface UpgradeModuleScope<nmUE : Any, omUE : Any, RUNTIME_KEY : Any> :
 	public fun <smUE : Any> keepModule(module: Module<smUE, RUNTIME_KEY>): Module<smUE, RUNTIME_KEY>
 	public fun <smUE : Any> keepAndMoveModule(oldModule: Module<smUE, RUNTIME_KEY>, newNs: Namespace<nmUE, RUNTIME_KEY>): Module<smUE, RUNTIME_KEY>
 
-	public fun <smUE : Any> upgradeModule(oldModule: Module<*, RUNTIME_KEY>, template: ModuleTemplate<smUE>): Module<smUE, RUNTIME_KEY>
-	public fun <smUE : Any> upgradeAndMoveModule(oldModule: Module<*, RUNTIME_KEY>, newNs: Namespace<nmUE, RUNTIME_KEY>, template: ModuleTemplate<smUE>): Module<smUE, RUNTIME_KEY>
+	public fun <smUE : Any> upgradeModule(oldModule: Module<*, RUNTIME_KEY>, template: Module.Template<smUE>): Module<smUE, RUNTIME_KEY>
+	public fun <smUE : Any> upgradeAndMoveModule(oldModule: Module<*, RUNTIME_KEY>, newNs: Namespace<nmUE, RUNTIME_KEY>, template: Module.Template<smUE>): Module<smUE, RUNTIME_KEY>
 
 	public fun removeModule(oldModule: Module<*, RUNTIME_KEY>)
 	public fun <smUE : Any> removeModuleAfterUpgrade(oldModule: Module<smUE, RUNTIME_KEY>): Module<smUE, RUNTIME_KEY>