Support - in npm version ranges #83

Reference: #83
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

src/univers/version_range.py

@@ -238,7 +238,7 @@ def get_allof_constraints(cls, clause):
     return allof_constraints
 
 
-def get_npm_version_constraint_for_tilde_and_caret(string, cls):
+def get_npm_version_constraints_from_semver_npm_spec(string, cls):
     """
     Return a VersionConstraint for the provided ``string``.
     """
@@ -254,7 +254,6 @@ def get_npm_version_constraint_for_tilde_and_caret(string, cls):
             anyof_constraints.extend(alloc)
         else:
             raise ValueError(f"Unknown clause type: {spec!r}")
-
     return anyof_constraints
 
 
@@ -289,39 +288,56 @@ def from_native(cls, string):
             )
 
         constraints = []
-        comparator = ""
         vrc = cls.version_class
         # A constraint item can be a comparator or a version or a version with comparator
         # If it's empty continue
         # If it's in `vers_by_native_comparators`, append it with the comparator and continue
         # If it's a version, make version constraint from the version and use the comparator from the previous item and make comparator empty
         # If it's a version with comparator, use split_req to get version and comparator to form constraint and make comparator empty
-        for constraint_item in string.split(" "):
-            if not constraint_item or constraint_item == "||":
-                continue
-            if "".join([comparator, constraint_item]) in cls.vers_by_native_comparators:
-                comparator = "".join([comparator, constraint_item])
-                comparator = cls.vers_by_native_comparators[comparator]
+
+        for range in string.split("||"):
+            if " - " in range:
+                constraints.extend(get_npm_version_constraints_from_semver_npm_spec(range, cls))
                 continue
-            if comparator:
-                constraint_item = constraint_item.lstrip("vV")
-                constraints.append(
-                    VersionConstraint(comparator=comparator, version=vrc(constraint_item))
-                )
-            else:
-                if constraint_item.startswith("~") or constraint_item.startswith("^"):
-                    constraints.extend(
-                        get_npm_version_constraint_for_tilde_and_caret(constraint_item, cls)
-                    )
-                else:
-                    comparator, version_constraint = split_req(
-                        constraint_item, cls.vers_by_native_comparators, default="="
-                    )
-                    version_constraint = version_constraint.lstrip("vV")
+            comparator = ""
+            for constraint in range.split(" "):
+                if not constraint:
+                    continue
+                if "".join([comparator, constraint]) in cls.vers_by_native_comparators:
+                    comparator = "".join([comparator, constraint])
+                    comparator = cls.vers_by_native_comparators[comparator]
+                    continue
+                if comparator:
+                    if ".x" in constraint:
+                        constraints.extend(
+                            get_npm_version_constraints_from_semver_npm_spec(constraint, cls)
+                        )
+                        continue
+                    constraint = constraint.lstrip("vV")
                     constraints.append(
-                        VersionConstraint(comparator=comparator, version=vrc(version_constraint))
+                        VersionConstraint(comparator=comparator, version=vrc(constraint))
                     )
-            comparator = ""
+                else:
+                    if ".x" in constraint:
+                        constraints.extend(
+                            get_npm_version_constraints_from_semver_npm_spec(constraint, cls)
+                        )
+                        continue
+                    if constraint.startswith("~") or constraint.startswith("^"):
+                        constraints.extend(
+                            get_npm_version_constraints_from_semver_npm_spec(constraint, cls)
+                        )
+                    else:
+                        comparator, version_constraint = split_req(
+                            constraint, cls.vers_by_native_comparators, default="="
+                        )
+                        version_constraint = version_constraint.lstrip("vV")
+                        constraints.append(
+                            VersionConstraint(
+                                comparator=comparator, version=vrc(version_constraint)
+                            )
+                        )
+                comparator = ""
         return cls(constraints=constraints)
 
 

tests/data/npm_advisory.json

