Do updates immediatly

.gitignore

@@ -1,4 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
+build
+.gradle
 web/js/generated
 gradle.properties
 local.properties

build.gradle.kts

@@ -1,24 +1,19 @@
 
 plugins {
-    kotlin("multiplatform") version "1.4.32"
+    kotlin("multiplatform") version "1.5.20"
     `maven-publish`
 }
 
 group = "nl.astraeus"
-version = "0.3.0-SNAPSHOT"
+version = "0.4.1"
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 kotlin {
-    /* Targets configuration omitted. 
-    *  To find out how to configure the targets, please follow the link:
-    *  https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#setting-up-targets */
     js(BOTH) {
         browser {
-            //produceKotlinLibrary()
             testTask {
                 useKarma {
                     useChromeHeadless()
@@ -32,7 +27,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-common"))
 
-                api("org.jetbrains.kotlinx:kotlinx-html-js:0.7.2")
+                api("org.jetbrains.kotlinx:kotlinx-html-js:0.7.3")
             }
         }
         val jsMain by getting {
@@ -53,7 +48,7 @@ publishing {
         if (project.properties["nexusUsername"] != null) {
             maven {
                 name = "releases"
-                url = uri("http://nexus.astraeus.nl/nexus/content/repositories/releases")
+                url = uri("https://nexus.astraeus.nl/nexus/content/repositories/releases")
                 credentials {
                     val nexusUsername: String by project
                     val nexusPassword: String by project
@@ -64,7 +59,7 @@ publishing {
             }
             maven {
                 name = "snapshots"
-                url = uri("http://nexus.astraeus.nl/nexus/content/repositories/snapshots")
+                url = uri("https://nexus.astraeus.nl/nexus/content/repositories/snapshots")
                 credentials {
                     val nexusUsername: String by project
                     val nexusPassword: String by project

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Wed Mar 04 13:29:12 CET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

komp.commonMain.iml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:commonMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.3.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:commonMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.6]/Native []/Native [general]" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-jsLegacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-jsIr/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.6]/Native []/Native [general]" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
         <newMppModelJpsModuleKind>SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <compilerSettings />
         <compilerArguments>
-          <option name="languageVersion" value="1.4" />
+          <option name="languageVersion" value="1.5" />
-          <option name="apiVersion" value="1.4" />
+          <option name="apiVersion" value="1.5" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.32/49656d531bfab9d6e45d3f27bc4d03b542d6766/kotlin-scripting-jvm-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.5.20/2fc370670110e51e13dc9795c69ba82632b2fffe/kotlin-scripting-jvm-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.32/6abda0fe69677f0e46e7539fd185e4bd093b7258/kotlin-scripting-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.5.20/5cb42f6dffcaa05963f604bf733c90ca8c766084/kotlin-scripting-common-1.5.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.8/f62be6d4cbf27781c2969867b4ed952f38378492/kotlinx-coroutines-core-1.3.8.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.32/461367948840adbb0839c51d91ed74ef4a9ccb52/kotlin-stdlib-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.20/9de35cc611bcecec8edce1d56d8e659953806751/kotlin-stdlib-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2/kotlin-stdlib-common-1.4.32.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.32/bac50b0748be017dbc13fc1cb7231b1c9da0e106/kotlin-script-runtime-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/3d79dbd48bf605f4aac1e7028981a1953e245cbb/kotlin-stdlib-common-1.5.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.5.20/4381bb58d37b84d4d1afe55ec35542dd9b77e101/kotlin-script-runtime-1.5.20.jar" />
             </array>
           </option>
           <option name="multiPlatform" value="true" />
@@ -32,7 +32,7 @@
     <content url="file://$MODULE_DIR$/src/commonMain" />
     <orderEntry type="jdk" jdkName="Kotlin SDK" jdkType="KotlinSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.3" level="project" />
   </component>
 </module>

komp.commonTest.iml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:commonTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.3.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:commonTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.6]/Native []/Native [general]" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-jsLegacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-jsIr/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="Common (experimental) " allPlatforms="JS []/JVM [1.6]/Native []/Native [general]" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
         <newMppModelJpsModuleKind>SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <externalSystemTestTasks>
           <externalSystemTestTask>jsLegacyBrowserTest|komp:jsTest|jsLegacy</externalSystemTestTask>
         </externalSystemTestTasks>
         <compilerSettings />
         <compilerArguments>
-          <option name="languageVersion" value="1.4" />
+          <option name="languageVersion" value="1.5" />
-          <option name="apiVersion" value="1.4" />
+          <option name="apiVersion" value="1.5" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.32/49656d531bfab9d6e45d3f27bc4d03b542d6766/kotlin-scripting-jvm-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.5.20/2fc370670110e51e13dc9795c69ba82632b2fffe/kotlin-scripting-jvm-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.32/6abda0fe69677f0e46e7539fd185e4bd093b7258/kotlin-scripting-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.5.20/5cb42f6dffcaa05963f604bf733c90ca8c766084/kotlin-scripting-common-1.5.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.8/f62be6d4cbf27781c2969867b4ed952f38378492/kotlinx-coroutines-core-1.3.8.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.32/461367948840adbb0839c51d91ed74ef4a9ccb52/kotlin-stdlib-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.20/9de35cc611bcecec8edce1d56d8e659953806751/kotlin-stdlib-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2/kotlin-stdlib-common-1.4.32.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.32/bac50b0748be017dbc13fc1cb7231b1c9da0e106/kotlin-script-runtime-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/3d79dbd48bf605f4aac1e7028981a1953e245cbb/kotlin-stdlib-common-1.5.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.5.20/4381bb58d37b84d4d1afe55ec35542dd9b77e101/kotlin-script-runtime-1.5.20.jar" />
             </array>
           </option>
           <option name="multiPlatform" value="true" />
@@ -36,9 +36,9 @@
     <orderEntry type="jdk" jdkName="Kotlin SDK" jdkType="KotlinSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="komp.commonMain" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.4.32" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.5.20" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.3" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="komp.commonMain" />
 </module>

komp.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="0.3.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.version="0.4.1" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

komp.ipr

@@ -61,6 +61,18 @@
         <element id="module-output" name="komp.jsMain" />
       </root>
     </artifact>
+    <artifact type="jar" name="komp-jslegacy-0.4.0-SNAPSHOT">
+      <output-path>$PROJECT_DIR$/build/libs</output-path>
+      <root id="archive" name="komp-jslegacy-0.4.0-SNAPSHOT.jar">
+        <element id="module-output" name="komp.jsMain" />
+      </root>
+    </artifact>
+    <artifact type="jar" name="komp-jslegacy-0.4.1">
+      <output-path>$PROJECT_DIR$/build/libs</output-path>
+      <root id="archive" name="komp-jslegacy-0.4.1.jar">
+        <element id="module-output" name="komp.jsMain" />
+      </root>
+    </artifact>
   </component>
   <component name="CheckStyle-IDEA">
     <option name="configuration">
@@ -260,6 +272,80 @@
     </group>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
+  <component name="ProjectCodeStyleConfiguration">
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <code_scheme name="Project" version="173">
+      <option name="LINE_SEPARATOR" value="&#10;" />
+      <option name="RIGHT_MARGIN" value="140" />
+      <H2CodeStyleSettings version="6">
+        <option name="USE_GENERAL_STYLE" value="false" />
+      </H2CodeStyleSettings>
+      <H2CodeStyleSettings version="6">
+        <option name="USE_GENERAL_STYLE" value="false" />
+      </H2CodeStyleSettings>
+      <JavaCodeStyleSettings>
+        <option name="ANNOTATION_PARAMETER_WRAP" value="5" />
+        <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      </JavaCodeStyleSettings>
+      <JetCodeStyleSettings>
+        <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />
+        <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />
+        <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      </JetCodeStyleSettings>
+      <codeStyleSettings language="JAVA">
+        <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+        <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+        <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+        <option name="ALIGN_GROUP_FIELD_DECLARATIONS" value="true" />
+        <option name="ALIGN_CONSECUTIVE_VARIABLE_DECLARATIONS" value="true" />
+        <option name="ALIGN_CONSECUTIVE_ASSIGNMENTS" value="true" />
+        <option name="ALIGN_SUBSEQUENT_SIMPLE_METHODS" value="true" />
+        <option name="CALL_PARAMETERS_WRAP" value="5" />
+        <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+        <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+        <option name="METHOD_PARAMETERS_WRAP" value="5" />
+        <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+        <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+        <option name="RESOURCE_LIST_WRAP" value="5" />
+        <option name="RESOURCE_LIST_LPAREN_ON_NEXT_LINE" value="true" />
+        <option name="RESOURCE_LIST_RPAREN_ON_NEXT_LINE" value="true" />
+        <option name="EXTENDS_LIST_WRAP" value="5" />
+        <option name="THROWS_LIST_WRAP" value="5" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+        <option name="PARENTHESES_EXPRESSION_LPAREN_WRAP" value="true" />
+        <option name="PARENTHESES_EXPRESSION_RPAREN_WRAP" value="true" />
+        <option name="BINARY_OPERATION_WRAP" value="5" />
+        <option name="TERNARY_OPERATION_WRAP" value="5" />
+        <option name="FOR_STATEMENT_WRAP" value="5" />
+        <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+        <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+        <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+        <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+        <option name="ASSERT_STATEMENT_WRAP" value="5" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+        <option name="ENUM_CONSTANTS_WRAP" value="5" />
+      </codeStyleSettings>
+      <codeStyleSettings language="kotlin">
+        <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+        <indentOptions>
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          <option name="TAB_SIZE" value="2" />
+        </indentOptions>
+      </codeStyleSettings>
+    </code_scheme>
+  </component>
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/komp.iml" filepath="$PROJECT_DIR$/komp.iml" />
@@ -380,122 +466,50 @@
       </list>
     </option>
   </component>
-  <component name="libraries-with-intellij-classes">
-    <option name="intellijApiContainingLibraries">
-      <list>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains.intellij.clion" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains.intellij.rider" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-      </list>
-    </option>
-  </component>
   <component name="libraryTable">
-    <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" type="kotlin.common">
+    <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20" type="kotlin.common">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2/kotlin-stdlib-common-1.4.32.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/3d79dbd48bf605f4aac1e7028981a1953e245cbb/kotlin-stdlib-common-1.5.20.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/f3e47c26a177728549b3dd2a624fec333aa17b36/kotlin-stdlib-common-1.4.32-sources.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/a074c913bd80f1f3b5a21789a609580e76208831/kotlin-stdlib-common-1.5.20-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.4.32" type="kotlin.js">
+    <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.5.20" type="kotlin.js">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.4.32/8dca0e318b64909eecfb2d00a9d045562f3e66f8/kotlin-stdlib-js-1.4.32.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.5.20/e8671435e8cbd97524d138c102c040ef0876f70d/kotlin-stdlib-js-1.5.20.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.4.32/5729944dc91bf28689461fe44b9e401fd41a84a7/kotlin-stdlib-js-1.4.32-sources.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-js/1.5.20/dcd3e87dab1d7ecc7f2952d5d213e20f977bbddc/kotlin-stdlib-js-1.5.20-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.4.32" type="kotlin.common">
+    <library name="Gradle: org.jetbrains.kotlin:kotlin-test-js:1.5.20" type="kotlin.js">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-annotations-common/1.4.32/f242cb223feb6d44e79588c26ca66bf57b0bc3a8/kotlin-test-annotations-common-1.4.32.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-js/1.5.20/6d38484b53b3db766cf080268dcc5fbf63aa9e5e/kotlin-test-js-1.5.20.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-annotations-common/1.4.32/57512e29ee20defe37d54ce19507d599b0f2113/kotlin-test-annotations-common-1.4.32-sources.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-js/1.5.20/8e70170db077d3f421c3fb6d24468b3938990f4a/kotlin-test-js-1.5.20-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.4.32" type="kotlin.common">
+    <library name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.3" type="kotlin.common">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-common/1.4.32/a10168dd408319a4af03763ad11f12e0fc1fc5ba/kotlin-test-common-1.4.32.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-common/0.7.3/4f3df7b2096bce6fef3e532ca1ccff13bd15a6bc/kotlinx-html-metadata-0.7.3.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-common/1.4.32/d1818d1bdc457b51289f006884a260b56a55cb77/kotlin-test-common-1.4.32-sources.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-common/0.7.3/f4eb48699d893b863f142a3c30e1ddddd13b876/kotlinx-html-common-0.7.3-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Gradle: org.jetbrains.kotlin:kotlin-test-js:1.4.32" type="kotlin.js">
+    <library name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.3" type="kotlin.js">
       <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-js/1.4.32/f4b4bf663acffeff2a664677b9e780f206f6842f/kotlin-test-js-1.4.32.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-js/0.7.3/93a1ab4269d3a567e05088d1237eedbc2efd03c9/kotlinx-html-jslegacy-0.7.3.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-test-js/1.4.32/8e70170db077d3f421c3fb6d24468b3938990f4a/kotlin-test-js-1.4.32-sources.jar!/" />
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-js/0.7.3/fc3bc71d1c037b715689112c95c44b96bb2409ea/kotlinx-html-js-0.7.3-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.2" type="kotlin.common">
-      <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-common/0.7.2/7da838083337896b558cab2884c4118709a58769/kotlinx-html-metadata-0.7.2.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-common/0.7.2/866bbbfe0a81d49cdf19fd149adafbb938b35be4/kotlinx-html-common-0.7.2-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.2" type="kotlin.js">
-      <CLASSES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-js/0.7.2/baf7e494e549776d0ae3e0ee225804a513f5dc26/kotlinx-html-jslegacy-0.7.2.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-html-js/0.7.2/b09bfd3565058174afa3fd0888743f8b8dca5406/kotlinx-html-js-0.7.2-sources.jar!/" />
       </SOURCES>
     </library>
   </component>

komp.jsMain.iml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:jsMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.3.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:jsMain" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-jsLegacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-jsIr/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="false" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
         <dependsOnModuleNames>komp:commonMain</dependsOnModuleNames>
         <sourceSets>
           <sourceSet>komp.commonMain</sourceSet>
@@ -10,25 +10,25 @@
         <newMppModelJpsModuleKind>COMPILATION_AND_SOURCE_SET_HOLDER</newMppModelJpsModuleKind>
         <compilerSettings />
         <compilerArguments>
-          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp-jsLegacy/kotlin/komp-jsLegacy.js" />
+          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp-js-legacy/kotlin/komp-js-legacy.js" />
           <option name="noStdlib" value="true" />
           <option name="sourceMap" value="true" />
           <option name="metaInfo" value="true" />
           <option name="target" value="v5" />
           <option name="moduleKind" value="umd" />
           <option name="main" value="call" />
-          <option name="languageVersion" value="1.4" />
+          <option name="languageVersion" value="1.5" />
-          <option name="apiVersion" value="1.4" />
+          <option name="apiVersion" value="1.5" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.32/bac50b0748be017dbc13fc1cb7231b1c9da0e106/kotlin-script-runtime-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.5.20/4381bb58d37b84d4d1afe55ec35542dd9b77e101/kotlin-script-runtime-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.32/6abda0fe69677f0e46e7539fd185e4bd093b7258/kotlin-scripting-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.5.20/5cb42f6dffcaa05963f604bf733c90ca8c766084/kotlin-scripting-common-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.32/49656d531bfab9d6e45d3f27bc4d03b542d6766/kotlin-scripting-jvm-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.5.20/2fc370670110e51e13dc9795c69ba82632b2fffe/kotlin-scripting-jvm-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2/kotlin-stdlib-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/3d79dbd48bf605f4aac1e7028981a1953e245cbb/kotlin-stdlib-common-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.32/461367948840adbb0839c51d91ed74ef4a9ccb52/kotlin-stdlib-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.20/9de35cc611bcecec8edce1d56d8e659953806751/kotlin-stdlib-1.5.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.8/f62be6d4cbf27781c2969867b4ed952f38378492/kotlinx-coroutines-core-1.3.8.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
             </array>
@@ -42,18 +42,18 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/js/packages/komp-jsLegacy/kotlin" />
+    <output url="file://$MODULE_DIR$/build/js/packages/komp-js-legacy/kotlin" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/build/externals/komp-jsIr/src" />
+    <content url="file://$MODULE_DIR$/build/externals/komp-js-ir/src" />
-    <content url="file://$MODULE_DIR$/build/externals/komp-jsLegacy/src" />
+    <content url="file://$MODULE_DIR$/build/externals/komp-js-legacy/src" />
     <content url="file://$MODULE_DIR$/src/jsMain">
       <sourceFolder url="file://$MODULE_DIR$/src/jsMain/kotlin" type="kotlin-source" />
     </content>
     <orderEntry type="jdk" jdkName="Kotlin SDK" jdkType="KotlinSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="komp.commonMain" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.4.32" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.5.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20" level="project" />
   </component>
 </module>

komp.jsTest.iml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="komp:jsTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.3.0-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="komp:jsTest" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="nl.astraeus" external.system.module.type="sourceSet" external.system.module.version="0.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-jsLegacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-jsIr/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
+      <configuration version="3" platform="JavaScript " allPlatforms="JS []" useProjectSettings="false" isTestModule="true" externalProjectId="komp" pureKotlinSourceFolders="$MODULE_DIR$/src/jsMain/kotlin;/home/rnentjes/Development/komp/komp/build/externals/komp-js-legacy/src;/home/rnentjes/Development/komp/komp/build/externals/komp-js-ir/src;/home/rnentjes/Development/komp/komp/src/jsTest/kotlin">
         <dependsOnModuleNames>komp:commonTest</dependsOnModuleNames>
         <sourceSets>
           <sourceSet>komp.commonTest</sourceSet>
@@ -15,25 +15,25 @@
         </externalSystemTestTasks>
         <compilerSettings />
         <compilerArguments>
-          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp-jsLegacy-test/kotlin/komp-jsLegacy-test.js" />
+          <option name="outputFile" value="$MODULE_DIR$/build/js/packages/komp-js-legacy-test/kotlin/komp-js-legacy-test.js" />
           <option name="noStdlib" value="true" />
           <option name="sourceMap" value="true" />
           <option name="metaInfo" value="true" />
           <option name="target" value="v5" />
           <option name="moduleKind" value="umd" />
           <option name="main" value="call" />
-          <option name="languageVersion" value="1.4" />
+          <option name="languageVersion" value="1.5" />
-          <option name="apiVersion" value="1.4" />
+          <option name="apiVersion" value="1.5" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.32/bac50b0748be017dbc13fc1cb7231b1c9da0e106/kotlin-script-runtime-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.5.20/4381bb58d37b84d4d1afe55ec35542dd9b77e101/kotlin-script-runtime-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.32/6abda0fe69677f0e46e7539fd185e4bd093b7258/kotlin-scripting-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.5.20/5cb42f6dffcaa05963f604bf733c90ca8c766084/kotlin-scripting-common-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.32/49656d531bfab9d6e45d3f27bc4d03b542d6766/kotlin-scripting-jvm-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.5.20/2fc370670110e51e13dc9795c69ba82632b2fffe/kotlin-scripting-jvm-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.32/ef50bfa2c0491a11dcc35d9822edbfd6170e1ea2/kotlin-stdlib-common-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.20/3d79dbd48bf605f4aac1e7028981a1953e245cbb/kotlin-stdlib-common-1.5.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.32/461367948840adbb0839c51d91ed74ef4a9ccb52/kotlin-stdlib-1.4.32.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.20/9de35cc611bcecec8edce1d56d8e659953806751/kotlin-stdlib-1.5.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.8/f62be6d4cbf27781c2969867b4ed952f38378492/kotlinx-coroutines-core-1.3.8.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
             </array>
@@ -47,7 +47,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/build/js/packages/komp-jsLegacy-test/kotlin" />
+    <output-test url="file://$MODULE_DIR$/build/js/packages/komp-js-legacy-test/kotlin" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/src/jsTest">
       <sourceFolder url="file://$MODULE_DIR$/src/jsTest/kotlin" type="kotlin-test" />
@@ -58,13 +58,29 @@
     <orderEntry type="module" module-name="komp.commonTest" scope="TEST" production-on-test="" />
     <orderEntry type="module" module-name="komp.jsMain" scope="TEST" />
     <orderEntry type="module" module-name="komp.jsMain" scope="RUNTIME" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.2" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-js:1.4.32" level="project" />
+      <library name="Gradle: nl.astraeus:komp">
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.4.32" level="project" />
+        <CLASSES>
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.2" level="project" />
+          <root url="file://$MODULE_DIR$/build/classes/kotlin/jsIr/main" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32" level="project" />
+        </CLASSES>
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.4.32" level="project" />
+        <JAVADOC />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.4.32" level="project" />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="RUNTIME">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/build/processedResources/jsIr/main" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-js:0.7.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-js:1.5.20" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-html-common:0.7.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-js:1.5.20" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="komp.jsMain" />
 </module>

settings.gradle.kts

@@ -12,5 +12,3 @@ pluginManagement {
 }
 
 rootProject.name = "komp"
-
-enableFeaturePreview("GRADLE_METADATA")

src/jsMain/kotlin/nl/astraeus/komp/HtmlBuilder.kt

@@ -1,114 +1,458 @@
 package nl.astraeus.komp
 
+import kotlinx.browser.document
 import kotlinx.html.DefaultUnsafe
 import kotlinx.html.Entities
+import kotlinx.html.FlowOrMetaDataOrPhrasingContent
 import kotlinx.html.Tag
 import kotlinx.html.TagConsumer
 import kotlinx.html.Unsafe
+import org.w3c.dom.Element
+import org.w3c.dom.HTMLElement
+import org.w3c.dom.HTMLSpanElement
+import org.w3c.dom.Node
+import org.w3c.dom.asList
 import org.w3c.dom.events.Event
+import org.w3c.dom.get
 
-interface HtmlConsumer : TagConsumer<VDOMElement> {
+private var currentElement: Element? = null
-  fun append(node: VDOMElement)
+
+interface HtmlConsumer : TagConsumer<Element> {
+  fun append(node: Element)
+  fun include(komponent: Komponent)
 }
 
+fun Int.asSpaces(): String {
+  val result = StringBuilder()
+  repeat(this) {
+    result.append(" ")
+  }
+  return result.toString()
+}
+
+fun FlowOrMetaDataOrPhrasingContent.currentElement(): Element = (currentElement as? Element) ?: error("No current element defined!")
+
+fun Element.printTree(indent: Int = 0): String {
+  val result = StringBuilder()
+
+  result.append(indent.asSpaces())
+  result.append(tagName)
+  if (this.namespaceURI != "http://www.w3.org/1999/xhtml") {
+    result.append(" [")
+    result.append(namespaceURI)
+    result.append("]")
+  }
+  result.append(" (")
+  var first = true
+  if (hasAttributes()) {
+    for (index in 0 until attributes.length) {
+      if (!first) {
+        result.append(", ")
+      } else {
+        first = false
+      }
+      result.append(attributes[index]?.localName)
+      result.append("=")
+      result.append(attributes[index]?.value)
+    }
+  }
+  result.append(") {")
+  result.append("\n")
+  for ((name, event) in getKompEvents()) {
+    result.append(indent.asSpaces())
+    result.append("on")
+    result.append(name)
+    result.append(" -> ")
+    result.append(event)
+    result.append("\n")
+  }
+  for (index in 0 until childNodes.length) {
+    childNodes[index]?.let {
+      if (it is Element) {
+        result.append(it.printTree(indent + 2))
+      } else {
+        result.append((indent + 2).asSpaces())
+        result.append(it.textContent)
+        result.append("\n")
+      }
+    }
+  }
+  result.append(indent.asSpaces())
+  result.append("}\n")
+
+  return result.toString()
+}
+
+fun Element.clearKompAttributes() {
+  this.asDynamic()["komp-attributes"] = mutableListOf<String>()
+}
+
+fun Element.getKompAttributes(): MutableList<String> {
+  var result: MutableList<String>? = this.asDynamic()["komp-attributes"] as MutableList<String>?
+
+  if (result == null) {
+    result = mutableListOf()
+
+    this.asDynamic()["komp-attributes"] = result
+  }
+
+  return result
+}
+
+fun Element.setKompAttribute(name: String, value: String) {
+  val setAttrs: MutableList<String> = getKompAttributes()
+  setAttrs.add(name)
+
+  if (this.getAttribute(name) != value) {
+    if (Komponent.logReplaceEvent) {
+      console.log("Setting attribute [$name,$value]  on $this (old: ${this.getAttribute(name)})")
+    }
+
+    setAttribute(name, value)
+  }
+}
+
+fun Element.clearKompEvents() {
+  for ((name, event) in getKompEvents()) {
+    currentElement?.removeEventListener(name, event)
+  }
+
+  this.asDynamic()["komp-events"] = mutableMapOf<String, (Event) -> Unit>()
+}
+
+fun Element.setKompEvent(name: String, event: (Event) -> Unit) {
+  val eventName: String = if (name.startsWith("on")) {
+    name.substring(2)
+  } else {
+    name
+  }
+
+  val events: MutableMap<String, (Event) -> Unit> = getKompEvents()
+
+  events[eventName]?.let {
+    println("Warn event already defined!")
+    currentElement?.removeEventListener(eventName, it)
+  }
+
+  events[eventName] = event
+
+  this.asDynamic()["komp-events"] = events
+
+  if (Komponent.logReplaceEvent) {
+    console.log("Setting events [$eventName]  on $this")
+  }
+
+  this.addEventListener(eventName, event)
+}
+
+fun Element.getKompEvents(): MutableMap<String, (Event) -> Unit> {
+  return this.asDynamic()["komp-events"] ?: mutableMapOf()
+}
+
+data class ElementIndex(
+  val parent: Node,
+  var childIndex: Int
+)
+
+fun ArrayList<ElementIndex>.currentParent(): Node {
+  this.lastOrNull()?.let {
+    return it.parent
+  }
+
+  throw IllegalStateException("currentParent should never be null!")
+}
+
+fun ArrayList<ElementIndex>.currentElement(): Node? {
+  this.lastOrNull()?.let {
+    return it.parent.childNodes[it.childIndex]
+  }
+
+  return null
+}
+
+fun ArrayList<ElementIndex>.nextElement() {
+  this.lastOrNull()?.let {
+    it.childIndex++
+  }
+}
+
+fun ArrayList<ElementIndex>.pop() {
+  this.removeLast()
+}
+
+fun ArrayList<ElementIndex>.push(element: Node) {
+  this.add(ElementIndex(element, 0))
+}
+
+fun ArrayList<ElementIndex>.replace(new: Node) {
+  if (this.currentElement() != null) {
+    this.currentElement()?.parentElement?.replaceChild(new, this.currentElement()!!)
+  } else {
+    this.last().parent.appendChild(new)
+  }
+}
+
+fun Node.asElement() = this as? HTMLElement
+
 class HtmlBuilder(
-  val baseHash: Int
+  val parent: Element,
+  var childIndex: Int = 0
 ) : HtmlConsumer {
-  private val path = arrayListOf<VDOMElement>()
+  private var currentPosition = arrayListOf<ElementIndex>()
-  private var lastLeaved: VDOMElement? = null
+  var currentNode: Node? = null
+  var root: Element? = null
+
+  init {
+    currentPosition.add(ElementIndex(parent, childIndex))
+  }
+
+  constructor(position: ElementIndex) : this(position.parent as Element, position.childIndex)
+
+  override fun include(komponent: Komponent) {
+    komponent.create(
+      currentPosition.last().parent as Element,
+      currentPosition.last().childIndex
+    )
+    currentPosition.nextElement()
+  }
+
+  override fun append(node: Element) {
+    currentPosition.replace(node)
+    currentPosition.nextElement()
+  }
+
+  fun logReplace(msg: String) {
+    if (Komponent.logReplaceEvent) {
+      console.log(msg)
+    }
+  }
 
   override fun onTagStart(tag: Tag) {
-    val element = VDOMElement(baseHash, tag.tagName, tag.namespace)
+    //logReplace"onTagStart, [${tag.tagName}, ${tag.namespace}], currentPosition: $currentPosition")
+    currentNode = currentPosition.currentElement()
 
-    for (entry in tag.attributesEntries) {
+    if (currentNode == null) {
-      element.setAttribute(entry.key, entry.value)
+      //logReplace"onTagStart, currentNode1: $currentNode")
+      currentNode = if (tag.namespace != null) {
+        document.createElementNS(tag.namespace, tag.tagName)
+      } else {
+        document.createElement(tag.tagName)
+      }
+
+      //logReplace"onTagStart, currentElement1.1: $currentNode")
+      currentPosition.currentParent().appendChild(currentNode!!)
+    } else if (
+      !currentNode?.asElement()?.tagName.equals(tag.tagName, true) ||
+      (
+          tag.namespace != null &&
+              !currentNode?.asElement()?.namespaceURI.equals(tag.namespace, true)
+          )
+    ) {
+      //logReplace"onTagStart, currentElement, namespace: ${currentNode?.asElement()?.namespaceURI} -> ${tag.namespace}")
+      //logReplace"onTagStart, currentElement, replace: ${currentNode?.asElement()?.tagName} -> ${tag.tagName}")
+      currentNode = if (tag.namespace != null) {
+        document.createElementNS(tag.namespace, tag.tagName) as Element
+      } else {
+        document.createElement(tag.tagName) as Element
+      }
+
+      currentPosition.replace(currentNode!!)
+    } else {
+      //logReplace"onTagStart, same node type")
     }
 
-    if (path.isNotEmpty()) {
+    currentElement = currentNode as? Element ?: currentElement
-      path.last().appendChild(element)
+
+    if (currentNode is Element) {
+      if (root == null) {
+        //logReplace"Setting root: $currentNode")
+        root = currentNode as Element
+      }
+
+      currentElement?.clearKompAttributes()
+      currentElement?.clearKompEvents()
+
+      for (entry in tag.attributesEntries) {
+        currentElement!!.setKompAttribute(entry.key, entry.value)
+      }
     }
 
-    path.add(element)
+    //logReplace"onTagStart, currentElement2: $currentNode")
+
+    currentPosition.push(currentNode!!)
+  }
+
+  private fun checkTag(tag: Tag) {
+    check(currentElement != null) {
+      js("debugger")
+      "No current tag"
+    }
+    check(currentElement?.tagName.equals(tag.tagName, ignoreCase = true)) {
+      js("debugger")
+      "Wrong current tag"
+    }
   }
 
   override fun onTagAttributeChange(tag: Tag, attribute: String, value: String?) {
-    when {
+    //logReplace"onTagAttributeChange, ${tag.tagName} [$attribute, $value]")
-      path.isEmpty() -> throw IllegalStateException("No current tag")
+    checkTag(tag)
-      path.last().content.toLowerCase() != tag.tagName.toLowerCase() -> throw IllegalStateException("Wrong current tag")
+
-      else -> path.last().let { node ->
+    if (value == null) {
-        if (value == null) {
+      currentElement?.removeAttribute(attribute)
-          node.removeAttribute(attribute)
+    } else {
-        } else {
+      currentElement?.setKompAttribute(attribute, value)
-          node.setAttribute(attribute, value)
-        }
-      }
     }
   }
 
   override fun onTagEvent(tag: Tag, event: String, value: (Event) -> Unit) {
-    when {
+    //logReplace"onTagEvent, ${tag.tagName} [$event, $value]")
-      path.isEmpty() -> throw IllegalStateException("No current tag")
+
-      path.last().content.toLowerCase() != tag.tagName.toLowerCase() -> throw IllegalStateException("Wrong current tag")
+    checkTag(tag)
-      else -> path.last().setKompEvent(event, value)
+
-    }
+    currentElement?.setKompEvent(event, value)
   }
 
   override fun onTagEnd(tag: Tag) {
-    if (path.isEmpty() || path.last().content.toLowerCase() != tag.tagName.toLowerCase()) {
+    //logReplace"onTagEnd: ${tag.tagName}, $currentElement")
-      throw IllegalStateException("We haven't entered tag ${tag.tagName} but trying to leave")
+    //logReplace"onTagEnd: ${tag.tagName}, $currentPosition")
+
+    while (currentPosition.currentElement() != null) {
+      currentPosition.currentElement()?.let {
+        //logReplace"Removing $it")
+        it.parentElement?.removeChild(it)
+      }
     }
 
-    lastLeaved = path.removeAt(path.lastIndex)
+    checkTag(tag)
-    lastLeaved?.updateChildHash()
+
+    //logReplace"onTagEnd, pre-pop: $currentPosition")
+
+    currentPosition.pop()
+
+    //logReplace"onTagEnd, post-pop: $currentPosition")
+
+    val setAttrs: List<String> = currentElement.asDynamic()["komp-attributes"] ?: listOf()
+
+    // remove attributes that where not set
+    if (currentElement?.hasAttributes() == true) {
+      for (index in 0 until (currentElement?.attributes?.length ?: 0)) {
+        val attr = currentElement?.attributes?.get(index)
+        if (attr != null) {
+          if (!setAttrs.contains(attr.name)) {
+            currentElement?.removeAttribute(attr.name)
+          }
+        }
+      }
+    }
+
+    currentPosition.nextElement()
+
+    currentElement = currentElement?.parentElement as? HTMLElement
+
+    //logReplace"onTagEnd, popped: $currentElement")
   }
 
   override fun onTagContent(content: CharSequence) {
-    if (path.isEmpty()) {
+    //logReplace"onTagContent, [$content]")
-      throw IllegalStateException("No current DOM node")
+
+    check(currentElement != null) {
+      "No current DOM node"
     }
 
-    path.last().appendChild(VDOMElement(baseHash, content.toString(), type = VDOMElementType.TEXT))
+    //logReplace"Tag content: $content")
+
+    if (currentElement?.textContent != content.toString()) {
+      currentElement?.textContent = content.toString()
+    }
+
+    currentPosition.nextElement()
   }
 
   override fun onTagContentEntity(entity: Entities) {
-    if (path.isEmpty()) {
+    //logReplace"onTagContentEntity, [${entity.text}]")
-      throw IllegalStateException("No current DOM node")
+
+    check(currentElement != null) {
+      "No current DOM node"
     }
 
-    // stupid hack as browsers don't support createEntityReference
+    val s = document.createElement("span") as HTMLSpanElement
-    path.last().appendChild(VDOMElement(baseHash, entity.text, type = VDOMElementType.ENTITY))
+    s.innerText = entity.text
-  }
+    currentPosition.replace(
-
+      s.childNodes.asList().firstOrNull() ?: document.createTextNode(entity.text)
-  override fun append(node: VDOMElement) {
+    )
-    path.last().appendChild(node)
+    currentPosition.nextElement()
   }
 
   override fun onTagContentUnsafe(block: Unsafe.() -> Unit) {
     with(DefaultUnsafe()) {
       block()
 
-      path.last().appendChild(VDOMElement(baseHash, toString(), type = VDOMElementType.UNSAFE))
+      val textContent = toString()
+
+      //logReplace"onTagContentUnsafe, [$textContent]")
+
+      var namespace: String? = null
+
+      if (currentPosition.currentParent().nodeType == 1.toShort()) {
+        val element = currentPosition.currentParent() as Element
+
+        namespace = when (Komponent.unsafeMode) {
+          UnsafeMode.UNSAFE_ALLOWED -> {
+            element.namespaceURI
+          }
+          UnsafeMode.UNSAFE_SVG_ONLY -> {
+            if (element.namespaceURI == "http://www.w3.org/2000/svg") {
+              element.namespaceURI
+            } else {
+              null
+            }
+          }
+          else -> {
+            null
+          }
+        }
+      }
+
+      //logReplace"onTagContentUnsafe, namespace: [$namespace]")
+
+      if (Komponent.unsafeMode == UnsafeMode.UNSAFE_ALLOWED ||
+        (Komponent.unsafeMode == UnsafeMode.UNSAFE_SVG_ONLY && namespace == "http://www.w3.org/2000/svg")
+      ) {
+        if (currentElement?.innerHTML != textContent) {
+          currentElement?.innerHTML = textContent
+        }
+      } else if (currentElement?.textContent != textContent) {
+        currentElement?.textContent = textContent
+      }
+
+      currentPosition.nextElement()
     }
   }
 
   override fun onTagComment(content: CharSequence) {
-    if (path.isEmpty()) {
+    //logReplace"onTagComment, [$content]")
-      throw IllegalStateException("No current DOM node")
-    }
 
-    path.last().appendChild(VDOMElement(baseHash, content.toString(), type = VDOMElementType.COMMENT))
+    check(currentElement != null) {
+      "No current DOM node"
+    }
+    currentElement?.appendChild(
+      document.createComment(content.toString())
+    )
+
+    currentPosition.nextElement()
   }
 
-  override fun finalize(): VDOMElement {
+  override fun finalize(): Element {
-    return lastLeaved ?: throw IllegalStateException("We can't finalize as there was no tags")
+    //logReplace"finalize, currentPosition: $currentPosition")
+    return root ?: throw IllegalStateException("We can't finalize as there was no tags")
   }
 
   companion object {
-    fun create(content: HtmlBuilder.() -> Unit): VDOMElement {
+    fun create(content: HtmlBuilder.() -> Unit): Element {
-      val komponent = DummyKomponent()
+      val container = document.createElement("div") as HTMLElement
-      val consumer = HtmlBuilder(komponent.hashCode())
+      val consumer = HtmlBuilder(container, 0)
       content.invoke(consumer)
-      return consumer.finalize()
+      return consumer.root ?: error("error")
     }
   }
 }

src/jsMain/kotlin/nl/astraeus/komp/Komponent.kt

@@ -1,16 +1,14 @@
 package nl.astraeus.komp
 
-import kotlinx.browser.document
 import kotlinx.browser.window
 import kotlinx.html.div
-import org.w3c.dom.HTMLDivElement
+import org.w3c.dom.Element
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.Node
 import org.w3c.dom.css.CSSStyleDeclaration
+import org.w3c.dom.get
 import kotlin.reflect.KProperty
 
-typealias CssStyle = CSSStyleDeclaration.() -> Unit
-
 class StateDelegate<T>(
   val komponent: Komponent,
   initialValue: T
@@ -31,112 +29,107 @@ class StateDelegate<T>(
 
 inline fun <reified T> Komponent.state(initialValue: T): StateDelegate<T> = StateDelegate(this, initialValue)
 
-fun HtmlConsumer.include(component: Komponent) {
+class DummyKomponent : Komponent() {
-  append(component.create())
-}
-
-class DummyKomponent: Komponent() {
   override fun HtmlBuilder.render() {
     div {
-      + "dummy"
+      +"dummy"
     }
   }
 }
 
+enum class UnsafeMode {
+  UNSAFE_ALLOWED,
+  UNSAFE_DISABLED,
+  UNSAFE_SVG_ONLY
+}
+
 abstract class Komponent {
-  private var createIndex = getNextCreateIndex()
+  val createIndex = getNextCreateIndex()
   private var dirty: Boolean = true
 
-  var vdom: VDOMElement? = null
   var element: Node? = null
   val declaredStyles: MutableMap<String, CSSStyleDeclaration> = HashMap()
 
-  open fun create(): VDOMElement {
+  open fun create(parent: Element, childIndex: Int = 0) {
-    val consumer = HtmlBuilder(this.createIndex)
+    //parent.parentElement?.child
-    try {
+    val builder = HtmlBuilder(parent, childIndex)
-      consumer.render()
-    } catch (e: Throwable) {
-      println("Exception occurred in ${this::class.simpleName}.render() call!")
 
-      throw e
+    builder.render()
-    }
+    element = builder.root
-    val result = consumer.finalize()
-
-    if (result.id.isBlank()) {
-      result.id = "komp_${createIndex}"
-    }
-
-    result.komponent = this
-
-    vdom = result
-
-    dirty = false
-
-    return result
   }
 
   abstract fun HtmlBuilder.render()
 
+  /**
+   * This method is called after the Komponent is updated
+   *
+   * note: it's not called at first render
+   */
+  open fun onAfterUpdate() {}
+
   fun requestUpdate() {
     dirty = true
     scheduleForUpdate(this)
   }
 
-  open fun style(className: String, vararg imports: CssStyle, block: CssStyle = {}) {
+  /**
-    val style = (document.createElement("div") as HTMLDivElement).style
+   * Request an immediate update of this Komponent
-    for (imp in imports) {
+   *
-      imp(style)
+   * This will run immediately, make sure Komponents are not rendered multiple times
-    }
+   * Any scheduled updates will be run as well
-    block(style)
+   */
-    declaredStyles[className] = style
+  fun requestImmediateUpdate() {
+    dirty = true
+    runUpdateImmediately(this)
   }
 
+  /**
+   * This function can be overwritten if you know how to update the Komponent yourself
+   *
+   * HTMLBuilder.render() is called 1st time the component is rendered, after that this
+   * method will be called
+   */
   open fun update() {
     refresh()
   }
 
   internal fun refresh() {
-    val oldElement = vdom
+    val currentElement = element
 
-    if (logRenderEvent) {
+    if (currentElement == null) {
-      console.log("Rendering", this)
+      error("element is null")
-    }
-    val newElement = create()
-
-    element = if (oldElement != null && element != null) {
-      if (logReplaceEvent) {
-        console.log("DomDiffing", oldElement, newElement)
-      }
-      DiffPatch.updateNode(element!!, oldElement, newElement)
     } else {
-      if (logReplaceEvent) {
+      val parent = currentElement.parentElement as? HTMLElement ?: error("parent is null!?")
-        console.log("Create", newElement)
+      var childIndex = 0
+      for (index in 0 until parent.children.length) {
+        if (parent.children[index] == currentElement) {
+          childIndex = index
+        }
       }
-      newElement.createElement()
+      val consumer = HtmlBuilder(parent, childIndex)
+      consumer.root = null
+      consumer.render()
+      element = consumer.root
+      dirty = false
     }
-
-    vdom = newElement
-    dirty = false
   }
 
   companion object {
     private var nextCreateIndex: Int = 1
     private var updateCallback: Int? = null
     private var scheduledForUpdate = mutableSetOf<Komponent>()
+    private var interceptor: (Komponent, () -> Unit) -> Unit = { _, block -> block() }
 
     var logRenderEvent = false
     var logReplaceEvent = false
+    var unsafeMode = UnsafeMode.UNSAFE_DISABLED
 
     fun create(parent: HTMLElement, component: Komponent, insertAsFirst: Boolean = false) {
-      val vdomElement = component.create()
+      component.create(parent)
-      val element = vdomElement.createElement()
+    }
-      component.element = element
 
-      if (insertAsFirst && parent.childElementCount > 0) {
+    fun setUpdateInterceptor(block: (Komponent, () -> Unit) -> Unit) {
-        parent.insertBefore(element, parent.firstChild)
+      interceptor = block
-      } else {
-        parent.appendChild(element)
-      }
     }
 
     private fun getNextCreateIndex() = nextCreateIndex++
@@ -151,6 +144,11 @@ abstract class Komponent {
       }
     }
 
+    private fun runUpdateImmediately(komponent: Komponent) {
+      scheduledForUpdate.add(komponent)
+      runUpdate()
+    }
+
     private fun runUpdate() {
       val todo = scheduledForUpdate.sortedBy { komponent -> komponent.createIndex }
 
@@ -159,25 +157,24 @@ abstract class Komponent {
       }
 
       todo.forEach { next ->
-        val element = next.element
+        interceptor(next) {
+          val element = next.element
 
-        if (element is HTMLElement) {
+          if (element is HTMLElement) {
-          if (document.getElementById(element.id) != null) {
             if (next.dirty) {
               if (logRenderEvent) {
                 console.log("Update dirty ${next.createIndex}")
               }
               next.update()
+              next.onAfterUpdate()
             } else {
               if (logRenderEvent) {
                 console.log("Skip ${next.createIndex}")
               }
             }
           } else {
-            console.log("Komponent element has no id, ", next, element)
+            console.log("Komponent element is null", next)
           }
-        } else {
-          console.log("Komponent element is null", next)
         }
       }
 

src/jsTest/kotlin/nl/astraeus/komp/TestUpdate.kt

@@ -1,12 +1,21 @@
 package nl.astraeus.komp
 
-import kotlinx.html.*
+import kotlinx.browser.document
+import kotlinx.html.div
+import kotlinx.html.id
 import kotlinx.html.js.onClickFunction
+import kotlinx.html.p
+import kotlinx.html.span
+import kotlinx.html.svg
+import kotlinx.html.table
+import kotlinx.html.td
+import kotlinx.html.tr
+import kotlinx.html.unsafe
 import org.w3c.dom.Element
+import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.get
 import kotlin.test.Test
-import kotlin.test.assertTrue
 
 fun nodesEqual(element: Element, vdom: VDOMElement): Boolean {
   if (element.childNodes.length != vdom.childNodes.size) {
@@ -41,104 +50,145 @@ fun nodesEqual(element: Element, vdom: VDOMElement): Boolean {
   return true
 }
 
-class TestUpdate {
+class TestKomponent : Komponent() {
-
+  override fun HtmlBuilder.render() {
-  @Test
+    div {
-  fun testCompare() {
+      +"Test"
-    val dom1 = HtmlBuilder.create {
-      div {
-        div(classes = "bla") {
-          span {
-            +" Some Text "
-          }
-          table {
-            tr {
-              td {
-                +"Table column"
-              }
-            }
-          }
-        }
-      }
     }
+  }
+}
 
-    val dom2 = HtmlBuilder.create {
+class Child1 : Komponent() {
-      div {
+  override fun HtmlBuilder.render() {
-        span {
+    div {
-          id = "123"
+      +"Child 1"
-
-          +"New dom!"
-        }
-        input {
-          value = "bla"
-        }
-      }
     }
+  }
+}
 
-    var element = dom1.createElement()
+class Child2 : Komponent() {
+  override fun HtmlBuilder.render() {
+    div {
+      +"Child 2"
+    }
+  }
+}
 
-    assertTrue(nodesEqual(element as Element, dom1), "Created dom not equal to original")
+class SimpleKomponent : Komponent() {
-
+  var hello = true
-    element = DiffPatch.updateNode(element, dom1, dom2) as HTMLElement
+  var append = HtmlBuilder.create {
-
+    p {
-    assertTrue(nodesEqual(element, dom2), "Updated dom not equal to original")
+      +"Appended"
+    }
   }
 
-  @Test
+
-  fun testCompare2() {
+  override fun HtmlBuilder.render() {
-    val dom1 = HtmlBuilder.create {
+    div("div_class") {
-      div {
+      span {
-        div(classes = "bla") {
+        svg {
-          span {
+          unsafe {
-            +" Some Text "
+            +"""
+              <p bla>
+            """.trimIndent()
           }
-          table {
+        }
-            tr {
+        if (hello) {
-              th {
+          div {
-                +"Header"
+            +"Hello"
-              }
+          }
-            }
+        } else {
-            tr {
+          span {
-              td {
+            +"Good bye"
-                +"Table column"
-              }
-            }
           }
         }
       }
-    }
-
-    val dom2 = HtmlBuilder.create {
       div {
-        div {
+        if (hello) {
-          span {
-            +"Other text"
-          }
-        }
-        span {
           id = "123"
-
+          +"div text"
-          +"New dom!"
+        } else {
+          +"div text goodbye"
         }
-        input {
-          value = "bla"
 
-          onClickFunction = {
+        onClickFunction = if (hello) {
-            println("Clickerdyclick!")
+          {
+            println("onClick")
+          }
+        } else {
+          {
+            println("onClick 2")
           }
         }
       }
+      if (hello) {
+        span {
+          +"2nd span"
+        }
+      }
+      //append(append)
+      if (hello) {
+        include(Child1())
+      } else {
+        include(Child2())
+      }
+      //append(append)
     }
-
+  }
-    Komponent.logRenderEvent = true
+
-
+}
-    var element = dom1.createElement()
+
-
+class TestUpdate {
-    assertTrue(nodesEqual(element as Element, dom1), "Created dom not equal to original")
+
-
+  @Test
-    element = DiffPatch.updateNode(element, dom1, dom2) as HTMLElement
+  fun testSimpleKomponent() {
-
+    val sk = SimpleKomponent()
-    assertTrue(nodesEqual(element, dom2), "Updated dom not equal to original")
+    val div = document.createElement("div") as HTMLDivElement
+
+    Komponent.create(div, sk)
+
+    println("SimpleKomponent: ${div.printTree()}")
+
+    sk.hello = false
+    sk.requestImmediateUpdate()
+
+    println("SimpleKomponent updated: ${div.printTree()}")
+  }
+
+  @Test
+  fun testCreate() {
+    var elemTest: Element? = null
+    val element = HtmlBuilder.create {
+      div("div_class") {
+        id = "123"
+        +"Test"
+
+        span("span_class") {
+          +"Span"
+
+          elemTest = currentElement()
+        }
+
+        table {
+          tr {
+            td {
+              +"column 1"
+            }
+            td {
+              +"column 2"
+            }
+          }
+        }
+      }
+    }
+
+    println("Element: ${element.printTree()}")
+    println("divTst: ${elemTest?.printTree()}")
+    println("span class: ${
+      elemTest?.getAttributeNames()?.joinToString
+      { "," }
+    }"
+    )
   }
 
 }