@platformatic/service 0.7.0 → 0.8.0

package/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { start } = require('@fastify/restartable')
+const autoload = require('@fastify/autoload')
 const sandbox = require('fastify-sandbox')
 const underPressure = require('@fastify/under-pressure')
 const { schema } = require('./lib/schema')
@@ -9,6 +10,9 @@ const { addLoggerToTheConfig, getJSPluginPath } = require('./lib/utils')
 const loadConfig = require('./lib/load-config')
 const { isKeyEnabled, deepmerge } = require('@platformatic/utils')
 const compiler = require('./lib/compile')
+const { stat } = require('fs').promises
+const { join } = require('path')
+const wrapperPath = join(__dirname, 'lib', 'autoload-wrapper.js')
 
 function createServerConfig (config) {
   // convert the config file to a new structure
@@ -46,44 +50,15 @@ async function platformaticService (app, opts, toLoad = []) {
     }
   }
 
-  if (opts.plugin) {
-    let pluginOptions = opts.plugin
-    /* c8 ignore next 4 */
-    if (pluginOptions.typescript !== undefined) {
-      const pluginPath = getJSPluginPath(pluginOptions.path, pluginOptions.typescript.outDir)
-      pluginOptions = { ...pluginOptions, path: pluginPath }
-    }
-
-    app.log.debug({ plugin: opts.plugin }, 'loading plugin')
-
-    // if not defined, we defaults to true (which can happen only if config is set programmatically,
-    // that's why we ignore the coverage of the `undefined` case, which cannot be covered in cli tests)
-    /* c8 ignore next */
-    const hotReload = opts.plugin.watchOptions?.hotReload !== false
-    const isWatchEnabled = opts.plugin.watch !== false
-    /* c8 ignore next 13 */
-    if (isWatchEnabled && hotReload) {
-      await app.register(sandbox, {
-        ...pluginOptions,
-        customizeGlobalThis (_globalThis) {
-        // Taken from https://github.com/nodejs/undici/blob/fa9fd9066569b6357acacffb806aa804b688c9d8/lib/global.js#L5
-          const globalDispatcher = Symbol.for('undici.globalDispatcher.1')
-          const dispatcher = globalThis[globalDispatcher]
-          /* istanbul ignore else */
-          if (dispatcher) {
-            _globalThis[globalDispatcher] = dispatcher
-          }
-        }
-      })
-    // c8 fails in reporting the coverage of this else branch, so we ignore it
-    /* c8 ignore next 7 */
-    } else {
-      let plugin = await import(`file://${pluginOptions.path}`)
-      if (plugin.__esModule === true) {
-        plugin = plugin.default
-      }
-      await app.register(plugin, pluginOptions.options)
+  // TODO apparently c8 is not able to mark
+  // this as covered even if it is
+  /* c8 ignore next 7 */
+  if (Array.isArray(opts.plugin)) {
+    for (const plugin of opts.plugin) {
+      await loadPlugin(app, opts, plugin)
     }
+  } else if (opts.plugin) {
+    await loadPlugin(app, opts, opts.plugin)
   }
 
   // Enable CORS
@@ -99,6 +74,58 @@ async function platformaticService (app, opts, toLoad = []) {
   }
 }
 
+async function loadPlugin (app, config, pluginOptions) {
+  /* c8 ignore next 4 */
+  if (pluginOptions.typescript !== undefined) {
+    const pluginPath = getJSPluginPath(pluginOptions.path, pluginOptions.typescript.outDir)
+    pluginOptions = { ...pluginOptions, path: pluginPath }
+  }
+
+  app.log.debug({ plugin: pluginOptions }, 'loading plugin')
+
+  // if not defined, we defaults to true (which can happen only if config is set programmatically,
+  // that's why we ignore the coverage of the `undefined` case, which cannot be covered in cli tests)
+  /* c8 ignore next 35  */
+  const hotReload = pluginOptions.hotReload !== false
+  const isWatchEnabled = config.watch !== false
+  if (isWatchEnabled && hotReload) {
+    let options = pluginOptions
+    if ((await stat(pluginOptions.path)).isDirectory()) {
+      options = {
+        path: wrapperPath,
+        options: pluginOptions
+      }
+    }
+    await app.register(sandbox, {
+      ...options,
+      customizeGlobalThis (_globalThis) {
+        // Taken from https://github.com/nodejs/undici/blob/fa9fd9066569b6357acacffb806aa804b688c9d8/lib/global.js#L5
+        const globalDispatcher = Symbol.for('undici.globalDispatcher.1')
+        const dispatcher = globalThis[globalDispatcher]
+        /* istanbul ignore else */
+        if (dispatcher) {
+          _globalThis[globalDispatcher] = dispatcher
+        }
+      }
+    })
+    // c8 fails in reporting the coverage of this else branch, so we ignore it
+  } else {
+    if ((await stat(pluginOptions.path)).isDirectory()) {
+      const options = {
+        ...pluginOptions.options,
+        dir: pluginOptions.path
+      }
+      await app.register(autoload, options)
+    } else {
+      let plugin = await import(`file://${pluginOptions.path}`)
+      if (plugin.__esModule === true) {
+        plugin = plugin.default
+      }
+      await app.register(plugin, pluginOptions.options)
+    }
+  }
+}
+
 platformaticService[Symbol.for('skip-override')] = true
 
 async function buildServer (options, app = platformaticService) {
@@ -109,7 +136,7 @@ async function buildServer (options, app = platformaticService) {
       schema
     })
     await cm.parseAndValidate()
-    options = deepmerge({}, cm.current, options)
+    options = deepmerge({}, options, cm.current)
     options.configManager = cm
   }
   const serverConfig = createServerConfig(options)