@@ -728,13 +728,13 @@
   {
     "test_index": 122,
     "scheme": "npm",
-    "npm_native": ">=2.0.0-alpha8",
+    "npm_native": ">=v2.0.0-alpha8",
     "expected_vers": "vers:npm/>=2.0.0-alpha8"
   },
   {
     "test_index": 123,
     "scheme": "npm",
-    "npm_native": "<=2.0.0-alpha7",
+    "npm_native": "<=v2.0.0-alpha7",
     "expected_vers": "vers:npm/<=2.0.0-alpha7"
   },
   {
@@ -1406,13 +1406,13 @@
   {
     "test_index": 235,
     "scheme": "npm",
-    "npm_native": ">=v2.6.0",
+    "npm_native": ">=2.6.0",
     "expected_vers": "vers:npm/>=2.6.0"
   },
   {
     "test_index": 236,
     "scheme": "npm",
-    "npm_native": "<v2.6.0",
+    "npm_native": "<2.6.0",
     "expected_vers": "vers:npm/<2.6.0"
   },
   {
@@ -1653,13 +1653,13 @@
     "test_index": 276,
     "scheme": "npm",
     "npm_native": ">= 2.2.x",
-    "expected_vers": "vers:npm/>=2.2.0+x"
+    "expected_vers": "vers:npm/>=2.2.0|<2.3.0"
   },
   {
     "test_index": 277,
     "scheme": "npm",
     "npm_native": "2.0.x || 2.1.x",
-    "expected_vers": "vers:npm/2.0.0+x|2.1.0+x"
+    "expected_vers": "vers:npm/>=2.0.0|<2.1.0|>=2.1.0|<2.2.0"
   },
   {
     "test_index": 278,
@@ -2481,7 +2481,7 @@
     "test_index": 414,
     "scheme": "npm",
     "npm_native": ">= 1.x",
-    "expected_vers": "vers:npm/>=1.0.0+x"
+    "expected_vers": "vers:npm/>=1.0.0|<2.0.0"
   },
   {
     "test_index": 415,
@@ -3429,7 +3429,7 @@
     "test_index": 572,
     "scheme": "npm",
     "npm_native": ">=3.4.6 < 4.0.0|| >=4.0.5",
-    "expected_vers": "vers:npm/>=3.4.6|<4.0.0--|>=4.0.5"
+    "expected_vers": "vers:npm/>=3.4.6|<4.0.0|>=4.0.5"
   },
   {
     "test_index": 573,
@@ -4077,7 +4077,7 @@
     "test_index": 680,
     "scheme": "npm",
     "npm_native": ">= 1.x",
-    "expected_vers": "vers:npm/>=1.0.0+x"
+    "expected_vers": "vers:npm/>=1.0.0|<2.0.0"
   },
   {
     "test_index": 681,
@@ -5272,5 +5272,41 @@
     "scheme": "npm",
     "npm_native": "<3.0.1",
     "expected_vers": "vers:npm/<3.0.1"
+  },
+  {
+    "test_index": 880,
+    "scheme": "npm",
+    "npm_native": "^1.2.9",
+    "expected_vers": "vers:npm/>=1.2.9|<2.0.0"
+  },
+  {
+    "test_index": 881,
+    "scheme": "npm",
+    "npm_native": "~3.8.2",
+    "expected_vers": "vers:npm/>=3.8.2|<3.9.0"
+  },
+  {
+    "test_index": 882,
+    "scheme": "npm",
+    "npm_native": "5.0.0 - 7.2.3",
+    "expected_vers": "vers:npm/>=5.0.0|<=7.2.3"
+  },
+  {
+    "test_index": 883,
+    "scheme": "npm",
+    "npm_native": "2.1 || 2.6",
+    "expected_vers": "vers:npm/2.1.0|2.6.0"
+  },
+  {
+    "test_index": 884,
+    "scheme": "npm",
+    "npm_native": "1.1.2 1.2.2",
+    "expected_vers": "vers:npm/1.1.2|1.2.2"
+  },
+  {
+    "test_index": 885,
+    "scheme": "npm",
+    "npm_native": "<=2.1 >=1.1",
+    "expected_vers": "vers:npm/>=1.1.0|<=2.1.0"
   }
 ]

tests/test_version_range.py

@@ -281,6 +281,15 @@ def test_nuget_version_range(self):
 
 VERSION_RANGE_TESTS_BY_SCHEME = {
     "nginx": ["0.8.40+", "0.7.52-0.8.39", "0.9.10", "1.5.0+, 1.4.1+"],
+    "npm": [
+        "^1.2.9",
+        "~3.8.2",
+        "5.0.0 - 7.2.3",
+        "2.1.0 || 2.6.0",
+        "1.1.2 1.2.2",
+        "<=2.1.0 >=1.1.0",
+        "1.2.x",
+    ],
     "openssl": ["1.1.1ak", "1.1.0", "3.0.2", "3.0.1, 0.9.7a", "1.0.2ck, 3.1.2"],
     "pypi": [">= 1.0", "<2.1.0", "!=5"],
 }