@uniweb/core 0.5.19 → 0.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.5.19",
+  "version": "0.5.21",
   "description": "Core classes for the Uniweb platform - Uniweb, Website, Page, Block",
   "type": "module",
   "exports": {
@@ -26,14 +26,14 @@
   "engines": {
     "node": ">=20.19"
   },
+  "scripts": {
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+  },
   "devDependencies": {
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@uniweb/semantic-parser": "1.1.9",
-    "@uniweb/theming": "0.1.3"
-  },
-  "scripts": {
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
+    "@uniweb/semantic-parser": "workspace:*",
+    "@uniweb/theming": "workspace:*"
   }
-}
+}

package/src/block.js

@@ -167,6 +167,15 @@ export default class Block {
     return this.page.getNavRoute()
   }
 
+  /**
+   * Unique key for this block across all pages.
+   * Combines the page route with the block's positional id.
+   * Use as a React key when cross-page uniqueness matters.
+   */
+  get key() {
+    return `${this.path}-${this.id}`
+  }
+
   /**
    * The parent page's URL path, one level up from the current page.
    * Use this for "Back" links in detail pages: /blog/1 → /blog

package/src/page.js

@@ -387,8 +387,13 @@ export default class Page {
    */
   getNavigableRoute() {
     if (this.hasContent()) return this.route
-    // Content-less containers: find first descendant with content
-    for (const child of this.children || []) {
+    const children = this.children || []
+    // Prefer the index child (designated landing page for this folder).
+    // Return this folder's own route so the URL stays clean (/Articles, not /Articles/index).
+    const indexChild = children.find((c) => c.isIndex)
+    if (indexChild) return this.route
+    // Fall back to first child with content
+    for (const child of children) {
       const route = child.getNavigableRoute()
       if (route) return route
     }

package/src/website.js

@@ -238,6 +238,23 @@ export default class Website {
       }
     }
 
+    // Fallback: infer parent-child from route structure for unlinked pages.
+    // The editor sets parentRoute via buildEnginePreviewPayload(), but published
+    // payloads may not include it. Infer from route nesting so children arrays
+    // are always populated (needed for nav filtering and getNavigableRoute).
+    // Only applies to nested routes (e.g., /Articles/index → parent /Articles).
+    // Top-level pages (e.g., /Features) are NOT children of the homepage.
+    for (const page of this.pages) {
+      if (page.parent || page.route === '/') continue
+      const inferredParent = page.route.replace(/\/[^/]+$/, '')
+      if (!inferredParent || inferredParent === '/' || inferredParent === page.route) continue
+      const parent = pageMap.get(inferredParent)
+      if (parent) {
+        parent.children.push(page)
+        page.parent = parent
+      }
+    }
+
     // Build page ID map for makeHref() resolution
     // Supports both explicit IDs and route-based lookup
     this._pageIdMap = new Map()
@@ -295,7 +312,13 @@ export default class Website {
     // For file-system sites whose page map uses canonical routes this will
     // simply fall through to the reverse-translate path below.
     const directMatch = this.pages.find((page) => page.route === normalizedStripped)
-    if (directMatch) return directMatch
+    if (directMatch) {
+      // Folder with index child: always resolve to the index page.
+      // The index child is the designated landing page for this folder URL.
+      const indexChild = directMatch.children.find((c) => c.isIndex)
+      if (indexChild) return indexChild
+      return directMatch
+    }
 
     // Reverse-translate display route to canonical (e.g., '/acerca-de' → '/about')
     stripped = this.reverseTranslateRoute(stripped)
@@ -306,7 +329,11 @@ export default class Website {
 
     // Priority 1b: Exact match on canonical route
     const exactMatch = this.pages.find((page) => page.route === normalizedRoute)
-    if (exactMatch) return exactMatch
+    if (exactMatch) {
+      const indexChild = exactMatch.children.find((c) => c.isIndex)
+      if (indexChild) return indexChild
+      return exactMatch
+    }
 
     // Priority 2: Index page nav route match
     const indexMatch = this.pages.find((page) => page.isIndex && page.getNavRoute() === normalizedRoute)
@@ -715,7 +742,9 @@ export default class Website {
    * @returns {string}
    */
   getLocaleUrl(localeCode, route = null) {
-    let targetRoute = route || this.activePage.route
+    // Use getNavRoute() so index pages return the clean folder URL
+    // (e.g., /Articles instead of /Articles/index)
+    let targetRoute = route || this.activePage.getNavRoute()
 
     // Strip current locale prefix if present in route
     if (this.activeLocale && this.activeLocale !== this.defaultLocale) {
@@ -930,11 +959,14 @@ export default class Website {
         if (navType === 'footer' && page.hideInFooter) return false
       }
 
-      // Skip content-less containers that have no visible children.
-      // Containers WITH visible children stay in the hierarchy as group nodes
-      // (hasContent: false) — navigation components can render them as headers
-      // or link them via navigableRoute to the first descendant with content.
-      if (!page.hasContent() && !page.children?.some(isPageVisible)) return false
+      // Skip content-less containers that have no visible or navigable children.
+      // Folders with an isIndex child are navigable (they link to the index page)
+      // even though the index child itself is filtered out of the nav tree above.
+      // Containers with other visible children stay as group nodes.
+      if (!page.hasContent()) {
+        const hasNavigableIndex = page.children?.some((c) => c.isIndex)
+        if (!hasNavigableIndex && !page.children?.some(isPageVisible)) return false
+      }
 
       // Apply custom filter if provided
       if (customFilter && !customFilter(page)) return false