@ubean/vue 0.5.2 → 0.6.0-beta.2

package/dist/generator.d.ts

@@ -1,4 +1,4 @@
-import { a as ScannedLayout, o as ScannedPage } from "./types-CeX4SJit.js";
+import { a as ScannedLayout, o as ScannedPage } from "./types-C1B8d1Ai.js";
 //#region src/generator.d.ts
 /**
  * 实体路由文件生成器(页面路由实体文件模式的唯一所有者,原

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as ScannedLayout, i as ScanPagesResult, n as PageMeta, o as ScannedPage, r as ScanPagesOptions, t as PageHead } from "./types-CeX4SJit.js";
+import { a as ScannedLayout, i as ScanPagesResult, n as PageMeta, o as ScannedPage, r as ScanPagesOptions, t as PageHead } from "./types-C1B8d1Ai.js";
 import { Component, ComputedRef, InjectionKey, Plugin, PropType, Ref, SlotsType, VNode } from "vue";
 import { NavigationGuard, RouteMeta, Router } from "vue-router";
 //#region src/view-transitions.d.ts
@@ -142,8 +142,8 @@ interface ClientOnlySlots {
  *   separate app by `hydrateIslands()` (content inside an island placeholder
  *   is replaced on hydration, so `<ClientOnly>` inside island children is
  *   wiped with it).
- * - `defineClientComponent` — programmatic wrapper (always renders a
- *   `<div data-client-only>` wrapper element).
+ * - `defineClientComponent` — programmatic wrapper (renders the same
+ *   `<!--client-only-->` comment placeholder, so it works in table/list contexts).
  */
 export declare const ClientOnly: import("vue").DefineSetupFnComponent<ClientOnlyProps, {}, SlotsType<ClientOnlySlots>, ClientOnlyProps & {}, import("vue").PublicProps>;
 /**

package/dist/index.js

@@ -659,8 +659,8 @@ const ErrorBoundary = defineComponent({
 *   separate app by `hydrateIslands()` (content inside an island placeholder
 *   is replaced on hydration, so `<ClientOnly>` inside island children is
 *   wiped with it).
-* - `defineClientComponent` — programmatic wrapper (always renders a
-*   `<div data-client-only>` wrapper element).
+* - `defineClientComponent` — programmatic wrapper (renders the same
+*   `<!--client-only-->` comment placeholder, so it works in table/list contexts).
 */
 const ClientOnly = defineComponent((props, { slots }) => {
 	const mounted = ref(false);
@@ -977,12 +977,25 @@ function isActiveRoute(currentPath, targetHref, exact = false) {
 //#endregion
 //#region src/matchers.ts
 /**
-* 全局 matcher 注册表(进程单例)。
+* matcher 注册表 —— **真·进程单例**（挂在 `globalThis` 上）。
 *
-* server / client 运行时各自维护一份;dev 模式下 HMR 不会自动清理注册表,
-* 但 `defineMatcher` 同名覆盖,因此重新加载 matcher 文件会自动更新函数引用。
+* 为什么不能用模块级 `Map`：模块级状态只在**同一个模块实例**内共享，而同一个进程里常常有第二份
+* `@ubean/vue`（dev 的 SSR 图会把 `ubean` 内联、却把 `@ubean/vue` 外部化；pnpm 也可能装出两份）。
+* 那样「用户注册」与「router 校验」读的是两个 Map，表现为**所有 `[id=numeric]` 路由一律 404**
+* （实测：`validateParams` 对未注册名保守返回 false）。i18n 的 ALS 与 `@ubean/build` 的模块注册表
+* 都出于同一理由挂在 `globalThis` 上（见 `packages/builder/src/registry.ts`）。
+*
+* 同名重复注册会覆盖 —— HMR 重新求值 matcher 文件时因此能拿到最新函数引用。
 */
-const matcherRegistry = /* @__PURE__ */ new Map();
+const MATCHERS_KEY = "__ubean_route_matchers__";
+function getMatcherRegistry() {
+	const store = globalThis;
+	const existing = store[MATCHERS_KEY];
+	if (existing instanceof Map) return existing;
+	const created = /* @__PURE__ */ new Map();
+	store[MATCHERS_KEY] = created;
+	return created;
+}
 /**
 * 定义并注册一个命名 route matcher。
 *
@@ -1000,26 +1013,26 @@ const matcherRegistry = /* @__PURE__ */ new Map();
 function defineMatcher(name, fn) {
 	if (typeof name !== "string" || name.length === 0) throw new TypeError(`[ubean] defineMatcher: name must be a non-empty string, got: ${typeof name}`);
 	if (typeof fn !== "function") throw new TypeError(`[ubean] defineMatcher: fn must be a function, got: ${typeof fn}`);
-	matcherRegistry.set(name, fn);
+	getMatcherRegistry().set(name, fn);
 	return fn;
 }
 /**
 * 按名称获取已注册的 matcher。未注册时返回 `undefined`。
 */
 function getMatcher(name) {
-	return matcherRegistry.get(name);
+	return getMatcherRegistry().get(name);
 }
 /**
 * 判断指定名称的 matcher 是否已注册。
 */
 function hasMatcher(name) {
-	return matcherRegistry.has(name);
+	return getMatcherRegistry().has(name);
 }
 /**
 * 获取所有已注册 matcher 的名称列表(主要用于调试 / DevTools)。
 */
 function listMatcherNames() {
-	return [...matcherRegistry.keys()];
+	return [...getMatcherRegistry().keys()];
 }
 /**
 * 清空所有已注册的 matcher。
@@ -1027,7 +1040,7 @@ function listMatcherNames() {
 * **仅供测试使用** —— 应用代码不应调用,避免误删其他模块注册的 matcher。
 */
 function clearMatchers() {
-	matcherRegistry.clear();
+	getMatcherRegistry().clear();
 }
 /**
 * 校验一组路由参数是否通过对应的 matcher。

package/dist/{types-CeX4SJit.d.ts → types-C1B8d1Ai.d.ts}

@@ -76,9 +76,6 @@ interface ScannedPage {
   frontmatter?: Record<string, unknown>;
   /** Parallel route slot name(`@slotName/` 目录约定)。 */
   slot?: string;
-  /** Intercepting route:从 `interceptFrom` 导航到 `interceptTarget` 时拦截。 */
-  interceptFrom?: string;
-  interceptTarget?: string;
   /** 路由参数 → matcher 名称映射(`[param=matcher]` 语法)。 */
   matchers?: Record<string, string>;
 }

package/dist/vite.d.ts

@@ -1,20 +1,16 @@
-import { i as ScanPagesResult, n as PageMeta, r as ScanPagesOptions, t as PageHead } from "./types-CeX4SJit.js";
+import { i as ScanPagesResult, n as PageMeta, r as ScanPagesOptions, t as PageHead } from "./types-C1B8d1Ai.js";
 import { Plugin } from "vite";
 //#region src/scan-pages.d.ts
 /**
- * Extract parallel route slot name and intercept info from a relative file path.
+ * Extract parallel route slot name from a relative file path.
  *
  * Parallel routes: `@slotName/page.vue` → slot = 'slotName'
- * Intercepting routes:
- *   `(..)target/page.vue`  → intercept from parent, target = 'target'
- *   `(.)target/page.vue`   → intercept from same level, target = 'target'
- *   `(...)target/page.vue` → intercept from root, target = 'target'
+ *
+ * 拦截路由标记段会让本函数抛错（见 `INTERCEPT_MARKER_RE`）。
  */
-export declare function extractSlotAndIntercept(fileBase: string): {
+export declare function extractSlotFromPath(fileBase: string): {
   cleanedBase: string;
   slot?: string;
-  interceptFrom?: string;
-  interceptTarget?: string;
 };
 export declare function scanPages(options: ScanPagesOptions): Promise<ScanPagesResult>;
 //#endregion

package/dist/vite.js

@@ -457,9 +457,12 @@ function filePathToRoute(filePath, prefix = "/") {
 * - markdown 页面(opt-in,`@ubean/markdown` 按需加载解析 frontmatter)
 * - 页面级 head(opt-in,`definePage({ head })` / frontmatter `head`)
 * - 特殊页:`404` / `loading` / `error`(仅页面目录根级)
-* - 并行路由 `@slot/` 与拦截路由 `(..)target/` `(.)target/` `(...)target/`
+* - 并行路由 `@slot/`
 * - `[param=matcher]` 语法 → matchers 映射
 *
+* 拦截路由(`(.)` / `(..)` / `(...)` 目录约定)**刻意不支持** —— 扫到标记段直接抛错，见
+* `extractSlotFromPath()` 的说明与 [docs/adr/0010]。
+*
 * `@ubean/scan` 聚合层的 `scanProject` 委托本模块。
 */
 /** 轻量告警(去重)—— 保持本包零 `@ubean/*` 硬依赖,不用 @ubean/logger。 */
@@ -496,43 +499,42 @@ function buildMarkdownHead(fm, enabled) {
 	return Object.keys(head).length > 0 ? head : void 0;
 }
 /**
-* Extract parallel route slot name and intercept info from a relative file path.
+* 拦截路由的标记段（Next 的 `(.)target` / `(..)target` / `(...)target` 目录约定）。
+*
+* **刻意不支持**（[docs/adr/0010] 的刻意不做清单）。本仓一度按约定扫出 `interceptFrom` /
+* `interceptTarget` 元数据、把页面注册成 `__intercept_*` 路由，但**全仓没有消费者**：
+* 「从 X 导航到 Y 时渲染拦截页」从未发生，拦截页只能落在它被清理后的路径上（一个谁也不会
+* 访问的废 URL）。而且真要接线，代价在运行时而非约定 —— 需要守卫 + 同 URL 双记录 + 故意的
+* SSR/客户端分叉（与本仓「两侧一致」的原则冲突），且背景页会重挂载（Next 原生保留上下文）。
+* 核心价值（URL 可分享、back 关闭对话框）用已有的并行路由 + 守卫在应用侧就能拿到，
+* 所以按「单独『竞品有』→ 刻意不做」处理。
+*
+* 因此扫到标记段**响亮失败**而不是静默降级：不拦的话它会退化成 `/feed/(.)photo/:id`
+* 这种字面垃圾路径（路由组正则 `\(([^(/\\]+)\)[/\\]` 只吞整段 `(group)/`，不吞 `(.)photo`）。
+*/
+const INTERCEPT_MARKER_RE = /^\((\.{1,3})\)(.+)$/;
+/**
+* Extract parallel route slot name from a relative file path.
 *
 * Parallel routes: `@slotName/page.vue` → slot = 'slotName'
-* Intercepting routes:
-*   `(..)target/page.vue`  → intercept from parent, target = 'target'
-*   `(.)target/page.vue`   → intercept from same level, target = 'target'
-*   `(...)target/page.vue` → intercept from root, target = 'target'
+*
+* 拦截路由标记段会让本函数抛错（见 `INTERCEPT_MARKER_RE`）。
 */
-function extractSlotAndIntercept(fileBase) {
+function extractSlotFromPath(fileBase) {
 	const segments = fileBase.split("/");
 	let slot;
-	let interceptFrom;
-	let interceptTarget;
 	const cleanedSegments = [];
-	for (let i = 0; i < segments.length; i++) {
-		const seg = segments[i];
+	for (const seg of segments) {
 		if (seg.startsWith("@")) {
 			slot = seg.slice(1);
 			continue;
 		}
-		const interceptMatch = seg.match(/^\((\.{1,3})\)(.+)$/);
-		if (interceptMatch) {
-			const dots = interceptMatch[1];
-			interceptTarget = interceptMatch[2];
-			const prefixSegments = cleanedSegments.slice(0, i);
-			if (dots === "..") interceptFrom = `/${prefixSegments.slice(0, -1).join("/")}`;
-			else if (dots === "...") interceptFrom = "/";
-			else interceptFrom = `/${prefixSegments.join("/")}`;
-			continue;
-		}
+		if (INTERCEPT_MARKER_RE.test(seg)) throw new Error(`[ubean] 拦截路由目录约定不被支持：发现了 "${seg}"（文件：${fileBase}）。ubean 刻意不做这个约定（见 docs/adr/0010 的刻意不做清单）—— 它需要故意的 SSR/客户端分叉，而核心价值（URL 可分享、back 关闭）用并行路由就能拿到。请改写为「并行路由 + <SlotView>」：把对话框页面放进 @dialog/ 目录（如 src/pages/@dialog/photo/[id].vue），在布局里用 <SlotView name="dialog" /> 承载，用查询标记之类的条件决定它何时出现（站点文档 guide/pages-routing 的 "Dialogs and shareable URLs"）。`);
 		cleanedSegments.push(seg);
 	}
 	return {
 		cleanedBase: cleanedSegments.join("/"),
-		slot,
-		interceptFrom,
-		interceptTarget
+		slot
 	};
 }
 /**
@@ -609,7 +611,7 @@ async function scanPages(options) {
 			const isReuse = !isMarkdown && /\.reuse\.(ts|js)$/.test(relativePath);
 			const pageBase = isReuse ? base.slice(0, -6) : base;
 			const dirPart = dirname(relativePath) === "." ? "" : dirname(relativePath);
-			const { cleanedBase, slot, interceptFrom, interceptTarget } = extractSlotAndIntercept(dirPart ? `${dirPart}/${pageBase}` : pageBase);
+			const { cleanedBase, slot } = extractSlotFromPath(dirPart ? `${dirPart}/${pageBase}` : pageBase);
 			const fileBase = cleanedBase;
 			if (!isReuse && dirPart === "" && (pageBase === "404" || pageBase === "loading" || pageBase === "error")) {
 				const { route: specialRoute, cleaned: specialCleaned } = filePathToRoute(fileBase);
@@ -679,8 +681,6 @@ async function scanPages(options) {
 				pageMeta: pageMeta || void 0,
 				frontmatter,
 				slot,
-				interceptFrom,
-				interceptTarget,
 				matchers
 			});
 		}
@@ -821,12 +821,7 @@ function generatePagesModuleSource(input, locale) {
 	if (input.notFoundPage) pageLoaders.push(`const Page_NotFound = () => import(${JSON.stringify(input.notFoundPage.fullPath)}).then(m => m.default || m);`);
 	const namedPages = input.notFoundPage ? [...sortedPages, input.notFoundPage] : sortedPages;
 	const routeGroups = /* @__PURE__ */ new Map();
-	const interceptPages = [];
 	for (const p of sortedPages) {
-		if (p.interceptTarget) {
-			interceptPages.push(p);
-			continue;
-		}
 		const routerPath = toVueRouterPath(p.route);
 		let group = routeGroups.get(routerPath);
 		if (!group) {
@@ -852,15 +847,6 @@ function generatePagesModuleSource(input, locale) {
 			routeEntries.push(`  { path: ${JSON.stringify(vuePath)}, name: ${JSON.stringify(defaultPage.name)}, component: ${varNameFor(defaultPage.name)}, meta: ${buildRouteMeta(defaultPage)} }`);
 		}
 	}
-	for (const p of interceptPages) {
-		const routerPath = withLocaleParam(toVueRouterPath(p.route), locale?.vueParam);
-		const interceptName = `__intercept_${p.name}`;
-		routeEntries.push(`  { path: ${JSON.stringify(routerPath)}, name: ${JSON.stringify(interceptName)}, component: ${varNameFor(p.name)}, meta: ${buildRouteMeta(p, {
-			interceptFrom: p.interceptFrom,
-			interceptTarget: p.interceptTarget,
-			isIntercepting: true
-		})} }`);
-	}
 	let hasNotFound = false;
 	if (input.notFoundPage) {
 		hasNotFound = true;
@@ -1198,4 +1184,4 @@ function ubeanVueVite(options = {}) {
 	};
 }
 //#endregion
-export { VUE_ROUTES_MODULE_ID, ubeanVueVite as default, ubeanVueVite, extractCallObject, extractDefinePage, extractDefinePageFromCode, extractSlotAndIntercept, filePathToRoute, generateLayoutName, generatePagesModuleSource, generateRouteName, generateTypedRouter, generateVirtualModuleDts, normalizePageHead, parseMatchers, scanClientPages, scanPages, stripDefinePageCalls, stripRouteGroups };
+export { VUE_ROUTES_MODULE_ID, ubeanVueVite as default, ubeanVueVite, extractCallObject, extractDefinePage, extractDefinePageFromCode, extractSlotFromPath, filePathToRoute, generateLayoutName, generatePagesModuleSource, generateRouteName, generateTypedRouter, generateVirtualModuleDts, normalizePageHead, parseMatchers, scanClientPages, scanPages, stripDefinePageCalls, stripRouteGroups };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/vue",
-  "version": "0.5.2",
+  "version": "0.6.0-beta.2",
   "description": "Lean Vue client kernel & page-routing owner for ubean — plugin-first page routing outlet, page cache (keep-alive), transitions, reload signal, definePage macro + file-routing Vite plugin (/vite: multi-dir scan, reuse routes, markdown & page-head opt-in). Runtime deps: vue + vue-router only.",
   "files": [
     "dist"
@@ -28,19 +28,19 @@
     "scule": "^1.3.0",
     "tinyglobby": "^0.2.17",
     "ufo": "^1.6.4",
-    "vue": "^3.5.42",
+    "vue": "^3.5.43",
     "vue-router": "^5.3.1"
   },
   "devDependencies": {
-    "@types/node": "^26.5.0",
-    "@ubean/markdown": "0.5.2",
-    "@unhead/vue": "^3.4.0",
-    "@vue/server-renderer": "^3.5.42",
+    "@types/node": "^26.6.1",
+    "@ubean/markdown": "0.6.0-beta.2",
+    "@unhead/vue": "^3.4.1",
+    "@vue/server-renderer": "^3.5.43",
     "happy-dom": "^20.14.5",
     "typescript": "npm:typescript-native-bridge@latest",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.3.1",
-    "vite-plus": "0.3.1",
-    "vitest": "5.0.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.3.3",
+    "vite-plus": "0.3.3",
+    "vitest": "5.0.1"
   },
   "peerDependencies": {
     "@ubean/markdown": ">=0.1.0",