@ubean/routes 0.3.1 → 0.3.3

package/dist/index.d.ts

@@ -234,15 +234,7 @@ interface RegisterOptions {
    */
   colorModeScript?: string;
 }
-/**
- * Sort page routes so catch-all routes (`/**:slug`, converted to Hono `*`)
- * are registered last. Hono's RegExpRouter matches in registration order,
- * so a catch-all registered before a specific path (e.g. `/`) would swallow
- * it. File-system sort order puts `[...slug].vue` before `index.vue`
- * (`[` < `i`), which is wrong for Hono — this sort corrects it.
- *
- * Stable: non-catch-all pages keep their original relative order.
- */
+declare function convertUbeanRoutePath(path: string): string;
 declare function sortPagesForRegistration<T extends {
   route: string;
 }>(pages: readonly T[]): T[];
@@ -710,4 +702,4 @@ declare function registerOpenAPIRoutes(app: Hono<UbeanEnv$1>, options?: OpenAPIG
   openAPIPath?: string;
 }): void;
 //#endregion
-export { ACTIONS_ENDPOINT, ACTION_BRAND, ACTION_RESPONSE_HEADER, type ActionContext, type ActionContextStorage, ActionError, type ActionFailure, type ActionHandler, type ActionId, type ActionResult, type ActionSchema, type CompiledLayout, type CompiledMiddleware, type CompiledPage, type CompiledRoute, type CompiledRouteRule, type ComposedHandler, type DefineActionOptions, type GenericSchema, type Input, type InternalFetchOptions, type IsrCacheEntry, type IsrCacheEntryInternal, type IsrCacheStore, type IsrRule, type IsrServeOptions, type OpenAPIGenerationOptions, type RegisterOptions, type ResolveSelectSsrInput, type ResolvedSelectSsr, type RouteMeta, type RouteRegistrar, type RouteRule, type RouteRulesMiddlewareOptions, type SelectSsrMode, type SelectSsrValue, type ServerAction, type Span, type SpanAttributes, type SpanContext, type SpanEndOptions, type SpanEvent, type SpanOptions, type SpanStatus, type UbeanBindings, type UbeanContext, type UbeanEnv, type UbeanHandler, type UbeanMiddleware, UbeanRouter, type UbeanVariables, applyPathTransform, bindActionContextStorage, buildActionContext, buildFormActionUrl, buildIsrCacheKey, clearActions, clearInternalFetcher, compileRouteRules, createActionId, createActionsMiddleware, createDetachedActionContext, createInternalAdapter, createRouteLoader, createRouteRulesMiddleware, createServerRouter, defineAction, defineHandler, defineHandlerMeta, defineMiddleware, defineServerFn, describeActionsOpenApi, dispatchAction, extractRouteMeta, fail, getAction, getActionContext, getInternalFetcher, getIsrCache, getIsrRuleFromContext, getStaleIsrCache, hasAction, hasFormAction, invalidateIsrCache, invalidateIsrCachePattern, invokeServerFn, isActionFailure, isActionResponse, isActionsRequest, isBotUserAgent, isHandlerChain, isIsrEntryStale, isServerAction, isValidActionId, listActions, matchRouteRules, normalizeActionResult, normalizeIsrRule, parseActionInput, parseFormActionName, registerAction, registerActions, registerApiRoutes, registerOpenAPIRoutes, registerPageRoutes, registerRoutes, resolveSelectSsr, runAction, runPageAction, runWithActionContext, serveIsr, setInternalFetcher, setIsrCache, sortPagesForRegistration, ssrModeHeader, unwrapActionResult, unwrapServerFnResult, useRouter, validateActionInput };
+export { ACTIONS_ENDPOINT, ACTION_BRAND, ACTION_RESPONSE_HEADER, type ActionContext, type ActionContextStorage, ActionError, type ActionFailure, type ActionHandler, type ActionId, type ActionResult, type ActionSchema, type CompiledLayout, type CompiledMiddleware, type CompiledPage, type CompiledRoute, type CompiledRouteRule, type ComposedHandler, type DefineActionOptions, type GenericSchema, type Input, type InternalFetchOptions, type IsrCacheEntry, type IsrCacheEntryInternal, type IsrCacheStore, type IsrRule, type IsrServeOptions, type OpenAPIGenerationOptions, type RegisterOptions, type ResolveSelectSsrInput, type ResolvedSelectSsr, type RouteMeta, type RouteRegistrar, type RouteRule, type RouteRulesMiddlewareOptions, type SelectSsrMode, type SelectSsrValue, type ServerAction, type Span, type SpanAttributes, type SpanContext, type SpanEndOptions, type SpanEvent, type SpanOptions, type SpanStatus, type UbeanBindings, type UbeanContext, type UbeanEnv, type UbeanHandler, type UbeanMiddleware, UbeanRouter, type UbeanVariables, applyPathTransform, bindActionContextStorage, buildActionContext, buildFormActionUrl, buildIsrCacheKey, clearActions, clearInternalFetcher, compileRouteRules, convertUbeanRoutePath, createActionId, createActionsMiddleware, createDetachedActionContext, createInternalAdapter, createRouteLoader, createRouteRulesMiddleware, createServerRouter, defineAction, defineHandler, defineHandlerMeta, defineMiddleware, defineServerFn, describeActionsOpenApi, dispatchAction, extractRouteMeta, fail, getAction, getActionContext, getInternalFetcher, getIsrCache, getIsrRuleFromContext, getStaleIsrCache, hasAction, hasFormAction, invalidateIsrCache, invalidateIsrCachePattern, invokeServerFn, isActionFailure, isActionResponse, isActionsRequest, isBotUserAgent, isHandlerChain, isIsrEntryStale, isServerAction, isValidActionId, listActions, matchRouteRules, normalizeActionResult, normalizeIsrRule, parseActionInput, parseFormActionName, registerAction, registerActions, registerApiRoutes, registerOpenAPIRoutes, registerPageRoutes, registerRoutes, resolveSelectSsr, runAction, runPageAction, runWithActionContext, serveIsr, setInternalFetcher, setIsrCache, sortPagesForRegistration, ssrModeHeader, unwrapActionResult, unwrapServerFnResult, useRouter, validateActionInput };

