@monkeyplus/flow 6.0.5 → 6.0.7

package/src/runtime/page-discovery.mjs

@@ -1,6 +1,7 @@
 import { existsSync, readdirSync } from "node:fs";
 import { resolve } from "node:path";
 import { createJiti } from "jiti";
+import { localizeRoutePattern, normalizePath, toPublicRoute } from "./locale-routing.mjs";
 const jiti = createJiti(import.meta.url, {
   fsCache: false,
   moduleCache: false
@@ -25,12 +26,6 @@ function collectFiles(rootDir, currentDir = rootDir) {
   }
   return files.sort((left, right) => left.localeCompare(right));
 }
-function normalizePath(value) {
-  if (!value || value === "/") {
-    return "/";
-  }
-  return value.length > 1 && value.endsWith("/") ? value.slice(0, -1) : value;
-}
 function createLocale(flowConfig, code) {
   const [lang = flowConfig.locale.language || "es", loc = flowConfig.locale.location || "ec"] = code.split("-");
   return {
@@ -55,9 +50,6 @@ function replacePath(pattern, url) {
   }
   return normalizePath(resolved.replaceAll("**", ""));
 }
-function toPublicRoutePattern(url) {
-  return normalizePath(url.replaceAll("*", ""));
-}
 function combineName(name, dynamicName) {
   return `${name.replace(/\/*$/, "")}/${dynamicName.replace(/^\/*/, "")}`;
 }
@@ -124,14 +116,15 @@ export async function getUrlFromDefinitions(definitions, flowConfig, namePage, l
     return void 0;
   }
   const localePage = definition.locales[localeCode];
+  const localizedRoute = localizeRoutePattern(flowConfig, localeCode, localePage?.url || "/");
   if (!localePage) {
     return void 0;
   }
   if (options.url) {
-    return replacePath(localePage.url, options.url);
+    return replacePath(localizedRoute, options.url);
   }
   if (options.params) {
-    return replacePath(localePage.url, options.params);
+    return replacePath(localizedRoute, options.params);
   }
   if (localePage.dynamic && options.dynamicName) {
     const entries = await getDynamicEntries(definitions, flowConfig, definition, localeCode, localePage);
@@ -139,9 +132,9 @@ export async function getUrlFromDefinitions(definitions, flowConfig, namePage, l
     if (!entry) {
       return void 0;
     }
-    return replacePath(localePage.url, entry.url);
+    return replacePath(localizedRoute, entry.url);
   }
-  return toPublicRoutePattern(localePage.url);
+  return toPublicRoute(flowConfig, localeCode, localePage.url);
 }
 export async function getUrlsFromDefinitions(definitions, flowConfig, withLocale = false, omitNoPublish = false) {
   const urls = [];
@@ -157,12 +150,12 @@ export async function getUrlsFromDefinitions(definitions, flowConfig, withLocale
       if (localePage.dynamic) {
         const entries = await getDynamicEntries(definitions, flowConfig, definition, localeCode, localePage);
         for (const entry of entries) {
-          const url2 = replacePath(localePage.url, entry.url);
+          const url2 = replacePath(localizeRoutePattern(flowConfig, localeCode, localePage.url), entry.url);
           urls.push(withLocale ? { url: url2, locale: localeCode, name: combineName(definition.name, entry.name) } : url2);
         }
         continue;
       }
-      const url = toPublicRoutePattern(localePage.url);
+      const url = toPublicRoute(flowConfig, localeCode, localePage.url);
       urls.push(withLocale ? { url, locale: localeCode, name: definition.name } : url);
     }
   }

package/src/runtime/pages.d.ts

@@ -66,6 +66,19 @@ export interface PageUrlInfo {
     locale: string;
     name: string;
 }
+export interface PageContextImageMeta {
+    rename?: string;
+    name: string;
+    alt?: string;
+    title?: string;
+}
+export type PageContextGetImage = ((input: string, modifiers?: Record<string, any>, options?: Record<string, unknown>) => unknown) & {
+    getSizes?: (input: string, options: any) => {
+        src?: string;
+        sizes: string;
+        srcset: string;
+    };
+};
 export interface PageViewDefinition {
     bundle?: string;
     template: string;
@@ -77,6 +90,9 @@ export interface PageContextUtils {
     getLocale: () => FlowLocale;
     getUrl: (namePage: string, localeCode?: string, options?: GetUrlOptions) => Promise<string | undefined>;
     getUrls: (withLocale?: boolean, omitNoPublish?: boolean) => Promise<Array<string | PageUrlInfo>>;
+    getImage?: PageContextGetImage;
+    getImageMeta?: (src: string) => PageContextImageMeta | undefined;
+    getImageOptions?: () => Record<string, unknown>;
 }
 export interface PageContextInput {
     locale: FlowLocale;

package/src/runtime/virtual.d.ts

@@ -38,6 +38,23 @@ declare module 'virtual:flow/strapi-config' {
   export default config;
 }
 
+declare module 'virtual:flow/content-config' {
+  const config: {
+    apiBase: string;
+  };
+
+  export default config;
+}
+
+declare module '#flow-content-server' {
+  export {
+    buildContentTree,
+    findContentEntries,
+    findContentTree,
+    readContentEntries,
+  } from '../../modules/content/query.ts';
+}
+
 declare module '#strapi' {
   export interface StrapiFetchOptions extends RequestInit {
     params?: Record<string, unknown>;

package/src/runtime/vue.mjs

@@ -1,7 +1,13 @@
 import ui from "@nuxt/ui/vue-plugin";
+import MkImage from "./components/MkImage.mjs";
+import MkLink from "./components/MkLink.mjs";
+import MkPicture from "./components/MkPicture.mjs";
 export function installFlowVuePlugins(app, { ui: enableUi } = { ui: true }) {
   if (enableUi) {
     app.use(ui);
   }
+  app.component("MkImage", MkImage);
+  app.component("MkLink", MkLink);
+  app.component("MkPicture", MkPicture);
   return app;
 }