using re[t.BUILD] in parseComparator

Author: i529015

classes/range.js

@@ -33,7 +33,7 @@ class Range {
     // First reduce all whitespace as much as possible so we do not have to rely
     // on potentially slow regexes like \s*. This is then stored and used for
     // future error messages as well.
-    this.raw = range.trim().replace(SPACE_CHARACTERS, ' ').replace(/\+[^ ]*/g, '')
+    this.raw = range.trim().replace(SPACE_CHARACTERS, ' ')
 
     // First, split on ||
     this.set = this.raw
@@ -255,6 +255,7 @@ const isSatisfiable = (comparators, options) => {
 // already replaced the hyphen ranges
 // turn into a set of JUST comparators.
 const parseComparator = (comp, options) => {
+  comp = comp.replace(re[t.BUILD], '')
   debug('comp', comp, options)
   comp = replaceCarets(comp, options)
   debug('caret', comp)
@@ -399,11 +400,6 @@ const replaceXRange = (comp, options) => {
     const xp = xm || isX(p)
     const anyX = xp
 
-    // Disallow prerelease with any X-range or partial version
-    if ((xM || xm || xp) && pr) {
-      throw new TypeError('Prerelease not allowed with X-ranges or partial versions')
-    }
-
     if (gtlt === '=' && anyX) {
       gtlt = ''
     }

test/classes/range.js

@@ -129,50 +129,46 @@ test('cache', (t) => {
 
 test('Build metadata is allowed and ignored for X-ranges and partials', t => {
   const buildCases = [
-    '1.x.x+build >2.x.x+build',
-    '>=1.x.x+build <2.x.x+build',
+    '1.x.x+build >2.x+build',
+    '>=1.x+build <2.x.x+build',
     '1.x.x+build || 2.x.x+build',
-    '1.x.x+build.123',
+    '1.x+build.123',
     '1.x.x+meta-data',
     '1.x.x+build.123 >2.x.x+meta-data',
     '1.x.x+build <2.x.x+meta',
-    '>1.x.x+build <=2.x.x+meta',
+    '>1.x+build <=2.x.x+meta',
     ' 1.x.x+build   >2.x.x+build  ',
+    '^1.x+build',
+    '^1.x.x+build',
+    '^1.2.x+build',
+    '^1.x+meta-data',
+    '^1.x.x+build.123',
+    '~1.x+build',
+    '~1.x.x+build',
+    '~1.2.x+build',
+    '~1.x+meta-data',
+    '~1.x.x+build.123',
+    '^1.x.x+build || ~2.x.x+meta',
+    '~1.x.x+build >2.x+meta',
+    '^1.x+build.123 <2.x.x+meta-data',
   ]
   t.plan(buildCases.length)
   buildCases.forEach(range => {
     t.doesNotThrow(() => new Range(range), `${range} should not throw`)
   })
+  t.end()
 })
 
-test('Build metadata with prerelease in X-ranges/partials throws', t => {
+test('Build metadata with prerelease in X-ranges/partials', t => {
   const cases = [
     '1.x.x-alpha+build',
-    '1.x-alpha+build',
-    '1-alpha+build',
     '>1.x.x-alpha+build',
     '>=1.x.x-alpha+build <2.x.x+build',
     '1.x.x-alpha+build || 2.x.x+build',
   ]
   t.plan(cases.length)
   cases.forEach(range => {
-    t.throws(() => new Range(range), TypeError, `${range} should throw TypeError`)
-  })
-})
-
-test('Prerelease is NOT allowed with X-ranges or partials', t => {
-  const prereleaseCases = [
-    '1.x-alpha',
-    '1-alpha',
-    '1.x.x-alpha',
-    '>1.x-alpha',
-    '>1-alpha',
-    '>1.x.x-alpha',
-    '1.x.x-alpha <2.x.x-alpha',
-    '>1.x.x-alpha <=2.x-alpha',
-  ]
-  t.plan(prereleaseCases.length)
-  prereleaseCases.forEach(range => {
-    t.throws(() => new Range(range), TypeError, `${range} should throw TypeError`)
+    t.doesNotThrow(() => new Range(range), TypeError, `${range} should not throw`)
   })
+  t.end()
 })