@@ -169,3 +196,4 @@ module.exports.platformaticService = platformaticService
 module.exports.addLoggerToTheConfig = addLoggerToTheConfig
 module.exports.loadConfig = loadConfig
 module.exports.tsCompiler = compiler
+module.exports.ConfigManager = ConfigManager

package/lib/autoload-wrapper.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const fp = require('fastify-plugin')
+const autoload = require('@fastify/autoload')
+
+module.exports = fp(async function (app, opts) {
+  app.register(autoload, {
+    dir: opts.path,
+    ...opts
+  })
+})

package/lib/config.js

@@ -9,11 +9,12 @@ class ServiceConfigManager extends ConfigManager {
   constructor (opts) {
     super({
       ...opts,
-      schema,
+      schema: opts.schema || schema,
       schemaOptions: {
         useDefaults: true,
         coerceTypes: true,
-        allErrors: true
+        allErrors: true,
+        strict: false
       },
       allowToWatch: ['.env'],
       envWhitelist: ['PORT', ...(opts.envWhitelist || [])]
@@ -21,10 +22,22 @@ class ServiceConfigManager extends ConfigManager {
   }
 
   _transformConfig () {
+    const fixPluginPath = (plugin) => {
+      // for some reasons c8 does not detect these
+      /* c8 ignore next 3 */
+      if (typeof plugin === 'string') {
+        plugin = { path: plugin }
+      }
+      plugin.path = this._fixRelativePath(plugin.path)
+      return plugin
+    }
+
     // relative-to-absolute plugin path
     /* c8 ignore next 3 */
-    if (this.current.plugin) {
-      this.current.plugin.path = this._fixRelativePath(this.current.plugin.path)
+    if (Array.isArray(this.current.plugin)) {
+      this.current.plugin = this.current.plugin.map(fixPluginPath)
+    } else if (this.current.plugin) {
+      this.current.plugin = fixPluginPath(this.current.plugin)
     }
   }
 
@@ -32,10 +45,22 @@ class ServiceConfigManager extends ConfigManager {
     const sanitizedConfig = clone(this.current)
     const dirOfConfig = dirname(this.fullPath)
 
+    const fixPluginPath = (plugin) => {
+      // for some reasons c8 does not detect these
+      /* c8 ignore next 3 */
+      if (typeof plugin === 'string') {
+        plugin = { path: plugin }
+      }
+      plugin.path = relative(dirOfConfig, plugin.path)
+      return plugin
+    }
+
     // relative-to-absolute plugin path
-    /* c8 ignore next 3 */
-    if (this.current.plugin) {
-      sanitizedConfig.plugin.path = relative(dirOfConfig, this.current.plugin.path)
+    /* c8 ignore next 6 */
+    if (Array.isArray(this.current.plugin)) {
+      sanitizedConfig.plugin = sanitizedConfig.plugin.map(fixPluginPath)
+    } else if (this.current.plugin) {
+      sanitizedConfig.plugin = fixPluginPath(sanitizedConfig.plugin)
     }
 
     return sanitizedConfig

package/lib/schema.js

@@ -84,6 +84,9 @@ const server = {
         { type: 'string' }
       ]
     },
+    pluginTimeout: {
+      type: 'integer'
+    },
     healthCheck: {
       anyOf: [
         { type: 'boolean' },
@@ -102,6 +105,34 @@ const server = {
   required: ['hostname', 'port']
 }
 
+const watch = {
+  $id: 'https://schemas.platformatic.dev/service/watch',
+  type: 'object',
+  properties: {
+    type: 'object',
+    properties: {
+      allow: {
+        type: 'array',
+        items: {
+          type: 'string'
+        },
+        minItems: 1,
+        nullable: true,
+        default: null
+      },
+      ignore: {
+        type: 'array',
+        items: {
+          type: 'string'
+        },
+        nullable: true,
+        default: null
+      }
+    },
+    additionalProperties: false
+  }
+}
+
 const plugin = {
   $id: 'https://schemas.platformatic.dev/service/plugin',
   type: 'object',
@@ -122,38 +153,12 @@ const plugin = {
       additionalProperties: false,
       required: ['outDir']
     },
-    watch: {
-      type: 'boolean'
-    },
     fallback: {
       type: 'boolean'
     },
-    watchOptions: {
-      type: 'object',
-      properties: {
-        hotReload: {
-          type: 'boolean',
-          default: true
-        },
-        allow: {
-          type: 'array',
-          items: {
-            type: 'string'
-          },
-          minItems: 1,
-          nullable: true,
-          default: null
-        },
-        ignore: {
-          type: 'array',
-          items: {
-            type: 'string'
-          },
-          nullable: true,
-          default: null
-        }
-      },
-      additionalProperties: false
+    hotReload: {
+      type: 'boolean',
+      default: true
     },
     options: {
       type: 'object'
@@ -190,12 +195,36 @@ const metrics = {
 const platformaticServiceSchema = {
   $id: 'https://schemas.platformatic.dev/db',
   type: 'object',
+  $defs: {
+    plugin
+  },
   properties: {
     server,
-    plugin,
+    plugin: {
+      anyOf: [{
+        type: 'array',
+        items: {
+          anyOf: [{
+            $ref: '#/$defs/plugin'
+          }, {
+            type: 'string'
+          }]
+        }
+      }, {
+        $ref: '#/$defs/plugin'
+      }, {
+        type: 'string'
+      }]
+    },
     metrics
   },
-  additionalProperties: false,
+  additionalProperties: {
+    watch: {
+      anyOf: [watch, {
+        type: 'boolean'
+      }]
+    }
+  },
   required: ['server']
 }
 
@@ -204,3 +233,4 @@ module.exports.metrics = metrics
 module.exports.cors = cors
 module.exports.server = server
 module.exports.plugin = plugin
+module.exports.watch = watch

package/lib/start.mjs

@@ -40,7 +40,7 @@ async function start (_args) {
 
   if (
     config.plugin !== undefined &&
-    config.plugin.watch !== false
+    config.watch !== false
   ) {
     await startFileWatching(server)
   }
@@ -92,8 +92,8 @@ async function startFileWatching (server) {
 
   const fileWatcher = new FileWatcher({
     path: dirname(configManager.fullPath),
-    allowToWatch: config.plugin.watchOptions?.allow,
-    watchIgnore: config.plugin.watchOptions?.ignore
+    allowToWatch: config.watch?.allow,
+    watchIgnore: config.watch?.ignore
   })
   fileWatcher.on('update', () => {
     onFilesUpdated(server)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/service",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "",
   "main": "index.js",
   "author": "Matteo Collina <hello@matteocollina.com>",
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@fastify/accepts": "^4.0.1",
+    "@fastify/autoload": "^5.5.0",
     "@fastify/basic-auth": "^4.0.0",
     "@fastify/cors": "^8.0.0",
     "@fastify/deepmerge": "^1.1.0",
@@ -34,8 +35,8 @@
     "@fastify/static": "^6.5.0",
     "@fastify/swagger": "^8.0.0",
     "@fastify/under-pressure": "^8.0.0",
-    "@platformatic/config": "0.7.0",
-    "@platformatic/utils": "0.7.0",
+    "@platformatic/config": "0.8.0",
+    "@platformatic/utils": "0.8.0",
     "close-with-grace": "^1.1.0",
     "commist": "^3.1.2",
     "desm": "^1.2.0",
@@ -45,7 +46,7 @@
     "fastify": "^4.6.0",
     "fastify-metrics": "^10.0.0",
     "fastify-plugin": "^4.1.0",
-    "fastify-sandbox": "^0.10.0",
+    "fastify-sandbox": "^0.11.0",
     "graphql": "^16.6.0",
     "help-me": "^4.1.0",
     "mercurius": "^11.3.0",

package/test/autoload.test.js

@@ -0,0 +1,346 @@
+'use strict'
+
+require('./helper')
+const { test } = require('tap')
+const { buildServer } = require('..')
+const { request } = require('undici')
+const { join } = require('path')
+
+test('autoload & filesystem based routing / watch disabled', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: join(__dirname, 'fixtures', 'directories', 'routes')
+    },
+    watch: false,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+})
+
+test('autoload & filesystem based routing / watch enabled', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: {
+      path: join(__dirname, 'fixtures', 'directories', 'routes')
+    },
+    watch: true,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+})
+
+test('multiple files', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: [{
+      path: join(__dirname, 'fixtures', 'directories', 'plugins')
+    }, {
+      path: join(__dirname, 'fixtures', 'directories', 'routes')
+    }],
+    watch: true,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/with-decorator`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'bar', 'body')
+  }
+})
+
+test('multiple files / watch false', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: [{
+      path: join(__dirname, 'fixtures', 'directories', 'plugins')
+    }, {
+      path: join(__dirname, 'fixtures', 'directories', 'routes')
+    }],
+    watch: false,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/with-decorator`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'bar', 'body')
+  }
+})
+
+test('autoload & filesystem based routing / watch disabled / no object', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: join(__dirname, 'fixtures', 'directories', 'routes'),
+    watch: false,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+})
+
+test('autoload & filesystem based routing / watch enabled / no object', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: join(__dirname, 'fixtures', 'directories', 'routes'),
+    watch: true,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+})
+
+test('multiple files / no object', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: [join(__dirname, 'fixtures', 'directories', 'plugins'), join(__dirname, 'fixtures', 'directories', 'routes')],
+    watch: true,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/with-decorator`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'bar', 'body')
+  }
+})
+
+test('multiple files / watch false / no object', async ({ teardown, equal }) => {
+  const config = {
+    server: {
+      hostname: '127.0.0.1',
+      port: 0
+    },
+    plugin: [
+      join(__dirname, 'fixtures', 'directories', 'plugins'),
+      join(__dirname, 'fixtures', 'directories', 'routes')
+    ],
+    watch: false,
+    metrics: false
+  }
+
+  const server = await buildServer(config)
+  teardown(server.stop)
+  await server.listen()
+
+  {
+    const res = await request(`${server.url}/`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from root', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/bar`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from bar', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/baz`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'from baz', 'body')
+  }
+
+  {
+    const res = await request(`${server.url}/foo/with-decorator`)
+    equal(res.statusCode, 200, 'status code')
+    const body = await res.body.json()
+    equal(body.hello, 'bar', 'body')
+  }
+})

package/test/cli/start.test.mjs

@@ -1,7 +1,8 @@
-import { start } from './helper.mjs'
+import { start, cliPath } from './helper.mjs'
 import { test } from 'tap'
 import { join } from 'desm'
 import { request } from 'undici'
+import { execa } from 'execa'
 
 test('autostart', async ({ equal, same, match, teardown }) => {
   const { child, url } = await start('-c', join(import.meta.url, '..', '..', 'fixtures', 'hello', 'platformatic.service.json'))
@@ -47,3 +48,7 @@ test('plugin options', async ({ equal, same, match, teardown }) => {
 
   child.kill('SIGINT')
 })
+
+test('not load', async ({ rejects }) => {
+  await rejects(execa('node', [cliPath, 'start', '-c', join(import.meta.url, '..', 'fixtures', 'not-load.service.json')]))
+})

package/test/cli/watch.test.mjs

@@ -29,9 +29,9 @@ test('should watch js files by default', async ({ equal, teardown }) => {
       hostname: '127.0.0.1',
       port: 0
     },
+    watch: true,
     plugin: {
-      path: pluginFilePath,
-      watch: true
+      path: pluginFilePath
     }
   }
 
@@ -66,12 +66,11 @@ test('should watch allowed file', async ({ comment, teardown }) => {
       hostname: '127.0.0.1',
       port: 0
     },
+    watch: {
+      allow: ['*.js', '*.json']
+    },
     plugin: {
-      path: pluginFilePath,
-      watch: true,
-      watchOptions: {
-        allow: ['*.js', '*.json']
-      }
+      path: pluginFilePath
     }
   }
 
@@ -113,12 +112,11 @@ test('should not watch ignored file', async ({ teardown, equal }) => {
       hostname: '127.0.0.1',
       port: 0
     },
+    watch: {
+      ignore: [basename(pluginFilePath)]
+    },
     plugin: {
-      path: pluginFilePath,
-      watch: true,
-      watchOptions: {
-        ignore: [basename(pluginFilePath)]
-      }
+      path: pluginFilePath
     }
   }
 
@@ -151,12 +149,11 @@ test('should not loop forever when doing ESM', { skip: true }, async ({ comment,
       hostname: '127.0.0.1',
       port: 0
     },
+    watch: {
+      ignore: [basename(pluginFilePath)]
+    },
     plugin: {
-      path: pluginFilePath,
-      watch: true,
-      watchOptions: {
-        ignore: [basename(pluginFilePath)]
-      }
+      path: pluginFilePath
     }
   }
 
@@ -196,12 +193,11 @@ test('should watch config file', async ({ comment, teardown }) => {
       hostname: '127.0.0.1',
       port: 0
     },
+    watch: {
+      allow: ['*.js', '*.json']
+    },
     plugin: {
-      path: pluginFilePath,
-      watch: true,
-      watchOptions: {
-        allow: ['*.js', '*.json']
-      }
+      path: pluginFilePath
     }
   }
 

package/test/fixtures/bad-typescript-plugin/platformatic.service.json

@@ -8,9 +8,9 @@
   },
   "plugin": {
     "path": "plugin.ts",
-    "watch": true,
     "typescript": {
       "outDir": "dist"
     }
-  }
+  },
+  "watch": true
 }

package/test/fixtures/directories/platformatic.service.json

@@ -0,0 +1,13 @@
+{
+  "server": {
+    "hostname": "127.0.0.1",
+    "port": 0,
+    "logger": {
+      "level": "info"
+    }
+  },
+  "plugin": {
+    "path": "./routes"
+  },
+  "metrics": false
+}

package/test/fixtures/directories/plugins/decorator.js

@@ -0,0 +1,7 @@
+'use strict'
+
+const fp = require('fastify-plugin')
+
+module.exports = fp(async function (app) {
+  app.decorate('foo', 'bar')
+})

package/test/fixtures/directories/routes/foo/bar.js

@@ -0,0 +1,11 @@
+'use strict'
+
+module.exports = async function (fastify, opts) {
+  fastify.get('/bar', async function (request, reply) {
+    return { hello: 'from bar' }
+  })
+
+  fastify.get('/with-decorator', async function (request, reply) {
+    return { hello: fastify.foo }
+  })
+}

package/test/fixtures/directories/routes/foo/baz/index.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (fastify, opts) {
+  fastify.get('/', async function (request, reply) {
+    return { hello: 'from baz' }
+  })
+}

package/test/fixtures/directories/routes/root.js

@@ -0,0 +1,7 @@
+'use strict'
+
+module.exports = async function (fastify, opts) {
+  fastify.get('/', async function (request, reply) {
+    return { hello: 'from root' }
+  })
+}

package/test/fixtures/not-load.js

@@ -0,0 +1,8 @@
+'use strict'
+
+const { promisify } = require('util')
+const sleep = promisify(setTimeout)
+
+module.exports = async function (app) {
+  await sleep(60000)
+}

package/test/fixtures/not-load.service.json

@@ -0,0 +1,14 @@
+{
+  "server": {
+    "logger": {
+      "level": "info"
+    },
+    "hostname": "127.0.0.1",
+    "port": "3042",
+    "pluginTimeout": "10"
+  },
+  "plugin": {
+    "path": "./not-load.js",
+    "watch": false
+  }
+}

package/test/load-and-reload-files.test.js

@@ -303,10 +303,7 @@ test('hot reload disabled, CommonJS', async ({ teardown, equal, pass, same }) =>
     },
     plugin: {
       path: file,
-      watch: true,
-      watchOptions: {
-        hotReload: false
-      }
+      hotReload: false
     }
   })
   teardown(server.stop)
@@ -359,11 +356,9 @@ test('hot reload disabled, ESM', async ({ teardown, equal, pass, same }) => {
     plugin: {
       path: file,
       stopTimeout: 1000,
-      watch: true,
-      watchOptions: {
-        hotReload: false
-      }
+      hotReload: false
     },
+    watch: true,
     metrics: false
   })
   teardown(server.stop)
@@ -416,11 +411,9 @@ test('hot reload disabled, with default export', async ({ teardown, equal, pass,
     plugin: {
       path: file,
       stopTimeout: 1000,
-      watch: true,
-      watchOptions: {
-        hotReload: false
-      }
+      hotReload: false
     },
+    watch: true,
     metrics: false
   })
   teardown(server.stop)
@@ -430,7 +423,6 @@ test('hot reload disabled, with default export', async ({ teardown, equal, pass,
     const res = await request(`${server.url}/test`, {
       method: 'GET'
     })
-    equal(res.statusCode, 200)
     same(await res.body.json(), { res: 'plugin, version 1' }, 'get rest plugin')
   }