fix(builder): fix double-joined srcDir and components.d.ts orphan entries

ResolvedConfig.srcDir is always absolute (guaranteed by the config
loader), but join(rootDir, srcDir) in ubeanVite and the core plugin
appended it onto rootDir again. unplugin-vue-components and
unplugin-auto-import then scanned a nonexistent dir, silently killing
local component/composable auto-import in dev (and breaking the dev
watcher paths). Use resolve() instead, which passes absolute srcDir
through unchanged.

generateComponentsDts now emits unplugin-vue-components-compatible
inline `typeof import('...')` entries (same relative-path algorithm,
`./` prefix, name-sorted) so the file survives unplugin's dev append
merge, which preserves scraped interface entries but drops surrounding
import lines. PageView is added to the builtin list to stay aligned
with UBEAN_BUILTIN_COMPONENTS in vue-plugin.ts.

Author: honghuangdc

packages/builder/src/codegen/auto-imports.ts

@@ -371,7 +371,7 @@ export async function generateAutoImports(
     }
   }
 
-  const componentsDts = generateComponentsDts(components);
+  const componentsDts = generateComponentsDts(components, componentsDtsPath);
   await writeFile(componentsDtsPath, componentsDts, 'utf-8');
 
   return {
@@ -382,42 +382,55 @@ export async function generateAutoImports(
   };
 }
 
