#582 remove code duplication from generator

Author: Alex009

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/CodeGenerators.kt

@@ -17,6 +17,7 @@ import com.squareup.kotlinpoet.TypeSpec
 import dev.icerock.gradle.generator.Constants.Apple
 import dev.icerock.gradle.generator.Constants.Jvm
 import dev.icerock.gradle.generator.Constants.PlatformDetails
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.metadata.resource.HierarchyMetadata
 import dev.icerock.gradle.metadata.resource.ResourceMetadata
 import org.gradle.api.GradleException
@@ -151,8 +152,8 @@ internal fun <T : ResourceMetadata> TypeSpec.Builder.addValuesFunction(
 
             hierarchyMetadata.joinToString { meta ->
                 meta.path.joinToString(separator = ".") +
-                    (".".takeIf { meta.path.isNotEmpty() } ?: "") +
-                    meta.key
+                        (".".takeIf { meta.path.isNotEmpty() } ?: "") +
+                        meta.key
             }
         } else {
             // Create simple resource key
@@ -200,13 +201,16 @@ internal fun TypeSpec.Builder.addOverrideAbstractValuesFunction(
     return addFunction(valuesFun)
 }
 
-internal fun TypeSpec.Builder.addJsFallbackProperty(fallbackFilePath: String) {
+internal fun TypeSpec.Builder.addJsFallbackProperty(
+    fallbackFilePath: String,
+    filePathMode: JsFilePathMode
+) {
     val property: PropertySpec = PropertySpec
         .builder(Constants.Js.fallbackFilePropertyName, String::class, KModifier.PRIVATE)
         .initializer(
             CodeBlock.of(
-                "js(%S) as %T",
-                "require(\"$fallbackFilePath\")",
+                "${filePathMode.format} as %T",
+                filePathMode.argument(fallbackFilePath),
                 String::class
             )
         )
@@ -215,21 +219,9 @@ internal fun TypeSpec.Builder.addJsFallbackProperty(fallbackFilePath: String) {
     addProperty(property)
 }
 
-internal fun TypeSpec.Builder.addWasmJsFallbackProperty(fallbackFilePath: String) {
-    val property: PropertySpec = PropertySpec
-        .builder(Constants.WasmJs.fallbackFilePropertyName, String::class, KModifier.PRIVATE)
-        .initializer(
-            CodeBlock.of(
-                "\"$fallbackFilePath\""
-            )
-        )
-        .build()
-
-    addProperty(property)
-}
-
 internal fun TypeSpec.Builder.addJsSupportedLocalesProperty(
     bcpLangToPath: List<Pair<String, String>>,
+    filePathMode: JsFilePathMode
 ) {
     val property: PropertySpec = PropertySpec
         .builder(
@@ -243,10 +235,10 @@ internal fun TypeSpec.Builder.addJsSupportedLocalesProperty(
                     add("%T(listOf(\n", Constants.Js.supportedLocalesName)
                     bcpLangToPath.forEach { (bcpLang, filePath) ->
                         add(
-                            "%T(%S, js(%S) as %T),\n",
+                            "%T(%S, ${filePathMode.format} as %T),\n",
                             Constants.Js.supportedLocaleName,
                             bcpLang,
-                            "require(\"$filePath\")",
+                            filePathMode.argument(filePath),
                             String::class
                         )
                     }
@@ -257,34 +249,6 @@ internal fun TypeSpec.Builder.addJsSupportedLocalesProperty(
     addProperty(property)
 }
 
-internal fun TypeSpec.Builder.addWasmJsSupportedLocalesProperty(
-    bcpLangToPath: List<Pair<String, String>>,
-) {
-    val property: PropertySpec = PropertySpec
-        .builder(
-            Constants.WasmJs.supportedLocalesPropertyName,
-            Constants.WasmJs.supportedLocalesName,
-            KModifier.PRIVATE
-        ).initializer(
-            CodeBlock
-                .builder()
-                .apply {
-                    add("%T(listOf(\n", Constants.WasmJs.supportedLocalesName)
-                    bcpLangToPath.forEach { (bcpLang, filePath) ->
-                        add(
-                            "%T(%S, %S),\n",
-                            Constants.WasmJs.supportedLocaleName,
-                            bcpLang,
-                            filePath
-                        )
-                    }
-                    add("))")
-                }.build()
-        ).build()
-
-    addProperty(property)
-}
-
 internal fun TypeSpec.Builder.addJsContainerStringsLoaderProperty() {
     val property = PropertySpec.builder(
         Constants.Js.stringsLoaderPropertyName,
@@ -299,18 +263,3 @@ internal fun TypeSpec.Builder.addJsContainerStringsLoaderProperty() {
     ).build()
     addProperty(property)
 }
-
-internal fun TypeSpec.Builder.addWasmJsContainerStringsLoaderProperty() {
-    val property = PropertySpec.builder(
-        Constants.WasmJs.stringsLoaderPropertyName,
-        Constants.WasmJs.stringLoaderName,
-        KModifier.OVERRIDE
-    ).initializer(
-        CodeBlock.of(
-            "${Constants.WasmJs.remoteStringLoaderClassName}.Impl(supportedLocales = %N, fallbackFileUri = %N)",
-            Constants.WasmJs.supportedLocalesPropertyName,
-            Constants.WasmJs.fallbackFilePropertyName
-        )
-    ).build()
-    addProperty(property)
-}

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/Constants.kt

@@ -56,19 +56,4 @@ internal object Constants {
         const val fallbackFilePropertyName = "fallbackFileUrl"
         const val supportedLocalesPropertyName = "supportedLocales"
     }
-
-    object WasmJs {
-        private const val internalPackage = "dev.icerock.moko.resources.internal"
-        val supportedLocalesName = ClassName(internalPackage, "SupportedLocales")
-        val supportedLocaleName = ClassName(internalPackage, "SupportedLocale")
-
-        const val remoteStringLoaderClassName = "RemoteJsStringLoader"
-        val loaderHolderName = ClassName(internalPackage, "${remoteStringLoaderClassName}Holder")
-        val stringLoaderName =
-            ClassName("dev.icerock.moko.resources.provider", remoteStringLoaderClassName)
-        const val stringsLoaderPropertyName = "stringsLoader"
-
-        const val fallbackFilePropertyName = "fallbackFileUrl"
-        const val supportedLocalesPropertyName = "supportedLocales"
-    }
 }

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/AssetGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.HierarchyPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.asset.AndroidAssetResourceGenerator
 import dev.icerock.gradle.generator.resources.asset.AppleAssetResourceGenerator
 import dev.icerock.gradle.generator.resources.asset.AssetResourceGenerator
 import dev.icerock.gradle.generator.resources.asset.JsAssetResourceGenerator
 import dev.icerock.gradle.generator.resources.asset.JvmAssetResourceGenerator
-import dev.icerock.gradle.generator.resources.asset.WasmJsAssetResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.AssetMetadata
 import dev.icerock.gradle.toModifier
@@ -79,12 +79,14 @@ internal class AssetGeneratorFactory(
             },
             createJs = {
                 JsAssetResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsAssetResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                JsAssetResourceGenerator(
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/FileGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.HierarchyPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.file.AndroidFileResourceGenerator
 import dev.icerock.gradle.generator.resources.file.AppleFileResourceGenerator
 import dev.icerock.gradle.generator.resources.file.FileResourceGenerator
 import dev.icerock.gradle.generator.resources.file.JsFileResourceGenerator
 import dev.icerock.gradle.generator.resources.file.JvmFileResourceGenerator
-import dev.icerock.gradle.generator.resources.file.WasmJsFileResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.FileMetadata
 import dev.icerock.gradle.toModifier
@@ -78,12 +78,14 @@ internal class FileGeneratorFactory(
             },
             createJs = {
                 JsFileResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsFileResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                JsFileResourceGenerator(
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/FontGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.FlatPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.font.AndroidFontResourceGenerator
 import dev.icerock.gradle.generator.resources.font.AppleFontResourceGenerator
 import dev.icerock.gradle.generator.resources.font.FontResourceGenerator
 import dev.icerock.gradle.generator.resources.font.JsFontResourceGenerator
 import dev.icerock.gradle.generator.resources.font.JvmFontResourceGenerator
-import dev.icerock.gradle.generator.resources.font.WasmJsFontResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.FontMetadata
 import dev.icerock.gradle.toModifier
@@ -71,13 +71,15 @@ internal class FontGeneratorFactory(
             createJs = {
                 JsFontResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsFontResourceGenerator(
+                JsFontResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/ImageGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.FlatPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.image.AndroidImageResourceGenerator
 import dev.icerock.gradle.generator.resources.image.AppleImageResourceGenerator
 import dev.icerock.gradle.generator.resources.image.ImageResourceGenerator
 import dev.icerock.gradle.generator.resources.image.JsImageResourceGenerator
 import dev.icerock.gradle.generator.resources.image.JvmImageResourceGenerator
-import dev.icerock.gradle.generator.resources.image.WasmJsImageResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.ImageMetadata
 import dev.icerock.gradle.toModifier
@@ -75,12 +75,14 @@ internal class ImageGeneratorFactory(
             },
             createJs = {
                 JsImageResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsImageResourceGenerator(
-                    resourcesGenerationDir = outputResourcesDir
+                JsImageResourceGenerator(
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/PluralGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.FlatPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.plural.AndroidPluralResourceGenerator
 import dev.icerock.gradle.generator.resources.plural.ApplePluralResourceGenerator
 import dev.icerock.gradle.generator.resources.plural.JsPluralResourceGenerator
 import dev.icerock.gradle.generator.resources.plural.JvmPluralResourceGenerator
 import dev.icerock.gradle.generator.resources.plural.PluralResourceGenerator
-import dev.icerock.gradle.generator.resources.plural.WasmJsPluralResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.PluralMetadata
 import dev.icerock.gradle.toModifier
@@ -78,13 +78,15 @@ internal class PluralGeneratorFactory(
             createJs = {
                 JsPluralResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsPluralResourceGenerator(
+                JsPluralResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/StringGeneratorFactory.kt

@@ -9,13 +9,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.FlatPropertiesGenerationStrategy
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.ResourceTypeGenerator
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.generator.resources.NOPResourceGenerator
 import dev.icerock.gradle.generator.resources.string.AndroidStringResourceGenerator
 import dev.icerock.gradle.generator.resources.string.AppleStringResourceGenerator
 import dev.icerock.gradle.generator.resources.string.JsStringResourceGenerator
 import dev.icerock.gradle.generator.resources.string.JvmStringResourceGenerator
 import dev.icerock.gradle.generator.resources.string.StringResourceGenerator
-import dev.icerock.gradle.generator.resources.string.WasmJsStringResourceGenerator
 import dev.icerock.gradle.metadata.container.ResourceType
 import dev.icerock.gradle.metadata.resource.StringMetadata
 import dev.icerock.gradle.toModifier
@@ -78,13 +78,15 @@ internal class StringGeneratorFactory(
             createJs = {
                 JsStringResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.require
                 )
             },
             createWasm = {
-                WasmJsStringResourceGenerator(
+                JsStringResourceGenerator(
                     resourcesPackageName = resourcesPackageName,
-                    resourcesGenerationDir = outputResourcesDir
+                    resourcesGenerationDir = outputResourcesDir,
+                    filePathMode = JsFilePathMode.rawPath
                 )
             }
         )

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/platform/js/JsFilePathMode.kt

@@ -0,0 +1,17 @@
+package dev.icerock.gradle.generator.platform.js
+
+internal data class JsFilePathMode(
+    val format: String,
+    val argument: (String) -> String,
+) {
+    companion object {
+        val require = JsFilePathMode(
+            format = "js(%S)",
+            argument = { """require("$it")""" }
+        )
+        val rawPath = JsFilePathMode(
+            format = "%S",
+            argument = { it }
+        )
+    }
+}

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/resources/asset/JsAssetResourceGenerator.kt

@@ -12,11 +12,13 @@ import dev.icerock.gradle.generator.Constants
 import dev.icerock.gradle.generator.PlatformResourceGenerator
 import dev.icerock.gradle.generator.addEmptyPlatformResourceProperty
 import dev.icerock.gradle.generator.addValuesFunction
+import dev.icerock.gradle.generator.platform.js.JsFilePathMode
 import dev.icerock.gradle.metadata.resource.AssetMetadata
 import java.io.File
 
 internal class JsAssetResourceGenerator(
     private val resourcesGenerationDir: File,
+    private val filePathMode: JsFilePathMode
 ) : PlatformResourceGenerator<AssetMetadata> {
 
     override fun imports(): List<ClassName> = emptyList()
@@ -25,10 +27,10 @@ internal class JsAssetResourceGenerator(
         val filePath: String = File(ASSETS_DIR, metadata.pathRelativeToBase.path)
             .invariantSeparatorsPath
 
-        val requireDeclaration = """require("./$filePath")"""
+        val originalPath: String = filePathMode.argument("./$filePath")
         return CodeBlock.of(
-            "AssetResource(originalPath = js(%S) as String, rawPath = %S)",
-            requireDeclaration,
+            "AssetResource(originalPath = ${filePathMode.format} as String, rawPath = %S)",
+            originalPath,
             metadata.pathRelativeToBase.invariantSeparatorsPath
         )
     }