@monkeyplus/flow 6.0.53 → 6.0.55

package/package.json

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

package/server/lib/pages.mjs

@@ -4,6 +4,36 @@ import pageDefinitions from "virtual:flow/pages";
 import { getFlowImageRuntimeUtils } from "../../modules/images/runtime/server.mjs";
 import { mergeLayoutContextValues } from "../../src/runtime/layout-context.mjs";
 import { localizeRoutePattern, normalizePath, toPublicRoute } from "../../src/runtime/locale-routing.mjs";
+function mergeHeadDefinitions(...heads) {
+  const result = {};
+  for (const head of heads) {
+    if (!head)
+      continue;
+    for (const [key, value] of Object.entries(head)) {
+      if (["meta", "link", "script", "style", "noscript"].includes(key)) {
+        result[key] = [...result[key] || [], ...Array.isArray(value) ? value : []];
+      } else if (["htmlAttrs", "bodyAttrs"].includes(key)) {
+        result[key] = { ...result[key], ...value };
+      } else if (key === "templateParams") {
+        result.templateParams = result.templateParams || {};
+        for (const [tpKey, tpValue] of Object.entries(value || {})) {
+          if (typeof tpValue === "object" && tpValue !== null && !Array.isArray(tpValue)) {
+            result.templateParams[tpKey] = {
+              ...result.templateParams[tpKey] || {},
+              ...tpValue
+            };
+          } else {
+            result.templateParams[tpKey] = tpValue;
+          }
+        }
+      } else {
+        result[key] = value;
+      }
+    }
+  }
+  console.log("mergeHeadDefinitions", result);
+  return result;
+}
 const dynamicRouteCache = /* @__PURE__ */ new Map();
 let runtimeConfigRequire;
 function getFlowRuntimeConfig() {
@@ -101,7 +131,12 @@ async function resolveLayoutContext(definition, ctx) {
   const layoutContext = layoutKey === "global" ? void 0 : layoutContexts[layoutKey];
   const resolvedGlobalContext = globalLayoutContext?.setup ? asContextRecord(await globalLayoutContext.setup(ctx)) : void 0;
   const resolvedLayoutContext = layoutContext?.setup ? asContextRecord(await layoutContext.setup(ctx)) : void 0;
-  return mergeLayoutContextValues(resolvedGlobalContext, resolvedLayoutContext);
+  const resolvedGlobalHead = globalLayoutContext?.head ? await globalLayoutContext.head(ctx) : void 0;
+  const resolvedLayoutHead = layoutContext?.head ? await layoutContext.head(ctx) : void 0;
+  return {
+    context: mergeLayoutContextValues(resolvedGlobalContext, resolvedLayoutContext),
+    head: { global: resolvedGlobalHead, layout: resolvedLayoutHead }
+  };
 }
 function mergeResolvedContext(context, layoutContext, dynamic, assign) {
   const resolvedContext = assign && dynamic?.context ? { ...context, [assign]: dynamic.context, dynamic } : dynamic ? { ...context, dynamic } : context;
@@ -277,11 +312,12 @@ export async function resolvePage(pathname, request) {
       continue;
     }
     const ctx = createContext(match.definition, locale, match.localePage, pathname, match.params, dynamic, request);
-    const head = match.localePage.head ? await match.localePage.head(ctx) : match.localePage.seo ? await match.localePage.seo(ctx) : {};
+    const pageHead = match.localePage.head ? await match.localePage.head(ctx) : match.localePage.seo ? await match.localePage.seo(ctx) : {};
     const layoutContext = await resolveLayoutContext(match.definition, ctx);
     const context = match.localePage.context ? await match.localePage.context(ctx) : {};
     const assign = match.localePage.dynamic?.assign;
-    const resolvedContext = mergeResolvedContext(context, layoutContext, dynamic, assign);
+    const resolvedContext = mergeResolvedContext(context, layoutContext.context, dynamic, assign);
+    const head = mergeHeadDefinitions(layoutContext.head.global, layoutContext.head.layout, pageHead);
     return {
       definition: match.definition,
       locale,
@@ -311,9 +347,10 @@ export async function resolvePageByName(name, pathname, request) {
     const locale = createLocale(localeCode);
     const params = {};
     const ctx = createContext(definition, locale, localePage, pathname, params, void 0, request);
-    const head = localePage.head ? await localePage.head(ctx) : localePage.seo ? await localePage.seo(ctx) : {};
+    const pageHead = localePage.head ? await localePage.head(ctx) : localePage.seo ? await localePage.seo(ctx) : {};
     const layoutContext = await resolveLayoutContext(definition, ctx);
     const context = localePage.context ? await localePage.context(ctx) : {};
+    const head = mergeHeadDefinitions(layoutContext.head.global, layoutContext.head.layout, pageHead);
     return {
       definition,
       locale,
@@ -323,7 +360,7 @@ export async function resolvePageByName(name, pathname, request) {
       params,
       head,
       seo: head,
-      context: mergeResolvedContext(context, layoutContext)
+      context: mergeResolvedContext(context, layoutContext.context)
     };
   }
   return void 0;

package/server/lib/render.mjs

@@ -135,7 +135,7 @@ async function renderBody(page) {
   const app = createSSRApp(TemplateRoot);
   app.config.warnHandler = (msg, instance, trace) => {
     const cleanTrace = trace.split("\n").map((line) => {
-      return line.length > 200 ? line.substring(0, 200) + " ... >" : line;
+      return line.length > 200 ? `${line.substring(0, 200)} ... >` : line;
     }).join("\n");
     console.warn(`[Vue warn]: ${msg}
 ${cleanTrace}`);
@@ -150,6 +150,7 @@ ${cleanTrace}`);
     }
   });
   head.push(normalizeSeoToHead(page.head, fallbackTitle, fallbackDescription));
+  console.log("head", head);
   app.use(head);
   installFlowVuePlugins(app);
   return {

package/src/public/vite.mjs

@@ -24,7 +24,7 @@ import {
 import { createFlowNitroConfig } from "./nitro.mjs";
 let schemaOrgImports = {};
 try {
-  const pkg = await import("@unhead/schema-org-vue");
+  const pkg = await import("@unhead/schema-org/vue");
   schemaOrgImports = pkg.schemaOrgAutoImports || {};
   console.log("--- SCHEMA ORG IMPORTS LOADED ---", typeof schemaOrgImports, Array.isArray(schemaOrgImports));
 } catch (e) {

package/src/runtime/head.d.ts

@@ -1,4 +1,4 @@
-import { useSchemaOrg } from '@unhead/schema-org-vue';
+import { useSchemaOrg } from '@unhead/schema-org/vue';
 import { useHead, useSeoMeta } from '@unhead/vue';
 export declare function getClientHead(): import("@unhead/vue").VueHeadClient<import("@unhead/vue").UseHeadInput<_Deprecated>, boolean>;
 export { useHead, useSchemaOrg, useSeoMeta };

package/src/runtime/head.mjs

@@ -1,5 +1,5 @@
 import { UnheadSchemaOrg } from "@unhead/schema-org";
-import { useSchemaOrg } from "@unhead/schema-org-vue";
+import { useSchemaOrg } from "@unhead/schema-org/vue";
 import { useHead, useSeoMeta } from "@unhead/vue";
 import { createHead } from "@unhead/vue/client";
 const clientHead = createHead();

package/src/runtime/islands.mjs

@@ -1,5 +1,5 @@
 import islands from "virtual:flow/islands";
-import { createSSRApp, h, defineComponent } from "vue";
+import { createSSRApp, defineComponent, h } from "vue";
 import { createBootImageUtils } from "./components/image-shared.mjs";
 import { getClientHead } from "./head.mjs";
 import { installFlowVuePlugins } from "./vue.mjs";
@@ -47,7 +47,7 @@ async function hydrateIsland(element, boot) {
       const slotEl = element.querySelector(`div[data-flow-slot-template="${name}"]`);
       if (slotEl) {
         const html = slotEl.innerHTML;
-        clientSlots[name] = () => h("div", { "data-flow-slot": name, style: "display: contents;", innerHTML: html });
+        clientSlots[name] = () => h("div", { "data-flow-slot": name, "style": "display: contents;", "innerHTML": html });
       }
     }
   }

package/src/runtime/layout-context.d.ts

@@ -1,7 +1,8 @@
-import type { MaybePromise, PageContextInput } from './pages.ts';
+import type { HeadDefinition, MaybePromise, PageContextInput } from './pages.ts';
 export interface LayoutContextDefinition {
-    setup: (ctx: PageContextInput) => MaybePromise<Record<string, unknown>>;
+    setup?: (ctx: PageContextInput) => MaybePromise<Record<string, unknown>>;
+    head?: (ctx: PageContextInput) => MaybePromise<HeadDefinition>;
 }
-export type LayoutContextValue<T extends LayoutContextDefinition> = Awaited<ReturnType<T['setup']>>;
+export type LayoutContextValue<T extends LayoutContextDefinition> = T['setup'] extends (...args: any) => any ? Awaited<ReturnType<T['setup']>> : Record<string, unknown>;
 export declare function defineLayoutContext(context: LayoutContextDefinition): LayoutContextDefinition;
 export declare function mergeLayoutContextValues(...contexts: Array<Record<string, unknown> | undefined>): Record<string, unknown>;