Bugfix: prefix aggregation issues (#94)

* Fix prefix aggregation issues

* Add tests

* Add more tests

index.js

@@ -83,7 +83,7 @@ async function findPlugins (dir, options, accumulator = [], prefix) {
 
     const file = path.join(dir, dirent.name)
     if (dirent.isDirectory()) {
-      directoryPromises.push(findPlugins(file, options, accumulator, (prefix ? prefix + '/' : '') + dirent.name))
+      directoryPromises.push(findPlugins(file, options, accumulator, (prefix ? prefix + '/' : '/') + dirent.name))
       continue
     }
 
@@ -125,6 +125,7 @@ async function loadPlugin (file, type, directoryPrefix, options) {
     plugin.autoConfig = undefined
   }
 
+  pluginOptions.prefix = (pluginOptions.prefix && pluginOptions.prefix.endsWith('/')) ? pluginOptions.prefix.slice(0, -1) : pluginOptions.prefix
   const prefixOverride = plugin.prefixOverride !== undefined ? plugin.prefixOverride : content.prefixOverride !== undefined ? content.prefixOverride : undefined
   const prefix = (plugin.autoPrefix !== undefined ? plugin.autoPrefix : content.autoPrefix !== undefined ? content.autoPrefix : undefined) || directoryPrefix
   if (prefixOverride !== undefined) {

test/commonjs/basic.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 
-t.plan(59)
+t.plan(65)
 
 const app = Fastify()
 
@@ -184,4 +184,22 @@ app.ready(function (err) {
     t.equal(res.statusCode, 200)
     t.deepEqual(JSON.parse(res.payload), { works: true })
   })
+
+  app.inject({
+    url: '/one/'
+  }, function (err, res) {
+    t.error(err)
+
+    t.equal(res.statusCode, 200)
+    t.deepEqual(JSON.parse(res.payload), { works: true })
+  })
+
+  app.inject({
+    url: '/one/two/three'
+  }, function (err, res) {
+    t.error(err)
+
+    t.equal(res.statusCode, 200)
+    t.deepEqual(JSON.parse(res.payload), { works: true })
+  })
 })

test/commonjs/basic/app.js

@@ -16,6 +16,11 @@ module.exports = function (fastify, opts, next) {
     options: { prefix: '/defaultPrefix' }
   })
 
+  fastify.register(autoLoad, {
+    dir: path.join(__dirname, 'one'),
+    options: { prefix: 'one/' }
+  })
+
   fastify.register(autoLoad, {
     dir: path.join(__dirname, 'index'),
     options: { prefix: 'index/' }

test/commonjs/basic/one/index.js

@@ -0,0 +1,5 @@
+module.exports = async (server, opts) => {
+  server.get('/', async (req, reply) => {
+    reply.send({ works: true })
+  })
+}

test/commonjs/basic/one/two/index.js

@@ -0,0 +1,5 @@
+module.exports = async (server, opts) => {
+  server.get('/three', async (req, reply) => {
+    reply.send({ works: true })
+  })
+}

test/module/basic.js

@@ -2,7 +2,7 @@ import t from 'tap'
 import fastify from 'fastify'
 import basicApp from './basic/app.js'
 
-t.plan(53)
+t.plan(59)
 
 const app = fastify()
 
@@ -167,4 +167,20 @@ app.ready(function (err) {
     t.equal(res.statusCode, 200)
     t.deepEqual(JSON.parse(res.payload), { no: 'prefix' })
   })
+
+  app.inject({
+    url: '/one/'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.deepEqual(JSON.parse(res.payload), { works: true })
+  })
+
+  app.inject({
+    url: '/one/two/three'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.deepEqual(JSON.parse(res.payload), { works: true })
+  })
 })

test/module/basic/app.js

@@ -19,6 +19,11 @@ export default function (fastify, opts, next) {
     options: { prefix: '/defaultPrefix' }
   })
 
+  fastify.register(autoLoad, {
+    dir: path.join(__dirname, 'one'),
+    options: { prefix: 'one/' }
+  })
+
   const skipDir = path.join(__dirname, 'skip')
   fs.mkdir(path.join(skipDir, 'empty'), () => {
     fastify.register(autoLoad, {

test/module/basic/one/index.js

@@ -0,0 +1,5 @@
+export default async (server, opts) => {
+  server.get('/', async (req, reply) => {
+    reply.send({ works: true })
+  })
+}

test/module/basic/one/two/index.js

@@ -0,0 +1,5 @@
+export default async (server, opts) => {
+  server.get('/three', async (req, reply) => {
+    reply.send({ works: true })
+  })
+}