Introduce workaround for map and legend tags with children clash inhe…

…rited from different tag groups
Kotlin · Apr 14, 2015 · 3ea5401 · 3ea5401
1 parent 45f5426
commit 3ea5401
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/generate/src/main/kotlin/codegen.kt b/generate/src/main/kotlin/codegen.kt
@@ -56,14 +56,17 @@ fun <O : Appendable> O.const(value : Const<*>) {
 data class Var(val name : String, val type : String, val mutable : Boolean = false, val override : Boolean = false, val forceOmitValVar : Boolean = false, val defaultValue : String = "")
 data class Clazz(val name: String, val parameters: List<String> = listOf(), val variables: List<Var> = listOf(), val parents: List<String> = listOf(), val isPublic: Boolean = true, val isAbstract: Boolean = false, val isOpen: Boolean = false, val isObject: Boolean = false, val isTrait : Boolean = false)
 
-fun <O : Appendable> O.variable(variable : Var, omitValVar : Boolean = false) : O {
+fun <O : Appendable> O.variable(variable : Var, omitValVar : Boolean = false, receiver : String = "") : O {
     if (!omitValVar && !variable.forceOmitValVar) {
         if (variable.override) {
             append("override ")
         }
         append(if (variable.mutable) "var " else "val ")
     }
 
+    if (receiver.isNotEmpty()) {
+        receiverDot(receiver)
+    }
     append(variable.name)
     append(" : ")
     append(variable.type)

diff --git a/generate/src/main/kotlin/tagsgen.kt b/generate/src/main/kotlin/tagsgen.kt
@@ -1,5 +1,6 @@
 package html4k.generate
 
+import html4k.generate.humanize.humanize
 import java.util.ArrayList
 import java.util.LinkedList
 
@@ -33,6 +34,20 @@ fun <O : Appendable> O.tagClass(tag : TagInfo, excludeAttributes : Set<String>)
         htmlTagBuilders(tag.safeName.toUpperCase(), children)
     }
 
+    if (parentElementTraits.size() > 1) {
+        val commons = tag.tagGroupNames.map {Repository.tagGroups[it].tags.toSet()}.reduce { a, b -> a.intersect(b) }
+        if (commons.isNotEmpty()) {
+            parentElementTraits.forEach { group ->
+                append("public ")
+                variable(Var(name = "as" + group.escapeUnsafeValues().capitalize(), type = group.escapeUnsafeValues().capitalize()), receiver = tag.safeName.toUpperCase())
+                appendln()
+                getter()
+                defineIs("this")
+                emptyLine()
+            }
+        }
+    }
+
     emptyLine()
 }
 

diff --git a/jvm/src/main/kotlin/main.kt b/jvm/src/main/kotlin/main.kt
@@ -109,6 +109,14 @@ fun main(args : Array<String>) {
 						}
 					}
 
+					p {
+						p {
+							map {
+                                asFlowContent.a ("") {
+                                }
+                            }
+						}
+					}
                     input(InputType.color) {
 
                     }

diff --git a/shared/src/main/kotlin/generated/gen-tags-l.kt b/shared/src/main/kotlin/generated/gen-tags-l.kt
@@ -23,6 +23,12 @@ public class LABEL(initialAttributes : Map<String, String>, override val consume
 public class LEGEND(initialAttributes : Map<String, String>, override val consumer : TagConsumer<*>) : HTMLTag("legend", consumer, initialAttributes), CommonEventsGroupFacade, CoreServerAttributeGroupFacade, CoreAttributeGroupFacade, FlowContent, PhrasingContent {
 
 }
+public val LEGEND.asFlowContent : FlowContent
+    get()  = this
+
+public val LEGEND.asPhrasingContent : PhrasingContent
+    get()  = this
+
 
 public class LI(initialAttributes : Map<String, String>, override val consumer : TagConsumer<*>) : HTMLTag("li", consumer, initialAttributes), CommonEventsGroupFacade, CoreServerAttributeGroupFacade, CoreAttributeGroupFacade, FlowContent {
     var value : String

diff --git a/shared/src/main/kotlin/generated/gen-tags-m.kt b/shared/src/main/kotlin/generated/gen-tags-m.kt
@@ -15,6 +15,12 @@ public class MAP(initialAttributes : Map<String, String>, override val consumer
 
 
 }
+public val MAP.asFlowContent : FlowContent
+    get()  = this
+
+public val MAP.asPhrasingContent : PhrasingContent
+    get()  = this
+
 
 public class MARK(initialAttributes : Map<String, String>, override val consumer : TagConsumer<*>) : HTMLTag("mark", consumer, initialAttributes), CommonEventsGroupFacade, CoreServerAttributeGroupFacade, CoreAttributeGroupFacade, PhrasingContent {