Merge pull request #82 from modelix/text-editor4

Several fixes for the light-model-client when used in the browser

Author: slisson

light-model-client/build.gradle.kts

@@ -21,6 +21,7 @@ kotlin {
                 }
             }
         }
+        useCommonJs()
     }
 
     sourceSets {

light-model-client/src/commonMain/kotlin/org/modelix/client/light/LightModelClient.kt

@@ -0,0 +1,8 @@
+package org.modelix.client.light
+
+internal expect class ReadWriteLock() {
+    fun <T> runRead(body: () -> T): T
+    fun <T> runWrite(body: () -> T): T
+    fun canRead(): Boolean
+    fun canWrite(): Boolean
+}

light-model-client/src/commonMain/kotlin/org/modelix/client/light/ReadWriteLock.kt

@@ -0,0 +1,35 @@
+package org.modelix.client.light
+
+internal actual class ReadWriteLock {
+    private var lock: LockType = LockType.Unlocked
+    actual fun <T> runRead(body: () -> T): T {
+        val previous = lock
+        try {
+            lock = LockType.Read
+            return body()
+        } finally {
+            lock = previous
+        }
+    }
+
+    actual fun <T> runWrite(body: () -> T): T {
+        if (lock == LockType.Read) throw IllegalStateException("Cannot start write from read")
+        val previous = lock
+        try {
+            lock = LockType.Write
+            return body()
+        } finally {
+            lock = previous
+        }
+    }
+
+    actual fun canRead(): Boolean = lock != LockType.Unlocked
+
+    actual fun canWrite(): Boolean = lock == LockType.Write
+}
+
+private enum class LockType {
+    Unlocked,
+    Read,
+    Write
+}

light-model-client/src/jsMain/kotlin/org/modelix/client/light/ReadWriteLock.kt

@@ -25,7 +25,7 @@ fun createLightModelClient(url: String = "ws://localhost:48302/ws", query: Model
     val httpClient = HttpClient(Js) {
         install(WebSockets)
     }
-    val modelClient = LightModelClient(WebsocketConnection(httpClient, url))
+    val modelClient = LightModelClient.builder().httpClient(httpClient).url(url).build()
     if (query != null) modelClient.changeQuery(query)
     return modelClient
 }

light-model-client/src/jsMain/kotlin/org/modelix/client/light/WebsocketConnectionJS.kt

@@ -0,0 +1,26 @@
+package org.modelix.client.light
+
+import java.util.concurrent.locks.ReentrantReadWriteLock
+import kotlin.concurrent.read
+import kotlin.concurrent.write
+
+internal actual class ReadWriteLock {
+    private val lock = ReentrantReadWriteLock()
+    private val isReadLockedByCurrentThread: ThreadLocal<Boolean> = ThreadLocal.withInitial { false }
+    actual fun <T> runRead(body: () -> T): T {
+        return lock.read {
+            val wasInRead = isReadLockedByCurrentThread.get()
+            try {
+                if (!wasInRead) isReadLockedByCurrentThread.set(true)
+                body()
+            } finally {
+                if (!wasInRead) isReadLockedByCurrentThread.set(false)
+            }
+        }
+    }
+    actual fun <T> runWrite(body: () -> T): T = lock.write(body)
+    actual fun canRead(): Boolean = lock.isWriteLockedByCurrentThread || isReadLockedByCurrentThread.get()
+
+    actual fun canWrite(): Boolean = lock.isWriteLockedByCurrentThread
+
+}

light-model-client/src/jvmMain/kotlin/org/modelix/client/light/ReadWriteLock.kt

@@ -68,7 +68,7 @@ class LightModelClientTest {
                     .url("ws://localhost/json/v2/test-repo/ws")
                     .debugName(debugName)
                     .build()
-                wait {client.isInitialized() }
+                wait { client.isInitialized() }
                 client
             }
             block(createClient)

light-model-client/src/jvmTest/kotlin/org/modelix/client/light/LightModelClientTest.kt

@@ -19,6 +19,7 @@ kotlin {
                 }
             }
         }
+        useCommonJs()
     }
 
     sourceSets {

model-api-gen-runtime/build.gradle.kts

@@ -39,6 +39,7 @@ kotlin {
                 }
             }
         }
+        useCommonJs()
     }
     sourceSets {
         val commonMain by getting {
@@ -83,6 +84,6 @@ kotlin {
 listOf("sourcesJar", "runKtlintCheckOverJsMainSourceSet", "jsSourcesJar", "jsPackageJson", "compileKotlinJs", "jsProcessResources").forEach {
     tasks.named(it) {
         dependsOn(":ts-model-api:npm_run_build")
-        dependsOn(":ts-model-api:npm_run_generateKotlin")
+        dependsOn(":ts-model-api:patchKotlinExternals")
     }
 }

model-api/build.gradle.kts

@@ -28,7 +28,7 @@ object NodeAdapterCache {
             }, 0)
         }
 
-        val key = toINode(node)
+        val key = JSNodeConverter.toINode(node)
         var wrapper = caches[0][key]
         if (wrapper == null) {
             wrapper = caches.asSequence().drop(1).mapNotNull { it.remove(key) }.firstOrNull()
@@ -39,18 +39,4 @@ object NodeAdapterCache {
         }
         return wrapper as Out
     }
-
-    private fun toINode(node: Any): INode {
-        if (node is INode) return node
-        if (node is NodeAdapterJS) return node.node
-
-        // if (node is TypedNode) return toINode(node.node)
-
-        // Workaround, because the line above fails with 'TypedNode is not defined'.
-        // The import for '@modelix/ts-model-api' seems to be missing in the generated JS.
-        val unwrapped = node.asDynamic().node
-        if (unwrapped != null) return toINode(unwrapped)
-
-        throw IllegalArgumentException("Unsupported node type: $node")
-    }
 }