@monkeyplus/flow 5.0.0-rc.102 → 5.0.0-rc.103

package/dist/chunks/index.mjs

@@ -24,7 +24,7 @@ import replace from '@rollup/plugin-replace';
 import { sanitizeFilePath } from 'mlly';
 import { resolveTSConfig } from 'pkg-types';
 
-const version = "5.0.0-rc.102";
+const version = "5.0.0-rc.103";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))

package/dist/core/runtime/nitro/renderer.mjs

@@ -5,6 +5,16 @@ const normalizeCall = async (seo, ctx) => {
     return await seo(ctx);
   return seo || {};
 };
+function replacePath(_path, url) {
+  if (url === "string") {
+    _path = joinURL(_path.replace("/**", ""), url);
+  } else {
+    Object.entries(url).forEach(([key, value]) => {
+      _path = _path.replace(`:${key}`, value);
+    });
+  }
+  return _path;
+}
 export default eventHandler(async (event) => {
   const url = event.req.url?.split("?")[0];
   const flow = event.context.flow;
@@ -15,13 +25,13 @@ export default eventHandler(async (event) => {
   const scripts = { head: [], bodyStart: [], bodyEnd: [] };
   const chunks = { head: [], body: [] };
   const generate = {};
-  const { page, locale, params, view, name: pageName } = flow.router.byUrl.lookup(url) || {};
+  const { page, locale, params, view, name: pageName, path: pagePath } = flow.router.byUrl.lookup(url) || {};
   if (!page)
     return;
   if (view.bundle)
     await flow.callHook("page:chunks", view.bundle, chunks);
   const templateContext = {};
-  const dynamic = params?._;
+  const isDynamic = !!Object.keys(params || {});
   const contextPage = {
     chunks,
     locale
@@ -43,9 +53,13 @@ export default eventHandler(async (event) => {
   contextPage.page = pageObject;
   templateContext.locale = locale;
   templateContext.view = view;
-  if (dynamic && page.dynamic) {
+  if (isDynamic && page.dynamic) {
     const pages = await page.dynamic.method({ locale, utils });
-    const dynamicPage = pages.find((_page) => _page.url === dynamic);
+    const dynamicPage = pages.find((_page) => {
+      const aUrl = replacePath(pagePath, _page.url);
+      const bUrl = replacePath(pagePath, params);
+      return aUrl === bUrl;
+    });
     if (!dynamicPage)
       return;
     if (page.dynamic.assign)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.102",
+  "version": "5.0.0-rc.103",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.102",
-    "@monkeyplus/flow-kit": "5.0.0-rc.102",
-    "@monkeyplus/flow-schema": "5.0.0-rc.102",
+    "@monkeyplus/flow-cli": "5.0.0-rc.103",
+    "@monkeyplus/flow-kit": "5.0.0-rc.103",
+    "@monkeyplus/flow-schema": "5.0.0-rc.103",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
     "c12": "^0.2.8",