harperdb 3.1.3 → 3.1.4

package/node_modules/fastify/lib/reply.js

@@ -462,17 +462,21 @@ function sendStream (payload, res, reply) {
   })
 
   eos(res, function (err) {
-    if (sourceOpen) {
-      if (err != null && res.headersSent && !errorLogged) {
-        errorLogged = true
-        logStreamError(reply.log, err, res)
-      }
-      if (typeof payload.destroy === 'function') {
-        payload.destroy()
-      } else if (typeof payload.close === 'function') {
-        payload.close(noop)
-      } else if (typeof payload.abort === 'function') {
-        payload.abort()
+    if (err != null) {
+      if (sourceOpen) {
+        if (res.headersSent) {
+          if (!errorLogged) {
+            errorLogged = true
+            logStreamError(reply.log, err, res)
+          }
+        }
+        if (payload.destroy) {
+          payload.destroy()
+        } else if (typeof payload.close === 'function') {
+          payload.close(noop)
+        } else if (typeof payload.abort === 'function') {
+          payload.abort()
+        }
       }
     }
   })

package/node_modules/fastify/lib/route.js

@@ -98,7 +98,7 @@ function buildRouting (options) {
   // Convert shorthand to extended route declaration
   function prepareRoute (method, url, options, handler) {
     if (!handler && typeof options === 'function') {
-      handler = options // for support over direct function calls such as fastify.get() options are reused as the handler
+      handler = options
       options = {}
     } else if (handler && typeof handler === 'function') {
       if (Object.prototype.toString.call(options) !== '[object Object]') {

package/node_modules/fastify/node_modules/semver/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "semver@7.3.4",
+      "semver@7.3.5",
       "/home/ubuntu/buildAgent/work/20f715f46c2b009e"
     ]
   ],
-  "_from": "semver@7.3.4",
-  "_id": "semver@7.3.4",
+  "_from": "semver@7.3.5",
+  "_id": "semver@7.3.5",
   "_inBundle": false,
-  "_integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+  "_integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
   "_location": "/fastify/semver",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "semver@7.3.4",
+    "raw": "semver@7.3.5",
     "name": "semver",
     "escapedName": "semver",
-    "rawSpec": "7.3.4",
+    "rawSpec": "7.3.5",
     "saveSpec": null,
-    "fetchSpec": "7.3.4"
+    "fetchSpec": "7.3.5"
   },
   "_requiredBy": [
     "/fastify"
   ],
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-  "_spec": "7.3.4",
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+  "_spec": "7.3.5",
   "_where": "/home/ubuntu/buildAgent/work/20f715f46c2b009e",
   "bin": {
     "semver": "bin/semver.js"
@@ -72,5 +72,5 @@
     "check-coverage": true,
     "coverage-map": "map.js"
   },
-  "version": "7.3.4"
+  "version": "7.3.5"
 }

package/node_modules/fastify/node_modules/semver/ranges/subset.js

@@ -1,20 +1,28 @@
 const Range = require('../classes/range.js')
-const { ANY } = require('../classes/comparator.js')
+const Comparator = require('../classes/comparator.js')
+const { ANY } = Comparator
 const satisfies = require('../functions/satisfies.js')
 const compare = require('../functions/compare.js')
 
 // Complex range `r1 || r2 || ...` is a subset of `R1 || R2 || ...` iff:
-// - Every simple range `r1, r2, ...` is a subset of some `R1, R2, ...`
+// - Every simple range `r1, r2, ...` is a null set, OR
+// - Every simple range `r1, r2, ...` which is not a null set is a subset of
+//   some `R1, R2, ...`
 //
 // Simple range `c1 c2 ...` is a subset of simple range `C1 C2 ...` iff:
 // - If c is only the ANY comparator
 //   - If C is only the ANY comparator, return true
-//   - Else return false
+//   - Else if in prerelease mode, return false
+//   - else replace c with `[>=0.0.0]`
+// - If C is only the ANY comparator
+//   - if in prerelease mode, return true
+//   - else replace C with `[>=0.0.0]`
 // - Let EQ be the set of = comparators in c
 // - If EQ is more than one, return true (null set)
 // - Let GT be the highest > or >= comparator in c
 // - Let LT be the lowest < or <= comparator in c
 // - If GT and LT, and GT.semver > LT.semver, return true (null set)
+// - If any C is a = range, and GT or LT are set, return false
 // - If EQ
 //   - If GT, and EQ does not satisfy GT, return true (null set)
 //   - If LT, and EQ does not satisfy LT, return true (null set)
@@ -23,13 +31,16 @@ const compare = require('../functions/compare.js')
 // - If GT
 //   - If GT.semver is lower than any > or >= comp in C, return false
 //   - If GT is >=, and GT.semver does not satisfy every C, return false
+//   - If GT.semver has a prerelease, and not in prerelease mode
+//     - If no C has a prerelease and the GT.semver tuple, return false
 // - If LT
 //   - If LT.semver is greater than any < or <= comp in C, return false
 //   - If LT is <=, and LT.semver does not satisfy every C, return false
-// - If any C is a = range, and GT or LT are set, return false
+//   - If GT.semver has a prerelease, and not in prerelease mode
+//     - If no C has a prerelease and the LT.semver tuple, return false
 // - Else return true
 
-const subset = (sub, dom, options) => {
+const subset = (sub, dom, options = {}) => {
   if (sub === dom)
     return true
 
@@ -58,8 +69,21 @@ const simpleSubset = (sub, dom, options) => {
   if (sub === dom)
     return true
 
-  if (sub.length === 1 && sub[0].semver === ANY)
-    return dom.length === 1 && dom[0].semver === ANY
+  if (sub.length === 1 && sub[0].semver === ANY) {
+    if (dom.length === 1 && dom[0].semver === ANY)
+      return true
+    else if (options.includePrerelease)
+      sub = [ new Comparator('>=0.0.0-0') ]
+    else
+      sub = [ new Comparator('>=0.0.0') ]
+  }
+
+  if (dom.length === 1 && dom[0].semver === ANY) {
+    if (options.includePrerelease)
+      return true
+    else
+      dom = [ new Comparator('>=0.0.0') ]
+  }
 
   const eqSet = new Set()
   let gt, lt
@@ -102,10 +126,32 @@ const simpleSubset = (sub, dom, options) => {
 
   let higher, lower
   let hasDomLT, hasDomGT
+  // if the subset has a prerelease, we need a comparator in the superset
+  // with the same tuple and a prerelease, or it's not a subset
+  let needDomLTPre = lt &&
+    !options.includePrerelease &&
+    lt.semver.prerelease.length ? lt.semver : false
+  let needDomGTPre = gt &&
+    !options.includePrerelease &&
+    gt.semver.prerelease.length ? gt.semver : false
+  // exception: <1.2.3-0 is the same as <1.2.3
+  if (needDomLTPre && needDomLTPre.prerelease.length === 1 &&
+      lt.operator === '<' && needDomLTPre.prerelease[0] === 0) {
+    needDomLTPre = false
+  }
+
   for (const c of dom) {
     hasDomGT = hasDomGT || c.operator === '>' || c.operator === '>='
     hasDomLT = hasDomLT || c.operator === '<' || c.operator === '<='
     if (gt) {
+      if (needDomGTPre) {
+        if (c.semver.prerelease && c.semver.prerelease.length &&
+            c.semver.major === needDomGTPre.major &&
+            c.semver.minor === needDomGTPre.minor &&
+            c.semver.patch === needDomGTPre.patch) {
+          needDomGTPre = false
+        }
+      }
       if (c.operator === '>' || c.operator === '>=') {
         higher = higherGT(gt, c, options)
         if (higher === c && higher !== gt)
@@ -114,6 +160,14 @@ const simpleSubset = (sub, dom, options) => {
         return false
     }
     if (lt) {
+      if (needDomLTPre) {
+        if (c.semver.prerelease && c.semver.prerelease.length &&
+            c.semver.major === needDomLTPre.major &&
+            c.semver.minor === needDomLTPre.minor &&
+            c.semver.patch === needDomLTPre.patch) {
+          needDomLTPre = false
+        }
+      }
       if (c.operator === '<' || c.operator === '<=') {
         lower = lowerLT(lt, c, options)
         if (lower === c && lower !== lt)
@@ -134,6 +188,12 @@ const simpleSubset = (sub, dom, options) => {
   if (lt && hasDomGT && !gt && gtltComp !== 0)
     return false
 
+  // we needed a prerelease range in a specific tuple, but didn't get one
+  // then this isn't a subset.  eg >=1.2.3-pre is not a subset of >=1.0.0,
+  // because it includes prereleases in the 1.2.3 tuple
+  if (needDomGTPre || needDomLTPre)
+    return false
+
   return true
 }
 

package/node_modules/fastify/package.json

@@ -1,14 +1,14 @@
 {
   "_args": [
     [
-      "fastify@3.14.0",
+      "fastify@3.13.0",
       "/home/ubuntu/buildAgent/work/20f715f46c2b009e"
     ]
   ],
-  "_from": "fastify@3.14.0",
-  "_id": "fastify@3.14.0",
+  "_from": "fastify@3.13.0",
+  "_id": "fastify@3.13.0",
   "_inBundle": false,
-  "_integrity": "sha512-a6W2iVPJMOaULqCykJ5nFRtnoknqt9K3b6rqAQcGjT/O2Hy+vvo+9/+cL2907KN0iF/91Ke+XQluKrVNF6+Z7w==",
+  "_integrity": "sha512-adp02czYrrO0c+CDuTF0BsTe5/prqc3aY+vOgdI419xBhbhrcxU4bt13XJ36o+RR5aQEVE3GVmW45F0ggAGgSA==",
   "_location": "/fastify",
   "_phantomChildren": {
     "inherits": "2.0.3",
@@ -19,18 +19,18 @@
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "fastify@3.14.0",
+    "raw": "fastify@3.13.0",
     "name": "fastify",
     "escapedName": "fastify",
-    "rawSpec": "3.14.0",
+    "rawSpec": "3.13.0",
     "saveSpec": null,
-    "fetchSpec": "3.14.0"
+    "fetchSpec": "3.13.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/fastify/-/fastify-3.14.0.tgz",
-  "_spec": "3.14.0",
+  "_resolved": "https://registry.npmjs.org/fastify/-/fastify-3.13.0.tgz",
+  "_spec": "3.13.0",
   "_where": "/home/ubuntu/buildAgent/work/20f715f46c2b009e",
   "author": {
     "name": "Matteo Collina",
@@ -117,7 +117,7 @@
     "abstract-logging": "^2.0.0",
     "ajv": "^6.12.2",
     "avvio": "^7.1.2",
-    "fast-json-stringify": "^2.5.0",
+    "fast-json-stringify": "^2.2.1",
     "fastify-error": "^0.3.0",
     "fastify-warning": "^0.2.0",
     "find-my-way": "^4.0.0",
@@ -235,5 +235,5 @@
   },
   "type": "commonjs",
   "types": "fastify.d.ts",
-  "version": "3.14.0"
+  "version": "3.13.0"
 }

package/node_modules/fastify/test/content-parser.test.js

@@ -3,186 +3,14 @@
 const t = require('tap')
 const test = t.test
 const Fastify = require('..')
-const keys = require('../lib/symbols')
-const { FST_ERR_CTP_ALREADY_PRESENT, FST_ERR_CTP_INVALID_TYPE } = require('../lib/errors')
-
-const first = function (req, payload, done) {}
-const second = function (req, payload, done) {}
-const third = function (req, payload, done) {}
-
-test('hasContentTypeParser', t => {
-  test('should know about internal parsers', t => {
-    t.plan(4)
-
-    const fastify = Fastify()
-    fastify.ready(err => {
-      t.error(err)
-      t.ok(fastify.hasContentTypeParser('application/json'))
-      t.ok(fastify.hasContentTypeParser('text/plain'))
-      t.notOk(fastify.hasContentTypeParser('application/jsoff'))
-    })
-  })
-
-  test('should work with string and RegExp', t => {
-    t.plan(7)
-
-    const fastify = Fastify()
-    fastify.addContentTypeParser(/^image\/.*/, first)
-    fastify.addContentTypeParser(/^application\/.+\+xml/, first)
-    fastify.addContentTypeParser('image/gif', first)
-
-    t.ok(fastify.hasContentTypeParser('application/json'))
-    t.ok(fastify.hasContentTypeParser(/^image\/.*/))
-    t.ok(fastify.hasContentTypeParser(/^application\/.+\+xml/))
-    t.ok(fastify.hasContentTypeParser('image/gif'))
-    t.notOk(fastify.hasContentTypeParser(/^image\/.+\+xml/))
-    t.notOk(fastify.hasContentTypeParser('image/png'))
-    t.notOk(fastify.hasContentTypeParser('*'))
-  })
-
-  t.end()
-})
-
-test('getParser', t => {
-  test('should return matching parser', t => {
-    t.plan(3)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser(/^image\/.*/, first)
-    fastify.addContentTypeParser(/^application\/.+\+xml/, second)
-    fastify.addContentTypeParser('text/html', third)
-
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('application/t+xml').fn, second)
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('image/png').fn, first)
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('text/html').fn, third)
-  })
-
-  test('should prefer content type parser with string value', t => {
-    t.plan(2)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser(/^image\/.*/, first)
-    fastify.addContentTypeParser('image/gif', second)
-
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('image/gif').fn, second)
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('image/png').fn, first)
-  })
-
-  test('should return parser that catches all if no other is set', t => {
-    t.plan(3)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser('*', first)
-    fastify.addContentTypeParser(/^text\/.*/, second)
-
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('image/gif').fn, first)
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('text/html').fn, second)
-    t.strictEqual(fastify[keys.kContentTypeParser].getParser('text').fn, first)
-  })
-
-  test('should return undefined if no matching parser exist', t => {
-    t.plan(2)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser(/^weirdType\/.+/, first)
-    fastify.addContentTypeParser('application/javascript', first)
-
-    t.notOk(fastify[keys.kContentTypeParser].getParser('application/xml'))
-    t.notOk(fastify[keys.kContentTypeParser].getParser('weirdType/'))
-  })
-
-  t.end()
-})
-
-test('existingParser', t => {
-  test('returns always false for "*"', t => {
-    t.plan(2)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser(/^image\/.*/, first)
-    fastify.addContentTypeParser(/^application\/.+\+xml/, first)
-    fastify.addContentTypeParser('text/html', first)
-
-    t.notOk(fastify[keys.kContentTypeParser].existingParser('*'))
-
-    fastify.addContentTypeParser('*', first)
-
-    t.notOk(fastify[keys.kContentTypeParser].existingParser('*'))
-  })
-
-  test('let you override the default parser once', t => {
-    t.plan(2)
-
-    const fastify = Fastify()
-
-    fastify.addContentTypeParser('application/json', first)
-    fastify.addContentTypeParser('text/plain', first)
-
-    t.throws(
-      () => fastify.addContentTypeParser('application/json', first),
-      FST_ERR_CTP_ALREADY_PRESENT,
-      "Content type parser 'application/json' already present"
-    )
-    t.throws(
-      () => fastify.addContentTypeParser('text/plain', first),
-      FST_ERR_CTP_ALREADY_PRESENT,
-      "Content type parser 'text/plain' already present"
-    )
-  })
 
+test('hasContentTypeParser should know about internal parsers', t => {
+  t.plan(4)
   const fastify = Fastify()
-  const contentTypeParser = fastify[keys.kContentTypeParser]
-
-  fastify.addContentTypeParser(/^image\/.*/, first)
-  fastify.addContentTypeParser(/^application\/.+\+xml/, first)
-  fastify.addContentTypeParser('text/html', first)
-
-  t.ok(contentTypeParser.existingParser(/^image\/.*/))
-  t.ok(contentTypeParser.existingParser('text/html'))
-  t.ok(contentTypeParser.existingParser(/^application\/.+\+xml/))
-  t.notOk(contentTypeParser.existingParser('application/json'))
-  t.notOk(contentTypeParser.existingParser('text/plain'))
-  t.notOk(contentTypeParser.existingParser('image/png'))
-  t.notOk(contentTypeParser.existingParser(/^application\/.+\+json/))
-
-  t.end()
-})
-
-test('add', t => {
-  test('should only accept string and RegExp', t => {
-    t.plan(4)
-
-    const fastify = Fastify()
-    const contentTypeParser = fastify[keys.kContentTypeParser]
-
-    t.error(contentTypeParser.add('test', {}, first))
-    t.error(contentTypeParser.add(/test/, {}, first))
-    t.throws(
-      () => contentTypeParser.add({}, {}, first),
-      FST_ERR_CTP_INVALID_TYPE,
-      'The content type should be a string or a RegExp'
-    )
-    t.throws(
-      () => contentTypeParser.add(1, {}, first),
-      FST_ERR_CTP_INVALID_TYPE,
-      'The content type should be a string or a RegExp'
-    )
-  })
-
-  test('should set "*" as parser that catches all', t => {
-    t.plan(1)
-
-    const fastify = Fastify()
-    const contentTypeParser = fastify[keys.kContentTypeParser]
-
-    contentTypeParser.add('*', {}, first)
-    t.strictEqual(contentTypeParser.customParsers[''].fn, first)
+  fastify.ready(err => {
+    t.error(err)
+    t.ok(fastify.hasContentTypeParser('application/json'))
+    t.ok(fastify.hasContentTypeParser('text/plain'))
+    t.notOk(fastify.hasContentTypeParser('application/jsoff'))
   })
-
-  t.end()
 })