@uniweb/core 0.4.8 → 0.5.0

package/package.json

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

package/src/page.js

@@ -26,13 +26,11 @@ export default class Page {
     this.hideInHeader = pageData.hideInHeader || false
     this.hideInFooter = pageData.hideInFooter || false
 
-    // Layout options (named layout + per-page overrides for header/footer/panels)
+    // Layout options (named layout + per-page overrides)
     this.layout = {
       name: pageData.layout?.name || null,
-      header: pageData.layout?.header !== false,
-      footer: pageData.layout?.footer !== false,
-      leftPanel: pageData.layout?.leftPanel !== false,
-      rightPanel: pageData.layout?.rightPanel !== false,
+      hide: pageData.layout?.hide || [],
+      params: pageData.layout?.params || {},
     }
 
     // SEO configuration
@@ -155,15 +153,12 @@ export default class Page {
 
   /**
    * Get all block groups (for Layout component)
-   * @returns {Object} { header, body, footer, left, right }
+   * @returns {Object} { body, ...areas }
    */
   getBlockGroups() {
     return {
-      header: this.getHeaderBlocks(),
       body: this.bodyBlocks,
-      footer: this.getFooterBlocks(),
-      left: this.getLeftBlocks(),
-      right: this.getRightBlocks(),
+      ...this.getLayoutAreas(),
     }
   }
 
@@ -208,13 +203,14 @@ export default class Page {
 
   /**
    * Get all blocks (header, body, footer) as flat array
-   * Respects page layout preferences (hasHeader, hasFooter, etc.)
+   * Respects page layout preferences (hide list)
    * @returns {Block[]}
    */
   getPageBlocks() {
     const blocks = []
-    const headerBlocks = this.getHeaderBlocks()
-    const footerBlocks = this.getFooterBlocks()
+    const areas = this.getLayoutAreas()
+    const headerBlocks = areas.header
+    const footerBlocks = areas.footer
 
     if (headerBlocks) blocks.push(...headerBlocks)
     blocks.push(...this.bodyBlocks)
@@ -232,69 +228,46 @@ export default class Page {
   }
 
   /**
-   * Get header blocks (respects layout preference, delegates to website)
+   * Get blocks for a specific area, respecting hide list
+   * @param {string} areaName - Area name (e.g., 'header', 'footer', 'left')
    * @returns {Block[]|null}
    */
-  getHeaderBlocks() {
-    if (!this.hasHeader()) return null
-    return this.website.getHeaderBlocks(this.getLayoutName())
+  getAreaBlocks(areaName) {
+    if (this.layout.hide.includes(areaName)) return null
+    return this.website.getAreaBlocks(areaName, this.getLayoutName())
   }
 
   /**
-   * Get footer blocks (respects layout preference, delegates to website)
-   * @returns {Block[]|null}
-   */
-  getFooterBlocks() {
-    if (!this.hasFooter()) return null
-    return this.website.getFooterBlocks(this.getLayoutName())
-  }
-
-  /**
-   * Get left panel blocks (respects layout preference, delegates to website)
-   * @returns {Block[]|null}
+   * Get all areas for this page's layout, excluding hidden areas
+   * @returns {Object} Map of areaName -> Block[]
    */
-  getLeftBlocks() {
-    if (!this.hasLeftPanel()) return null
-    return this.website.getLeftBlocks(this.getLayoutName())
-  }
-
-  /**
-   * Get right panel blocks (respects layout preference, delegates to website)
-   * @returns {Block[]|null}
-   */
-  getRightBlocks() {
-    if (!this.hasRightPanel()) return null
-    return this.website.getRightBlocks(this.getLayoutName())
-  }
-
-  /**
-   * Get header block (legacy - returns first block)
-   * @returns {Block|null}
-   * @deprecated Use getHeaderBlocks() instead
-   */
-  getHeader() {
-    return this.getHeaderBlocks()?.[0] || null
+  getLayoutAreas() {
+    const allAreas = this.website.getLayoutAreas(this.getLayoutName())
+    const result = {}
+    for (const [name, blocks] of Object.entries(allAreas)) {
+      if (!this.layout.hide.includes(name)) {
+        result[name] = blocks
+      }
+    }
+    return result
   }
 
   /**
-   * Get footer block (legacy - returns first block)
-   * @returns {Block|null}
-   * @deprecated Use getFooterBlocks() instead
+   * Get layout params for this page (merged with defaults at render time)
+   * @returns {Object}
    */
-  getFooter() {
-    return this.getFooterBlocks()?.[0] || null
+  getLayoutParams() {
+    return this.layout.params
   }
 
   /**
    * Reset block states (for scroll restoration)
    */
   resetBlockStates() {
+    const areas = this.getLayoutAreas()
     const allBlocks = [
-      ...(this.getHeaderBlocks() || []),
       ...this.bodyBlocks,
-      ...(this.getFooterBlocks() || []),
-      ...(this.getLeftBlocks() || []),
-      ...(this.getRightBlocks() || []),
+      ...Object.values(areas).flat(),
     ]
 
     for (const block of allBlocks) {
@@ -350,38 +323,6 @@ export default class Page {
     return !this.hidden && !this.hideInFooter
   }
 
-  /**
-   * Check if header should be rendered on this page
-   * @returns {boolean}
-   */
-  hasHeader() {
-    return this.layout.header
-  }
-
-  /**
-   * Check if footer should be rendered on this page
-   * @returns {boolean}
-   */
-  hasFooter() {
-    return this.layout.footer
-  }
-
-  /**
-   * Check if left panel should be rendered on this page
-   * @returns {boolean}
-   */
-  hasLeftPanel() {
-    return this.layout.leftPanel
-  }
-
-  /**
-   * Check if right panel should be rendered on this page
-   * @returns {boolean}
-   */
-  hasRightPanel() {
-    return this.layout.rightPanel
-  }
-
   /**
    * Check if page has child pages
    * @returns {boolean}

package/src/website.js

@@ -11,35 +11,26 @@ import singularize from './singularize.js'
 
 export default class Website {
   constructor(websiteData) {
-    const { pages = [], theme = {}, config = {}, layouts, header, footer, left, right, notFound, versionedScopes = {} } = websiteData
+    const { pages = [], theme = {}, config = {}, layouts, 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)
+    // General area storage: { layoutName: { areaName: Page } }
+    this._layoutSets = {}
     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,
+      for (const [name, areaData] of Object.entries(layouts)) {
+        this._layoutSets[name] = {}
+        for (const [areaName, pageData] of Object.entries(areaData)) {
+          if (pageData) {
+            this._layoutSets[name][areaName] = new Page(pageData, `layout-${name}-${areaName}`, this)
+          }
         }
       }
-    } else {
-      this._layoutSets = null
     }
 
-    // Layout panels as Page objects (header, footer, left, right)
-    // 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
-    this.rightPage = right ? new Page(right, 'right', this) : null
-
     // Store 404 page (for SPA routing)
     // Convention: pages/404/ directory
     this.notFoundPage = notFound || pages.find((p) => p.route === '/404') || null
@@ -477,13 +468,11 @@ export default class Website {
    */
   getRemoteLayout(layoutName) {
     const config = globalThis.uniweb?.foundationConfig
-    if (!config) return null
-    // Named layouts map
-    if (layoutName && config.layouts?.[layoutName]) {
+    if (!config?.layouts) return null
+    if (layoutName && config.layouts[layoutName]) {
       return config.layouts[layoutName]
     }
-    // Single Layout (backward compat)
-    return config.Layout || null
+    return null
   }
 
   /**
@@ -502,35 +491,52 @@ export default class Website {
   }
 
   // ─────────────────────────────────────────────────────────────────
-  // Layout Blocks (from layout panel pages)
+  // Layout Areas (general named areas)
   // ─────────────────────────────────────────────────────────────────
 
-  getHeaderBlocks(layoutName) {
-    if (layoutName && this._layoutSets?.[layoutName]) {
-      return this._layoutSets[layoutName].headerPage?.bodyBlocks || null
+  /**
+   * Get blocks for a specific area, with layout name resolution
+   * @param {string} areaName - Area name (e.g., 'header', 'footer', 'left', 'sidebar')
+   * @param {string} [layoutName] - Named layout to look in (falls back to 'default')
+   * @returns {Block[]|null}
+   */
+  getAreaBlocks(areaName, layoutName) {
+    if (layoutName && this._layoutSets[layoutName]) {
+      return this._layoutSets[layoutName][areaName]?.bodyBlocks || null
     }
-    return this.headerPage?.bodyBlocks || null
-  }
-
-  getFooterBlocks(layoutName) {
-    if (layoutName && this._layoutSets?.[layoutName]) {
-      return this._layoutSets[layoutName].footerPage?.bodyBlocks || null
+    // Fallback to 'default' layout
+    if (this._layoutSets.default) {
+      return this._layoutSets.default[areaName]?.bodyBlocks || null
     }
-    return this.footerPage?.bodyBlocks || null
+    return null
   }
 
-  getLeftBlocks(layoutName) {
-    if (layoutName && this._layoutSets?.[layoutName]) {
-      return this._layoutSets[layoutName].leftPage?.bodyBlocks || null
+  /**
+   * Get all areas for a layout as { areaName: Block[] }
+   * @param {string} [layoutName] - Named layout (falls back to 'default')
+   * @returns {Object} Map of areaName -> Block[]
+   */
+  getLayoutAreas(layoutName) {
+    const setName = layoutName || 'default'
+    const layoutSet = this._layoutSets[setName] || this._layoutSets.default
+    if (!layoutSet) return {}
+
+    const areas = {}
+    for (const [areaName, page] of Object.entries(layoutSet)) {
+      if (page?.bodyBlocks) {
+        areas[areaName] = page.bodyBlocks
+      }
     }
-    return this.leftPage?.bodyBlocks || null
+    return areas
   }
 
-  getRightBlocks(layoutName) {
-    if (layoutName && this._layoutSets?.[layoutName]) {
-      return this._layoutSets[layoutName].rightPage?.bodyBlocks || null
-    }
-    return this.rightPage?.bodyBlocks || null
+  /**
+   * Get layout metadata from foundation config
+   * @param {string} layoutName - Layout name
+   * @returns {Object|null} Layout meta { areas, transitions, defaults }
+   */
+  getLayoutMeta(layoutName) {
+    return globalThis.uniweb?.foundationConfig?.layoutMeta?.[layoutName] || null
   }
 
   /**