package/dist/index.js

@@ -874,21 +874,27 @@ function convertUbeanRoutePath(path) {
 		if (rest) return `*${name}`;
 		return `:${name}`;
 	});
+	honoPath = honoPath.replace(/:([A-Za-z_][\w-]*)\(([^()]*)\)[*+?]?/g, (_m, name, regex) => `:${name}{${regex}}`);
 	return honoPath;
 }
 /**
-* Sort page routes so catch-all routes (`/**:slug`, converted to Hono `*`)
-* are registered last. Hono's RegExpRouter matches in registration order,
-* so a catch-all registered before a specific path (e.g. `/`) would swallow
-* it. File-system sort order puts `[...slug].vue` before `index.vue`
-* (`[` < `i`), which is wrong for Hono — this sort corrects it.
+* Sort page routes so catch-all routes are registered last. Hono's
+* RegExpRouter matches in registration order, so a catch-all registered
+* before a specific path (e.g. `/`) would swallow it. File-system sort
+* order puts `[...slug].vue` before `index.vue` (`[` < `i`), which is
+* wrong for Hono — this sort corrects it.
+*
+* Detects both catch-all spellings: the scan-default `/**:slug` form and
+* the vue-router regex form `:slug(.*)*` / `:slug(.*)` used by custom
+* `definePage({ path })` values.
 *
 * Stable: non-catch-all pages keep their original relative order.
 */
