@uniweb/core 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Core classes for the Uniweb platform - Uniweb, Website, Page, Block",
   "type": "module",
   "exports": {
@@ -30,7 +30,7 @@
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@uniweb/semantic-parser": "1.0.14"
+    "@uniweb/semantic-parser": "1.0.15"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"

package/src/block.js

@@ -52,9 +52,6 @@ export default class Block {
       ? blockData.subsections.map((block, i) => new Block(block, `${id}_${i}`))
       : []
 
-    // Input data
-    this.input = blockData.input || null
-
     // Fetch configuration (from section frontmatter)
     // Supports local files (path) or remote URLs (url)
     this.fetch = blockData.fetch || null

package/src/page.js

@@ -26,7 +26,6 @@ export default class Page {
     this.description = pageData.description || ''
     this.label = pageData.label || null // Short label for navigation (null = use title)
     this.keywords = pageData.keywords || null
-    this.order = pageData.order ?? 0
     this.lastModified = pageData.lastModified || null
 
     // Navigation visibility options
@@ -38,11 +37,8 @@ export default class Page {
     this.layout = {
       header: pageData.layout?.header !== false,
       footer: pageData.layout?.footer !== false,
-      left: pageData.layout?.left !== false,
-      right: pageData.layout?.right !== false,
-      // Aliases for backwards compatibility
-      leftPanel: pageData.layout?.left !== false,
-      rightPanel: pageData.layout?.right !== false,
+      leftPanel: pageData.layout?.leftPanel !== false,
+      rightPanel: pageData.layout?.rightPanel !== false,
     }
 
     // SEO configuration

package/src/website.js

@@ -167,12 +167,8 @@ export default class Website {
       }
     }
 
-    // Sort children by order
-    for (const page of this.pages) {
-      if (page.children.length > 0) {
-        page.children.sort((a, b) => (a.order || 0) - (b.order || 0))
-      }
-    }
+    // Note: Pages arrive pre-sorted from build time.
+    // The hierarchy is hydrated from that order - no runtime sorting needed.
 
     // Build page ID map for makeHref() resolution
     // Supports both explicit IDs and route-based lookup
@@ -201,18 +197,22 @@ export default class Website {
    * @returns {Page|undefined}
    */
   getPage(route) {
+    // Normalize trailing slashes for consistent matching
+    // '/about/' and '/about' should match the same page
+    const normalizedRoute = route === '/' ? '/' : route.replace(/\/$/, '')
+
     // Priority 1: Exact match on actual route
-    const exactMatch = this.pages.find((page) => page.route === route)
+    const exactMatch = this.pages.find((page) => page.route === normalizedRoute)
     if (exactMatch) return exactMatch
 
     // Priority 2: Index page nav route match
-    const indexMatch = this.pages.find((page) => page.isIndex && page.getNavRoute() === route)
+    const indexMatch = this.pages.find((page) => page.isIndex && page.getNavRoute() === normalizedRoute)
     if (indexMatch) return indexMatch
 
     // Priority 3: Dynamic route pattern matching
     // Check cache first
-    if (this._dynamicPageCache.has(route)) {
-      return this._dynamicPageCache.get(route)
+    if (this._dynamicPageCache.has(normalizedRoute)) {
+      return this._dynamicPageCache.get(normalizedRoute)
     }
 
     // Try to match against dynamic route patterns
@@ -220,13 +220,13 @@ export default class Website {
       // Check if this is a dynamic page (has :param in route)
       if (!page.route.includes(':')) continue
 
-      const match = this._matchDynamicRoute(page.route, route)
+      const match = this._matchDynamicRoute(page.route, normalizedRoute)
       if (match) {
         // Create a dynamic page instance with the concrete route and params
-        const dynamicPage = this._createDynamicPage(page, route, match.params)
+        const dynamicPage = this._createDynamicPage(page, normalizedRoute, match.params)
         if (dynamicPage) {
           // Cache for future requests
-          this._dynamicPageCache.set(route, dynamicPage)
+          this._dynamicPageCache.set(normalizedRoute, dynamicPage)
           return dynamicPage
         }
       }
@@ -739,7 +739,7 @@ export default class Website {
    *
    * // Custom filtering
    * const topLevel = website.getPageHierarchy({
-   *   filter: (page) => page.order < 10
+   *   filter: (page) => !page.route.startsWith('/admin')
    * })
    */
   getPageHierarchy(options = {}) {
@@ -795,7 +795,6 @@ export default class Website {
       title: page.title,
       label: page.getLabel(),
       description: page.description,
-      order: page.order,
       hasContent: page.hasContent(),
       children: nested && page.hasChildren()
         ? page.children.filter(isPageVisible).map(buildPageInfo)