@monkeyplus/flow 6.0.57 → 6.0.59

package/package.json

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

package/server/lib/pages.mjs

@@ -98,10 +98,14 @@ function createLocale(code) {
 function createContext(definition, locale, localePage, pathname, params, dynamic, request) {
   const imageUtils = getFlowImageRuntimeUtils();
   const preview = request?.headers.get("cookie")?.includes("flow_preview=true") || false;
+  const config = getFlowRuntimeConfig();
+  const siteUrl = config.flow?.siteUrl || "";
+  const fullPath = siteUrl ? `${siteUrl.replace(/\/$/, "")}${pathname}` : pathname;
   return {
     dynamic,
     locale,
     path: pathname,
+    fullPath,
     name: definition.name,
     page: localePage,
     params,
@@ -379,7 +383,15 @@ export async function resolveBreadcrumbs(pageName, pathname, localeCode, params,
   if (!localePage || !localePage.breadcrumb) return [];
   const locale = createLocale(localeCode);
   const ctx = createContext(definition, locale, localePage, pathname, params, dynamic, request);
-  const result = await localePage.breadcrumb(ctx);
+  const pageContext = localePage.context ? await localePage.context(ctx) : {};
+  const pageHead = localePage.head ? await localePage.head(ctx) : localePage.seo ? await localePage.seo(ctx) : {};
+  const breadcrumbCtx = {
+    ...ctx,
+    context: pageContext,
+    head: pageHead,
+    seo: pageHead.seo || pageHead
+  };
+  const result = await localePage.breadcrumb(breadcrumbCtx);
   if (!result) return [];
   let currentItems = [];
   if (result.items) {

package/server/lib/render.mjs

@@ -150,6 +150,9 @@ ${cleanTrace}`);
       lang: page.locale.lang
     }
   });
+  if (page.head) {
+    head.push(page.head);
+  }
   head.push(normalizeSeoToHead(page.head, fallbackTitle, fallbackDescription));
   app.use(head);
   installFlowVuePlugins(app);
@@ -200,5 +203,28 @@ export async function renderDocument(page, clientAssets) {
     ].join("\n    "),
     body: pageMarkup
   });
-  return transformHtmlTemplate(rendered.head, html);
+  let finalHtml = await transformHtmlTemplate(rendered.head, html);
+  const schemaOrgConfig = page.head.templateParams?.schemaOrg;
+  if (schemaOrgConfig?.inLanguage && schemaOrgConfig.inLanguage !== page.locale.lang) {
+    finalHtml = finalHtml.replace(/<script[^>]*data-hid="schema-org-graph"[^>]*>([\s\S]*?)<\/script>/, (match, content) => {
+      try {
+        const data = JSON.parse(content);
+        const replaceLang = (obj) => {
+          if (Array.isArray(obj)) {
+            obj.forEach(replaceLang);
+          } else if (typeof obj === "object" && obj !== null) {
+            if (obj.inLanguage === page.locale.lang) {
+              obj.inLanguage = schemaOrgConfig.inLanguage;
+            }
+            Object.values(obj).forEach(replaceLang);
+          }
+        };
+        replaceLang(data);
+        return match.replace(content, JSON.stringify(data));
+      } catch (e) {
+        return match;
+      }
+    });
+  }
+  return finalHtml;
 }

package/src/runtime/pages.d.ts

@@ -99,6 +99,7 @@ export interface PageContextUtils {
 export interface PageContextInput {
     locale: FlowLocale;
     path: string;
+    fullPath?: string;
     name: string;
     view: PageViewDefinition;
     page: PageLocaleDefinition;
@@ -120,6 +121,14 @@ export interface BreadcrumbDefinition {
     item?: BreadcrumbItem;
     items?: BreadcrumbItem[];
 }
+export interface BreadcrumbContextInput extends PageContextInput {
+    context: Record<string, unknown>;
+    head: HeadDefinition;
+    /**
+     * @deprecated Use head.
+     */
+    seo: HeadDefinition;
+}
 export interface PageLocaleDefinition {
     url: string;
     head?: (ctx: PageContextInput) => MaybePromise<HeadDefinition>;
@@ -128,7 +137,7 @@ export interface PageLocaleDefinition {
      */
     seo?: (ctx: PageContextInput) => MaybePromise<HeadDefinition>;
     context?: (ctx: PageContextInput) => MaybePromise<Record<string, unknown>>;
-    breadcrumb?: (ctx: PageContextInput) => MaybePromise<BreadcrumbDefinition>;
+    breadcrumb?: (ctx: BreadcrumbContextInput) => MaybePromise<BreadcrumbDefinition>;
     dynamic?: DynamicRouteOptions;
 }
 export interface PageDefinition {