@uniweb/core 0.7.13 → 0.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.7.13",
+  "version": "0.7.15",
   "description": "Core classes for the Uniweb platform - Uniweb, Website, Page, Block",
   "type": "module",
   "exports": {

package/src/block.js

@@ -437,6 +437,15 @@ export default class Block {
    * @returns {Object|null} Next block's info or null
    */
   getNextBlockInfo() {
+    // Layout-area blocks (header/footer/panels) live on a shared, contentless
+    // area page — not the content page being rendered — so walking their own
+    // page's sequence never reaches the content. Their "next block" is the
+    // first content section of the active page (a header adapting to the
+    // section it floats over). Resolve against the active page instead.
+    const active = this.website?.activePage
+    if (active && active !== this.page) {
+      return active.getFirstBodyBlockInfo()
+    }
     const index = this.getIndex()
     if (index < 0 || !this.page) return null
     return this.page.getBlockInfo(index + 1)
@@ -448,6 +457,12 @@ export default class Block {
    * @returns {Object|null} Previous block's info or null
    */
   getPrevBlockInfo() {
+    // See getNextBlockInfo: from a shared layout-area block, "previous" is the
+    // last content section of the active page (e.g. a footer adapting to it).
+    const active = this.website?.activePage
+    if (active && active !== this.page) {
+      return active.getLastBodyBlockInfo()
+    }
     const index = this.getIndex()
     if (index <= 0 || !this.page) return null
     return this.page.getBlockInfo(index - 1)

package/src/page.js

@@ -7,6 +7,7 @@
 
 import Block from './block.js'
 import ObservableState from './observable-state.js'
+import { normalizeSeo } from './seo.js'
 
 // Normalize a page's nav-visibility into a deduped hideIn array (the layout-area
 // names the page is suppressed from). Reads the canonical hideIn (array, or a single
@@ -63,16 +64,8 @@ export default class Page {
       params: pageData.layout?.params || {},
     }
 
-    // SEO configuration
-    this.seo = {
-      noindex: pageData.seo?.noindex || false,
-      image: pageData.seo?.image || null,
-      ogTitle: pageData.seo?.ogTitle || null,
-      ogDescription: pageData.seo?.ogDescription || null,
-      canonical: pageData.seo?.canonical || null,
-      changefreq: pageData.seo?.changefreq || null,
-      priority: pageData.seo?.priority || null,
-    }
+    // SEO configuration (canonical shape — shared with the site level via normalizeSeo)
+    this.seo = normalizeSeo(pageData.seo)
 
     // Parent page (set by Website.buildPageHierarchy())
     this.parent = null
@@ -159,16 +152,22 @@ export default class Page {
    */
   getHeadMeta() {
     const resolvedTitle = this.getTitle()
+    // Site-level seo provides the defaults; a page overrides any field it sets.
+    // (Website.seo / Website.keywords are the normalized site-root values.)
+    const site = this.website?.seo || {}
+    const siteKeywords = this.website?.keywords || null
     return {
       title: resolvedTitle,
       description: this.description,
-      keywords: this.keywords,
+      keywords: this.keywords || siteKeywords,
       canonical: this.seo.canonical,
-      robots: this.seo.noindex ? 'noindex, nofollow' : null,
+      robots: this.seo.noindex || site.noindex ? 'noindex, nofollow' : null,
       og: {
-        title: this.seo.ogTitle || resolvedTitle,
-        description: this.seo.ogDescription || this.description,
-        image: this.seo.image,
+        // Page content wins; site-level seo only fills gaps. Image is the
+        // exception authors most want cascaded (the shared social card).
+        title: this.seo.ogTitle || resolvedTitle || site.ogTitle,
+        description: this.seo.ogDescription || this.description || site.ogDescription,
+        image: this.seo.image || site.image,
         url: this.route,
       },
     }
@@ -266,6 +265,18 @@ export default class Page {
     return this.bodyBlocks?.[0]?.getBlockInfo() || null
   }
 
+  /**
+   * Get the last body block's info.
+   * Symmetric to getFirstBodyBlockInfo — e.g. a footer adapting to the
+   * content section directly above it.
+   *
+   * @returns {Object|null} Last body block's info or null
+   */
+  getLastBodyBlockInfo() {
+    const blocks = this.bodyBlocks
+    return blocks?.[blocks.length - 1]?.getBlockInfo() || null
+  }
+
   /**
    * Get all blocks (header, body, footer) as flat array
    * Respects page layout preferences (hide list)

package/src/seo.js

@@ -0,0 +1,28 @@
+/**
+ * Canonical SEO / social-card shape.
+ *
+ * Shared by Website (site-level defaults) and Page (per-page), so the same
+ * concept has the same shape at every level. Site `seo` cascades as the
+ * default; a page overrides any field it sets (see Page.getHeadMeta).
+ *
+ * Field names are camelCase to match the framework's authored convention
+ * (`defaultLanguage`, etc.). `changefreq`/`priority` are sitemap hints — only
+ * meaningful per-page, but carried uniformly so the shape never drifts.
+ *
+ * @param {Object} [raw] - raw `seo:` block from site.yml / page.yml
+ * @returns {{ noindex: boolean, image: string|null, ogTitle: string|null,
+ *   ogDescription: string|null, canonical: string|null, changefreq: string|null,
+ *   priority: (string|number)|null }}
+ */
+export function normalizeSeo(raw) {
+  const seo = raw || {}
+  return {
+    noindex: seo.noindex || false,
+    image: seo.image || null,
+    ogTitle: seo.ogTitle || null,
+    ogDescription: seo.ogDescription || null,
+    canonical: seo.canonical || null,
+    changefreq: seo.changefreq || null,
+    priority: seo.priority || null,
+  }
+}

package/src/website.js

@@ -9,6 +9,7 @@ import DataStore from './datastore.js'
 import EntityStore from './entity-store.js'
 import FetcherDispatcher from './fetcher-dispatcher.js'
 import ObservableState from './observable-state.js'
+import { normalizeSeo } from './seo.js'
 
 /**
  * Website — orchestration root for a single site instance.
@@ -73,6 +74,8 @@ export default class Website {
     this.pageRoutes = []
     this.themeData = {}
     this.config = {}
+    this.seo = {} // site-level SEO/social defaults (normalized; cascade to pages)
+    this.keywords = null // site-level default keywords (localized list or null)
     this.siteDefaultLocale = 'en'
     this.defaultLocale = 'en'
     this.activeLocale = 'en'
@@ -153,6 +156,12 @@ export default class Website {
     this.themeData = theme
     this.config = config
 
+    // Site-level SEO/social metadata — defaults that cascade to every page's
+    // effective head meta (Page.getHeadMeta). `config.seo` / `config.keywords`
+    // ride the raw site.yml spread; normalize seo to the canonical shape here.
+    this.seo = normalizeSeo(config.seo)
+    this.keywords = config.keywords || null
+
     this.siteDefaultLocale = config.defaultLanguage || 'en'
     this.defaultLocale = config.domainLocale || this.siteDefaultLocale
     this.activeLocale = config.activeLocale || this.defaultLocale