@uniweb/core 0.5.12 → 0.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.5.12",
+  "version": "0.5.14",
   "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.1.6",
+    "@uniweb/semantic-parser": "1.1.7",
     "@uniweb/theming": "0.1.2"
   },
   "scripts": {

package/src/page.js

@@ -96,14 +96,15 @@ export default class Page {
    * @returns {Object} Head metadata
    */
   getHeadMeta() {
+    const resolvedTitle = this.getTitle()
     return {
-      title: this.title,
+      title: resolvedTitle,
       description: this.description,
       keywords: this.keywords,
       canonical: this.seo.canonical,
       robots: this.seo.noindex ? 'noindex, nofollow' : null,
       og: {
-        title: this.seo.ogTitle || this.title,
+        title: this.seo.ogTitle || resolvedTitle,
         description: this.seo.ogDescription || this.description,
         image: this.seo.image,
         url: this.route,
@@ -284,21 +285,41 @@ export default class Page {
   // ─────────────────────────────────────────────────────────────────
 
   /**
-   * Get the navigation route (canonical route for links)
-   * With the new routing model, route is already the canonical nav route.
-   * Index pages have route set to parent route (e.g., '/' for homepage).
+   * Get the navigation route (canonical route for links).
+   * For index pages whose route ends in /index (e.g., /Articles/index),
+   * returns the parent folder route (/Articles) so nav comparisons and
+   * active-route highlighting work against the clean URL.
    * @returns {string}
    */
   getNavRoute() {
+    if (this.isIndex && this.route.endsWith('/index')) {
+      return this.route.slice(0, -'/index'.length) || '/'
+    }
     return this.route
   }
 
+  /**
+   * Get display title for the page.
+   * For index pages with no meaningful title (empty or the literal string "index"),
+   * falls back to the parent folder's title so /Articles/index shows "Articles".
+   * @returns {string}
+   */
+  getTitle() {
+    if (this.isIndex && this.route.endsWith('/index')) {
+      const own = this.title?.trim()
+      if (!own || own.toLowerCase() === 'index') {
+        return this.parent?.title || own || ''
+      }
+    }
+    return this.title
+  }
+
   /**
    * Get display label for navigation (short form of title)
    * @returns {string}
    */
   getLabel() {
-    return this.label || this.title
+    return this.label || this.getTitle()
   }
 
   /**
@@ -361,7 +382,13 @@ export default class Page {
    */
   getNavigableRoute() {
     if (this.hasContent()) return this.route
-    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

@@ -289,7 +289,16 @@ export default class Website {
 
     // Priority 1: Exact match on actual route
     const exactMatch = this.pages.find((page) => page.route === normalizedRoute)
-    if (exactMatch) return exactMatch
+    if (exactMatch) {
+      // Priority 1.5: folder page with an isIndex child — resolve to the index child.
+      // This makes /Articles resolve to the /Articles/index page for rendering,
+      // keeping the URL clean while serving real content.
+      if (!exactMatch.hasContent()) {
+        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)
@@ -878,6 +887,10 @@ export default class Website {
       // These are templates for generating pages, not actual navigable pages
       if (page.route.includes(':')) return false
 
+      // Exclude index pages (route ends in /index) from navigation — they are
+      // represented by their parent folder entry which links to them via navigableRoute
+      if (page.isIndex && page.route.endsWith('/index')) return false
+
       // Check visibility based on navigation type
       if (!includeHidden) {
         if (page.hidden) return false
@@ -885,9 +898,11 @@ export default class Website {
         if (navType === 'footer' && page.hideInFooter) return false
       }
 
-      // Skip empty folders (no content) that have no visible children.
-      // Folders with children still appear as dropdown parents.
-      if (!page.hasContent() && !page.children?.some(isPageVisible)) return false
+      // Skip empty folders that have no visible children AND no index child.
+      // Folders with an isIndex child are navigable (they link to the index page)
+      // even after the index child itself is filtered out above.
+      const hasNavigableIndex = !page.hasContent() && page.children?.some((c) => c.isIndex)
+      if (!page.hasContent() && !hasNavigableIndex && !page.children?.some(isPageVisible)) return false
 
       // Apply custom filter if provided
       if (customFilter && !customFilter(page)) return false
@@ -900,7 +915,9 @@ export default class Website {
     // When nested, only include root-level pages at top level
     // (children will be nested inside their parents)
     if (nested) {
-      filteredPages = filteredPages.filter(page => !page.parent)
+      // Exclude child pages from root list. Also exclude orphans whose parent
+      // was removed (e.g., hidden) — they have parentRoute but no resolved parent.
+      filteredPages = filteredPages.filter(page => !page.parent && !page.parentRoute)
     }
 
     // Apply custom sort or default to order
@@ -917,7 +934,7 @@ export default class Website {
         route: navRoute, // Use canonical nav route (e.g., '/' for index pages)
         navigableRoute: page.getNavigableRoute(), // First route with content (for links)
         translatedRoute: this.translateRoute(navRoute), // Locale-specific display route
-        title: page.title,
+        title: page.getTitle(),
         label: page.getLabel(),
         description: page.description,
         hasContent: page.hasContent(),