@monkeyplus/flow 6.0.12 → 6.0.13

package/README.md

@@ -25,6 +25,11 @@ La guia detallada de authoring vive en `docs/authoring.md` e incluye:
 - como organizar templates, layouts y `*.context.ts`
 - como trabajar con `FlowIsland` y `client/islands/*`
 
+Documentacion complementaria:
+
+- `docs/modules.md`: referencia de modulos builtin
+- `docs/recipes.md`: recetas basadas en el playground actual
+
 Si vas a crear o mantener una app en Flow, ese archivo deberia ser el punto de entrada principal.
 
 ## API pública

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.12",
+  "version": "6.0.13",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {

package/server/lib/pages.mjs

@@ -130,6 +130,26 @@ function replacePath(pattern, url) {
 function combineName(name, dynamicName) {
   return `${name.replace(/\/*$/, "")}/${dynamicName.replace(/^\/*/, "")}`;
 }
+function resolveUrlTarget(namePage, explicitDynamicName) {
+  if (explicitDynamicName || !namePage.includes("/")) {
+    return {
+      namePage,
+      dynamicName: explicitDynamicName
+    };
+  }
+  const match = pageDefinitions.filter((candidate) => candidate.name && namePage.startsWith(`${candidate.name}/`)).sort((left, right) => right.name.length - left.name.length)[0];
+  if (!match) {
+    return {
+      namePage,
+      dynamicName: explicitDynamicName
+    };
+  }
+  const dynamicName = namePage.slice(match.name.length + 1);
+  return {
+    namePage: match.name,
+    dynamicName: dynamicName || explicitDynamicName
+  };
+}
 function getEnabledLocaleCodes() {
   const runtimeConfig = getFlowRuntimeConfig();
   return runtimeConfig.flow?.locale?.locales || [];
@@ -163,8 +183,9 @@ export async function getUrl(namePage, localeCode, options = {}) {
   const enabledLocales = getEnabledLocaleCodes();
   const targetLocale = localeCode || enabledLocales[0];
   const runtimeConfig = getFlowRuntimeConfig();
+  const target = resolveUrlTarget(namePage, options.dynamicName);
   for (const definition of pageDefinitions) {
-    if (definition.name !== namePage) {
+    if (definition.name !== target.namePage) {
       continue;
     }
     const localeEntries = targetLocale ? [targetLocale] : Object.keys(definition.locales);
@@ -180,11 +201,11 @@ export async function getUrl(namePage, localeCode, options = {}) {
       if (options.params) {
         return replacePath(localizedRoute, options.params);
       }
-      if (localePage.dynamic && options.dynamicName) {
+      if (localePage.dynamic && target.dynamicName) {
         const locale = createLocale(code);
         const ctx = createContext(definition, locale, localePage, toPublicRoute(runtimeConfig.flow, code, localePage.url), {});
         const entries = await getDynamicEntries(definition, code, ctx);
-        const entry = entries.find((candidate) => candidate.name === options.dynamicName);
+        const entry = entries.find((candidate) => candidate.name === target.dynamicName);
         if (!entry) {
           return void 0;
         }

package/src/runtime/page-discovery.mjs

@@ -53,6 +53,26 @@ function replacePath(pattern, url) {
 function combineName(name, dynamicName) {
   return `${name.replace(/\/*$/, "")}/${dynamicName.replace(/^\/*/, "")}`;
 }
+function resolveUrlTarget(definitions, namePage, explicitDynamicName) {
+  if (explicitDynamicName || !namePage.includes("/")) {
+    return {
+      namePage,
+      dynamicName: explicitDynamicName
+    };
+  }
+  const match = definitions.filter((candidate) => candidate.name && namePage.startsWith(`${candidate.name}/`)).sort((left, right) => right.name.length - left.name.length)[0];
+  if (!match) {
+    return {
+      namePage,
+      dynamicName: explicitDynamicName
+    };
+  }
+  const dynamicName = namePage.slice(match.name.length + 1);
+  return {
+    namePage: match.name,
+    dynamicName: dynamicName || explicitDynamicName
+  };
+}
 function createContext(definitions, flowConfig, definition, locale, localePage, pathname, params, dynamic) {
   return {
     dynamic,
@@ -111,7 +131,8 @@ export async function loadPageDefinitions(projectRoot, flowConfig) {
   return pages;
 }
 export async function getUrlFromDefinitions(definitions, flowConfig, namePage, localeCode = flowConfig.locale.locales[0], options = {}) {
-  const definition = definitions.find((candidate) => candidate.name === namePage);
+  const target = resolveUrlTarget(definitions, namePage, options.dynamicName);
+  const definition = definitions.find((candidate) => candidate.name === target.namePage);
   if (!definition) {
     return void 0;
   }
@@ -126,9 +147,9 @@ export async function getUrlFromDefinitions(definitions, flowConfig, namePage, l
   if (options.params) {
     return replacePath(localizedRoute, options.params);
   }
-  if (localePage.dynamic && options.dynamicName) {
+  if (localePage.dynamic && target.dynamicName) {
     const entries = await getDynamicEntries(definitions, flowConfig, definition, localeCode, localePage);
-    const entry = entries.find((candidate) => candidate.name === options.dynamicName);
+    const entry = entries.find((candidate) => candidate.name === target.dynamicName);
     if (!entry) {
       return void 0;
     }