fix: faster parse options (#535)

H4ad · web-flow · commit aa516b50b32f · 2023-04-10T10:58:06.000-07:00
diff --git a/bin/semver.js b/bin/semver.js
@@ -26,6 +26,7 @@ let identifier
 let identifierBase
 
 const semver = require('../')
+const parseOptions = require('../internal/parse-options')
 
 let reverse = false
 
@@ -93,7 +94,7 @@ const main = () => {
     }
   }
 
-  options = { loose: loose, includePrerelease: includePrerelease, rtl: rtl }
+  options = parseOptions({ loose, includePrerelease, rtl })
 
   versions = versions.map((v) => {
     return coerce ? (semver.coerce(v, options) || { version: v }).version : v
diff --git a/classes/comparator.js b/classes/comparator.js
@@ -78,13 +78,6 @@ class Comparator {
       throw new TypeError('a Comparator is required')
     }
 
-    if (!options || typeof options !== 'object') {
-      options = {
-        loose: !!options,
-        includePrerelease: false,
-      }
-    }
-
     if (this.operator === '') {
       if (this.value === '') {
         return true
diff --git a/internal/parse-options.js b/internal/parse-options.js
@@ -1,11 +1,15 @@
-// parse out just the options we care about so we always get a consistent
-// obj with keys in a consistent order.
-const opts = ['includePrerelease', 'loose', 'rtl']
-const parseOptions = options =>
-  !options ? {}
-  : typeof options !== 'object' ? { loose: true }
-  : opts.filter(k => options[k]).reduce((o, k) => {
-    o[k] = true
-    return o
-  }, {})
+// parse out just the options we care about
+const looseOption = Object.freeze({ loose: true })
+const emptyOpts = Object.freeze({ })
+const parseOptions = options => {
+  if (!options) {
+    return emptyOpts
+  }
+
+  if (typeof options !== 'object') {
+    return looseOption
+  }
+
+  return options
+}
 module.exports = parseOptions
diff --git a/test/internal/parse-options.js b/test/internal/parse-options.js
@@ -18,12 +18,24 @@ t.test('truthy non-objects always loose mode, for backwards comp', t => {
   t.end()
 })
 
-t.test('objects only include truthy flags we know about, set to true', t => {
-  t.strictSame(parseOptions(/asdf/), {})
-  t.strictSame(parseOptions(new Error('hello')), {})
-  t.strictSame(parseOptions({ loose: true, a: 1, rtl: false }), { loose: true })
+t.test('any object passed is returned', t => {
+  t.strictSame(parseOptions(/asdf/), /asdf/)
+  t.strictSame(parseOptions(new Error('hello')), new Error('hello'))
+  t.strictSame(parseOptions({ loose: true, a: 1, rtl: false }), { loose: true, a: 1, rtl: false })
   t.strictSame(parseOptions({ loose: 1, rtl: 2, includePrerelease: 10 }), {
+    loose: 1,
+    rtl: 2,
+    includePrerelease: 10,
+  })
+  t.strictSame(parseOptions({ loose: true }), { loose: true })
+  t.strictSame(parseOptions({ rtl: true }), { rtl: true })
+  t.strictSame(parseOptions({ includePrerelease: true }), { includePrerelease: true })
+  t.strictSame(parseOptions({ loose: true, rtl: true }), { loose: true, rtl: true })
+  t.strictSame(parseOptions({ loose: true, includePrerelease: true }), {
     loose: true,
+    includePrerelease: true,
+  })
+  t.strictSame(parseOptions({ rtl: true, includePrerelease: true }), {
     rtl: true,
     includePrerelease: true,
   })

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ let identifier`
`26`	`26`	`let identifierBase`
`27`	`27`
`28`	`28`	`const semver = require('../')`
	`29`	`+const parseOptions = require('../internal/parse-options')`
`29`	`30`
`30`	`31`	`let reverse = false`
`31`	`32`
`@@ -93,7 +94,7 @@ const main = () => {`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`
`96`		`- options = { loose: loose, includePrerelease: includePrerelease, rtl: rtl }`
	`97`	`+ options = parseOptions({ loose, includePrerelease, rtl })`
`97`	`98`
`98`	`99`	`versions = versions.map((v) => {`
`99`	`100`	`return coerce ? (semver.coerce(v, options) \|\| { version: v }).version : v`