Improved kotlin/js webidl codegen

Author: fabmax

kool-demo/src/wasmJsMain/kotlin/Main.kt

@@ -1,6 +1,7 @@
 import de.fabmax.kool.KoolApplication
 import de.fabmax.kool.KoolConfigWasm
 import de.fabmax.kool.demo.demo
+import de.fabmax.kool.physics.Physics
 import de.fabmax.kool.physics2d.Physics2d
 
 fun main() = KoolApplication(
@@ -9,6 +10,7 @@ fun main() = KoolApplication(
         deviceScaleLimit = 1.5,
     )
 ) {
+    Physics.loadPhysics()
     Physics2d.loadPhysics2d()
     demo(null, ctx)
 }

kool-physics-2d/build.gradle.kts

@@ -38,7 +38,7 @@ webidl {
     modelName = "Box2dWasm"
 
     generateKotlinJsInterfaces {
-        outputDirectory = file("${projectDir}/src/jsMain/kotlin/box2d")
+        outputDirectory = file("${projectDir}/src/webMain/kotlin/box2d")
         packagePrefix = "box2d"
         moduleName = "kool-box2d-wasm"
         modulePromiseName = "Box2D"

kool-physics-2d/src/jsMain/kotlin/box2d/Box2dWasmLoader.js.kt

@@ -0,0 +1,39 @@
+/*
+ * Generated from WebIDL by webidl-util
+ */
+
+package box2d
+
+import kotlinx.coroutines.await
+import kotlin.js.Promise
+
+@JsModule("kool-box2d-wasm")
+private external val Box2D: () -> Promise<JsAny>
+
+actual object Box2dWasmLoader {
+    private var box2dWasmModule: JsAny? = null
+    private val box2dWasmPromise = Box2D()
+    private var _isLoaded = false
+    actual val isLoaded: Boolean get() = _isLoaded
+
+    internal actual val box2dWasm: JsAny get() = requireNotNull(box2dWasmModule) {
+        "Module 'kool-box2d-wasm' is not loaded. Call loadModule() first"
+    }
+
+    actual suspend fun loadModule() {
+        if (!isLoaded) {
+            box2dWasmPromise.then<JsAny> { box2dWasmModule = it; it }
+        }
+        box2dWasmPromise.await<JsAny>()
+        _isLoaded = true
+    }
+
+    fun checkIsLoaded() {
+        if (!isLoaded) {
+            throw IllegalStateException("Module 'kool-box2d-wasm' is not loaded. Call loadModule() first.")
+        }
+    }
+}
+
+private fun destroyNative(module: JsAny, obj: DestroyableNative): Unit = js("module.destroy(obj)")
+actual fun DestroyableNative.destroy() = destroyNative(Box2dWasmLoader.box2dWasm, this)

kool-physics-2d/src/jsMain/kotlin/box2d/Box2dWasmLoader.kt

@@ -1,3 +1,7 @@
+/*
+ * Generated from WebIDL by webidl-util
+ */
+
 package box2d
 
 import kotlinx.coroutines.await
@@ -6,32 +10,30 @@ import kotlin.js.Promise
 @JsModule("kool-box2d-wasm")
 private external val Box2D: () -> Promise<JsAny>
 
-internal actual object Box2dWasmLoader {
+actual object Box2dWasmLoader {
     private var box2dWasmModule: JsAny? = null
-    internal actual val box2dWasm: JsAny get() = requireNotNull(box2dWasmModule) { "Module 'kool-box2d-wasm' is not loaded" }
     private val box2dWasmPromise = Box2D()
-    private var isLoaded: Boolean = false
+    private var _isLoaded = false
+    actual val isLoaded: Boolean get() = _isLoaded
+
+    internal actual val box2dWasm: JsAny get() = requireNotNull(box2dWasmModule) {
+        "Module 'kool-box2d-wasm' is not loaded. Call loadModule() first"
+    }
 
     actual suspend fun loadModule() {
         if (!isLoaded) {
-            box2dWasmPromise.then<JsAny> { module ->
-                box2dWasmModule = module
-                module
-            }
+            box2dWasmPromise.then<JsAny> { box2dWasmModule = it; it }
         }
         box2dWasmPromise.await<JsAny>()
-        isLoaded = true
+        _isLoaded = true
     }
 
     fun checkIsLoaded() {
         if (!isLoaded) {
-            throw IllegalStateException("Module 'kool-box2d-wasm' is not loaded. Call loadModule() first and wait for loading to be finished.")
+            throw IllegalStateException("Module 'kool-box2d-wasm' is not loaded. Call loadModule() first.")
         }
     }
-
-    actual fun destroy(nativeObject: JsAny) {
-        destroyJsNativeAny(box2dWasm, nativeObject)
-    }
 }
 
-private fun destroyJsNativeAny(module: JsAny, obj: JsAny): Unit = js("module.destroy(obj)")
+private fun destroyNative(module: JsAny, obj: DestroyableNative): Unit = js("module.destroy(obj)")
+actual fun DestroyableNative.destroy() = destroyNative(Box2dWasmLoader.box2dWasm, this)