Kind and css support to single platform JS

#KT-39770 fixed

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/JsModuleConfigurator.kt

@@ -9,20 +9,75 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
 import org.jetbrains.annotations.NonNls
 import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
 import org.jetbrains.kotlin.tools.projectWizard.core.Reader
+import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.ModuleConfiguratorSetting
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildSystemIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.KotlinBuildSystemPluginIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.GradleIRListBuilder
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.irsList
+import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModulesToIrConversionData
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind
 
-interface JSConfigurator : ModuleConfiguratorWithModuleType {
+interface JSConfigurator : ModuleConfiguratorWithModuleType, ModuleConfiguratorWithSettings {
     override val moduleType: ModuleType get() = ModuleType.js
+
+    override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
+        super.getConfiguratorSettings() + kind
+
+    fun Reader.isApplication(module: Module): Boolean =
+        settingsValue(module, kind) == JsTargetKind.APPLICATION
+
+    fun Reader.hasCssSupport(module: Module): Boolean =
+        settingsValue(module, cssSupport)
+
+    fun GradleIRListBuilder.browserSubTarget(module: Module, reader: Reader) {
+        "browser" {
+            if (reader.isApplication(module)) {
+                applicationSupport()
+            }
+            if (reader.hasCssSupport(module)) {
+                if (reader.isApplication(module)) {
+                    applicationCssSupport()
+                }
+                testCssSupport()
+            }
+        }
+    }
+
+    fun GradleIRListBuilder.nodejsSubTarget(module: Module, reader: Reader) {
+        "nodejs" {
+            if (reader.isApplication(module)) {
+                applicationSupport()
+            }
+        }
+    }
+
+    companion object : ModuleConfiguratorSettings() {
+        val kind by enumSetting<JsTargetKind>(
+            KotlinNewProjectWizardBundle.message("module.configurator.js.target.settings.kind"),
+            GenerationPhase.PROJECT_GENERATION
+        ) {
+            defaultValue = value(JsTargetKind.APPLICATION)
+        }
+
+        val cssSupport by booleanSetting(
+            KotlinNewProjectWizardBundle.message("module.configurator.js.css"),
+            GenerationPhase.PROJECT_GENERATION
+        ) {
+            defaultValue = value(true)
+        }
+    }
 }
 
-object JsSingleplatformModuleConfigurator : JSConfigurator, ModuleConfiguratorWithTests, SinglePlatformModuleConfigurator, ModuleConfiguratorWithSettings {
+object JsSingleplatformModuleConfigurator : JSConfigurator, ModuleConfiguratorWithTests, SinglePlatformModuleConfigurator,
+    ModuleConfiguratorWithSettings {
+    override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
+        super<ModuleConfiguratorWithTests>.getConfiguratorSettings() +
+                super<JSConfigurator>.getConfiguratorSettings() +
+                JSConfigurator.cssSupport
+
     override val moduleKind = ModuleKind.singleplatformJs
 
     @NonNls
@@ -49,16 +104,16 @@ object JsSingleplatformModuleConfigurator : JSConfigurator, ModuleConfiguratorWi
     ): List<BuildSystemIR> = irsList {
         "kotlin" {
             "js" {
-                +"browser" {
+                browserSubTarget(module, reader)
-                    applicationCssSupport()
-                    testCssSupport()
-                }
-                +"binaries.executable()"
             }
         }
     }
 }
 
+fun GradleIRListBuilder.applicationSupport() {
+    +"binaries.executable()"
+}
+
 fun GradleIRListBuilder.applicationCssSupport() {
     "webpackTask" {
         +"cssSupport.enabled = true"

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurator.kt

@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.GradleStri
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.irsList
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.DefaultTargetConfigurationIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.multiplatform.TargetAccessIR
+import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.JSConfigurator.Companion.cssSupport
 import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.buildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle
@@ -69,32 +70,7 @@ internal fun Module.createTargetAccessIr(moduleSubType: ModuleSubType) =
     )
 
 
-interface JsTargetConfigurator : JSConfigurator, TargetConfigurator, SingleCoexistenceTargetConfigurator, ModuleConfiguratorWithSettings {
+interface JsTargetConfigurator : JSConfigurator, TargetConfigurator, SingleCoexistenceTargetConfigurator, ModuleConfiguratorWithSettings
-    companion object : ModuleConfiguratorSettings() {
-        val kind by enumSetting<JsTargetKind>(
-            KotlinNewProjectWizardBundle.message("module.configurator.js.target.settings.kind"),
-            GenerationPhase.PROJECT_GENERATION
-        ) {
-            defaultValue = value(JsTargetKind.APPLICATION)
-        }
-
-        val cssSupport by booleanSetting(
-            KotlinNewProjectWizardBundle.message("module.configurator.js.css"),
-            GenerationPhase.PROJECT_GENERATION
-        ) {
-            defaultValue = value(true)
-        }
-    }
-
-    override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
-        super.getConfiguratorSettings() + kind + cssSupport
-
-    fun Reader.isApplication(module: Module): Boolean =
-        settingsValue(module, kind) == JsTargetKind.APPLICATION
-
-    fun Reader.hasCssSupport(module: Module): Boolean =
-        settingsValue(module, cssSupport)
-}
 
 enum class JsTargetKind(override val text: String) : DisplayableSettingItem {
     LIBRARY(KotlinNewProjectWizardBundle.message("module.configurator.js.target.settings.kind.library")),
@@ -104,7 +80,8 @@ enum class JsTargetKind(override val text: String) : DisplayableSettingItem {
 object JsBrowserTargetConfigurator : JsTargetConfigurator, ModuleConfiguratorWithTests {
     override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
         super<ModuleConfiguratorWithTests>.getConfiguratorSettings() +
-                super<JsTargetConfigurator>.getConfiguratorSettings()
+                super<JsTargetConfigurator>.getConfiguratorSettings() +
+                cssSupport
 
     @NonNls
     override val id = "jsBrowser"
@@ -122,17 +99,7 @@ object JsBrowserTargetConfigurator : JsTargetConfigurator, ModuleConfiguratorWit
         +DefaultTargetConfigurationIR(
             module.createTargetAccessIr(ModuleSubType.js)
         ) {
-            "browser" {
+            browserSubTarget(module, this@createTargetIrs)
-                if (isApplication(module)) {
-                    +"binaries.executable()"
-                }
-                if (hasCssSupport(module)) {
-                    if (isApplication(module)) {
-                        applicationCssSupport()
-                    }
-                    testCssSupport()
-                }
-            }
         }
     }
 }
@@ -153,11 +120,7 @@ object JsNodeTargetConfigurator : JsTargetConfigurator {
         +DefaultTargetConfigurationIR(
             module.createTargetAccessIr(ModuleSubType.js)
         ) {
-            "nodejs" {
+            nodejsSubTarget(module, this@createTargetIrs)
-                if (isApplication(module)) {
-                    +"binaries.executable()"
-                }
-            }
         }
     }
 }

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt

@@ -1,3 +1,8 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
 package org.jetbrains.kotlin.tools.projectWizard.projectTemplates
 
 import org.jetbrains.annotations.NonNls
@@ -207,7 +212,7 @@ object MultiplatformLibraryProjectTemplate : ProjectTemplate() {
                         ModuleType.common.createDefaultTarget(),
                         ModuleType.jvm.createDefaultTarget(),
                         ModuleType.js.createDefaultTarget().withConfiguratorSettings(JsBrowserTargetConfigurator) {
-                            JsTargetConfigurator.kind withValue JsTargetKind.LIBRARY
+                            JSConfigurator.kind withValue JsTargetKind.LIBRARY
                         },
                         ModuleType.native.createDefaultTarget()
                     )