fix: include directoryPrefix when using autoPrefix

index.js

@@ -302,11 +302,17 @@ async function loadPlugin ({ file, type, directoryPrefix, options, log }) {
 
   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
+  const autoPrefix = plugin.autoPrefix !== undefined ? plugin.autoPrefix : content.autoPrefix !== undefined ? content.autoPrefix : undefined
+
   if (prefixOverride !== undefined) {
     pluginOptions.prefix = prefixOverride
-  } else if (prefix) {
-    pluginOptions.prefix = (pluginOptions.prefix || '') + prefix.replace(/\/+/gu, '/')
+  } else {
+    if (directoryPrefix !== undefined) {
+      pluginOptions.prefix = (pluginOptions.prefix || '') + directoryPrefix.replace(/\/+/gu, '/')
+    }
+    if (autoPrefix !== undefined) {
+      pluginOptions.prefix = (pluginOptions.prefix || '') + autoPrefix.replace(/\/+/gu, '/')
+    }
   }
 
   return {

package.json

@@ -52,6 +52,8 @@
     "@types/jest": "^29.0.0",
     "@types/node": "^20.1.0",
     "@types/tap": "^15.0.5",
+    "esbuild": "^0.19.2",
+    "esbuild-register": "^3.4.1",
     "fastify": "^4.0.0-rc.2",
     "fastify-plugin": "^4.0.0",
     "jest": "^28.1.3",
@@ -65,12 +67,9 @@
     "tsm": "^2.2.1",
     "tsx": "^3.7.1",
     "typescript": "^5.0.2",
-    "esbuild": "^0.19.2",
-    "esbuild-register": "^3.4.1",
     "vite": "^5.0.0",
     "vitest": "^0.34.1"
   },
-  "dependencies": {},
   "standard": {
     "ignore": [
       "test/*/*-error/lib/a.js"

test/commonjs/basic.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 
-t.plan(101)
+t.plan(115)
 
 const app = Fastify()
 
@@ -60,7 +60,7 @@ app.ready(function (err) {
   })
 
   app.inject({
-    url: '/semiautomatic/items/1'
+    url: '/manualprefix/semiautomatic/items/1'
   }, function (err, res) {
     t.error(err)
 
@@ -69,7 +69,7 @@ app.ready(function (err) {
   })
 
   app.inject({
-    url: '/semiautomatic/items'
+    url: '/manualprefix/semiautomatic/items'
   }, function (err, res) {
     t.error(err)
 
@@ -144,6 +144,29 @@ app.ready(function (err) {
     t.equal(res.statusCode, 404)
   })
 
+  app.inject({
+    url: '/defaultPrefix/nested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { indexNested: true })
+  })
+
+  app.inject({
+    url: '/defaultPrefix/nested/prefixedNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { prefixedNested: true })
+  })
+
+  app.inject({
+    url: '/defaultPrefix/nested/overriddenPrefix'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 404)
+  })
+
   app.inject({
     url: '/overriddenPrefix'
   }, function (err, res) {
@@ -152,6 +175,14 @@ app.ready(function (err) {
     t.same(JSON.parse(res.payload), { overide: 'prefix' })
   })
 
+  app.inject({
+    url: '/overriddenPrefixNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { overide: 'prefixNested' })
+  })
+
   app.inject({
     url: '/noPrefix'
   }, function (err, res) {
@@ -160,6 +191,14 @@ app.ready(function (err) {
     t.same(JSON.parse(res.payload), { no: 'prefix' })
   })
 
+  app.inject({
+    url: '/noPrefixNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { no: 'prefixNested' })
+  })
+
   app.inject({
     url: '/a/b/c'
   }, function (err, res) {

test/commonjs/basic/defaultPrefix/nested/defaultPrefix.js

@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ indexNested: true })
+  })
+
+  next()
+}

test/commonjs/basic/defaultPrefix/nested/noDefaultPrefix.js

@@ -0,0 +1,11 @@
+'use strict'
+
+module.exports = function (f, opts, next) {
+  f.get('/noPrefixNested', (request, reply) => {
+    reply.send({ no: 'prefixNested' })
+  })
+
+  next()
+}
+
+module.exports.prefixOverride = ''

test/commonjs/basic/defaultPrefix/nested/overridePrefix.js

@@ -0,0 +1,13 @@
+'use strict'
+
+module.exports = function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ overide: 'prefixNested' })
+  })
+
+  next()
+}
+
+module.exports.autoPrefix = '/notUsed'
+
+module.exports.prefixOverride = '/overriddenPrefixNested'

test/commonjs/basic/defaultPrefix/nested/prefixed.js

@@ -0,0 +1,11 @@
+'use strict'
+
+module.exports = function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ prefixedNested: true })
+  })
+
+  next()
+}
+
+module.exports.autoPrefix = '/prefixedNested'

