Skip to content

Commit 58078d1

Browse files
adam-enkodeepy
adam-enko
authored and
deepy
committed
Format NPM code to follow Kotlin default style
1 parent cf42426 commit 58078d1

File tree

9 files changed

+151
-85
lines changed

9 files changed

+151
-85
lines changed

‎src/main/kotlin/com/github/gradle/node/NodeExtension.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@ open class NodeExtension(project: Project) {
185185
distBaseUrl.set("https://nodejs.org/dist")
186186
}
187187

188-
@Deprecated("useGradleProxySettings has been replaced with nodeProxySettings",
189-
replaceWith = ReplaceWith("nodeProxySettings.set(i)"))
188+
@Deprecated(
189+
"useGradleProxySettings has been replaced with nodeProxySettings",
190+
replaceWith = ReplaceWith("nodeProxySettings.set(i)")
191+
)
190192
fun setUseGradleProxySettings(value: Boolean) {
191193
nodeProxySettings.set(if (value) ProxySettings.SMART else ProxySettings.OFF)
192194
}
@@ -214,7 +216,7 @@ open class NodeExtension(project: Project) {
214216

215217
@JvmStatic
216218
fun create(project: Project): NodeExtension {
217-
return project.extensions.create<NodeExtension>(NAME, project, )
219+
return project.extensions.create<NodeExtension>(NAME, project)
218220
}
219221
}
220222
}

‎src/main/kotlin/com/github/gradle/node/NodePlugin.kt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import com.github.gradle.node.pnpm.task.PnpmSetupTask
1414
import com.github.gradle.node.pnpm.task.PnpmTask
1515
import com.github.gradle.node.task.NodeSetupTask
1616
import com.github.gradle.node.task.NodeTask
17-
import com.github.gradle.node.util.*
17+
import com.github.gradle.node.util.OsType
18+
import com.github.gradle.node.util.parseOsType
19+
import com.github.gradle.node.util.parsePlatform
1820
import com.github.gradle.node.variant.computeNodeArchiveDependency
1921
import com.github.gradle.node.variant.computeNodeDir
2022
import com.github.gradle.node.yarn.task.YarnInstallTask
@@ -24,7 +26,9 @@ import org.gradle.api.Action
2426
import org.gradle.api.Plugin
2527
import org.gradle.api.Project
2628
import org.gradle.api.provider.Property
27-
import org.gradle.kotlin.dsl.*
29+
import org.gradle.kotlin.dsl.create
30+
import org.gradle.kotlin.dsl.register
31+
import org.gradle.kotlin.dsl.withType
2832
import org.gradle.process.ExecSpec
2933
import org.gradle.util.GradleVersion
3034
import java.io.ByteArrayOutputStream
@@ -199,9 +203,9 @@ class NodePlugin : Plugin<Project> {
199203
project.tasks.withType<NodeSetupTask>().configureEach {
200204
nodeDir.set(nodeExtension.resolvedNodeDir)
201205
val archiveFileProvider = computeNodeArchiveDependency(nodeExtension)
202-
.map { nodeArchiveDependency ->
203-
resolveNodeArchiveFile(nodeArchiveDependency)
204-
}
206+
.map { nodeArchiveDependency ->
207+
resolveNodeArchiveFile(nodeArchiveDependency)
208+
}
205209
nodeArchiveFile.set(project.layout.file(archiveFileProvider))
206210
}
207211
}

‎src/main/kotlin/com/github/gradle/node/exec/ExecConfiguration.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import org.gradle.process.ExecSpec
55
import java.io.File
66

77
data class ExecConfiguration(
8-
val executable: String,
9-
val args: List<String> = listOf(),
10-
val additionalBinPaths: List<String> = listOf(),
11-
val environment: Map<String, String> = mapOf(),
12-
val workingDir: File? = null,
13-
val ignoreExitValue: Boolean = false,
14-
val execOverrides: Action<ExecSpec>? = null
8+
val executable: String,
9+
val args: List<String> = listOf(),
10+
val additionalBinPaths: List<String> = listOf(),
11+
val environment: Map<String, String> = mapOf(),
12+
val workingDir: File? = null,
13+
val ignoreExitValue: Boolean = false,
14+
val execOverrides: Action<ExecSpec>? = null
1515
)

‎src/main/kotlin/com/github/gradle/node/exec/NodeExecConfiguration.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import org.gradle.process.ExecSpec
55
import java.io.File
66

77
data class NodeExecConfiguration(
8-
val command: List<String> = listOf(),
9-
val environment: Map<String, String> = mapOf(),
10-
val workingDir: File? = null,
11-
val ignoreExitValue: Boolean = false,
12-
val execOverrides: Action<ExecSpec>? = null
8+
val command: List<String> = listOf(),
9+
val environment: Map<String, String> = mapOf(),
10+
val workingDir: File? = null,
11+
val ignoreExitValue: Boolean = false,
12+
val execOverrides: Action<ExecSpec>? = null
1313
)

‎src/main/kotlin/com/github/gradle/node/npm/exec/NpmExecConfiguration.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ import com.github.gradle.node.variant.VariantComputer
55
import org.gradle.api.file.Directory
66
import org.gradle.api.provider.Provider
77

