fastify 3.21.5 → 3.21.6

package/lib/decorate.js

@@ -36,7 +36,7 @@ function decorate (instance, name, fn, dependencies) {
 
 function decorateConstructor (konstructor, name, fn, dependencies) {
   const instance = konstructor.prototype
-  if (instance.hasOwnProperty(name) || konstructor.props.includes(name)) {
+  if (instance.hasOwnProperty(name) || hasKey(konstructor, name)) {
     throw new FST_ERR_DEC_ALREADY_PRESENT(name)
   }
 
@@ -47,10 +47,10 @@ function decorateConstructor (konstructor, name, fn, dependencies) {
       get: fn.getter,
       set: fn.setter
     })
-  } else if (fn !== undefined && fn !== null) {
+  } else if (typeof fn === 'function') {
     instance[name] = fn
   } else {
-    konstructor.props.push(name)
+    konstructor.props.push({ key: name, value: fn })
   }
 }
 
@@ -74,13 +74,17 @@ function checkExistence (instance, name) {
   return instance in this
 }
 
+function hasKey (fn, name) {
+  return fn.props.find(({ key }) => key === name)
+}
+
 function checkRequestExistence (name) {
-  if (name && this[kRequest].props.includes(name)) return true
+  if (name && hasKey(this[kRequest], name)) return true
   return checkExistence(this[kRequest].prototype, name)
 }
 
 function checkReplyExistence (name) {
-  if (name && this[kReply].props.includes(name)) return true
+  if (name && hasKey(this[kReply], name)) return true
   return checkExistence(this[kReply].prototype, name)
 }
 

package/lib/reply.js

@@ -673,9 +673,12 @@ function buildReply (R) {
     this[kReplyStartTime] = undefined
     this.log = log
 
+    // eslint-disable-next-line no-var
+    var prop
     // eslint-disable-next-line no-var
     for (var i = 0; i < props.length; i++) {
-      this[props[i]] = null
+      prop = props[i]
+      this[prop.key] = prop.value
     }
   }
   _Reply.prototype = new R()

package/lib/request.js

@@ -54,9 +54,12 @@ function buildRegularRequest (R) {
     this.log = log
     this.body = null
 
+    // eslint-disable-next-line no-var
+    var prop
     // eslint-disable-next-line no-var
     for (var i = 0; i < props.length; i++) {
-      this[props[i]] = null
+      prop = props[i]
+      this[prop.key] = prop.value
     }
   }
   _Request.prototype = new R()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "3.21.5",
+  "version": "3.21.6",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",

package/test/decorator.test.js

@@ -113,12 +113,11 @@ test('should pass error for missing request decorator', t => {
 })
 
 test('decorateReply inside register', t => {
-  t.plan(12)
+  t.plan(11)
   const fastify = Fastify()
 
   fastify.register((instance, opts, done) => {
     instance.decorateReply('test', 'test')
-    t.ok(instance[symbols.kReply].prototype.test)
 
     instance.get('/yes', (req, reply) => {
       t.ok(reply.test, 'test exists')
@@ -256,12 +255,11 @@ test('decorateReply as plugin (outside .after)', t => {
 })
 
 test('decorateRequest inside register', t => {
-  t.plan(12)
+  t.plan(11)
   const fastify = Fastify()
 
   fastify.register((instance, opts, done) => {
     instance.decorateRequest('test', 'test')
-    t.ok(instance[symbols.kRequest].prototype.test)
 
     instance.get('/yes', (req, reply) => {
       t.ok(req.test, 'test exists')
@@ -976,8 +974,8 @@ test('decorateRequest/decorateReply is undefined', t => {
   fastify.decorateRequest('test', undefined)
   fastify.decorateReply('test2', undefined)
   fastify.get('/yes', (req, reply) => {
-    t.equal(req.test, null)
-    t.equal(reply.test2, null)
+    t.equal(req.test, undefined)
+    t.equal(reply.test2, undefined)
     reply.send({ hello: 'world' })
   })
   t.teardown(fastify.close.bind(fastify))
@@ -1005,8 +1003,8 @@ test('decorateRequest/decorateReply is not set to a value', t => {
   fastify.decorateRequest('test')
   fastify.decorateReply('test2')
   fastify.get('/yes', (req, reply) => {
-    t.equal(req.test, null)
-    t.equal(reply.test2, null)
+    t.equal(req.test, undefined)
+    t.equal(reply.test2, undefined)
     reply.send({ hello: 'world' })
   })
   t.teardown(fastify.close.bind(fastify))