@uniweb/core 0.4.5 → 0.4.6

package/package.json

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

package/src/block.js

@@ -8,17 +8,14 @@
 import { parseContent as parseSemanticContent } from '@uniweb/semantic-parser'
 
 export default class Block {
-  constructor(blockData, id) {
+  constructor(blockData, id, page) {
     this.id = id
     this.stableId = blockData.stableId || null // Stable section ID for scroll targeting (from filename or frontmatter)
-    // 'type' matches frontmatter convention; 'component' supported for backwards compatibility
-    this.type = blockData.type || blockData.component || 'Section'
+    this.page = page
+    this.website = page.website
+    this.type = blockData.type || this.website.getDefaultBlockType()
     this.Component = null
 
-    // Back-references (set by Page when creating blocks)
-    this.page = null
-    this.website = null
-
     // Content structure
     // The content can be:
     // 1. Raw ProseMirror content (from content collection)
@@ -77,7 +74,7 @@ export default class Block {
 
     // Child blocks (subsections)
     this.childBlocks = blockData.subsections
-      ? blockData.subsections.map((block, i) => new Block(block, `${id}_${i}`))
+      ? blockData.subsections.map((block, i) => new Block(block, `${id}_${i}`, this.page))
       : []
 
     // Fetch configuration (from section frontmatter)

package/src/page.js

@@ -8,15 +8,7 @@
 import Block from './block.js'
 
 export default class Page {
-  constructor(
-    pageData,
-    id,
-    website,
-    pageHeader,
-    pageFooter,
-    pageLeft,
-    pageRight,
-  ) {
+  constructor(pageData, id, website) {
     this.id = id
     this.stableId = pageData.id || null // Stable page ID for page: links (from page.yml)
     this.route = pageData.route
@@ -77,14 +69,25 @@ export default class Page {
     this.versionMeta = pageData.versionMeta || null // { versions, latestId }
     this.versionScope = pageData.versionScope || null // The route where versioning starts
 
-    // Build block groups for all layout areas
-    this.pageBlocks = this.buildPageBlocks(
-      pageData.sections,
-      pageHeader?.sections,
-      pageFooter?.sections,
-      pageLeft?.sections,
-      pageRight?.sections,
-    )
+    // Store raw section data for lazy block building
+    // Blocks are created on first access (when page is rendered), not during Website init
+    // This ensures foundationConfig is available for getDefaultBlockType()
+    // Layout panels (header, footer, left, right) are shared at Website level
+    this._bodySections = pageData.sections
+    this._bodyBlocks = null
+  }
+
+  /**
+   * Lazy getter for body blocks
+   * Blocks are built on first access, ensuring foundation is loaded
+   */
+  get bodyBlocks() {
+    if (!this._bodyBlocks) {
+      this._bodyBlocks = (this._bodySections || []).map(
+        (section, index) => new Block(section, index, this)
+      )
+    }
+    return this._bodyBlocks
   }
 
   /**
@@ -140,66 +143,18 @@ export default class Page {
     return this.dynamicContext?.paramValue || null
   }
 
-  /**
-   * Build the page block structure for all layout areas.
-   * Each area can have multiple sections/blocks.
-   *
-   * @param {Array} body - Body sections from page content
-   * @param {Array} header - Header sections from @header page
-   * @param {Array} footer - Footer sections from @footer page
-   * @param {Array} left - Left panel sections from @left page
-   * @param {Array} right - Right panel sections from @right page
-   * @returns {Object} Block groups for each layout area
-   */
-  buildPageBlocks(body, header, footer, left, right) {
-    const buildBlocks = (sections, prefix) => {
-      if (!sections || sections.length === 0) return null
-      return sections.map((section, index) => {
-        const block = new Block(section, `${prefix}-${index}`)
-        this.initBlockReferences(block)
-        return block
-      })
-    }
-
-    const bodyBlocks = (body || []).map((section, index) => {
-      const block = new Block(section, index)
-      this.initBlockReferences(block)
-      return block
-    })
-
-    return {
-      header: buildBlocks(header, 'header'),
-      body: bodyBlocks,
-      footer: buildBlocks(footer, 'footer'),
-      left: buildBlocks(left, 'left'),
-      right: buildBlocks(right, 'right'),
-    }
-  }
-
-  /**
-   * Initialize block back-references to page and website.
-   * Also recursively sets references for child blocks.
-   *
-   * @param {Block} block - The block to initialize
-   */
-  initBlockReferences(block) {
-    block.page = this
-    block.website = this.website
-
-    // Recursively set references for child blocks
-    if (block.childBlocks?.length) {
-      for (const childBlock of block.childBlocks) {
-        this.initBlockReferences(childBlock)
-      }
-    }
-  }
-
   /**
    * Get all block groups (for Layout component)
    * @returns {Object} { header, body, footer, left, right }
    */
   getBlockGroups() {
-    return this.pageBlocks
+    return {
+      header: this.getHeaderBlocks(),
+      body: this.bodyBlocks,
+      footer: this.getFooterBlocks(),
+      left: this.getLeftBlocks(),
+      right: this.getRightBlocks(),
+    }
   }
 
   // ─────────────────────────────────────────────────────────────────
@@ -238,8 +193,7 @@ export default class Page {
    * @returns {Object|null} First body block's info or null
    */
   getFirstBodyBlockInfo() {
-    const bodyBlocks = this.pageBlocks.body
-    return bodyBlocks?.[0]?.getBlockInfo() || null
+    return this.bodyBlocks?.[0]?.getBlockInfo() || null
   }
 
   /**
@@ -249,62 +203,58 @@ export default class Page {
    */
   getPageBlocks() {
     const blocks = []
+    const headerBlocks = this.getHeaderBlocks()
+    const footerBlocks = this.getFooterBlocks()
 
-    if (this.hasHeader() && this.pageBlocks.header) {
-      blocks.push(...this.pageBlocks.header)
-    }
-
-    blocks.push(...this.pageBlocks.body)
-
-    if (this.hasFooter() && this.pageBlocks.footer) {
-      blocks.push(...this.pageBlocks.footer)
-    }
+    if (headerBlocks) blocks.push(...headerBlocks)
+    blocks.push(...this.bodyBlocks)
+    if (footerBlocks) blocks.push(...footerBlocks)
 
     return blocks
   }
 
   /**
-   * Get just body blocks
+   * Get body blocks
    * @returns {Block[]}
    */
   getBodyBlocks() {
-    return this.pageBlocks.body
+    return this.bodyBlocks
   }
 
   /**
-   * Get header blocks (respects layout preference)
+   * Get header blocks (respects layout preference, delegates to website)
    * @returns {Block[]|null}
    */
   getHeaderBlocks() {
     if (!this.hasHeader()) return null
-    return this.pageBlocks.header
+    return this.website.getHeaderBlocks()
   }
 
   /**
-   * Get footer blocks (respects layout preference)
+   * Get footer blocks (respects layout preference, delegates to website)
    * @returns {Block[]|null}
    */
   getFooterBlocks() {
     if (!this.hasFooter()) return null
-    return this.pageBlocks.footer
+    return this.website.getFooterBlocks()
   }
 
   /**
-   * Get left panel blocks (respects layout preference)
+   * Get left panel blocks (respects layout preference, delegates to website)
    * @returns {Block[]|null}
    */
   getLeftBlocks() {
     if (!this.hasLeftPanel()) return null
-    return this.pageBlocks.left
+    return this.website.getLeftBlocks()
   }
 
   /**
-   * Get right panel blocks (respects layout preference)
+   * Get right panel blocks (respects layout preference, delegates to website)
    * @returns {Block[]|null}
    */
   getRightBlocks() {
     if (!this.hasRightPanel()) return null
-    return this.pageBlocks.right
+    return this.website.getRightBlocks()
   }
 
   /**
@@ -313,7 +263,7 @@ export default class Page {
    * @deprecated Use getHeaderBlocks() instead
    */
   getHeader() {
-    return this.pageBlocks.header?.[0] || null
+    return this.getHeaderBlocks()?.[0] || null
   }
 
   /**
@@ -322,7 +272,7 @@ export default class Page {
    * @deprecated Use getFooterBlocks() instead
    */
   getFooter() {
-    return this.pageBlocks.footer?.[0] || null
+    return this.getFooterBlocks()?.[0] || null
   }
 
   /**
@@ -330,11 +280,11 @@ export default class Page {
    */
   resetBlockStates() {
     const allBlocks = [
-      ...(this.pageBlocks.header || []),
-      ...this.pageBlocks.body,
-      ...(this.pageBlocks.footer || []),
-      ...(this.pageBlocks.left || []),
-      ...(this.pageBlocks.right || []),
+      ...(this.getHeaderBlocks() || []),
+      ...this.bodyBlocks,
+      ...(this.getFooterBlocks() || []),
+      ...(this.getLeftBlocks() || []),
+      ...(this.getRightBlocks() || []),
     ]
 
     for (const block of allBlocks) {
@@ -435,7 +385,7 @@ export default class Page {
    * @returns {boolean}
    */
   hasContent() {
-    return this.pageBlocks.body.length > 0
+    return this.bodyBlocks.length > 0
   }
 
   // ─────────────────────────────────────────────────────────────────

package/src/website.js

@@ -18,12 +18,12 @@ export default class Website {
     this.description = config.description || ''
     this.url = config.url || ''
 
-    // Store layout panels (header, footer, left, right)
-    // These come from top-level properties set by content-collector
-    this.headerPage = header || null
-    this.footerPage = footer || null
-    this.leftPage = left || null
-    this.rightPage = right || null
+    // Layout panels as Page objects (header, footer, left, right)
+    // They build their own blocks lazily, just like regular pages
+    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
@@ -44,8 +44,7 @@ export default class Website {
     this._dynamicPageCache = new Map()
 
     this.pages = regularPages.map(
-      (page, index) =>
-        new Page(page, index, this, this.headerPage, this.footerPage, this.leftPage, this.rightPage)
+      (page, index) => new Page(page, index, this)
     )
 
     // Build parent-child relationships based on route structure
@@ -416,15 +415,7 @@ export default class Website {
     }
 
     // Create the page instance
-    const dynamicPage = new Page(
-      pageData,
-      `dynamic-${concreteRoute}`,
-      this,
-      this.headerPage,
-      this.footerPage,
-      this.leftPage,
-      this.rightPage
-    )
+    const dynamicPage = new Page(pageData, `dynamic-${concreteRoute}`, this)
 
     // Copy parent reference from template
     dynamicPage.parent = templatePage.parent
@@ -472,6 +463,33 @@ export default class Website {
     return globalThis.uniweb?.foundationConfig?.Layout || null
   }
 
+  /**
+   * Get default block type from foundation config
+   */
+  getDefaultBlockType() {
+    return globalThis.uniweb?.foundationConfig?.defaultType || 'Section'
+  }
+
+  // ─────────────────────────────────────────────────────────────────
+  // Layout Blocks (from layout panel pages)
+  // ─────────────────────────────────────────────────────────────────
+
+  getHeaderBlocks() {
+    return this.headerPage?.bodyBlocks || null
+  }
+
+  getFooterBlocks() {
+    return this.footerPage?.bodyBlocks || null
+  }
+
+  getLeftBlocks() {
+    return this.leftPage?.bodyBlocks || null
+  }
+
+  getRightBlocks() {
+    return this.rightPage?.bodyBlocks || null
+  }
+
   /**
    * Get remote props from foundation config
    */