Moving JS only runtime to JS sourceset, using unsafeCast instead of d…

…ynamicCastTo.
deezer · Dec 20, 2022 · 23ca02b · 23ca02b
1 parent 8296759
commit 23ca02b
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 349 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 
 allprojects {
     group = "deezer.kustomexport"
-    version = "0.7.0"
+    version = "0.8.0"
 
     repositories {
         mavenLocal()

diff --git a/compiler/src/main/kotlin/deezer/kustomexport/compiler/ExportCompiler.kt b/compiler/src/main/kotlin/deezer/kustomexport/compiler/ExportCompiler.kt
@@ -43,13 +43,9 @@ import deezer.kustomexport.compiler.js.InterfaceDescriptor
 import deezer.kustomexport.compiler.js.SealedClassDescriptor
 import deezer.kustomexport.compiler.js.TopLevelFunctionDescriptor
 import deezer.kustomexport.compiler.js.ValueClassDescriptor
-import deezer.kustomexport.compiler.js.pattern.`class`.transform
-import deezer.kustomexport.compiler.js.pattern.`interface`.transform
-import deezer.kustomexport.compiler.js.pattern.enum.transform
-import deezer.kustomexport.compiler.js.pattern.function.transform
+import deezer.kustomexport.compiler.js.pattern.transform
 import deezer.kustomexport.compiler.js.pattern.parseClass
 import deezer.kustomexport.compiler.js.pattern.parseFunction
-import deezer.kustomexport.compiler.js.pattern.value.transform
 
 // Trick to share the Logger everywhere without injecting the dependency everywhere
 internal lateinit var sharedLogger: KSPLogger

diff --git a/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/Extensions.kt b/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/Extensions.kt
@@ -25,8 +25,8 @@ import com.squareup.kotlinpoet.TypeName
 import deezer.kustomexport.compiler.CompilerArgs
 
 val jsExport = ClassName("kotlin.js", "JsExport")
+val unsafeCast = MemberName("kotlin.js", "unsafeCast")
 
-val dynamicCastTo = MemberName("deezer.kustomexport", "dynamicCastTo")
 val dynamicNull = MemberName("deezer.kustomexport", "dynamicNull")
 val dynamicString = MemberName("deezer.kustomexport", "dynamicString")
 val dynamicNotString = MemberName("deezer.kustomexport", "dynamicNotString")

diff --git a/...iler/js/pattern/class/ClassTransformer.kt → ...t/compiler/js/pattern/ClassTransformer.kt b/...iler/js/pattern/class/ClassTransformer.kt → ...t/compiler/js/pattern/ClassTransformer.kt
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.`class`
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
@@ -28,22 +28,8 @@ import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.STRING
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeSpec
-import deezer.kustomexport.compiler.js.ALL_KOTLIN_EXCEPTIONS
-import deezer.kustomexport.compiler.js.ClassDescriptor
-import deezer.kustomexport.compiler.js.FormatString
-import deezer.kustomexport.compiler.js.MethodNameDisambiguation
-import deezer.kustomexport.compiler.js.ParameterDescriptor
-import deezer.kustomexport.compiler.js.dynamicCastTo
-import deezer.kustomexport.compiler.js.dynamicNotString
-import deezer.kustomexport.compiler.js.dynamicNull
-import deezer.kustomexport.compiler.js.dynamicString
-import deezer.kustomexport.compiler.js.jsExport
-import deezer.kustomexport.compiler.js.jsPackage
+import deezer.kustomexport.compiler.js.*
 import deezer.kustomexport.compiler.js.mapping.INDENTATION
-import deezer.kustomexport.compiler.js.pattern.asClassName
-import deezer.kustomexport.compiler.js.pattern.buildWrappingFunction
-import deezer.kustomexport.compiler.js.pattern.overrideGetterSetter
-import deezer.kustomexport.compiler.js.pattern.suppress
 
 fun ClassDescriptor.transform() = transformClass(this)
 
@@ -140,9 +126,9 @@ private fun buildExportedClass(
                             // Without that, it fails at runtime because there is no dynamicCastTo method on null.
                             // > TypeError: Cannot read properties of null (reading 'dynamicCastTo')
                             origin.constructorParams
-                                .joinToString { "${it.name}·=·%M${if (ctorDyn == dynamicNull) "?" else ""}.%M<%T>()" },
+                                .joinToString { "${it.name}·=·%M.%M<%T>()" },
                             *origin.constructorParams
-                                .flatMap { listOf(ctorDyn, dynamicCastTo, it.type.exportedTypeName) }.toTypedArray()
+                                .flatMap { listOf(ctorDyn, unsafeCast, it.type.exportedTypeName) }.toTypedArray()
                         )
                     )
                     .addParameter(ParameterSpec("common", originalClass))
@@ -188,7 +174,7 @@ private fun buildExportedClass(
                             b.addSuperclassConstructorParameter(
                                 CodeBlock.of(
                                     "common = %M.%M<%T>()",
-                                    dynamicNull, dynamicCastTo, supr.origin.concreteTypeName.asClassName()
+                                    dynamicNull, unsafeCast, supr.origin.concreteTypeName.asClassName()
                                 )
                             )
                         }

diff --git a/...mpiler/js/pattern/enum/EnumTransformer.kt → ...rt/compiler/js/pattern/EnumTransformer.kt b/...mpiler/js/pattern/enum/EnumTransformer.kt → ...rt/compiler/js/pattern/EnumTransformer.kt
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.enum
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.ARRAY
 import com.squareup.kotlinpoet.ClassName
@@ -30,7 +30,6 @@ import deezer.kustomexport.compiler.js.EnumDescriptor
 import deezer.kustomexport.compiler.js.jsExport
 import deezer.kustomexport.compiler.js.jsPackage
 import deezer.kustomexport.compiler.js.mapping.INDENTATION
-import deezer.kustomexport.compiler.js.pattern.overrideGetterSetter
 
 fun EnumDescriptor.transform() = transformEnum(this)
 

diff --git a/...s/pattern/function/FunctionTransformer.kt → ...ompiler/js/pattern/FunctionTransformer.kt b/...s/pattern/function/FunctionTransformer.kt → ...ompiler/js/pattern/FunctionTransformer.kt
@@ -15,18 +15,14 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.function
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
-import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.MemberName
 import deezer.kustomexport.compiler.js.TopLevelFunctionDescriptor
 import deezer.kustomexport.compiler.js.jsExport
 import deezer.kustomexport.compiler.js.jsPackage
-import deezer.kustomexport.compiler.js.pattern.addParameters
-import deezer.kustomexport.compiler.js.pattern.buildWrappingFunctionBody
-import deezer.kustomexport.compiler.js.pattern.returnType
 
 fun TopLevelFunctionDescriptor.transform() = transformFunction(this)
 

diff --git a/...pattern/interface/InterfaceTransformer.kt → ...mpiler/js/pattern/InterfaceTransformer.kt b/...pattern/interface/InterfaceTransformer.kt → ...mpiler/js/pattern/InterfaceTransformer.kt
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.`interface`
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
@@ -33,10 +33,6 @@ import deezer.kustomexport.compiler.js.PropertyDescriptor
 import deezer.kustomexport.compiler.js.jsExport
 import deezer.kustomexport.compiler.js.jsPackage
 import deezer.kustomexport.compiler.js.mapping.INDENTATION
-import deezer.kustomexport.compiler.js.pattern.OverrideMode
-import deezer.kustomexport.compiler.js.pattern.buildWrappingFunction
-import deezer.kustomexport.compiler.js.pattern.overrideGetterSetter
-import deezer.kustomexport.compiler.js.pattern.packageName
 import java.util.Locale
 
 fun InterfaceDescriptor.transform() = transformInterface(this)

diff --git a/...s/pattern/class/SealedClassTransformer.kt → ...iler/js/pattern/SealedClassTransformer.kt b/...s/pattern/class/SealedClassTransformer.kt → ...iler/js/pattern/SealedClassTransformer.kt
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.`class`
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock

diff --git a/...js/pattern/value/ValueClassTransformer.kt → ...piler/js/pattern/ValueClassTransformer.kt b/...js/pattern/value/ValueClassTransformer.kt → ...piler/js/pattern/ValueClassTransformer.kt
@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package deezer.kustomexport.compiler.js.pattern.value
+package deezer.kustomexport.compiler.js.pattern
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec

diff --git a/lib/src/commonMain/kotlin/deezer/kustomexport/Dynamics.kt b/lib/src/commonMain/kotlin/deezer/kustomexport/Dynamics.kt
diff --git a/lib/src/commonMain/kotlin/deezer/kustomexport/dynamicCastTo.kt b/lib/src/commonMain/kotlin/deezer/kustomexport/dynamicCastTo.kt
diff --git a/lib/src/iosMain/kotlin/deezer/kustomexport/dynamicCastTo.kt b/lib/src/iosMain/kotlin/deezer/kustomexport/dynamicCastTo.kt
diff --git a/lib/src/iosMain/kotlin/deezer/kustomexport/dynamicNull.kt b/lib/src/iosMain/kotlin/deezer/kustomexport/dynamicNull.kt
diff --git a/lib/src/iosSimulatorArm64Main/kotlin/kustomexport/dynamicCastTo.kt b/lib/src/iosSimulatorArm64Main/kotlin/kustomexport/dynamicCastTo.kt
diff --git a/lib/src/iosSimulatorArm64Main/kotlin/kustomexport/dynamicNull.kt b/lib/src/iosSimulatorArm64Main/kotlin/kustomexport/dynamicNull.kt
diff --git a/lib/src/jsMain/kotlin/deezer/kustomexport/Dynamics.kt b/lib/src/jsMain/kotlin/deezer/kustomexport/Dynamics.kt
@@ -17,6 +17,6 @@
 
 package deezer.kustomexport
 
-actual val dynamicNull: dynamic = null
-actual val dynamicString: dynamic = "marker"
-actual val dynamicNotString: dynamic = 123456
+val dynamicNull: dynamic = null
+val dynamicString: dynamic = "marker"
+val dynamicNotString: dynamic = 123456
diff --git a/lib/src/jsMain/kotlin/deezer/kustomexport/dynamicCastTo.kt b/lib/src/jsMain/kotlin/deezer/kustomexport/dynamicCastTo.kt
diff --git a/lib/src/jvmMain/kotlin/deezer/kustomexport/dynamicCastTo.kt b/lib/src/jvmMain/kotlin/deezer/kustomexport/dynamicCastTo.kt
diff --git a/lib/src/jvmMain/kotlin/deezer/kustomexport/dynamicNull.kt b/lib/src/jvmMain/kotlin/deezer/kustomexport/dynamicNull.kt