Merge pull request #5 from Code-Sakura/feature/event

Feature/event

Author: kigawa01

convention-plugins/src/main/kotlin/renlin.common.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     kotlin("multiplatform")
 
@@ -6,10 +8,10 @@ plugins {
 
 kotlin {
     jvm {
-//        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-//        compilerOptions {
-//            freeCompilerArgs = listOf("-Xjsr305=strict")
-//        }
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            freeCompilerArgs = listOf("-Xjsr305=strict")
+        }
     }
     js {
         browser {
@@ -18,7 +20,6 @@ kotlin {
                     useChromeHeadless()
                 }
             }
-            binaries.executable()
         }
     }
     sourceSets["commonMain"].dependencies {

generate/build.gradle.kts

@@ -21,14 +21,8 @@ kotlin {
     }
     js {
         browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
-            }
             binaries.executable()
         }
     }
 
 }
-

generate/src/jvmMain/kotlin/generator/NativeGenerator.kt

@@ -1,14 +1,31 @@
 package generator
 
 import java.io.File
+import tagCategories
+import categoryParents
 
 class NativeGenerator(val categoryNativeOutputDir: String) {
     fun generate(categories: Map<String, Set<String>>) {
+        // 親カテゴリーの情報を収集
+        val allParentCategories = categoryParents.toMutableMap()
+        tagCategories.forEach { tagInfo ->
+            allParentCategories.putAll(tagInfo.tagCategories.parentCategories)
+            allParentCategories.putAll(tagInfo.allowedCategories.parentCategories)
+        }
 
         // Unionクラスの生成
         categories.forEach { (name, deps) ->
             val categoryName = name
 
+            // 親カテゴリーを取得
+            val parentCategory = allParentCategories[name]
+
+            // 継承するインターフェースのリスト
+            val interfaces = if (parentCategory != null) {
+                (deps + "ContentCategory" + parentCategory).joinToString(", ")
+            } else {
+                (deps + "ContentCategory").joinToString(", ")
+            }
 
             val fileContent = """
                 package net.kigawa.renlin.w3c.category.native
@@ -17,14 +34,14 @@ class NativeGenerator(val categoryNativeOutputDir: String) {
 
                 /**
                  * Union to ${deps.joinToString(", ")}
+                 * ${if (parentCategory != null) "Parent: $parentCategory" else ""}
                  */
-                interface $categoryName :  ${(deps + "ContentCategory").joinToString(", ")}
+                interface $categoryName : $interfaces
             """.trimIndent()
 
             val file = File("$categoryNativeOutputDir/${categoryName}.kt")
             file.writeText(fileContent)
             println("Generated native: ${categoryName}.kt")
         }
-
     }
-}
+}

generate/src/jvmMain/kotlin/model/AllowedCategories.kt

@@ -2,6 +2,9 @@ package model
 
 data class AllowedCategories(
     override val categories: Set<String>,
+    override val parentCategories: Map<String, String> = emptyMap(),
 ) : Categories {
     constructor(vararg categories: String) : this(categories.toSet())
-}
+    constructor(vararg categories: String, parentCategories: Map<String, String>) : this(categories.toSet(), parentCategories)
+    constructor(categories: Set<String>, vararg parentCategoryPairs: Pair<String, String>) : this(categories, parentCategoryPairs.toMap())
+}

generate/src/jvmMain/kotlin/model/Categories.kt

@@ -2,6 +2,8 @@ package model
 
 interface Categories {
     val categories: Set<String>
+    val parentCategories: Map<String, String>
+
     fun connectedStr(pluralSuffix: String = ""): String {
         // 複数のカテゴリーがある場合、交差インターフェース名を生成
         if (categories.size > 1) {
@@ -13,4 +15,4 @@ interface Categories {
         // 单一カテゴリーの場合
         return categories.firstOrNull() ?: "ContentCategory"
     }
-}
+}

generate/src/jvmMain/kotlin/model/TagCategories.kt

@@ -2,6 +2,9 @@ package model
 
 data class TagCategories(
     override val categories: Set<String>,
+    override val parentCategories: Map<String, String> = emptyMap(),
 ) : Categories {
     constructor(vararg categories: String) : this(categories.toSet())
-}
+    constructor(vararg categories: String, parentCategories: Map<String, String>) : this(categories.toSet(), parentCategories)
+    constructor(categories: Set<String>, vararg parentCategoryPairs: Pair<String, String>) : this(categories, parentCategoryPairs.toMap())
+}

generate/src/jvmMain/kotlin/tagCategories.kt

@@ -2,6 +2,25 @@ import model.AllowedCategories
 import model.TagCategories
 import model.TagInfo
 
+// カテゴリーの親子関係を定義
+val categoryParents = mapOf(
+    "PhrasingContent" to "FlowContent",
+    "HeadingContent" to "FlowContent",
+    "SectioningContent" to "FlowContent",
+    "EmbeddedContent" to "PhrasingContent",
+    "InteractiveContent" to "PhrasingContent",
+    "FlowContent" to "EventTarget",
+    "MetaDataContent" to "FlowContent",
+    "PhrasingPhrasingContent" to "PhrasingContent",
+    "FlowPhrasingContent" to "FlowContent",
+    "MetaDataPhrasingContent" to "MetaDataContent",
+    "FlowMetaDataContent" to "FlowContent",
+    "HeadingPhrasingContent" to "HeadingContent",
+    "SectioningRoot" to "Any",
+    "SectioningHeadings" to "HeadingContent",
+    "FlowSectioningContent" to "FlowContent",
+)
+
 // 元のコードの並び順を維持するためのタグリスト
 val tagCategories = setOf(
     // Main root
@@ -316,4 +335,4 @@ val tagCategories = setOf(
         ),
         AllowedCategories()
     )
-)
+)

renlin/build.gradle.kts

@@ -1,7 +1,6 @@
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -19,22 +18,6 @@ dependencies {
 }
 
 kotlin {
-    jvm {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
-        compilerOptions {
-            freeCompilerArgs = listOf("-Xjsr305=strict")
-        }
-    }
-    js {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
-            }
-            binaries.executable()
-        }
-    }
     sourceSets["commonMain"].dependencies {
         implementation(libs.kotlinx.coroutines.core)
         implementation(libs.kotlin.stdlib)

renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/Dsl.kt

@@ -2,11 +2,13 @@ package net.kigawa.renlin.dsl
 
 import net.kigawa.hakate.api.state.State
 import net.kigawa.renlin.Html
+import net.kigawa.renlin.state.DslStateData
 
 @Html
 interface Dsl {
     /**
      * このDSLで使用されているすべての状態のセット。
      */
     val states: Set<State<*>>
+    val dslStateData: DslStateData?
 }

renlin/src/commonMain/kotlin/net/kigawa/renlin/dsl/DslBase.kt

@@ -2,13 +2,15 @@ package net.kigawa.renlin.dsl
 
 import net.kigawa.hakate.api.state.State
 import net.kigawa.renlin.state.DslState
+import net.kigawa.renlin.state.DslStateData
 import net.kigawa.renlin.w3c.category.ContentCategory
 
 abstract class DslBase<CONTENT_CATEGORY : ContentCategory>(
-    override val dslState: DslState
+    override val dslState: DslState,
 ) : StatedDsl<CONTENT_CATEGORY> {
     private val subDsls = mutableListOf<RegisteredDslData>()
     override val states = mutableSetOf<State<*>>()
+    override val dslStateData: DslStateData? = dslState.dslStateData()
 
     override fun registerSubDsl(registeredDslData: RegisteredDslData) {