fix: multiple route same schema (#2108)

* Revert "Workaround for using one schema for multiple routes (#2044)"

This reverts commit 62f21b1.

* fix regression

lib/schemas.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const fastClone = require('rfdc')({ circles: false, proto: true })
+const { kSchemaVisited } = require('./symbols')
 const kFluentSchema = Symbol.for('fluent-schema-object')
 
 const {
@@ -43,9 +44,17 @@ Schemas.prototype.resolve = function (id) {
 }
 
 Schemas.prototype.resolveRefs = function (routeSchemas, dontClearId, refResolver) {
-  // check if our schema has both querystring and query
-  if (routeSchemas.query && routeSchemas.querystring) {
-    throw new FST_ERR_SCH_DUPLICATE('querystring')
+  if (routeSchemas[kSchemaVisited]) {
+    return routeSchemas
+  }
+
+  // alias query to querystring schema
+  if (routeSchemas.query) {
+    // check if our schema has both querystring and query
+    if (routeSchemas.querystring) {
+      throw new FST_ERR_SCH_DUPLICATE('querystring')
+    }
+    routeSchemas.querystring = routeSchemas.query
   }
 
   // let's check if our schemas have a custom prototype
@@ -58,22 +67,17 @@ Schemas.prototype.resolveRefs = function (routeSchemas, dontClearId, refResolver
   // See issue https://github.com/fastify/fastify/issues/1767
   const cachedSchema = Object.assign({}, routeSchemas)
 
-  // alias query to querystring schema
-  if (routeSchemas.query) {
-    cachedSchema.querystring = routeSchemas.query
-  }
-
   try {
     // this will work only for standard json schemas
     // other compilers such as Joi will fail
-    this.traverse(cachedSchema, refResolver)
+    this.traverse(routeSchemas, refResolver)
 
     // when a plugin uses the 'skip-override' and call addSchema
     // the same JSON will be pass throug all the avvio tree. In this case
     // it is not possible clean the id. The id will be cleared
     // in the startup phase by the call of validation.js. Details PR #1496
     if (dontClearId !== true) {
-      this.cleanId(cachedSchema)
+      this.cleanId(routeSchemas)
     }
   } catch (err) {
     // if we have failed because `resolve` has thrown
@@ -85,19 +89,20 @@ Schemas.prototype.resolveRefs = function (routeSchemas, dontClearId, refResolver
     return cachedSchema
   }
 
-  if (cachedSchema.headers) {
-    cachedSchema.headers = this.getSchemaAnyway(cachedSchema.headers)
+  if (routeSchemas.headers) {
+    routeSchemas.headers = this.getSchemaAnyway(routeSchemas.headers)
   }
 
-  if (cachedSchema.querystring) {
-    cachedSchema.querystring = this.getSchemaAnyway(cachedSchema.querystring)
+  if (routeSchemas.querystring) {
+    routeSchemas.querystring = this.getSchemaAnyway(routeSchemas.querystring)
   }
 
-  if (cachedSchema.params) {
-    cachedSchema.params = this.getSchemaAnyway(cachedSchema.params)
+  if (routeSchemas.params) {
+    routeSchemas.params = this.getSchemaAnyway(routeSchemas.params)
   }
 
-  return cachedSchema
+  routeSchemas[kSchemaVisited] = true
+  return routeSchemas
 }
 
 Schemas.prototype.traverse = function (schema, refResolver) {

lib/symbols.js

@@ -33,7 +33,8 @@ const keys = {
   kOptions: Symbol('fastify.options'),
   kGlobalHooks: Symbol('fastify.globalHooks'),
   kDisableRequestLogging: Symbol('fastify.disableRequestLogging'),
-  kPluginNameChain: Symbol('fastify.pluginNameChain')
+  kPluginNameChain: Symbol('fastify.pluginNameChain'),
+  kSchemaVisited: Symbol('fastify.schemaVisited')
 }
 
 module.exports = keys

test/hooks.test.js

@@ -2783,3 +2783,36 @@ if (semver.gt(process.versions.node, '8.0.0')) {
   t.pass('Skip because Node version < 8')
   t.end()
 }
+
+test('onRoute should have compiled schemas - replace-way', t => {
+  t.plan(2)
+  const fastify = Fastify()
+
+  let routeConfigLink
+  fastify.addHook('onRoute', function (route) {
+    routeConfigLink = route
+  })
+
+  fastify.addSchema({
+    $id: 'mySchema',
+    type: 'object',
+    properties: {
+      host: { type: 'number' }
+    }
+  })
+
+  fastify.get('/', {
+    schema: { query: 'mySchema#' }
+  }, (req, reply) => { reply.send('hello') })
+
+  fastify.ready((err) => {
+    t.error(err)
+
+    t.deepEqual(routeConfigLink.schema.query, {
+      type: 'object',
+      properties: {
+        host: { type: 'number' }
+      }
+    })
+  })
+})

test/route.test.js

@@ -320,13 +320,11 @@ test('multiple routes with one schema', t => {
     }
   })
 
-  fastify.listen(0, error => {
+  fastify.ready(error => {
     t.error(error)
     t.strictSame(schema, {
-      query: {
-        id: { type: 'number' }
-      }
+      query: { id: { type: 'number' } },
+      querystring: { type: 'object', properties: { id: { type: 'number' } } }
     })
-    fastify.server.unref()
   })
 })