test/module/basic.js

@@ -2,7 +2,7 @@ import t from 'tap'
 import fastify from 'fastify'
 import basicApp from './basic/app.js'
 
-t.plan(74)
+t.plan(88)
 
 const app = fastify()
 
@@ -57,7 +57,7 @@ app.ready(function (err) {
   })
 
   app.inject({
-    url: '/semiautomatic/items/1'
+    url: '/manualprefix/semiautomatic/items/1'
   }, function (err, res) {
     t.error(err)
 
@@ -66,7 +66,7 @@ app.ready(function (err) {
   })
 
   app.inject({
-    url: '/semiautomatic/items'
+    url: '/manualprefix/semiautomatic/items'
   }, function (err, res) {
     t.error(err)
 
@@ -152,6 +152,29 @@ app.ready(function (err) {
     t.equal(res.statusCode, 404)
   })
 
+  app.inject({
+    url: '/defaultPrefix/nested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { indexNested: true })
+  })
+
+  app.inject({
+    url: '/defaultPrefix/nested/prefixedNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { prefixedNested: true })
+  })
+
+  app.inject({
+    url: '/defaultPrefix/nested/overriddenPrefix'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 404)
+  })
+
   app.inject({
     url: '/overriddenPrefix'
   }, function (err, res) {
@@ -160,6 +183,14 @@ app.ready(function (err) {
     t.same(JSON.parse(res.payload), { overide: 'prefix' })
   })
 
+  app.inject({
+    url: '/overriddenPrefixNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { overide: 'prefixNested' })
+  })
+
   app.inject({
     url: '/noPrefix'
   }, function (err, res) {
@@ -168,6 +199,14 @@ app.ready(function (err) {
     t.same(JSON.parse(res.payload), { no: 'prefix' })
   })
 
+  app.inject({
+    url: '/noPrefixNested'
+  }, function (err, res) {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.payload), { no: 'prefixNested' })
+  })
+
   app.inject({
     url: '/one/'
   }, function (err, res) {

test/module/basic/defaultPrefix/nested/defaultPrefix.js

@@ -0,0 +1,9 @@
+'use strict'
+
+export default function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ indexNested: true })
+  })
+
+  next()
+}

test/module/basic/defaultPrefix/nested/noDefaultPrefix.js

@@ -0,0 +1,11 @@
+'use strict'
+
+export default function (f, opts, next) {
+  f.get('/noPrefixNested', (request, reply) => {
+    reply.send({ no: 'prefixNested' })
+  })
+
+  next()
+}
+
+export const prefixOverride = ''

test/module/basic/defaultPrefix/nested/overridePrefix.js

@@ -0,0 +1,13 @@
+'use strict'
+
+export default function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ overide: 'prefixNested' })
+  })
+
+  next()
+}
+
+export const autoPrefix = '/notUsed'
+
+export const prefixOverride = '/overriddenPrefixNested'

test/module/basic/defaultPrefix/nested/prefixed.js

@@ -0,0 +1,11 @@
+'use strict'
+
+export default function (f, opts, next) {
+  f.get('/', (request, reply) => {
+    reply.send({ prefixedNested: true })
+  })
+
+  next()
+}
+
+export const autoPrefix = '/prefixedNested'