[Wasm] EnvSpec has executable provider and env instead of produceEnv

js/js.tests/build.gradle.kts

@@ -1,7 +1,6 @@
 import com.github.gradle.node.npm.task.NpmTask
 import com.github.gradle.node.variant.computeNodeExec
 import org.apache.tools.ant.filters.FixCrLfFilter
-import org.jetbrains.kotlin.build.d8.D8Extension
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
@@ -214,7 +213,7 @@ fun Test.setupNodeJs() {
 }
 
 fun Test.setUpJsBoxTests(tags: String?) {
-    with(project.the<D8Extension>()) {
+    with(d8KotlinBuild) {
         setupV8()
     }
 

js/js.tests/klib-compatibility/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.build.d8.D8Extension
 import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
 
 plugins {
@@ -48,7 +47,7 @@ sourceSets {
 testsJar {}
 
 fun Test.setUpJsBoxTests() {
-    with(project.the<D8Extension>()) {
+    with(d8KotlinBuild) {
         setupV8()
     }
     dependsOn(":dist")

libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api

@@ -3027,9 +3027,10 @@ public abstract class org/jetbrains/kotlin/gradle/targets/js/EnvSpec {
 	public abstract fun getCommand ()Lorg/gradle/api/provider/Property;
 	public abstract fun getDownload ()Lorg/gradle/api/provider/Property;
 	public abstract fun getDownloadBaseUrl ()Lorg/gradle/api/provider/Property;
+	public abstract fun getExecutable ()Lorg/gradle/api/provider/Provider;
 	public abstract fun getInstallationDirectory ()Lorg/gradle/api/file/DirectoryProperty;
 	public abstract fun getVersion ()Lorg/gradle/api/provider/Property;
-	public abstract fun produceEnv (Lorg/gradle/api/provider/ProviderFactory;)Lorg/gradle/api/provider/Provider;
+	protected abstract fun produceEnv ()Lorg/gradle/api/provider/Provider;
 }
 
 public final class org/jetbrains/kotlin/gradle/targets/js/JsAggregatingExecutionSource : org/jetbrains/kotlin/gradle/execution/KotlinAggregateExecutionSource {
@@ -3243,7 +3244,8 @@ public abstract class org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRo
 	public static final field Companion Lorg/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootEnvSpec$Companion;
 	public static final field EXTENSION_NAME Ljava/lang/String;
 	public fun <init> ()V
-	public fun produceEnv (Lorg/gradle/api/provider/ProviderFactory;)Lorg/gradle/api/provider/Provider;
+	public fun getExecutable ()Lorg/gradle/api/provider/Provider;
+	protected final fun produceEnv ()Lorg/gradle/api/provider/Provider;
 }
 
 public final class org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootEnvSpec$Companion {
@@ -3317,8 +3319,9 @@ public abstract class org/jetbrains/kotlin/gradle/targets/js/d8/D8EnvSpec : org/
 	public fun <init> ()V
 	public final fun getD8SetupTaskProvider (Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;
 	public abstract fun getEdition ()Lorg/gradle/api/provider/Property;
+	public fun getExecutable ()Lorg/gradle/api/provider/Provider;
 	public abstract fun getVersion ()Lorg/gradle/api/provider/Property;
-	public fun produceEnv (Lorg/gradle/api/provider/ProviderFactory;)Lorg/gradle/api/provider/Provider;
+	protected final fun produceEnv ()Lorg/gradle/api/provider/Provider;
 }
 
 public final class org/jetbrains/kotlin/gradle/targets/js/d8/D8EnvSpec$Companion {
@@ -4121,8 +4124,9 @@ public abstract class org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsEnvSpe
 	public static final field Companion Lorg/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsEnvSpec$Companion;
 	public static final field EXTENSION_NAME Ljava/lang/String;
 	public fun <init> ()V
+	public fun getExecutable ()Lorg/gradle/api/provider/Provider;
 	public final fun getNodeJsSetupTaskProvider (Lorg/gradle/api/Project;)Lorg/gradle/api/tasks/TaskProvider;
-	public fun produceEnv (Lorg/gradle/api/provider/ProviderFactory;)Lorg/gradle/api/provider/Provider;
+	protected final fun produceEnv ()Lorg/gradle/api/provider/Provider;
 }
 
 public final class org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsEnvSpec$Companion {
@@ -5859,12 +5863,13 @@ public abstract class org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootEnvSpe
 	public static final field Companion Lorg/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootEnvSpec$Companion;
 	public static final field YARN Ljava/lang/String;
 	public fun <init> ()V
+	public fun getExecutable ()Lorg/gradle/api/provider/Provider;
 	public abstract fun getIgnoreScripts ()Lorg/gradle/api/provider/Property;
 	public abstract fun getReportNewYarnLock ()Lorg/gradle/api/provider/Property;
 	public abstract fun getResolutions ()Lorg/gradle/api/provider/ListProperty;
 	public abstract fun getYarnLockAutoReplace ()Lorg/gradle/api/provider/Property;
 	public abstract fun getYarnLockMismatchReport ()Lorg/gradle/api/provider/Property;
-	public fun produceEnv (Lorg/gradle/api/provider/ProviderFactory;)Lorg/gradle/api/provider/Provider;
+	protected final fun produceEnv ()Lorg/gradle/api/provider/Provider;
 }
 
 public final class org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootEnvSpec$Companion {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/AbstractEnvSpec.kt

@@ -4,13 +4,14 @@ import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnEnv
 
 /**
  * Instance which describes specific runtimes for JS and Wasm targets
  *
  * It encapsulates necessary information about a tool to run application and tests
  */
-abstract class EnvSpec<T> {
+abstract class EnvSpec<T : AbstractEnv> {
 
     /**
      * Specify whether we need to download the tool
@@ -40,8 +41,18 @@ abstract class EnvSpec<T> {
      */
     abstract val command: Property<String>
 
+    /**
+     * Full serializable cache-friendly entity without Gradle Provider API
+     */
+    internal abstract val env: Provider<T>
+
+    /**
+     * Provider with full executable path
+     */
+    abstract val executable: Provider<String>
+
     /**
      * Produce  full serializable cache-friendly entity without Gradle Provider API
      */
-    abstract fun produceEnv(providerFactory: ProviderFactory): Provider<T>
+    protected abstract fun produceEnv(): Provider<T>
 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/AbstractSetupTask.kt

@@ -34,7 +34,7 @@ abstract class AbstractSetupTask<Env : AbstractEnv, Spec : EnvSpec<Env>>(
     protected abstract val artifactName: String
 
     @get:Internal
-    protected val env: Provider<Env> = spec.produceEnv(project.providers)
+    protected val env: Provider<Env> = spec.env
 
     private val shouldDownload: Provider<Boolean> = env.map { it.download }
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootEnvSpec.kt

@@ -10,6 +10,7 @@ import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.EnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnv
 import org.jetbrains.kotlin.gradle.tasks.internal.CleanableStore
 import org.jetbrains.kotlin.gradle.utils.getFile
 
@@ -24,9 +25,12 @@ abstract class BinaryenRootEnvSpec : EnvSpec<BinaryenEnv>() {
      */
     internal abstract val platform: Property<BinaryenPlatform>
 
-    override fun produceEnv(providerFactory: ProviderFactory): Provider<BinaryenEnv> {
-        return providerFactory.provider {
-            val versionValue = version.get()
+    final override val env: Provider<BinaryenEnv> = produceEnv()
+
+    override val executable: Provider<String> = env.map { it.executable }
+
+    final override fun produceEnv(): Provider<BinaryenEnv> {
+        return version.map { versionValue ->
             val requiredVersionName = "binaryen-version_$versionValue"
             val cleanableStore = CleanableStore[installationDirectory.getFile().absolutePath]
             val targetPath = cleanableStore[requiredVersionName].use()

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/binaryen/BinaryenRootExtension.kt

@@ -48,7 +48,7 @@ open class BinaryenRootExtension(
     internal val platform: org.gradle.api.provider.Property<BinaryenPlatform> = rootProject.objects.property<BinaryenPlatform>()
 
     override fun finalizeConfiguration(): BinaryenEnv {
-        return binaryenSpec.produceEnv(rootProject.providers).get()
+        return binaryenSpec.env.get()
     }
 
     companion object {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8EnvSpec.kt

@@ -11,6 +11,7 @@ import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.tasks.TaskProvider
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.EnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenEnv
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsSetupTask
 import org.jetbrains.kotlin.gradle.tasks.internal.CleanableStore
 import org.jetbrains.kotlin.gradle.utils.getFile
@@ -45,9 +46,13 @@ abstract class D8EnvSpec : EnvSpec<D8Env>() {
      */
     abstract val edition: org.gradle.api.provider.Property<String>
 
-    override fun produceEnv(providerFactory: ProviderFactory): Provider<D8Env> {
-        return providerFactory.provider {
-            val requiredVersion = "${D8Platform.platform}-${edition.get()}-${version.get()}"
+    final override val env: Provider<D8Env> = produceEnv()
+
+    override val executable: Provider<String> = env.map { it.executable }
+
+    final override fun produceEnv(): Provider<D8Env> {
+        return edition.map { editionValue ->
+            val requiredVersion = "${D8Platform.platform}-$editionValue-${version.get()}"
             val requiredVersionName = "v8-$requiredVersion"
             val cleanableStore = CleanableStore[installationDirectory.getFile().absolutePath]
             val targetPath = cleanableStore[requiredVersionName].use()

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt

@@ -63,7 +63,7 @@ open class D8Exec : AbstractExecTask<D8Exec>(D8Exec::class.java) {
             return project.registerTask(
                 name
             ) {
-                it.executable = d8.produceEnv(project.providers).get().executable
+                it.executable = d8.executable.get()
                 with(d8) {
                     it.dependsOn(project.d8SetupTaskProvider)
                 }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Plugin.kt

@@ -49,7 +49,7 @@ open class D8Plugin : Plugin<Project> {
         }
 
         project.registerTask<CleanDataTask>("d8" + CleanDataTask.NAME_SUFFIX) {
-            it.cleanableStoreProvider = spec.produceEnv(project.providers).map { it.cleanableStore }
+            it.cleanableStoreProvider = spec.env.map { it.cleanableStore }
             it.group = TASKS_GROUP_NAME
             it.description = "Clean unused local d8 version"
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8RootExtension.kt

@@ -51,7 +51,7 @@ open class D8RootExtension(
         .convention("d8")
 
     override fun finalizeConfiguration(): D8Env {
-        return d8EnvSpec.produceEnv(project.providers).get()
+        return d8EnvSpec.env.get()
     }
 
     val setupTaskProvider: TaskProvider<out D8SetupTask>

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsEnvSpec.kt

@@ -24,9 +24,12 @@ abstract class NodeJsEnvSpec : EnvSpec<NodeJsEnv>() {
      */
     internal abstract val platform: org.gradle.api.provider.Property<Platform>
 
-    override fun produceEnv(providerFactory: ProviderFactory): Provider<NodeJsEnv> {
-        return providerFactory.provider {
-            val platformValue = platform.get()
+    final override val env: Provider<NodeJsEnv> = produceEnv()
+
+    override val executable: Provider<String> = env.map { it.executable }
+
+    final override fun produceEnv(): Provider<NodeJsEnv> {
+        return platform.map { platformValue ->
             val name = platformValue.name
             val architecture = platformValue.arch
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt

@@ -106,7 +106,7 @@ constructor(
                 listOf(compilation)
             ) {
                 it.nodeJsRoot = nodeJsRoot
-                it.executable = nodeJs.produceEnv(project.providers).get().executable
+                it.executable = nodeJs.executable.get()
                 if ((compilation.target as? KotlinJsIrTarget)?.wasmTargetType != KotlinWasmTargetType.WASI) {
                     it.workingDir(npmProject.dir)
                     it.dependsOn(

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt

@@ -143,7 +143,7 @@ open class NodeJsRootExtension(
 
     @Deprecated("Use NodeJsEnvSpec instead. This will be removed in 2.2")
     fun requireConfigured(): NodeJsEnv {
-        return nodeJs().produceEnv(project.providers).get()
+        return nodeJs().env.get()
     }
 
     companion object {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt

@@ -57,7 +57,7 @@ open class NodeJsRootPlugin : Plugin<Project> {
         val nodeJs = NodeJsPlugin.apply(project)
 
         npm.nodeJsEnvironment.value(
-            nodeJs.produceEnv(project.providers)
+            nodeJs.env
         ).disallowChanges()
 
         nodeJsRoot.packageManagerExtension.convention(
@@ -234,7 +234,7 @@ open class NodeJsRootPlugin : Plugin<Project> {
         }
 
         project.tasks.register("node" + CleanDataTask.NAME_SUFFIX, CleanDataTask::class.java) {
-            it.cleanableStoreProvider = nodeJs.produceEnv(project.providers).map { it.cleanableStore }
+            it.cleanableStoreProvider = nodeJs.env.map { it.cleanableStore }
             it.group = TASKS_GROUP_NAME
             it.description = "Clean unused local node version"
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt

@@ -94,7 +94,7 @@ open class NpmProject(@Transient val compilation: KotlinJsIrCompilation) : Seria
     }
 
     private val nodeExecutable by lazy {
-        nodeJs.produceEnv(project.providers).get().executable
+        nodeJs.executable.get()
     }
 
     fun useTool(

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt

@@ -48,7 +48,7 @@ abstract class KotlinNpmInstallTask :
     // -----
 
     private val nodsJsEnvironment by lazy {
-        asNodeJsEnvironment(nodeJsRoot, nodeJs.produceEnv(project.providers).get())
+        asNodeJsEnvironment(nodeJsRoot, nodeJs.env.get())
     }
 
     private val packageManagerEnv by lazy {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt

@@ -47,7 +47,7 @@ abstract class RootPackageJsonTask :
     // -----
 
     private val nodeJsEnvironment by lazy {
-        asNodeJsEnvironment(nodeJsRoot, nodeJs.produceEnv(project.providers).get())
+        asNodeJsEnvironment(nodeJsRoot, nodeJs.env.get())
     }
 
     private val packageManagerEnv by lazy {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt

@@ -37,7 +37,7 @@ constructor(
     @Transient
     private val nodeJs = project.kotlinNodeJsEnvSpec
 
-    private val nodeExecutable = nodeJs.produceEnv(project.providers).map { it.executable }
+    private val nodeExecutable = nodeJs.executable
 
     @Input
     var environment = mutableMapOf<String, String>()

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt

@@ -31,7 +31,7 @@ internal class KotlinWasmD8(kotlinJsTest: KotlinJsTest) : KotlinJsTestFramework
 
     override val workingDir: Provider<Directory> = projectLayout.dir(kotlinJsTest.inputFileProperty.asFile.map { it.parentFile })
 
-    override val executable: Provider<String> = d8.produceEnv(compilation.project.providers).map { it.executable }
+    override val executable: Provider<String> = d8.executable
 
     override fun createTestExecutionSpec(
         task: KotlinJsTest,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt

@@ -42,7 +42,7 @@ internal class KotlinWasmNode(kotlinJsTest: KotlinJsTest) : KotlinJsTestFramewor
             }
         }
 
-    override val executable: Provider<String> = nodeJs.produceEnv(kotlinJsTest.project.providers).map { it.executable }
+    override val executable: Provider<String> = nodeJs.executable
 
     override fun createTestExecutionSpec(
         task: KotlinJsTest,

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt

@@ -81,7 +81,7 @@ class KotlinKarma(
     override val workingDir: Provider<Directory>
         get() = npmProjectDir
 
-    override val executable: Provider<String> = nodeJsEnvSpec.produceEnv(project.providers).map { it.executable }
+    override val executable: Provider<String> = nodeJsEnvSpec.executable
 
     override fun getPath() = "$basePath:kotlinKarma"
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt

@@ -38,7 +38,7 @@ class KotlinMocha(@Transient override val compilation: KotlinJsIrCompilation, pr
     override val workingDir: Provider<Directory>
         get() = npmProjectDir
 
-    override val executable: Provider<String> = nodeJs.produceEnv(project.providers).map { it.executable }
+    override val executable: Provider<String> = nodeJs.executable
 
     override val settingsState: String
         get() = "mocha"

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt

@@ -73,7 +73,7 @@ open class YarnPlugin : Plugin<Project> {
         }
 
         yarnRootExtension.nodeJsEnvironment.value(
-            nodeJs.produceEnv(project.providers)
+            nodeJs.env
         ).disallowChanges()
 
         tasks.register("yarn" + CleanDataTask.NAME_SUFFIX, CleanDataTask::class.java) {

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootEnvSpec.kt

@@ -10,6 +10,7 @@ import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
 import org.jetbrains.kotlin.gradle.targets.js.EnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenEnv
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.Platform
 import org.jetbrains.kotlin.gradle.tasks.internal.CleanableStore
 import org.jetbrains.kotlin.gradle.utils.getFile
@@ -60,11 +61,15 @@ abstract class YarnRootEnvSpec : EnvSpec<YarnEnv>() {
      */
     abstract val resolutions: ListProperty<YarnResolution>
 
-    override fun produceEnv(providerFactory: ProviderFactory): Provider<YarnEnv> {
-        return providerFactory.provider {
+    final override val env: Provider<YarnEnv> = produceEnv()
+
+    override val executable: Provider<String> = env.map { it.executable }
+
+    final override fun produceEnv(): Provider<YarnEnv> {
+        return platform.map { platformValue ->
             val cleanableStore = CleanableStore[installationDirectory.getFile().path]
 
-            val isWindows = platform.get().isWindows()
+            val isWindows = platformValue.isWindows()
 
             val home = cleanableStore["yarn-v${version.get()}"].use()
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt

@@ -102,7 +102,7 @@ open class YarnRootExtension(
     internal val nodeJsEnvironment: org.gradle.api.provider.Property<NodeJsEnv> = project.objects.property(NodeJsEnv::class.java)
 
     override fun finalizeConfiguration(): YarnEnv {
-        return yarnSpec.produceEnv(project.providers).get()
+        return yarnSpec.env.get()
     }
 
     val restoreYarnLockTaskProvider: TaskProvider<YarnLockCopyTask>