feat: load content config of each Nuxt layer

Author: farnabaz

src/module.ts

@@ -22,7 +22,7 @@ import { collectionsTemplate, componentsManifestTemplate, contentTypesTemplate,
 import type { ResolvedCollection } from './types/collection'
 import type { ModuleOptions, SqliteDatabaseConfig } from './types/module'
 import { getContentChecksum, localDatabase, logger, watchContents, chunks, watchComponents, watchConfig } from './utils/dev'
-import { loadContentConfig } from './utils/config'
+import { loadLayersConfig } from './utils/config'
 import { parseContent } from './utils/content'
 import { installMDCModule } from './utils/mdc'
 import { findPreset } from './presets'
@@ -91,7 +91,7 @@ export default defineNuxtModule<ModuleOptions>({
       await mkdir(dirname((options.database as SqliteDatabaseConfig).filename), { recursive: true }).catch(() => {})
     }
 
-    const { collections } = await loadContentConfig(nuxt.options.rootDir, { defaultFallback: true })
+    const { collections } = await loadLayersConfig(nuxt)
     manifest.collections = collections
 
     nuxt.options.runtimeConfig.public.content = {
@@ -127,11 +127,11 @@ export default defineNuxtModule<ModuleOptions>({
 
     // Add Templates & aliases
     nuxt.options.nitro.alias = nuxt.options.nitro.alias || {}
-    addTypeTemplate(contentTypesTemplate(collections))
+    addTypeTemplate(contentTypesTemplate(manifest.collections))
     addTemplate(fullDatabaseRawDumpTemplate(manifest))
-    nuxt.options.nitro.alias['#content/collections'] = addTemplate(collectionsTemplate(collections)).dst
+    nuxt.options.nitro.alias['#content/collections'] = addTemplate(collectionsTemplate(manifest.collections)).dst
     nuxt.options.alias['#content/components'] = addTemplate(componentsManifestTemplate(manifest)).dst
-    nuxt.options.alias['#content/manifest'] = addTemplate(manifestTemplate(collections, manifest)).dst
+    nuxt.options.alias['#content/manifest'] = addTemplate(manifestTemplate(manifest)).dst
 
     // Load preset
     nuxt.hook('nitro:config', async (config) => {
@@ -150,7 +150,7 @@ export default defineNuxtModule<ModuleOptions>({
     })
 
     nuxt.options.routeRules ||= {}
-    collections.forEach((collection) => {
+    manifest.collections.forEach((collection) => {
       if (!collection.private) {
         nuxt.options.routeRules![`/api/content/${collection.name}/database.sql`] = { prerender: true }
       }
@@ -162,7 +162,7 @@ export default defineNuxtModule<ModuleOptions>({
       return
     }
 
-    const dumpGeneratePromise = processCollectionItems(nuxt, collections, options)
+    const dumpGeneratePromise = processCollectionItems(nuxt, manifest.collections, options)
       .then((fest) => {
         manifest.checksum = fest.checksum
         manifest.dump = fest.dump
@@ -184,7 +184,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     if (nuxt.options.dev) {
       addPlugin({ src: resolver.resolve('./runtime/plugins/websocket.dev'), mode: 'client' })
-      await watchContents(nuxt, collections, options, manifest)
+      await watchContents(nuxt, options, manifest)
       await watchComponents(nuxt)
       await watchConfig(nuxt)
     }

src/utils/config.ts

@@ -1,4 +1,8 @@
+import { stat } from 'node:fs/promises'
 import { loadConfig } from 'c12'
+import type { Nuxt } from '@nuxt/schema'
+import { join } from 'pathe'
+import type { ResolvedCollection } from '../types'
 import { defineCollection, resolveCollections } from './collection'
 import { logger } from './dev'
 
@@ -25,3 +29,22 @@ export async function loadContentConfig(rootDir: string, opts: { defaultFallback
     collections: resolveCollections(config.collections || {}),
   }
 }
+
+export async function loadLayersConfig(nuxt: Nuxt) {
+  const collectionMap = {} as Record<string, ResolvedCollection>
+  const _layers = [...nuxt.options._layers].reverse()
+  for (const layer of _layers) {
+    const rootDir = layer.config.rootDir
+    const configStat = await stat(join(rootDir, 'content.config.ts')).catch(() => null)
+    if (configStat && configStat.isFile()) {
+      const { collections } = await loadContentConfig(rootDir, { defaultFallback: false })
+      for (const collection of collections) {
+        collectionMap[collection.name] = collection
+      }
+    }
+  }
+
+  return {
+    collections: Object.values(collectionMap),
+  }
+}

src/utils/dev.ts

@@ -12,16 +12,17 @@ import { resolve } from 'pathe'
 import type { WebSocket } from 'ws'
 import { WebSocketServer } from 'ws'
 import { listen, type Listener } from 'listhen'
-import type { ResolvedCollection, ModuleOptions } from '../types'
+import type { ModuleOptions } from '../types'
 import type { Manifest } from '../types/manifest'
 import { generateCollectionInsert, parseSourceBase } from './collection'
 import { parseContent } from './content'
 import { moduleTemplates } from './templates'
 
 export const logger: ConsolaInstance = useLogger('@nuxt/content')
 
-export async function watchContents(nuxt: Nuxt, collections: ResolvedCollection[], options: ModuleOptions, manifest: Manifest) {
+export async function watchContents(nuxt: Nuxt, options: ModuleOptions, manifest: Manifest) {
   const db = localDatabase(options._localDatabase!.filename)
+  const collections = manifest.collections
 
   const localCollections = collections.filter(c => c.source && !c.source.repository)
 

src/utils/templates.ts

@@ -159,10 +159,10 @@ export const componentsManifestTemplate = (manifest: Manifest) => {
   } satisfies NuxtTemplate
 }
 
-export const manifestTemplate = (collections: ResolvedCollection[], manifest: Manifest) => ({
+export const manifestTemplate = (manifest: Manifest) => ({
   filename: moduleTemplates.manifest,
-  getContents: ({ options }: { options: { collections: ResolvedCollection[], manifest: Manifest } }) => {
-    const collectionsMeta = options.collections.reduce((acc, collection) => {
+  getContents: ({ options }: { options: { manifest: Manifest } }) => {
+    const collectionsMeta = options.manifest.collections.reduce((acc, collection) => {
       acc[collection.name] = {
         jsonFields: collection.jsonFields,
       }
@@ -173,7 +173,7 @@ export const manifestTemplate = (collections: ResolvedCollection[], manifest: Ma
       `export const checksums = ${JSON.stringify(manifest.checksum, null, 2)}`,
       '',
       `export const tables = ${JSON.stringify(
-        Object.fromEntries(collections.map(c => [c.name, c.tableName])),
+        Object.fromEntries(manifest.collections.map(c => [c.name, c.tableName])),
         null,
         2,
       )}`,
@@ -182,7 +182,6 @@ export const manifestTemplate = (collections: ResolvedCollection[], manifest: Ma
     ].join('\n')
   },
   options: {
-    collections,
     manifest,
   },
   write: true,