@ubean/build 0.3.6 → 0.4.0

package/dist/codegen/index.d.ts

@@ -1,39 +1,82 @@
+import { AutoImportOptions, ComponentsOptions } from "@ubean/config";
 import { ScanResult } from "@ubean/scan";
 import { Import, InlinePreset } from "unimport";
+import { Options } from "unplugin-vue-components/types";
+import { Options as Options$1 } from "unplugin-auto-import/types";
 //#region src/codegen/auto-imports.d.ts
-interface AutoImportOptions {
+interface GenerateAutoImportsOptions {
   cwd: string;
   srcDir: string;
   buildDir: string;
-  composablesDirs?: string[];
-  componentsDirs?: string[];
+  /** `srcDir` 内扫描目录名（默认 `composables` / `components`）。 */
   dirs?: {
     composables?: string;
     components?: string;
   };
-  imports?: {
-    autoImport?: boolean;
-    global?: boolean;
-  };
-  components?: {
-    autoImport?: boolean;
-    directoryAsNamespace?: boolean;
-  };
+  /** `ubean.config.ts` 的 `autoImports` 配置（`boolean | AutoImportOptions`）。 */
+  autoImports?: boolean | AutoImportOptions;
+  /** `ubean.config.ts` 的 `components` 配置（`boolean | ComponentsOptions`）。 */
+  components?: boolean | ComponentsOptions;
 }
+interface ResolvedAutoImports {
+  /** 总开关（`autoImports: false` 时为 `false`）。 */
+  enabled: boolean;
+  /** ubean 内置 API（client + server 预设），默认 `true`。 */
+  ubean: boolean;
+  /** vue composables + reactivity macros，默认 `false`。 */
+  vue: boolean;
+  /** vue-router `useRouter`，默认 `false`。 */
+  vueRouter: boolean;
+  /** vue-i18n `useI18n`，默认 `false`。 */
+  vueI18n: boolean;
+  /** hono-openapi `validator`/`describeRoute`，默认 `false`。 */
+  honoOpenapi: boolean;
+  /** 用户对象形态配置（boolean/undefined 时为 `{}`）。 */
+  options: AutoImportOptions;
+}
+/** 将 `boolean | AutoImportOptions` 归一化为分库开关 + 透传选项。 */
+declare function resolveAutoImportsConfig(input: boolean | AutoImportOptions | undefined): ResolvedAutoImports;
+/** 按分库开关组装内置预设（顺序稳定：ubean client/server → vue → vue-router → vue-i18n → hono-openapi）。 */
+declare function getAutoImportPresets(resolved: ResolvedAutoImports): InlinePreset[];
+interface ResolvedComponentsAutoImport {
+  /** 目录扫描 + dts 总开关（`components: false` 时为 `false`；resolver 仍然生效）。 */
+  enabled: boolean;
+  /** ubean 内置组件（`Link`/`Head`/`PageView`）resolver，默认 `true`。 */
+  ubean: boolean;
+  /** 用户对象形态配置（boolean/undefined 时为 `{}`）。 */
+  options: ComponentsOptions;
+}
+/** 将 `boolean | ComponentsOptions` 归一化。 */
+declare function resolveComponentsConfig(input: boolean | ComponentsOptions | undefined): ResolvedComponentsAutoImport;
+/** unplugin 系选项普遍使用 `Arrayable<T>`，合并进数组前先归一化。 */
+declare function toArray<T>(value: T | T[] | undefined): T[];
 declare const VUE_PRESET: InlinePreset;
 declare const VUE_MACROS_PRESET: InlinePreset;
 /**
  * Client-safe symbols sourced from the first-class `ubean/client` entry.
  * These are safe to auto-import in Vue components (browser-side) because
  * `@ubean/client` has zero build-time dependencies and no `node:*` imports.
- * (`ubean/runtime/vue` still works — it re-exports the same kernel — but
- * new code should prefer `ubean/client`.)
  */
 declare const UBEAN_CLIENT_PRESET: InlinePreset;
 /**
- * Server-only symbols that come from the main `ubean` package.
- * These import the full ubean entry (which includes build tools like `vite`),
- * so they must only be used in server-side files (API routes, middleware, etc.).
+ * vue-router composables, sourced directly from `vue-router` (not re-exported
+ * through `ubean/client` — third-party APIs are imported from their own packages).
+ */
+declare const VUE_ROUTER_PRESET: InlinePreset;
+/**
+ * vue-i18n Composition API, sourced directly from `vue-i18n` (ubean no longer
+ * wraps `useI18n` — same instance is exposed by the framework-installed
+ * vue-i18n plugin; `t` is destructured from the returned composer).
+ */
+declare const VUE_I18N_PRESET: InlinePreset;
+/**
+ * Server-only symbols sourced from the `ubean/server` aggregation entry
+ * (`@ubean/app` + `@ubean/routes` + `@ubean/server` + `@ubean/shared/node`).
+ * Sourcing from `ubean/server` (instead of the full `ubean` barrel) keeps
+ * build-time tooling (scan / build / cli, oxc-parser WASM…) out of the import
+ * closure, so these must still only be used in server-side files
+ * (API routes, middleware, etc.) — the closure still contains Hono and
+ * `node:*` builtins.
  *
  * Note: the isomorphic data composables (`useData` / `useAsyncData` /
  * `useFetch`) are intentionally NOT listed here — they are exported from
@@ -57,35 +100,41 @@ interface AutoImportResult {
   autoImportsDtsPath: string;
   componentsDtsPath: string;
 }
-declare function generateAutoImports(_scanResult: ScanResult, options: AutoImportOptions): Promise<AutoImportResult>;
+declare function generateAutoImports(_scanResult: ScanResult, options: GenerateAutoImportsOptions): Promise<AutoImportResult>;
 declare function getBuiltinComposables(): Import[];
+/** unplugin-auto-import 的组装结果（透传字段类型直接引用 unplugin 类型，避免跨包类型命名问题）。 */
+interface UbeanAutoImportConfig {
+  imports: Options$1['imports'];
+  dirs: string[];
+  dts: Options$1['dts'];
+  vueTemplate: boolean;
+  eslintrc: Options$1['eslintrc'];
+}
 declare function getUbeanAutoImportConfig(options?: {
   cwd?: string;
   srcDir?: string;
   buildDir?: string;
   composablesDirs?: string[];
-}): {
-  imports: InlinePreset[];
+  /** `ubean.config.ts` 的 `autoImports` 配置（默认最小：仅 ubean 内置 API）。 */
+  autoImports?: boolean | AutoImportOptions;
+}): UbeanAutoImportConfig;
+/** unplugin-vue-components 的组装结果（类型直接引用 unplugin，理由同上）。 */
+interface UbeanComponentsConfig {
   dirs: string[];
-  dts: string;
-  vueTemplate: boolean;
-  eslintrc: {
-    enabled: boolean;
-  };
-};
+  extensions: string[];
+  directoryAsNamespace: boolean;
+  dts: Options['dts'];
+  deep: boolean;
+}
 declare function getUbeanComponentsConfig(options?: {
   cwd?: string;
   srcDir?: string;
   buildDir?: string;
   componentsDirs?: string[];
   directoryAsNamespace?: boolean;
-}): {
-  dirs: string[];
-  extensions: string[];
-  directoryAsNamespace: boolean;
-  dts: string;
-  deep: boolean;
-};
+  /** `ubean.config.ts` 的 `components` 配置。 */
+  components?: boolean | ComponentsOptions;
+}): UbeanComponentsConfig;
 declare function generateImportsTransform(imports: Import[]): {
   code: string;
   map?: null;
@@ -168,7 +217,7 @@ interface CodegenManifest {
     generated: boolean;
   }>;
 }
