Merge branch 'master' of github.com:jean-michelet/fastify-autoload in…

…to v5-2

index.js

@@ -84,7 +84,9 @@ const fastifyAutoload = async function autoload (fastify, options) {
         registerAllPlugins(app, pluginFiles, true)
       }
 
-      fastify.register(composedPlugin, { prefix: options.options?.prefix ?? prefix })
+      fastify.register(composedPlugin, {
+        prefix: options.options?.prefix ?? replaceRouteParamPattern(prefix)
+      })
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/autoload",
-  "version": "5.8.1",
+  "version": "5.8.2",
   "description": "Require all plugins in a directory",
   "main": "index.js",
   "type": "commonjs",

test/issues/374/routes/entity/.autohooks.js

@@ -0,0 +1,8 @@
+'use strict'
+
+module.exports = async function (app, opts) {
+  app.addHook('onRequest', async (req, reply) => {
+      req.hooked = req.hooked || []
+      req.hooked.push('root')
+    })
+}

test/issues/374/routes/entity/_entity/index.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (app, opts, next) {
+  app.get('/', async function (req, reply) {
+    reply.status(200).send({ path: req.url, hooked: req.hooked, params: req.params })
+  })
+}

test/issues/374/routes/entity/index.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (app, opts, next) {
+  app.get('/', async function (req, reply) {
+    reply.status(200).send({ path: req.url, hooked: req.hooked })
+  })
+}

test/issues/374/routes/index.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (app, opts, next) {
+  app.get('/', async function (req, reply) {
+    reply.status(200).send({ path: req.url })
+  })
+}

test/issues/374/test.js

@@ -0,0 +1,44 @@
+'use strict'
+
+const t = require('tap')
+const path = require('node:path')
+const Fastify = require('fastify')
+const autoLoad = require('../../../')
+
+t.plan(10)
+
+const app = Fastify()
+
+app.register(autoLoad, {
+  dir: path.join(__dirname, 'routes'),
+  autoHooks: true,
+  cascadeHooks: true
+})
+
+app.ready(function (err) {
+  t.error(err)
+
+  app.inject({
+    url: '/'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(res.json(), { path: '/' })
+  })
+
+  app.inject({
+    url: '/entity'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(res.json(), { path: '/entity', hooked: ['root'] })
+  })
+
+  app.inject({
+    url: '/entity/1'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(res.json(), { path: '/entity/1', hooked: ['root'], params: { entity: 1 } })
+  })
+})