@uniweb/core 0.4.6 → 0.4.8

package/package.json

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

package/src/page.js

@@ -26,8 +26,9 @@ export default class Page {
     this.hideInHeader = pageData.hideInHeader || false
     this.hideInFooter = pageData.hideInFooter || false
 
-    // Layout options (per-page overrides for header/footer/panels)
+    // Layout options (named layout + per-page overrides for header/footer/panels)
     this.layout = {
+      name: pageData.layout?.name || null,
       header: pageData.layout?.header !== false,
       footer: pageData.layout?.footer !== false,
       leftPanel: pageData.layout?.leftPanel !== false,
@@ -143,6 +144,15 @@ export default class Page {
     return this.dynamicContext?.paramValue || null
   }
 
+  /**
+   * Get the resolved layout name for this page.
+   * Cascade: page.layout.name > foundation defaultLayout > null
+   * @returns {string|null}
+   */
+  getLayoutName() {
+    return this.layout.name || this.website?.getDefaultLayoutName() || null
+  }
+
   /**
    * Get all block groups (for Layout component)
    * @returns {Object} { header, body, footer, left, right }
@@ -227,7 +237,7 @@ export default class Page {
    */
   getHeaderBlocks() {
     if (!this.hasHeader()) return null
-    return this.website.getHeaderBlocks()
+    return this.website.getHeaderBlocks(this.getLayoutName())
   }
 
   /**
@@ -236,7 +246,7 @@ export default class Page {
    */
   getFooterBlocks() {
     if (!this.hasFooter()) return null
-    return this.website.getFooterBlocks()
+    return this.website.getFooterBlocks(this.getLayoutName())
   }
 
   /**
@@ -245,7 +255,7 @@ export default class Page {
    */
   getLeftBlocks() {
     if (!this.hasLeftPanel()) return null
-    return this.website.getLeftBlocks()
+    return this.website.getLeftBlocks(this.getLayoutName())
   }
 
   /**
@@ -254,7 +264,7 @@ export default class Page {
    */
   getRightBlocks() {
     if (!this.hasRightPanel()) return null
-    return this.website.getRightBlocks()
+    return this.website.getRightBlocks(this.getLayoutName())
   }
 
   /**

package/src/website.js

@@ -11,15 +11,30 @@ import singularize from './singularize.js'
 
 export default class Website {
   constructor(websiteData) {
-    const { pages = [], theme = {}, config = {}, header, footer, left, right, notFound, versionedScopes = {} } = websiteData
+    const { pages = [], theme = {}, config = {}, layouts, header, footer, left, right, notFound, versionedScopes = {} } = websiteData
 
     // Site metadata
     this.name = config.name || ''
     this.description = config.description || ''
     this.url = config.url || ''
 
+    // Named layout section sets (when site has layout subdirectories)
+    if (layouts && typeof layouts === 'object') {
+      this._layoutSets = {}
+      for (const [name, panelData] of Object.entries(layouts)) {
+        this._layoutSets[name] = {
+          headerPage: panelData.header ? new Page(panelData.header, `layout-${name}-header`, this) : null,
+          footerPage: panelData.footer ? new Page(panelData.footer, `layout-${name}-footer`, this) : null,
+          leftPage: panelData.left ? new Page(panelData.left, `layout-${name}-left`, this) : null,
+          rightPage: panelData.right ? new Page(panelData.right, `layout-${name}-right`, this) : null,
+        }
+      }
+    } else {
+      this._layoutSets = null
+    }
+
     // Layout panels as Page objects (header, footer, left, right)
-    // They build their own blocks lazily, just like regular pages
+    // Flat fields for backward compatibility (used when no named layouts)
     this.headerPage = header ? new Page(header, 'header', this) : null
     this.footerPage = footer ? new Page(footer, 'footer', this) : null
     this.leftPage = left ? new Page(left, 'left', this) : null
@@ -458,35 +473,63 @@ export default class Website {
 
   /**
    * Get remote layout component from foundation config
+   * @param {string|null} layoutName - Named layout to look up (null = default)
+   */
+  getRemoteLayout(layoutName) {
+    const config = globalThis.uniweb?.foundationConfig
+    if (!config) return null
+    // Named layouts map
+    if (layoutName && config.layouts?.[layoutName]) {
+      return config.layouts[layoutName]
+    }
+    // Single Layout (backward compat)
+    return config.Layout || null
+  }
+
+  /**
+   * Get default layout name from foundation config
+   * @returns {string|null}
    */
-  getRemoteLayout() {
-    return globalThis.uniweb?.foundationConfig?.Layout || null
+  getDefaultLayoutName() {
+    return globalThis.uniweb?.foundationConfig?.defaultLayout || null
   }
 
   /**
    * Get default block type from foundation config
    */
   getDefaultBlockType() {
-    return globalThis.uniweb?.foundationConfig?.defaultType || 'Section'
+    return globalThis.uniweb?.foundationConfig?.defaultSection || 'Section'
   }
 
   // ─────────────────────────────────────────────────────────────────
   // Layout Blocks (from layout panel pages)
   // ─────────────────────────────────────────────────────────────────
 
-  getHeaderBlocks() {
+  getHeaderBlocks(layoutName) {
+    if (layoutName && this._layoutSets?.[layoutName]) {
+      return this._layoutSets[layoutName].headerPage?.bodyBlocks || null
+    }
     return this.headerPage?.bodyBlocks || null
   }
 
-  getFooterBlocks() {
+  getFooterBlocks(layoutName) {
+    if (layoutName && this._layoutSets?.[layoutName]) {
+      return this._layoutSets[layoutName].footerPage?.bodyBlocks || null
+    }
     return this.footerPage?.bodyBlocks || null
   }
 
-  getLeftBlocks() {
+  getLeftBlocks(layoutName) {
+    if (layoutName && this._layoutSets?.[layoutName]) {
+      return this._layoutSets[layoutName].leftPage?.bodyBlocks || null
+    }
     return this.leftPage?.bodyBlocks || null
   }
 
-  getRightBlocks() {
+  getRightBlocks(layoutName) {
+    if (layoutName && this._layoutSets?.[layoutName]) {
+      return this._layoutSets[layoutName].rightPage?.bodyBlocks || null
+    }
     return this.rightPage?.bodyBlocks || null
   }