fix(db): handle build cache buildDir for schema types

onmax · onmax · commit dc6d7d2f4a76 · 2026-01-26T19:36:51.000+01:00
During build, Nuxt uses node_modules/.cache/nuxt/.nuxt/ as buildDir
where tsdown doesn't generate .d.mts. Fall back to .nuxt/ for types.

Also:
- Merge build+copy into single hook (prevent race condition)
- Only write stubs if files don't exist (prevent overwriting)
diff --git a/src/db/setup.ts b/src/db/setup.ts
@@ -1,4 +1,4 @@
-import { mkdir, copyFile, writeFile, readFile } from 'node:fs/promises'
+import { mkdir, copyFile, writeFile, readFile, stat } from 'node:fs/promises'
 import chokidar from 'chokidar'
 import { glob } from 'tinyglobby'
 import { join, resolve as resolveFs, relative } from 'pathe'
@@ -274,28 +274,39 @@ async function generateDatabaseSchema(nuxt: Nuxt, hub: ResolvedHubConfig) {
     write: true
   })
 
-  // Build schema types during prepare/dev/build
+  // Build schema types during prepare/dev/build, then copy to node_modules
   nuxt.hooks.hookOnce('app:templatesGenerated', async () => {
+    // Build first
     await buildDatabaseSchema(nuxt.options.buildDir, { relativeDir: nuxt.options.rootDir })
-  })
 
-  // Copy schema to node_modules/@nuxthub/db/ for workflow compatibility
-  nuxt.hooks.hookOnce('app:templatesGenerated', async () => {
+    // Then copy to node_modules/@nuxthub/db/ for workflow compatibility
     const physicalDbDir = join(nuxt.options.rootDir, 'node_modules', '@nuxthub', 'db')
     await mkdir(physicalDbDir, { recursive: true })
 
     try {
       await copyFile(join(nuxt.options.buildDir, 'hub/db/schema.mjs'), join(physicalDbDir, 'schema.mjs'))
 
-      // Copy the generated .d.mts file for TypeScript support (overwrites stub from setupDatabaseClient)
-      const schemaDtsSource = join(nuxt.options.buildDir, 'hub/db/schema.d.mts')
+      // Copy the generated .d.mts file for TypeScript support
+      // Try buildDir first, then fall back to .nuxt (for when buildDir is in .cache during build)
+      const buildDirSource = join(nuxt.options.buildDir, 'hub/db/schema.d.mts')
+      const nuxtDirSource = join(nuxt.options.rootDir, '.nuxt/hub/db/schema.d.mts')
+
+      let schemaTypes: string | undefined
       try {
-        const schemaTypes = await readFile(schemaDtsSource, 'utf-8')
-        await writeFile(join(physicalDbDir, 'schema.d.mts'), schemaTypes)
+        schemaTypes = await readFile(buildDirSource, 'utf-8')
       } catch {
-        // During tests, don't overwrite existing types with stub (preserves dev-generated types)
-        if (nuxt.options.test) return
-        // Fallback: create a simple re-export if .d.mts doesn't exist yet
+        // Fallback to .nuxt directory (types generated during prepare)
+        try {
+          schemaTypes = await readFile(nuxtDirSource, 'utf-8')
+        } catch {
+          // Types not found in either location
+        }
+      }
+
+      if (schemaTypes && schemaTypes.length > 50) {
+        await writeFile(join(physicalDbDir, 'schema.d.mts'), schemaTypes)
+      } else if (!nuxt.options.test) {
+        // Fallback: create a simple re-export if types not available
         await writeFile(join(physicalDbDir, 'schema.d.mts'), `export * from './schema.mjs'`)
       }
     } catch (error) {
@@ -531,9 +542,13 @@ export const db: ReturnType<typeof drizzleCore<typeof schema>>
   }
   try {
     await writeFile(join(physicalDbDir, 'package.json'), JSON.stringify(packageJson, null, 2))
-    // Stub schema files (overwritten with actual schema during build)
-    await writeFile(join(physicalDbDir, 'schema.mjs'), 'export {}')
-    await writeFile(join(physicalDbDir, 'schema.d.mts'), 'export {}')
+    // Stub schema files only if they don't exist (real types written by app:templatesGenerated hook)
+    const schemaPath = join(physicalDbDir, 'schema.mjs')
+    const schemaDtsPath = join(physicalDbDir, 'schema.d.mts')
+    const schemaExists = await stat(schemaPath).then(s => s.size > 20).catch(() => false)
+    const schemaDtsExists = await stat(schemaDtsPath).then(s => s.size > 20).catch(() => false)
+    if (!schemaExists) await writeFile(schemaPath, 'export {}')
+    if (!schemaDtsExists) await writeFile(schemaDtsPath, 'export {}')
   } catch (error) {
     throw new Error(`Failed to create @nuxthub/db package files: ${(error as Error).message}`)
   }