+const CATCH_ALL_ROUTE_REGEX = /\/\*\*:|\(\.\*\)/;
 function sortPagesForRegistration(pages) {
 	return [...pages].sort((a, b) => {
-		const aCatchall = /\/\*\*:/.test(a.route);
-		const bCatchall = /\/\*\*:/.test(b.route);
+		const aCatchall = CATCH_ALL_ROUTE_REGEX.test(a.route);
+		const bCatchall = CATCH_ALL_ROUTE_REGEX.test(b.route);
 		if (aCatchall && !bCatchall) return 1;
 		if (!aCatchall && bCatchall) return -1;
 		return 0;
@@ -1185,7 +1191,7 @@ async function registerPageRoutes(app, options) {
 			component: page.reuseTarget || page.name,
 			props,
 			params: c.req.param(),
-			url: (c.get("pathWithoutLocale") || c.req.path) + (c.req.url.includes("?") ? new URL(c.req.url).search : ""),
+			url: c.req.path + (c.req.url.includes("?") ? new URL(c.req.url).search : ""),
 			layout: page.layout === false ? false : page.layout || page.pageMeta?.layout || (hasDefaultLayout ? "default" : false),
 			errors: actionErrors,
 			head: page.pageMeta?.head
@@ -1479,4 +1485,4 @@ function registerOpenAPIRoutes(app, options = {}) {
 	});
 }
 //#endregion
-export { ACTIONS_ENDPOINT, ACTION_BRAND, ACTION_RESPONSE_HEADER, ActionError, UbeanRouter, applyPathTransform, bindActionContextStorage, buildActionContext, buildFormActionUrl, buildIsrCacheKey, clearActions, clearInternalFetcher, compileRouteRules, createActionId, createActionsMiddleware, createDetachedActionContext, createInternalAdapter, createRouteLoader, createRouteRulesMiddleware, createServerRouter, defineAction, defineHandler, defineHandlerMeta, defineMiddleware, defineServerFn, describeActionsOpenApi, dispatchAction, extractRouteMeta, fail, getAction, getActionContext, getInternalFetcher, getIsrCache, getIsrRuleFromContext, getStaleIsrCache, hasAction, hasFormAction, invalidateIsrCache, invalidateIsrCachePattern, invokeServerFn, isActionFailure, isActionResponse, isActionsRequest, isBotUserAgent, isHandlerChain, isIsrEntryStale, isServerAction, isValidActionId, listActions, matchRouteRules, normalizeActionResult, normalizeIsrRule, parseActionInput, parseFormActionName, registerAction, registerActions, registerApiRoutes, registerOpenAPIRoutes, registerPageRoutes, registerRoutes, resolveSelectSsr, runAction, runPageAction, runWithActionContext, serveIsr, setInternalFetcher, setIsrCache, sortPagesForRegistration, ssrModeHeader, unwrapActionResult, unwrapServerFnResult, useRouter, validateActionInput };
+export { ACTIONS_ENDPOINT, ACTION_BRAND, ACTION_RESPONSE_HEADER, ActionError, UbeanRouter, applyPathTransform, bindActionContextStorage, buildActionContext, buildFormActionUrl, buildIsrCacheKey, clearActions, clearInternalFetcher, compileRouteRules, convertUbeanRoutePath, createActionId, createActionsMiddleware, createDetachedActionContext, createInternalAdapter, createRouteLoader, createRouteRulesMiddleware, createServerRouter, defineAction, defineHandler, defineHandlerMeta, defineMiddleware, defineServerFn, describeActionsOpenApi, dispatchAction, extractRouteMeta, fail, getAction, getActionContext, getInternalFetcher, getIsrCache, getIsrRuleFromContext, getStaleIsrCache, hasAction, hasFormAction, invalidateIsrCache, invalidateIsrCachePattern, invokeServerFn, isActionFailure, isActionResponse, isActionsRequest, isBotUserAgent, isHandlerChain, isIsrEntryStale, isServerAction, isValidActionId, listActions, matchRouteRules, normalizeActionResult, normalizeIsrRule, parseActionInput, parseFormActionName, registerAction, registerActions, registerApiRoutes, registerOpenAPIRoutes, registerPageRoutes, registerRoutes, resolveSelectSsr, runAction, runPageAction, runWithActionContext, serveIsr, setInternalFetcher, setIsrCache, sortPagesForRegistration, ssrModeHeader, unwrapActionResult, unwrapServerFnResult, useRouter, validateActionInput };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/routes",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Server routes runtime for ubean (defineHandler, defineMiddleware, registerRoutes, Server Actions, rou3 server router, route rules, ISR, internal-fetch, OpenAPI)",
   "files": [
     "dist"
@@ -24,23 +24,23 @@
     "@soybeanjs/fetch": "^0.1.0",
     "@standard-community/standard-json": "^0.3.5",
     "@standard-community/standard-openapi": "^0.2.9",
-    "@ubean/i18n": "0.3.1",
-    "@ubean/shared": "0.3.1",
+    "@ubean/i18n": "0.3.3",
+    "@ubean/shared": "0.3.3",
     "hono": "4.13.5",
     "hono-openapi": "^1.3.1",
     "rou3": "^0.9.2"
   },
   "devDependencies": {
     "@types/node": "^26.4.0",
-    "@ubean/pages": "0.3.1",
-    "@ubean/scan": "0.3.1",
+    "@ubean/pages": "0.3.3",
+    "@ubean/scan": "0.3.3",
     "typescript": "7.0.2",
     "vite-plus": "0.3.0",
     "vue": "^3.5.42"
   },
   "peerDependencies": {
-    "@ubean/pages": "0.3.1",
-    "@ubean/scan": "0.3.1",
+    "@ubean/pages": "0.3.3",
+    "@ubean/scan": "0.3.3",
     "vue": "^3.0.0"
   },
   "peerDependenciesMeta": {