-interface CodegenOptions extends Omit<AutoImportOptions, 'cwd' | 'srcDir' | 'buildDir'> {
+interface CodegenOptions extends Omit<GenerateAutoImportsOptions, 'cwd' | 'srcDir' | 'buildDir'> {
   cwd: string;
   srcDir: string;
   buildDir: string;
@@ -183,4 +232,4 @@ interface CodegenResult {
 }
 declare function generateTypes(result: ScanResult, options: CodegenOptions): Promise<CodegenResult>;
 //#endregion
-export { type AutoImportOptions, type AutoImportResult, BUILTIN_PRESETS, CODEGEN_CONTRACT_VERSION, CODEGEN_FILES, CodegenFileContract, CodegenManifest, CodegenOptions, CodegenResult, type ComponentInfo, type GenerateOpenApiTypesOptions, HONO_OPENAPI_PRESET, type I18nTypesOptions, type Import, type InlinePreset, type PageTypesOptions, type RouteTypesOptions, UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET, VUE_MACROS_PRESET, VUE_PRESET, generateAutoImports, generateI18nTypes, generateImportsTransform, generateOpenApiTypes, generateOpenApiTypesFromServer, generatePageTypes, generateRouteTypes, generateTypes, getBuiltinComposables, getUbeanAutoImportConfig, getUbeanComponentsConfig, messagesToTsType };
+export { type AutoImportResult, BUILTIN_PRESETS, CODEGEN_CONTRACT_VERSION, CODEGEN_FILES, CodegenFileContract, CodegenManifest, CodegenOptions, CodegenResult, type ComponentInfo, type GenerateAutoImportsOptions, type GenerateOpenApiTypesOptions, HONO_OPENAPI_PRESET, type I18nTypesOptions, type Import, type InlinePreset, type PageTypesOptions, type ResolvedAutoImports, type ResolvedComponentsAutoImport, type RouteTypesOptions, UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET, VUE_I18N_PRESET, VUE_MACROS_PRESET, VUE_PRESET, VUE_ROUTER_PRESET, generateAutoImports, generateI18nTypes, generateImportsTransform, generateOpenApiTypes, generateOpenApiTypesFromServer, generatePageTypes, generateRouteTypes, generateTypes, getAutoImportPresets, getBuiltinComposables, getUbeanAutoImportConfig, getUbeanComponentsConfig, messagesToTsType, resolveAutoImportsConfig, resolveComponentsConfig, toArray };

package/dist/codegen/index.js

@@ -1,2 +1,2 @@
-import { _ as generateImportsTransform, a as generateOpenApiTypesFromServer, b as getUbeanComponentsConfig, c as generateI18nTypes, d as HONO_OPENAPI_PRESET, f as UBEAN_CLIENT_PRESET, g as generateAutoImports, h as VUE_PRESET, i as generateOpenApiTypes, l as messagesToTsType, m as VUE_MACROS_PRESET, n as CODEGEN_FILES, o as generatePageTypes, p as UBEAN_SERVER_PRESET, r as generateTypes, s as generateRouteTypes, t as CODEGEN_CONTRACT_VERSION, u as BUILTIN_PRESETS, v as getBuiltinComposables, y as getUbeanAutoImportConfig } from "../codegen-DX7zMgPZ.js";
-export { BUILTIN_PRESETS, CODEGEN_CONTRACT_VERSION, CODEGEN_FILES, HONO_OPENAPI_PRESET, UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET, VUE_MACROS_PRESET, VUE_PRESET, generateAutoImports, generateI18nTypes, generateImportsTransform, generateOpenApiTypes, generateOpenApiTypesFromServer, generatePageTypes, generateRouteTypes, generateTypes, getBuiltinComposables, getUbeanAutoImportConfig, getUbeanComponentsConfig, messagesToTsType };
+import { C as getUbeanComponentsConfig, E as toArray, S as getUbeanAutoImportConfig, T as resolveComponentsConfig, _ as VUE_ROUTER_PRESET, a as generateOpenApiTypesFromServer, b as getAutoImportPresets, c as generateI18nTypes, d as HONO_OPENAPI_PRESET, f as UBEAN_CLIENT_PRESET, g as VUE_PRESET, h as VUE_MACROS_PRESET, i as generateOpenApiTypes, l as messagesToTsType, m as VUE_I18N_PRESET, n as CODEGEN_FILES, o as generatePageTypes, p as UBEAN_SERVER_PRESET, r as generateTypes, s as generateRouteTypes, t as CODEGEN_CONTRACT_VERSION, u as BUILTIN_PRESETS, v as generateAutoImports, w as resolveAutoImportsConfig, x as getBuiltinComposables, y as generateImportsTransform } from "../codegen-BqqGw4Dv.js";
+export { BUILTIN_PRESETS, CODEGEN_CONTRACT_VERSION, CODEGEN_FILES, HONO_OPENAPI_PRESET, UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET, VUE_I18N_PRESET, VUE_MACROS_PRESET, VUE_PRESET, VUE_ROUTER_PRESET, generateAutoImports, generateI18nTypes, generateImportsTransform, generateOpenApiTypes, generateOpenApiTypesFromServer, generatePageTypes, generateRouteTypes, generateTypes, getAutoImportPresets, getBuiltinComposables, getUbeanAutoImportConfig, getUbeanComponentsConfig, messagesToTsType, resolveAutoImportsConfig, resolveComponentsConfig, toArray };

package/dist/{codegen-DX7zMgPZ.js → codegen-BqqGw4Dv.js}

@@ -4,6 +4,42 @@ import { glob } from "tinyglobby";
 import { createUnimport, toTypeDeclarationFile } from "unimport";
 import openapiTS, { astToString } from "openapi-typescript";
 //#region src/codegen/auto-imports.ts
+/** 将 `boolean | AutoImportOptions` 归一化为分库开关 + 透传选项。 */
+function resolveAutoImportsConfig(input) {
+	const options = typeof input === "object" && input !== null ? input : {};
+	return {
+		enabled: input !== false,
+		ubean: options.ubean ?? true,
+		vue: options.vue ?? false,
+		vueRouter: options.vueRouter ?? false,
+		vueI18n: options.vueI18n ?? false,
+		honoOpenapi: options.honoOpenapi ?? false,
+		options
+	};
+}
+/** 按分库开关组装内置预设（顺序稳定：ubean client/server → vue → vue-router → vue-i18n → hono-openapi）。 */
+function getAutoImportPresets(resolved) {
+	const presets = [];
+	if (resolved.ubean) presets.push(UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET);
+	if (resolved.vue) presets.push(VUE_PRESET, VUE_MACROS_PRESET);
+	if (resolved.vueRouter) presets.push(VUE_ROUTER_PRESET);
+	if (resolved.vueI18n) presets.push(VUE_I18N_PRESET);
+	if (resolved.honoOpenapi) presets.push(HONO_OPENAPI_PRESET);
+	return presets;
+}
+/** 将 `boolean | ComponentsOptions` 归一化。 */
+function resolveComponentsConfig(input) {
+	const options = typeof input === "object" && input !== null ? input : {};
+	return {
+		enabled: input !== false,
+		ubean: options.ubean ?? true,
+		options
+	};
+}
+/** unplugin 系选项普遍使用 `Arrayable<T>`，合并进数组前先归一化。 */
+function toArray(value) {
+	return value === void 0 ? [] : Array.isArray(value) ? value : [value];
+}
 const VUE_PRESET = {
 	from: "vue",
 	imports: [
@@ -81,8 +117,6 @@ const VUE_MACROS_PRESET = {
 * Client-safe symbols sourced from the first-class `ubean/client` entry.
 * These are safe to auto-import in Vue components (browser-side) because
 * `@ubean/client` has zero build-time dependencies and no `node:*` imports.
-* (`ubean/runtime/vue` still works — it re-exports the same kernel — but
-* new code should prefer `ubean/client`.)
 */
 const UBEAN_CLIENT_PRESET = {
 	from: "ubean/client",
@@ -92,8 +126,6 @@ const UBEAN_CLIENT_PRESET = {
 		"defineApp",
 		"applyAppConfig",
 		"createDefaultAppConfig",
-		"t",
-		"useI18n",
 		"setLocale",
 		"useLocalePath",
 		"useSwitchLocalePath",
@@ -104,7 +136,6 @@ const UBEAN_CLIENT_PRESET = {
 		"useSearch",
 		"useSeoMeta",
 		"usePage",
-		"useRouter",
 		"useHead",
 		"useViewTransition",
 		"useData",
@@ -128,9 +159,30 @@ const UBEAN_CLIENT_PRESET = {
 	]
 };
 /**
-* Server-only symbols that come from the main `ubean` package.
-* These import the full ubean entry (which includes build tools like `vite`),
-* so they must only be used in server-side files (API routes, middleware, etc.).
+* vue-router composables, sourced directly from `vue-router` (not re-exported
+* through `ubean/client` — third-party APIs are imported from their own packages).
+*/
+const VUE_ROUTER_PRESET = {
+	from: "vue-router",
+	imports: ["useRouter"]
+};
+/**
+* vue-i18n Composition API, sourced directly from `vue-i18n` (ubean no longer
+* wraps `useI18n` — same instance is exposed by the framework-installed
+* vue-i18n plugin; `t` is destructured from the returned composer).
+*/
+const VUE_I18N_PRESET = {
+	from: "vue-i18n",
+	imports: ["useI18n"]
+};
+/**
+* Server-only symbols sourced from the `ubean/server` aggregation entry
+* (`@ubean/app` + `@ubean/routes` + `@ubean/server` + `@ubean/shared/node`).
+* Sourcing from `ubean/server` (instead of the full `ubean` barrel) keeps
+* build-time tooling (scan / build / cli, oxc-parser WASM…) out of the import
+* closure, so these must still only be used in server-side files
+* (API routes, middleware, etc.) — the closure still contains Hono and
+* `node:*` builtins.
 *
 * Note: the isomorphic data composables (`useData` / `useAsyncData` /
 * `useFetch`) are intentionally NOT listed here — they are exported from
@@ -140,7 +192,7 @@ const UBEAN_CLIENT_PRESET = {
 * the client preset only.
 */
 const UBEAN_SERVER_PRESET = {
-	from: "ubean",
+	from: "ubean/server",
 	imports: [
 		"defineHandlerMeta",
 		"defineAction",
@@ -165,6 +217,8 @@ const HONO_OPENAPI_PRESET = {
 };
 const BUILTIN_PRESETS = [
 	UBEAN_CLIENT_PRESET,
+	VUE_ROUTER_PRESET,
+	VUE_I18N_PRESET,
 	UBEAN_SERVER_PRESET,
 	HONO_OPENAPI_PRESET
 ];
@@ -198,6 +252,14 @@ function transformImportPath(filePath, srcDir) {
 	const posixSrcDir = toPosixPath(normalize(srcDir));
 	return `~/${toPosixPath(relative(posixSrcDir, posixPath)).replace(/\.(ts|js|mts|mjs|cts|cjs|tsx|jsx)$/, "")}`;
 }
+/**
+* Bare package specifiers (`vue`, `vue-router`, `hono-openapi`, `ubean/client`…)
+* keep their source in the generated dts; only project-relative files are
+* rewritten to `~/` paths.
+*/
+function isPackageSource(from) {
+	return !from.startsWith(".") && !from.startsWith("/") && !from.startsWith("~");
+}
 async function scanComponentsDir(dir, srcDir, directoryAsNamespace, ignore = [
 	"**/*.test.*",
 	"**/*.spec.*",
@@ -232,27 +294,27 @@ async function scanComponentsDir(dir, srcDir, directoryAsNamespace, ignore = [
 	return components;
 }
 async function generateAutoImports(_scanResult, options) {
-	const { cwd, srcDir, buildDir, composablesDirs = [], componentsDirs = [], dirs = {}, imports: importsConfig, components: componentsConfig } = options;
+	const { cwd, srcDir, buildDir, dirs = {}, autoImports: autoImportsInput, components: componentsInput } = options;
 	const outDir = join(cwd, buildDir);
 	await mkdir(outDir, { recursive: true });
-	const autoImportEnabled = importsConfig?.autoImport !== false;
-	const componentAutoImportEnabled = componentsConfig?.autoImport !== false;
-	const directoryAsNamespace = componentsConfig?.directoryAsNamespace ?? false;
+	const resolvedAutoImports = resolveAutoImportsConfig(autoImportsInput);
+	const resolvedComponents = resolveComponentsConfig(componentsInput);
+	const directoryAsNamespace = resolvedComponents.options.directoryAsNamespace ?? false;
 	const composablesDir = dirs.composables || "composables";
 	const componentsDir = dirs.components || "components";
 	let composablesImports = [];
 	let components = [];
 	const autoImportsDtsPath = join(outDir, "auto-imports.d.ts");
 	const componentsDtsPath = join(outDir, "components.d.ts");
-	if (autoImportEnabled) {
-		const allComposablesDirs = [join(srcDir, composablesDir), ...composablesDirs];
+	if (resolvedAutoImports.enabled) {
+		const allComposablesDirs = [join(srcDir, composablesDir), ...resolvedAutoImports.options.dirs ?? []];
 		const existingDirs = [];
 		for (const dir of allComposablesDirs) try {
 			const { statSync } = await import("node:fs");
 			if (statSync(dir).isDirectory()) existingDirs.push(dir);
 		} catch {}
 		const unimport = createUnimport({
-			presets: BUILTIN_PRESETS,
+			presets: getAutoImportPresets(resolvedAutoImports),
 			dirs: existingDirs,
 			dirsScanOptions: {
 				cwd: srcDir,
@@ -262,20 +324,20 @@ async function generateAutoImports(_scanResult, options) {
 		});
 		await unimport.init();
 		composablesImports = (await unimport.getImports()).map((imp) => {
-			if (imp.from === "vue" || imp.from === "vue/macros" || imp.from === "ubean" || imp.from.startsWith("ubean/")) return imp;
+			if (isPackageSource(imp.from)) return imp;
 			return {
 				...imp,
 				from: transformImportPath(imp.from, srcDir)
 			};
 		});
 		const dtsContent = toTypeDeclarationFile(composablesImports, { resolvePath: (imp) => {
-			if (imp.from === "vue" || imp.from === "vue/macros" || imp.from === "ubean" || imp.from.startsWith("ubean/")) return imp.from;
+			if (isPackageSource(imp.from)) return imp.from;
 			return transformImportPath(imp.from, srcDir);
 		} });
 		await writeFile(autoImportsDtsPath, dtsContent, "utf-8");
 	} else await writeFile(autoImportsDtsPath, "// Auto-generated by ubean - auto-imports disabled\n/* eslint-disable */\n// @ts-nocheck\nexport {}\n", "utf-8");
-	if (componentAutoImportEnabled) {
-		const allComponentsDirs = [join(srcDir, componentsDir), ...componentsDirs];
+	if (resolvedComponents.enabled) {
+		const allComponentsDirs = [join(srcDir, componentsDir), ...resolvedComponents.options.dirs ?? []];
 		for (const dir of allComponentsDirs) {
 			const scanned = await scanComponentsDir(dir, srcDir, directoryAsNamespace);
 			components.push(...scanned);
@@ -350,29 +412,37 @@ function getUbeanAutoImportConfig(options = {}) {
 	const cwd = options.cwd || process.cwd();
 	const srcDir = options.srcDir || join(cwd, "src");
 	const buildDir = options.buildDir || ".ubean";
-	const composablesDirs = [join(srcDir, "composables"), ...options.composablesDirs || []];
+	const composablesDirName = "composables";
+	const resolved = resolveAutoImportsConfig(options.autoImports);
+	const composablesDirs = [
+		join(srcDir, composablesDirName),
+		...resolved.options.dirs ?? [],
+		...options.composablesDirs || []
+	];
 	return {
-		imports: [
-			UBEAN_CLIENT_PRESET,
-			UBEAN_SERVER_PRESET,
-			HONO_OPENAPI_PRESET
-		],
+		imports: [...getAutoImportPresets(resolved), ...toArray(resolved.options.imports)],
 		dirs: composablesDirs,
-		dts: join(cwd, buildDir, "auto-imports.d.ts"),
-		vueTemplate: true,
-		eslintrc: { enabled: false }
+		dts: resolved.options.dts === void 0 ? join(cwd, buildDir, "auto-imports.d.ts") : resolved.options.dts,
+		vueTemplate: resolved.options.vueTemplate ?? true,
+		eslintrc: resolved.options.eslintrc ?? { enabled: false }
 	};
 }
 function getUbeanComponentsConfig(options = {}) {
 	const cwd = options.cwd || process.cwd();
 	const srcDir = options.srcDir || join(cwd, "src");
 	const buildDir = options.buildDir || ".ubean";
+	const componentsDirName = "components";
+	const resolved = resolveComponentsConfig(options.components);
 	return {
-		dirs: [join(srcDir, "components"), ...options.componentsDirs || []],
+		dirs: [
+			join(srcDir, componentsDirName),
+			...resolved.options.dirs ?? [],
+			...options.componentsDirs || []
+		],
 		extensions: ["vue"],
-		directoryAsNamespace: options.directoryAsNamespace ?? false,
-		dts: join(cwd, buildDir, "components.d.ts"),
-		deep: true
+		directoryAsNamespace: resolved.options.directoryAsNamespace ?? options.directoryAsNamespace ?? false,
+		dts: resolved.options.dts === void 0 ? join(cwd, buildDir, "components.d.ts") : resolved.options.dts,
+		deep: resolved.options.deep ?? true
 	};
 }
 function generateImportsTransform(imports) {
@@ -698,4 +768,4 @@ async function generateTypes(result, options) {
 	};
 }
 //#endregion
-export { generateImportsTransform as _, generateOpenApiTypesFromServer as a, getUbeanComponentsConfig as b, generateI18nTypes as c, HONO_OPENAPI_PRESET as d, UBEAN_CLIENT_PRESET as f, generateAutoImports as g, VUE_PRESET as h, generateOpenApiTypes as i, messagesToTsType as l, VUE_MACROS_PRESET as m, CODEGEN_FILES as n, generatePageTypes as o, UBEAN_SERVER_PRESET as p, generateTypes as r, generateRouteTypes as s, CODEGEN_CONTRACT_VERSION as t, BUILTIN_PRESETS as u, getBuiltinComposables as v, getUbeanAutoImportConfig as y };
+export { getUbeanComponentsConfig as C, toArray as E, getUbeanAutoImportConfig as S, resolveComponentsConfig as T, VUE_ROUTER_PRESET as _, generateOpenApiTypesFromServer as a, getAutoImportPresets as b, generateI18nTypes as c, HONO_OPENAPI_PRESET as d, UBEAN_CLIENT_PRESET as f, VUE_PRESET as g, VUE_MACROS_PRESET as h, generateOpenApiTypes as i, messagesToTsType as l, VUE_I18N_PRESET as m, CODEGEN_FILES as n, generatePageTypes as o, UBEAN_SERVER_PRESET as p, generateTypes as r, generateRouteTypes as s, CODEGEN_CONTRACT_VERSION as t, BUILTIN_PRESETS as u, generateAutoImports as v, resolveAutoImportsConfig as w, getBuiltinComposables as x, generateImportsTransform as y };

package/dist/index.js

@@ -1,4 +1,4 @@
 import { a as useVirtualRegistry, i as resetVirtualRegistry, n as defineVirtualModule, r as defineVirtualModulePrefix, t as VirtualModuleRegistry } from "./virtual-registry-BWkaQHXN.js";
-import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, o as stripMacros, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-D5WBA3u7.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, o as stripMacros, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-vLkLkAfT.js";
 import { a as ssrSingletonProdOptimizeExclude, c as getCssImports, d as resetModuleRegistry, i as ssrSingletonDevPolicy, l as registerComponentResolver, n as SSR_SINGLETON_OPTIMIZE_EXCLUDE, o as ssrSingletonProdSsr, r as SSR_SINGLETON_PACKAGES, s as getComponentResolvers, t as SSR_SINGLETON_DEDUPE, u as registerCssImport } from "./ssr-singleton-CEQi_H6-.js";
 export { SSR_SINGLETON_DEDUPE, SSR_SINGLETON_OPTIMIZE_EXCLUDE, SSR_SINGLETON_PACKAGES, VirtualModuleRegistry, createAppVirtualModule, createLocalesVirtualModule, createMetaVirtualModule, createPagesVirtualModule, createRoutingVirtualModule, defineVirtualModule, defineVirtualModulePrefix, getComponentResolvers, getCssImports, registerComponentResolver, registerCssImport, resetModuleRegistry, resetVirtualRegistry, ssrSingletonDevPolicy, ssrSingletonProdOptimizeExclude, ssrSingletonProdSsr, stripMacros, transformMacros, useVirtualRegistry };

package/dist/production.js

@@ -1,8 +1,8 @@
 import { a as useVirtualRegistry } from "./virtual-registry-BWkaQHXN.js";
-import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, t as createAppVirtualModule } from "./virtual-modules-D5WBA3u7.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, t as createAppVirtualModule } from "./virtual-modules-vLkLkAfT.js";
 import { a as ssrSingletonProdOptimizeExclude, o as ssrSingletonProdSsr } from "./ssr-singleton-CEQi_H6-.js";
-import { n as localeVueParamFromI18n, r as serializeI18nConfig, t as ubeanPlugin } from "./vite-B3y8Qoan.js";
-import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-JEYc4beF.js";
+import { n as localeVueParamFromI18n, r as serializeI18nConfig, t as ubeanPlugin } from "./vite-D2EZl_6P.js";
+import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-I5nC0ldj.js";
 import { join, relative, resolve } from "pathe";
 import { resolveModules } from "@ubean/config";
 import { build } from "vite";
@@ -132,7 +132,7 @@ async function generateVirtualModulesToDisk(cwd, config, scanResult, virtualDir,
 		pageMeta: scanResult.notFoundPage.pageMeta
 	} : null);
 	const colorModeScript = config.colorMode !== false ? getColorModeScript(resolveColorModeConfig(config.colorMode)) : "";
-	const rendererImport = ssrEnabled ? `import { createVueRenderer } from 'ubean/vue-ssr';` : "";
+	const rendererImport = ssrEnabled ? `import { createVueRenderer } from 'ubean/ssr';` : "";
 	const prodLocaleVueParam = localeVueParamFromI18n(config.i18n) || "";
 	const rendererSetup = ssrEnabled ? `
 // --- SSR renderer setup ---
@@ -202,7 +202,7 @@ ${contentEntries.map(([name, docs]) => `registerContent(${JSON.stringify(name)},
 ` : "";
 	if (hasServer) {
 		const serverEntry = `// Auto-generated server entry
-import { createUbeanApp, applyServerConfig } from 'ubean/runtime/app';
+import { createUbeanApp, applyServerConfig } from 'ubean/server';
 import { toVueRouterLocalePath } from '@ubean/i18n';
 import 'ubean:locales';
 ${rendererImport}

package/dist/{virtual-modules-D5WBA3u7.js → virtual-modules-vLkLkAfT.js}

@@ -262,7 +262,7 @@ const defaultCode = ${defaultCode};
 
 let i18nRuntime = null;
 if (import.meta.env.SSR) {
-  i18nRuntime = await import('ubean/runtime/i18n');
+  i18nRuntime = await import('ubean/i18n');
   if (i18nConfig && i18nConfig.fallbackLocale) {
     i18nRuntime.setFallbackLocale(i18nConfig.fallbackLocale);
   } else if (defaultCode) {

package/dist/{vite-B3y8Qoan.js → vite-D2EZl_6P.js}

@@ -1,5 +1,5 @@
 import { a as useVirtualRegistry } from "./virtual-registry-BWkaQHXN.js";
-import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-D5WBA3u7.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-vLkLkAfT.js";
 import { join, relative, resolve } from "pathe";
 import { loadUbeanConfig, tryGetConfig } from "@ubean/config";
 import { createServerRouter } from "@ubean/routes";

package/dist/vite.js

@@ -1,2 +1,2 @@
-import { t as ubeanPlugin } from "./vite-B3y8Qoan.js";
+import { t as ubeanPlugin } from "./vite-D2EZl_6P.js";
 export { ubeanPlugin };

package/dist/{vue-JEYc4beF.js → vue-I5nC0ldj.js}

@@ -1,6 +1,6 @@
 import { a as useVirtualRegistry, n as defineVirtualModule } from "./virtual-registry-BWkaQHXN.js";
 import { c as getCssImports, i as ssrSingletonDevPolicy, s as getComponentResolvers } from "./ssr-singleton-CEQi_H6-.js";
-import { f as UBEAN_CLIENT_PRESET, p as UBEAN_SERVER_PRESET } from "./codegen-DX7zMgPZ.js";
+import { E as toArray, T as resolveComponentsConfig, b as getAutoImportPresets, w as resolveAutoImportsConfig } from "./codegen-BqqGw4Dv.js";
 import { createRequire } from "node:module";
 import { join, resolve } from "pathe";
 import { scanProject } from "@ubean/scan";
@@ -44,18 +44,19 @@ function createVueAppEntryVirtualModule(appEntry = EMPTY_APP_ENTRY) {
 		const hasSharedApp = appEntry.shared.exists;
 		const hasServerApp = appEntry.server.exists;
 		const hasClientApp = appEntry.client.exists;
+		const hasRootApp = appEntry.root?.exists;
 		return `${`
 // Auto-generated by ubean - do not edit
 /* eslint-disable */
 ${hasSharedApp ? `import _sharedApp from ${JSON.stringify(appEntry.shared.fullPath)};` : "const _sharedApp = null;"}
 ${hasServerApp ? `import _serverApp from ${JSON.stringify(appEntry.server.fullPath)};` : "const _serverApp = null;"}
 ${hasClientApp ? `import _clientApp from ${JSON.stringify(appEntry.client.fullPath)};` : "const _clientApp = null;"}
+${hasRootApp ? `import _rootApp from ${JSON.stringify(appEntry.root.fullPath)};` : "const _rootApp = null;"}
 
 import {
   createUbeanClientApp,
   createUbeanSSRApp,
   usePage,
-  useRouter,
   useHead,
   useSeoMeta,
   Link,
@@ -72,6 +73,8 @@ import {
   scheduleIslandHydration,
   configureI18nRuntime
 } from 'ubean/client';
+// useRouter 由 vue-router 直源(ubean 不再透传第三方 API)
+import { useRouter } from 'vue-router';
 
 import { i18nConfig as _i18nConfig, loadLocale as _loadLocale } from 'ubean:locales';
 
@@ -147,6 +150,7 @@ function _mergeAppConfig(base, ...configs) {
     if (cfg.onClientReady) result.onClientReady = cfg.onClientReady;
     if (cfg.errorComponent) result.errorComponent = cfg.errorComponent;
     if (cfg.loadingComponent) result.loadingComponent = cfg.loadingComponent;
+    if (cfg.appRoot) result.appRoot = cfg.appRoot;
     if (cfg.viewTransitions !== undefined) result.viewTransitions = cfg.viewTransitions;
     if (cfg.serializeState) result.serializeState = cfg.serializeState;
     if (cfg.hydrateState) result.hydrateState = cfg.hydrateState;
@@ -172,6 +176,12 @@ function _mergeAppConfig(base, ...configs) {
 
 export function resolveAppConfig(mode) {
   const base = createDefaultAppConfig();
+  // src/app.vue / src/App.vue 自动检测(小写优先)作为默认 appRoot;
+  // 显式 defineApp({ appRoot }) 在下方 merge 时按"后者覆盖"盖过它。
+  // 注入 base 而非在消费点 || _rootApp,保证走 resolveAppConfig('server')
+  // 的 dev/prod SSR(经 @ubean/client/ssr 的 createVueRenderer)与客户端
+  // resolveAppConfig('client') 读到一致的 appRoot → 水合结构不 mismatch。
+  if (_rootApp) base.appRoot = _rootApp;
   if (!_sharedApp && !_serverApp && !_clientApp) return base;
 
   const sharedCfg = typeof _sharedApp === 'function' ? _sharedApp() : _sharedApp;
@@ -225,7 +235,9 @@ export async function createApp() {
     hydrate: !!initialPage,
     routerSetup: config.router?.setup,
     loadingComponent,
-    errorComponent
+    errorComponent,
+    // appRoot 已在 resolveAppConfig 中合并(src/App.vue 默认 + defineApp 显式覆盖)
+    appRoot: config.appRoot
   });
 
   applyAppConfig(instance.app, config, 'client');
@@ -308,7 +320,10 @@ export async function createSSRApp(initialPage) {
     head,
     routerSetup: config.router?.setup,
     loadingComponent,
-    errorComponent
+    errorComponent,
+    // appRoot 已在 resolveAppConfig 中合并(src/App.vue 默认 + defineApp 显式覆盖),
+    // 客户端水合同理会从 resolveAppConfig('client') 读到一致的值。
+    appRoot: config.appRoot
   });
 
   applyAppConfig(app, config, 'server');
@@ -355,7 +370,7 @@ import {
   defineServer,
   createDefaultServerConfig,
   mergeServerConfigs
-} from 'ubean/runtime/app';
+} from 'ubean/server';
 
 export {
   defineServer,
@@ -437,14 +452,13 @@ function ubeanVite(options) {
 	const dtsDir = join(ubeanConfig.rootDir, ".ubean");
 	const markdownEnabled = ubeanConfig.markdown?.enabled !== false;
 	const mdxEnabled = ubeanConfig.markdown?.mdx === true;
-	const autoImportEnabled = ubeanConfig.imports.autoImport !== false;
-	const componentAutoImportEnabled = ubeanConfig.components.autoImport !== false;
+	const autoImports = resolveAutoImportsConfig(ubeanConfig.autoImports);
+	const componentsAutoImport = resolveComponentsConfig(ubeanConfig.components);
 	const markdownComponentsAutoImport = ubeanConfig.markdown?.components?.autoImport !== false;
-	const directoryAsNamespace = ubeanConfig.components.directoryAsNamespace ?? false;
 	const composablesDirName = ubeanConfig.dir.composables || "composables";
 	const componentsDirName = ubeanConfig.dir.components || "components";
-	const composablesDirs = [join(srcDir, composablesDirName), ...ubeanConfig.imports.dirs || []];
-	const componentsDirs = [join(srcDir, componentsDirName), ...ubeanConfig.components.dirs || []];
+	const composablesDirs = [join(srcDir, composablesDirName), ...autoImports.options.dirs ?? []];
+	const componentsDirs = [join(srcDir, componentsDirName), ...componentsAutoImport.options.dirs ?? []];
 	const mdExtensions = mdxEnabled ? ["md", "mdx"] : ["md"];
 	function getVirtualModule(virtualId) {
 		return virtualRegistry.getModules().find((m) => m.id === virtualId);
@@ -561,7 +575,7 @@ function ubeanVite(options) {
 			for (const dir of watchDirs) server.watcher.add(join(srcDir, dir));
 			async function handleFileChange(file) {
 				const rel = file.replace(`${srcDir}/`, "");
-				const isAppFile = /^app(\.(server|client))?\.(ts|js|mjs|mts)$/.test(rel);
+				const isAppFile = /^(app(\.(server|client))?|App)\.(ts|js|mjs|mts|vue)$/.test(rel);
 				const isServerFile = /^server(\.(dev|prod))?\.(ts|js|mjs|mts)$/.test(rel);
 				const isMarkdownFile = new RegExp(`\\.(${mdExtensions.join("|")})$`).test(rel);
 				if (isAppFile || isServerFile || watchDirs.some((d) => rel.startsWith(`${d}/`)) || isMarkdownFile) {
@@ -600,13 +614,17 @@ function ubeanVite(options) {
 		remarkPlugins: ubeanConfig.markdown?.remarkPlugins || [],
 		rehypePlugins: ubeanConfig.markdown?.rehypePlugins || []
 	}));
-	if (autoImportEnabled) plugins.push(AutoImport({
-		imports: [UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET],
-		dirs: composablesDirs,
-		dts: join(dtsDir, "auto-imports.d.ts"),
-		vueTemplate: true,
-		eslintrc: { enabled: false }
-	}));
+	if (autoImports.enabled) {
+		const userAutoImports = autoImports.options;
+		plugins.push(AutoImport({
+			vueTemplate: true,
+			eslintrc: { enabled: false },
+			...userAutoImports,
+			imports: [...getAutoImportPresets(autoImports), ...toArray(userAutoImports.imports)],
+			dirs: composablesDirs,
+			dts: userAutoImports.dts === void 0 ? join(dtsDir, "auto-imports.d.ts") : userAutoImports.dts
+		}));
+	}
 	const UBEAN_BUILTIN_COMPONENTS = [
 		"Link",
 		"Head",
@@ -618,13 +636,14 @@ function ubeanVite(options) {
 			from: "ubean/client"
 		};
 	}
-	const dynamicResolvers = [ubeanComponentsResolver, (name) => {
+	const dynamicResolvers = [...componentsAutoImport.ubean ? [ubeanComponentsResolver] : [], (name) => {
 		for (const resolver of getComponentResolvers()) {
 			const result = typeof resolver === "function" ? resolver(name) : resolver.resolve(name);
 			if (result) return result;
 		}
 	}];
-	if (componentAutoImportEnabled) {
+	if (componentsAutoImport.enabled) {
+		const userComponents = componentsAutoImport.options;
 		const extensions = ["vue"];
 		const includePatterns = [/\.vue$/, /\.vue\?vue/];
 		if (markdownEnabled && markdownComponentsAutoImport) {
@@ -633,13 +652,13 @@ function ubeanVite(options) {
 			if (mdxEnabled) includePatterns.push(/\.mdx$/);
 		}
 		plugins.push(Components({
+			deep: true,
+			...userComponents,
 			dirs: componentsDirs,
 			extensions,
 			include: includePatterns,
-			directoryAsNamespace,
-			dts: join(dtsDir, "components.d.ts"),
-			deep: true,
-			resolvers: dynamicResolvers
+			dts: userComponents.dts === void 0 ? join(dtsDir, "components.d.ts") : userComponents.dts,
+			resolvers: [...dynamicResolvers, ...toArray(userComponents.resolvers)]
 		}));
 	} else plugins.push(Components({
 		dts: true,

package/dist/vue.js

@@ -1,2 +1,2 @@
-import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-JEYc4beF.js";
+import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-I5nC0ldj.js";
 export { VUE_PLUGIN_INCLUDE, createClientEntryVirtualModule, createServerEntryVirtualModule, createVueAppEntryVirtualModule, createVuePagesVirtualModule, ubeanVite as default, ubeanVite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/build",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "Vite plugins, production build, SSG prerender, type codegen, and Server Actions plugin for ubean",
   "files": [
     "dist"
@@ -41,17 +41,17 @@
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "11.2.5",
-    "@ubean/client": "0.3.6",
-    "@ubean/config": "0.3.6",
-    "@ubean/i18n": "0.3.6",
-    "@ubean/islands": "0.3.6",
-    "@ubean/markdown": "0.3.6",
-    "@ubean/pages": "0.3.6",
-    "@ubean/preset": "0.3.6",
-    "@ubean/routes": "0.3.6",
-    "@ubean/scan": "0.3.6",
-    "@ubean/shared": "0.3.6",
-    "@ubean/vue": "0.3.6",
+    "@ubean/client": "0.4.0",
+    "@ubean/config": "0.4.0",
+    "@ubean/i18n": "0.4.0",
+    "@ubean/islands": "0.4.0",
+    "@ubean/markdown": "0.4.0",
+    "@ubean/pages": "0.4.0",
+    "@ubean/preset": "0.4.0",
+    "@ubean/routes": "0.4.0",
+    "@ubean/scan": "0.4.0",
+    "@ubean/shared": "0.4.0",
+    "@ubean/vue": "0.4.0",
     "@vitejs/plugin-vue": "^6.0.8",
     "openapi-typescript": "^7.13.0",
     "oxc-transform": "^0.147.0",