8-
internal typealias CommandExecComputer = (variantComputer: VariantComputer, nodeExtension: NodeExtension,
9-
npmBinDir: Provider<Directory>) -> Provider<String>
8+
internal typealias CommandExecComputer = (
9+
variantComputer: VariantComputer,
10+
nodeExtension: NodeExtension,
11+
npmBinDir: Provider<Directory>,
12+
) -> Provider<String>
1013

1114
internal data class NpmExecConfiguration(
12-
val command: String,
13-
val commandExecComputer: CommandExecComputer
15+
val command: String,
16+
val commandExecComputer: CommandExecComputer,
1417
)

‎src/main/kotlin/com/github/gradle/node/npm/exec/NpmExecRunner.kt‎

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,53 +20,76 @@ abstract class NpmExecRunner {
2020
@get:Inject
2121
abstract val providers: ProviderFactory
2222

23-
fun executeNpmCommand(project: ProjectApiHelper, extension: NodeExtension, nodeExecConfiguration: NodeExecConfiguration, variants: VariantComputer): ExecResult {
24-
val npmExecConfiguration = NpmExecConfiguration("npm"
23+
fun executeNpmCommand(
24+
project: ProjectApiHelper,
25+
extension: NodeExtension,
26+
nodeExecConfiguration: NodeExecConfiguration,
27+
variants: VariantComputer
28+
): ExecResult {
29+
val npmExecConfiguration = NpmExecConfiguration(
30+
"npm"
2531
) { variantComputer, nodeExtension, npmBinDir -> variantComputer.computeNpmExec(nodeExtension, npmBinDir) }
26-
return executeCommand(project, extension, NpmProxy.addProxyEnvironmentVariables(extension.nodeProxySettings.get(), nodeExecConfiguration),
27-
npmExecConfiguration,
28-
variants)
32+
return executeCommand(
33+
project,
34+
extension,
35+
NpmProxy.addProxyEnvironmentVariables(extension.nodeProxySettings.get(), nodeExecConfiguration),
36+
npmExecConfiguration,
37+
variants
38+
)
2939
}
3040

31-
fun executeNpxCommand(project: ProjectApiHelper, extension: NodeExtension, nodeExecConfiguration: NodeExecConfiguration, variants: VariantComputer): ExecResult {
41+
fun executeNpxCommand(
42+
project: ProjectApiHelper,
43+
extension: NodeExtension,
44+
nodeExecConfiguration: NodeExecConfiguration,
45+
variants: VariantComputer
46+
): ExecResult {
3247
val npxExecConfiguration = NpmExecConfiguration("npx") { variantComputer, nodeExtension, npmBinDir ->
3348
variantComputer.computeNpxExec(nodeExtension, npmBinDir)
3449
}
3550

3651
return executeCommand(project, extension, nodeExecConfiguration, npxExecConfiguration, variants)
3752
}
3853

39-
private fun executeCommand(project: ProjectApiHelper, extension: NodeExtension, nodeExecConfiguration: NodeExecConfiguration,
40-
npmExecConfiguration: NpmExecConfiguration,
41-
variantComputer: VariantComputer): ExecResult {
54+
private fun executeCommand(
55+
project: ProjectApiHelper,
56+
extension: NodeExtension,
57+
nodeExecConfiguration: NodeExecConfiguration,
58+
npmExecConfiguration: NpmExecConfiguration,
59+
variantComputer: VariantComputer
60+
): ExecResult {
4261
val execConfiguration =
43-
computeExecConfiguration(extension, npmExecConfiguration, nodeExecConfiguration, variantComputer).get()
62+
computeExecConfiguration(extension, npmExecConfiguration, nodeExecConfiguration, variantComputer).get()
4463
val execRunner = ExecRunner()
4564
return execRunner.execute(project, extension, execConfiguration)
4665
}
4766

48-
private fun computeExecConfiguration(extension: NodeExtension, npmExecConfiguration: NpmExecConfiguration,
49-
nodeExecConfiguration: NodeExecConfiguration,
50-
variantComputer: VariantComputer): Provider<ExecConfiguration> {
67+
private fun computeExecConfiguration(
68+
extension: NodeExtension,
69+
npmExecConfiguration: NpmExecConfiguration,
70+
nodeExecConfiguration: NodeExecConfiguration,
71+
variantComputer: VariantComputer
72+
): Provider<ExecConfiguration> {
5173
val additionalBinPathProvider = computeAdditionalBinPath(extension, variantComputer)
5274
val executableAndScriptProvider = computeExecutable(extension, npmExecConfiguration, variantComputer)
5375
return zip(additionalBinPathProvider, executableAndScriptProvider)
54-
.map { (additionalBinPath, executableAndScript) ->
55-
val argsPrefix =
56-
if (executableAndScript.script != null) listOf(executableAndScript.script) else listOf()
57-
val args = argsPrefix.plus(nodeExecConfiguration.command)
58-
ExecConfiguration(executableAndScript.executable, args, additionalBinPath,
59-
nodeExecConfiguration.environment, nodeExecConfiguration.workingDir,
60-
nodeExecConfiguration.ignoreExitValue, nodeExecConfiguration.execOverrides)
61-
}
76+
.map { (additionalBinPath, executableAndScript) ->
77+
val argsPrefix =
78+
if (executableAndScript.script != null) listOf(executableAndScript.script) else listOf()
79+
val args = argsPrefix.plus(nodeExecConfiguration.command)
80+
ExecConfiguration(
81+
executableAndScript.executable, args, additionalBinPath,
82+
nodeExecConfiguration.environment, nodeExecConfiguration.workingDir,
83+
nodeExecConfiguration.ignoreExitValue, nodeExecConfiguration.execOverrides
84+
)
85+
}
6286
}
6387

6488
private fun computeExecutable(
6589
nodeExtension: NodeExtension,
6690
npmExecConfiguration: NpmExecConfiguration,
6791
variantComputer: VariantComputer
68-
):
69-
Provider<ExecutableAndScript> {
92+
): Provider<ExecutableAndScript> {
7093
val nodeDirProvider = nodeExtension.resolvedNodeDir
7194
val npmDirProvider = variantComputer.computeNpmDir(nodeExtension, nodeDirProvider)
7295
val nodeBinDirProvider = variantComputer.computeNodeBinDir(nodeDirProvider, nodeExtension.resolvedPlatform)
@@ -97,11 +120,14 @@ abstract class NpmExecRunner {
97120
}
98121

99122
private data class ExecutableAndScript(
100-
val executable: String,
101-
val script: String? = null
123+
val executable: String,
124+
val script: String? = null
102125
)
103126

104-
private fun computeAdditionalBinPath(nodeExtension: NodeExtension, variantComputer: VariantComputer): Provider<List<String>> {
127+
private fun computeAdditionalBinPath(
128+
nodeExtension: NodeExtension,
129+
variantComputer: VariantComputer
130+
): Provider<List<String>> {
105131
return nodeExtension.download.flatMap { download ->
106132
if (!download) {
107133
providers.provider { listOf<String>() }

‎src/main/kotlin/com/github/gradle/node/npm/task/NpmInstallTask.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.io.File
1818
abstract class NpmInstallTask : NpmTask() {
1919
@get:Internal
2020
val nodeModulesOutputFilter =
21-
objects.property<Action<ConfigurableFileTree>>()
21+
objects.property<Action<ConfigurableFileTree>>()
2222

2323
@get:Internal
2424
val fastInstall = objects.property<Boolean>()
@@ -74,7 +74,7 @@ abstract class NpmInstallTask : NpmTask() {
7474

7575
private fun projectFileIfExists(name: String): Provider<File?> {
7676
return nodeExtension.nodeProjectDir.map { it.file(name).asFile }
77-
.flatMap { if (it.exists()) providers.provider { it } else providers.provider { null } }
77+
.flatMap { if (it.exists()) providers.provider { it } else providers.provider { null } }
7878
}
7979

8080
@Optional
@@ -95,13 +95,13 @@ abstract class NpmInstallTask : NpmTask() {
9595
} else {
9696
val nodeModulesDirectoryProvider = nodeExtension.nodeProjectDir.dir("node_modules")
9797
zip(nodeModulesDirectoryProvider, nodeModulesOutputFilter)
98-
.flatMap { (nodeModulesDirectory, nodeModulesOutputFilter) ->
99-
if (nodeModulesOutputFilter != null) {
100-
val fileTree = projectHelper.fileTree(nodeModulesDirectory)
101-
nodeModulesOutputFilter.execute(fileTree)
102-
providers.provider { fileTree }
103-
} else providers.provider { null }
104-
}
98+
.flatMap { (nodeModulesDirectory, nodeModulesOutputFilter) ->
99+
if (nodeModulesOutputFilter != null) {
100+
val fileTree = projectHelper.fileTree(nodeModulesDirectory)
101+
nodeModulesOutputFilter.execute(fileTree)
102+
providers.provider { fileTree }
103+
} else providers.provider { null }
104+
}
105105
}
106106
}
107107

@@ -127,7 +127,7 @@ abstract class NpmInstallTask : NpmTask() {
127127
if (npmVersion.isBlank()) {
128128
if (nodeExtension.version.get().split('.').first().toInt() <= 14)
129129
return true
130-
} else if (npmVersion.split('.').first().toInt() < 7 ) {
130+
} else if (npmVersion.split('.').first().toInt() < 7) {
131131
return true
132132
}
133133

‎src/main/kotlin/com/github/gradle/node/npm/task/NpmSetupTask.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ abstract class NpmSetupTask : BaseTask() {
8080
val directory = npmDir.get().asFile
8181
// npm < 7 creates the directory if it's missing, >= 7 fails if it's missing
8282
File(directory, "lib").mkdirs()
83-
return listOf("install", "--global", "--no-save", "--prefix", directory.absolutePath,
84-
"npm@$version") + args.get()
83+
return listOf(
84+
"install", "--global", "--no-save", "--prefix", directory.absolutePath,
85+
"npm@$version"
86+
) + args.get()
8587
}
8688

8789
companion object {

0 commit comments

Comments
 (0)