@uniweb/core 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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.12"
+    "@uniweb/semantic-parser": "1.0.14"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"

package/src/block.js

@@ -233,7 +233,8 @@ export default class Block {
       videos: c.videos || [],
       lists: c.lists || [],
       buttons: c.buttons || [],
-      items: c.items || []
+      items: c.items || [],
+      data: c.data || {}
     }
   }
 

package/src/page.js

@@ -20,6 +20,7 @@ export default class Page {
     this.id = id
     this.stableId = pageData.id || null // Stable page ID for page: links (from page.yml)
     this.route = pageData.route
+    this.sourcePath = pageData.sourcePath || null // Original folder-based path (for ancestor checking)
     this.isIndex = pageData.isIndex || false // True if this page is the index for its parent route
     this.title = pageData.title || ''
     this.description = pageData.description || ''
@@ -345,22 +346,12 @@ export default class Page {
 
   /**
    * Get the navigation route (canonical route for links)
-   * For index pages, returns the parent route (e.g., '/' for homepage)
-   * For regular pages, returns the actual route
+   * With the new routing model, route is already the canonical nav route.
+   * Index pages have route set to parent route (e.g., '/' for homepage).
    * @returns {string}
    */
   getNavRoute() {
-    if (!this.isIndex) {
-      return this.route
-    }
-    // Index page - compute parent route
-    // /home -> /
-    // /docs/getting-started -> /docs
-    const segments = this.route.split('/').filter(Boolean)
-    if (segments.length <= 1) {
-      return '/'
-    }
-    return '/' + segments.slice(0, -1).join('/')
+    return this.route
   }
 
   /**
@@ -494,18 +485,27 @@ export default class Page {
   /**
    * Check if this page or any descendant matches the given route.
    * Useful for highlighting parent nav items when a child page is active.
-   * Delegates to Website.isRouteActiveOrAncestor() for consistent logic.
+   *
+   * For index pages, uses sourcePath (original folder path) for ancestor checking
+   * to avoid false positives. E.g., homepage at '/' shouldn't be ancestor of '/about'.
    *
    * @param {string} currentRoute - Current route to compare against
    * @returns {boolean} True if this page or a descendant is active
    *
    * @example
-   * // Page route: '/docs'
-   * // Current route: 'docs/getting-started/installation'
-   * page.isActiveOrAncestor('docs/getting-started/installation') // true
+   * // Page route: '/docs' (index page with sourcePath: '/docs/intro')
+   * // Current route: '/docs/api'
+   * page.isActiveOrAncestor('/docs/api') // false (not under /docs/intro)
    */
   isActiveOrAncestor(currentRoute) {
-    return this.website.isRouteActiveOrAncestor(this.route, currentRoute)
+    // Exact match on canonical route
+    if (this.website.isRouteActive(this.route, currentRoute)) {
+      return true
+    }
+    // Ancestor check uses sourcePath (folder-based path) to avoid false positives
+    // For index pages, sourcePath differs from route
+    const pathForAncestorCheck = this.sourcePath || this.route
+    return this.website.isRouteActiveOrAncestor(pathForAncestorCheck, currentRoute)
   }
 
   // ─────────────────────────────────────────────────────────────────

package/src/website.js

@@ -969,8 +969,18 @@ export default class Website {
 
     // Check each versioned scope to see if route falls within it
     for (const scope of Object.keys(this.versionedScopes)) {
-      // Route matches scope exactly or is a child of scope
-      if (normalizedRoute === scope || normalizedRoute.startsWith(scope + '/')) {
+      // Route matches scope exactly
+      if (normalizedRoute === scope) {
+        return scope
+      }
+
+      // Root scope matches all routes starting with /
+      if (scope === '/') {
+        if (normalizedRoute.startsWith('/') || normalizedRoute === '') {
+          return scope
+        }
+      } else if (normalizedRoute.startsWith(scope + '/')) {
+        // Route is a child of this scope
         return scope
       }
     }
@@ -1060,7 +1070,10 @@ export default class Website {
     if (!targetVersionInfo) return null
 
     // Extract the path within the scope (after scope and any version prefix)
-    const afterScope = currentRoute.slice(scope.length) // e.g., '/getting-started' or '/v1/getting-started'
+    // For root scope ('/'), keep the full path; otherwise slice off the scope
+    const afterScope = scope === '/'
+      ? currentRoute
+      : currentRoute.slice(scope.length) // e.g., '/getting-started' or '/v1/getting-started'
 
     // Check if current route has a version prefix
     let pathWithinVersion = afterScope
@@ -1076,9 +1089,13 @@ export default class Website {
     // Build target URL
     // Latest version has no prefix, others have /vN prefix
     if (targetVersionInfo.latest) {
-      return scope + pathWithinVersion
+      // For root scope, return path directly; otherwise prepend scope
+      return scope === '/' ? pathWithinVersion : scope + pathWithinVersion
     } else {
-      return scope + '/' + targetVersion + pathWithinVersion
+      // For root scope: /v1/path; otherwise: scope/v1/path
+      return scope === '/'
+        ? '/' + targetVersion + pathWithinVersion
+        : scope + '/' + targetVersion + pathWithinVersion
     }
   }