fix(spec/npm): build metadata ranges

Author: jjmaestro

spec/internal/clauses.bzl

@@ -382,6 +382,7 @@ def _range_new(
         version_scheme = Version.SCHEME.SEMVER,
         prerelease_policy = None,
         build_policy = None,
+        npm_mode = False,
         _fail = fail):
     def _same_at(v1, v2, level):
         if not (v1.has(level) or v2.has(level)):
@@ -501,12 +502,11 @@ def _range_new(
     target = VersionScheme.parse(target)
 
     prerelease_policy = prerelease_policy or PRERELEASE.NATURAL
-    build_policy = build_policy or BUILD.IMPLICIT
 
-    if target.build:
-        build_policy = BUILD.STRICT
+    if build_policy == None:
+        build_policy = BUILD.STRICT if target.build else BUILD.IMPLICIT
 
-    if target.build and operator not in (OP.EQ, OP.NE):
+    if target.build and operator not in (OP.EQ, OP.NE) and not npm_mode:
         msg = "Invalid range '%s%s': build numbers have no ordering."
         return _fail(msg % (operator, target.to_str()))
 

spec/internal/npm.bzl

@@ -187,14 +187,18 @@ def _npm_parser_new(version_scheme = Version.SCHEME.SEMVER, _fail = fail):
 
         return result
 
-    def _range(operator, target):
-        return Range.new(
-            operator,
-            target,
+    def _range(operator, target, build_policy = None):
+        kwargs = dict(
             version_scheme = version_scheme,
             prerelease_policy = Range.PRERELEASE.SAMEPATCH,
+            npm_mode = True,
         )
 
+        if build_policy != None:
+            kwargs["build_policy"] = build_policy
+
+        return Range.new(operator, target, **kwargs)
+
     # buildifier: disable=name-conventions
     VersionScheme = Version.new(version_scheme, _fail = _fail)
 

spec/internal/simple.bzl

@@ -206,6 +206,8 @@ def _parse_block(self, expression, VersionScheme, npm_mode = False, _fail = fail
             return [
                 self._range(Range.OP.EQ, target, build_policy = Range.BUILD.STRICT),
             ]
+        elif npm_mode:
+            return [self._range(Range.OP.EQ, target, build_policy = Range.BUILD.IMPLICIT)]
         else:
             return [self._range(Range.OP.EQ, target)]
 

tests/spec/npm_server.bzl

@@ -37,12 +37,12 @@ def _npm_server_impl(ctx):
         ("1.0.0-100", "<1.0.0-150", True),
         ("1.0.0-100", "<1.0.0-150 >=1.0.0-100 || >1.0.0-150 <1.0.0-200", True),
         ("1.0.0-199", "<1.0.0-150 >=1.0.0-100 || >1.0.0-150 <1.0.0-200", True),
-        #("1.0.0+200", "1.0.0+100", True),
-        #("1.0.0", "1.0.0+100", True),
-        #("1.0.0+100", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
-        #("1.0.0+199", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
-        #("1.0.0+200", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
-        #("1.0.0+150", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
+        ("1.0.0+200", "1.0.0+100", True),
+        ("1.0.0", "1.0.0+100", True),
+        ("1.0.0+100", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
+        ("1.0.0+199", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
+        ("1.0.0+200", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
+        ("1.0.0+150", "<1.0.0+150 >=1.0.0+100 || >1.0.0+150 <1.0.0+200", False),
     ]
 
     for version, spec, satisfies in params: