[Gradle, JS] RejectAll => reject wildcard

^KT-41054 fixed
This commit is contained in:
Ilya Goncharov
2020-08-05 20:18:41 +03:00
parent d4c0d62eeb
commit b95eb66032
3 changed files with 6 additions and 5 deletions
@@ -65,6 +65,8 @@ infix fun NpmRange.union(other: NpmRange): List<NpmRange> {
} }
fun NpmRange.invert(): List<NpmRange> { fun NpmRange.invert(): List<NpmRange> {
if (startVersion == null && endVersion == null) return emptyList()
val result = mutableListOf<NpmRange>() val result = mutableListOf<NpmRange>()
if (startVersion != null || endVersion == null) { if (startVersion != null || endVersion == null) {
result.add( result.add(
@@ -175,5 +175,6 @@ class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange>>() {
const val AND = " " const val AND = " "
const val OR = " || " const val OR = " || "
const val WILDCARD = "*"
} }
} }
@@ -5,15 +5,15 @@
package org.jetbrains.kotlin.gradle.targets.js.npm package org.jetbrains.kotlin.gradle.targets.js.npm
import com.github.gundy.semver4j.SemVer
import org.gradle.api.internal.artifacts.dependencies.DefaultMutableVersionConstraint import org.gradle.api.internal.artifacts.dependencies.DefaultMutableVersionConstraint
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.WILDCARD
class NpmVersionConstraint( class NpmVersionConstraint(
version: String version: String
) : DefaultMutableVersionConstraint(version) { ) : DefaultMutableVersionConstraint(version) {
override fun rejectAll() { override fun rejectAll() {
super.rejectAll() super.rejectAll()
reject(NONE_VERSION) reject(WILDCARD)
} }
fun toSemVer(): String { fun toSemVer(): String {
@@ -37,6 +37,4 @@ class NpmVersionConstraint(
true true
) )
} }
} }
const val NONE_VERSION = "0.0.0"