-function generateComponentsDts(components: ComponentInfo[]): string {
-  const lines: string[] = [
-    '// Auto-generated by ubean - do not edit manually',
-    '/* eslint-disable */',
-    '// @ts-nocheck',
-    '',
-    "declare module 'vue' {"
-  ];
+/**
+ * Generate the `.ubean/components.d.ts` in a format compatible with
+ * unplugin-vue-components (both writers own the same file).
+ *
+ * `ubean dev` runs codegen first, then unplugin-vue-components rewrites the
+ * file in dev mode using its append merge: it keeps entries scraped from the
+ * existing `GlobalComponents` interface but drops any surrounding
+ * `import`/`const` declaration lines. Entries must therefore be
+ * self-contained inline `typeof import('...')` declarations so they stay
+ * valid after unplugin merges them.
+ */
+function generateComponentsDts(components: ComponentInfo[], dtsPath: string): string {
+  const dtsDir = fileDirname(toPosixPath(normalize(dtsPath)));
 
-  const importLines: string[] = [];
-  const componentEntries: string[] = [];
+  const entries = new Map<string, string>();
 
-  const BUILTIN_COMPONENTS = ['Link', 'Head'];
+  // Keep in sync with UBEAN_BUILTIN_COMPONENTS in ../vue-plugin.ts
+  const BUILTIN_COMPONENTS = ['Link', 'Head', 'PageView'];
   for (const name of BUILTIN_COMPONENTS) {
-    importLines.push(`  const ${name}: typeof import('ubean/client')['${name}'];`);
-    componentEntries.push(`    ${name}: typeof ${name};`);
+    entries.set(name, `typeof import('ubean/client')['${name}']`);
   }
 
   for (const comp of components) {
-    importLines.push(`  import ${comp.pascalName} from ${JSON.stringify(comp.importPath)};`);
-    componentEntries.push(`    ${comp.pascalName}: typeof ${comp.pascalName};`);
+    const rel = toPosixPath(relative(dtsDir, toPosixPath(normalize(comp.filePath))));
+    // Always prefix `./` like unplugin-vue-components does, so both writers
+    // emit byte-identical entries and neither triggers a redundant rewrite.
+    const importPath = `./${rel}`;
+    entries.set(comp.pascalName, `typeof import('${importPath}')['default']`);
   }
 
-  if (importLines.length > 0) {
-    lines.push(...importLines);
-    lines.push('');
-    lines.push('  export interface GlobalComponents {');
-    lines.push(...componentEntries);
-    lines.push('  }');
-  } else {
-    lines.push('  export interface GlobalComponents {}');
-  }
+  const lines: string[] = [
+    '// Auto-generated by ubean - do not edit manually',
+    '/* eslint-disable */',
+    '// @ts-nocheck',
+    '// biome-ignore lint: disable',
+    '// oxlint-disable',
+    '',
+    'export {}',
+    '',
+    '/* prettier-ignore */',
+    "declare module 'vue' {",
+    '  export interface GlobalComponents {'
+  ];
 
+  const sorted = [...entries.entries()].sort(([a], [b]) => a.localeCompare(b));
+  lines.push(...sorted.map(([name, declaration]) => `    ${name}: ${declaration}`));
+  lines.push('  }');
   lines.push('}');
   lines.push('');
-  lines.push('export {}');
 
   return `${lines.join('\n')}\n`;
 }

packages/builder/src/vite.ts

@@ -121,7 +121,8 @@ export function ubeanPlugin(options?: UbeanPluginOptions): Plugin {
 
       // config 在 buildStart 中已加载,此处一定可用
       const config = ubeanConfig!;
-      const srcDir = join(config.rootDir, config.srcDir);
+      // ResolvedConfig.srcDir 已是绝对路径,resolve 避免二次拼接(join 会把绝对路径追加到 rootDir 后)
+      const srcDir = resolve(config.rootDir, config.srcDir);
 
       for (const dir of watchDirs) {
         server.watcher.add(join(srcDir, dir));

packages/builder/src/vue-plugin.ts

@@ -11,7 +11,7 @@ import { getVueLocaleParam } from '@ubean/i18n';
 import { ubeanMdxPlugin } from '@ubean/markdown';
 import { renderFaviconLink } from '@ubean/pages';
 import { scanProject } from '@ubean/scan';
-import { join } from 'pathe';
+import { join, resolve } from 'pathe';
 import type { InlinePreset } from 'unimport';
 import { UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET } from './codegen';
 import { getComponentResolvers } from './registry';
@@ -83,7 +83,8 @@ function localeVueParamFromConfig(config: UbeanResolvedConfig): string | undefin
 export function ubeanVite(options: UbeanViteOptions): Plugin[] {
   const { config: ubeanConfig } = options;
   const virtualRegistry = useVirtualRegistry();
-  const srcDir = join(ubeanConfig.rootDir, ubeanConfig.srcDir);
+  // ResolvedConfig.srcDir 已是绝对路径（loader 保证），resolve 不会像 join 那样二次拼接
+  const srcDir = resolve(ubeanConfig.rootDir, ubeanConfig.srcDir);
   const dtsDir = join(ubeanConfig.rootDir, '.ubean');
   const markdownEnabled = ubeanConfig.markdown?.enabled !== false;
   const mdxEnabled = ubeanConfig.markdown?.mdx === true;
@@ -422,7 +423,7 @@ async function runPagefindIndexing(
   searchConfig: NonNullable<UbeanResolvedConfig['search']>
 ): Promise<void> {
   const { spawn } = await import('node:child_process');
-  const { resolve } = await import('node:path');
+  const { resolve: resolvePath } = await import('node:path');
 
   const isObjectConfig = typeof searchConfig === 'object';
   const enabled = isObjectConfig ? searchConfig.enabled !== false : true;
@@ -436,7 +437,7 @@ async function runPagefindIndexing(
 
   const verbose = isObjectConfig && searchConfig.verbose === true;
 
-  const sitePath = resolve(ubeanConfig.rootDir, outDir);
+  const sitePath = resolvePath(ubeanConfig.rootDir, outDir);
 
   const args = ['pagefind', '--site', sitePath, '--output-subdir', indexPath];
 

packages/builder/test/codegen-components-dts.test.ts

@@ -0,0 +1,62 @@
+import { mkdir, mkdtemp, readFile, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { describe, expect, it } from 'vitest';
+import type { ScanResult } from '@ubean/scan';
+import { dirname, join, resolve } from 'pathe';
+import { generateAutoImports } from '../src/codegen/auto-imports';
+
+function emptyScan(): ScanResult {
+  return {
+    apiRoutes: [],
+    pages: [],
+    layouts: [],
+    middlewares: [],
+    plugins: [],
+    crons: [],
+    queues: [],
+    locales: [],
+    appEntry: { shared: { exists: false }, server: { exists: false }, client: { exists: false } },
+    serverEntry: { shared: { exists: false }, dev: { exists: false }, prod: { exists: false } }
+  };
+}
+
+describe('generateAutoImports components.d.ts format', () => {
+  it('emits self-contained inline import entries (unplugin merge-safe)', async () => {
+    const cwd = await mkdtemp(join(tmpdir(), 'ubean-codegen-dts-'));
+    const componentsDir = join(cwd, 'src/components/islands');
+    await mkdir(componentsDir, { recursive: true });
+    await writeFile(join(componentsDir, 'island-clock.vue'), '<template><span /></template>');
+
+    // ResolvedConfig.srcDir is always absolute (guaranteed by the config loader)
+    const result = await generateAutoImports(emptyScan(), {
+      cwd,
+      srcDir: resolve(cwd, 'src'),
+      buildDir: '.ubean'
+    });
+
+    const raw = await readFile(result.componentsDtsPath, 'utf8');
+    const entryLines = raw.split('\n').filter(line => /^ {4}\w+: /.test(line));
+    expect(entryLines.length).toBeGreaterThan(0);
+
+    for (const line of entryLines) {
+      // Every entry must carry its own import path. Bare `typeof X` entries lose
+      // their meaning when unplugin-vue-components merges this file in dev mode
+      // (it preserves interface entries but drops surrounding import statements).
+      expect(line, `entry is not self-contained: ${line}`).toMatch(/^ {4}\w+: typeof import\('/);
+      expect(line).not.toMatch(/: typeof \w+$/);
+    }
+
+    // Builtins stay aligned with UBEAN_BUILTIN_COMPONENTS in ../src/vue-plugin.ts
+    for (const name of ['Link', 'Head', 'PageView']) {
+      expect(raw).toContain(`${name}: typeof import('ubean/client')['${name}']`);
+    }
+
+    // The scanned entry points at the real file, relative to the d.ts directory
+    const clockLine = entryLines.find(line => line.startsWith('    IslandClock:'));
+    expect(clockLine).toBeDefined();
+    expect(clockLine).toContain("./../src/components/islands/island-clock.vue')['default']");
+    const match = clockLine!.match(/typeof import\('([^']+)'\)/);
+    expect(match).toBeTruthy();
+    expect(resolve(dirname(result.componentsDtsPath), match![1])).toBe(join(componentsDir, 'island-clock.vue'));
+  });
+});