feat: basic multi dir support

nitrojs · Mar 29, 2022 · 376d349 · 376d349
1 parent f166cfa
commit 376d349
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 26 deletions.
diff --git a/src/build.ts b/src/build.ts
@@ -123,7 +123,7 @@ export async function writeTypes (nitro: Nitro) {
 }
 
 async function _build (nitro: Nitro) {
-  nitro.scannedMiddleware = await scanMiddleware(nitro.options.srcDir)
+  nitro.scannedMiddleware = await scanMiddleware(nitro)
   await writeTypes(nitro)
 
   consola.start('Building server...')
@@ -203,7 +203,7 @@ function startRollupWatcher (nitro: Nitro) {
 
 async function _watch (nitro: Nitro) {
   let watcher = startRollupWatcher(nitro)
-  nitro.scannedMiddleware = await scanMiddleware(nitro.options.srcDir,
+  nitro.scannedMiddleware = await scanMiddleware(nitro,
     (middleware, event) => {
       nitro.scannedMiddleware = middleware
       if (['add', 'addDir'].includes(event)) {

diff --git a/src/options.ts b/src/options.ts
@@ -13,6 +13,7 @@ const NitroDefaults: NitroConfig = {
   analyze: false,
   experiments: {},
   moduleSideEffects: ['unenv/runtime/polyfill/'],
+  scanDirs: [],
   middleware: [],
   modulesDir: [],
   ignore: [],
@@ -80,6 +81,9 @@ export async function loadOptions (overrideConfig: NitroConfig = {}): Promise<Ni
   }
   options.modulesDir.push(resolve(options.rootDir, 'node_modules'))
   options.modulesDir.push(resolve(pkgDir, 'node_modules'))
+  if (!options.scanDirs.length) {
+    options.scanDirs = [options.srcDir]
+  }
 
   // Dev-only storage
   if (options.dev) {

diff --git a/src/server/middleware.ts b/src/server/middleware.ts
@@ -1,8 +1,9 @@
 import { resolve, join, extname } from 'pathe'
-import { joinURL } from 'ufo'
+import { withBase } from 'ufo'
 import { globby } from 'globby'
 import { watch } from 'chokidar'
 import type { Middleware } from 'h3'
+import { Nitro } from '../types'
 
 export interface ServerMiddleware {
   route: string
@@ -21,15 +22,13 @@ export interface ServerMiddleware {
   promisify?: boolean // Default is true
 }
 
-function filesToMiddleware (files: string[], baseDir: string, baseURL: string, overrides?: Partial<ServerMiddleware>): ServerMiddleware[] {
-  return files.map((file) => {
-    const route = joinURL(
-      baseURL,
-      file
-        .slice(0, file.length - extname(file).length)
-        .replace(/\/index$/, '')
-    )
-    const handler = resolve(baseDir, file)
+function filesToMiddleware (files: string[], baseDir: string, prefix: string, overrides?: Partial<ServerMiddleware>): ServerMiddleware[] {
+  return files.map((fileName: string) => {
+    const normalizedName = fileName
+      .slice(0, fileName.length - extname(fileName).length)
+      .replace(/\/index$/, '')
+    const route = withBase(normalizedName, prefix)
+    const handler = resolve(baseDir, fileName)
     return {
       route,
       handler
@@ -39,25 +38,37 @@ function filesToMiddleware (files: string[], baseDir: string, baseURL: string, o
     .map(m => ({ ...m, ...overrides }))
 }
 
-export function scanMiddleware (serverDir: string, onChange?: (results: ServerMiddleware[], event: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir', file: string) => void): Promise<ServerMiddleware[]> {
-  const pattern = '**/*.{ts,mjs,js,cjs}'
-  const globalDir = resolve(serverDir, 'middleware')
-  const apiDir = resolve(serverDir, 'api')
+export function scanMiddleware (nitro: Nitro, onChange?: (results: ServerMiddleware[], event: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir', file: string) => void): Promise<ServerMiddleware[]> {
+  const globPattern = '**/*.{ts,mjs,js,cjs}'
+
+  type ScanOptions = { cwd: string, name: string, prefix: string, options: Partial<ServerMiddleware> }
+  const scanDirs: ScanOptions[] = []
+  for (const dir of nitro.options.scanDirs) {
+    scanDirs.push({
+      cwd: dir,
+      name: 'api',
+      prefix: '/api',
+      options: { lazy: true }
+    })
+    scanDirs.push({
+      cwd: dir,
+      name: 'middleware',
+      prefix: '/',
+      options: {}
+    })
+  }
 
   const scan = async () => {
-    const globalFiles = await globby(pattern, { cwd: globalDir, dot: true })
-    const apiFiles = await globby(pattern, { cwd: apiDir, dot: true })
-    return [
-      ...filesToMiddleware(globalFiles, globalDir, '/', { route: '/' }),
-      ...filesToMiddleware(apiFiles, apiDir, '/api', { lazy: true })
-    ]
+    const middleware = (await Promise.all(scanDirs.map(async (scanDir) => {
+      const cwd = join(scanDir.cwd, scanDir.name)
+      const files = await globby(globPattern, { cwd, dot: true })
+      return filesToMiddleware(files, cwd, scanDir.prefix, scanDir.options)
+    }))).flat()
+    return middleware
   }
 
   if (typeof onChange === 'function') {
-    const watcher = watch([
-      join(globalDir, pattern),
-      join(apiDir, pattern)
-    ], { ignoreInitial: true })
+    const watcher = watch(scanDirs.map(dir => join(dir.cwd, dir.name, globPattern)), { ignoreInitial: true })
     watcher.on('all', async (event, file) => {
       onChange(await scan(), event, file)
     })

diff --git a/src/types/nitro.ts b/src/types/nitro.ts
@@ -45,6 +45,7 @@ export interface NitroOptions {
 
   rootDir: string
   srcDir: string
+  scanDirs: string[]
   buildDir: string
   generateDir: string
   publicDir: string