@uniweb/kit 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/kit",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Standard component library for Uniweb foundations",
   "type": "module",
   "exports": {
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "tailwind-merge": "^2.6.0",
-    "@uniweb/core": "0.1.13"
+    "@uniweb/core": "0.1.14"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",

package/src/hooks/useActiveRoute.js

@@ -1,8 +1,9 @@
 /**
  * useActiveRoute Hook
  *
- * SSG-safe hook for active route detection in navigation components.
- * Provides utilities for checking if pages are active or ancestors of the current route.
+ * Hook for active route detection in navigation components.
+ * All route comparison logic is delegated to Website class methods
+ * to ensure a single source of truth for route normalization and matching.
  *
  * @example
  * function NavItem({ page }) {
@@ -13,25 +14,18 @@
  *       href={page.getNavigableRoute()}
  *       className={isActiveOrAncestor(page) ? 'active' : ''}
  *     >
- *       {page.label}
+ *       {page.getLabel()}
  *     </Link>
  *   )
  * }
  */
 
 import { useRouting } from './useRouting.js'
+import { useWebsite } from './useWebsite.js'
 
 /**
- * Normalize a route by removing leading/trailing slashes
- * @param {string} route
- * @returns {string}
- */
-function normalizeRoute(route) {
-  return (route || '').replace(/^\//, '').replace(/\/$/, '')
-}
-
-/**
- * Hook for active route detection with SSG-safe fallbacks.
+ * Hook for active route detection.
+ * Delegates all logic to Website class for consistency.
  *
  * @returns {Object} Route utilities
  * @property {string} route - Current normalized route (e.g., 'docs/getting-started')
@@ -41,17 +35,18 @@ function normalizeRoute(route) {
  */
 export function useActiveRoute() {
   const { useLocation } = useRouting()
+  const { website } = useWebsite()
   const location = useLocation()
 
-  const route = normalizeRoute(location?.pathname)
-  const rootSegment = route.split('/')[0]
+  const currentRoute = website.normalizeRoute(location?.pathname)
+  const rootSegment = currentRoute.split('/')[0]
 
   return {
     /**
      * Current normalized route (no leading/trailing slashes)
      * @type {string}
      */
-    route,
+    route: currentRoute,
 
     /**
      * First segment of the current route
@@ -62,34 +57,31 @@ export function useActiveRoute() {
 
     /**
      * Check if a page is the current active page (exact match)
+     * Delegates to Website.isRouteActive() for consistent comparison.
      *
-     * @param {Object} page - Page object with getNormalizedRoute() or route property
+     * @param {Object|string} pageOrRoute - Page object or route string
      * @returns {boolean}
      */
-    isActive: (page) => {
-      if (typeof page.getNormalizedRoute === 'function') {
-        return page.getNormalizedRoute() === route
-      }
-      // Fallback for page info objects from getPageHierarchy
-      return normalizeRoute(page.route) === route
+    isActive: (pageOrRoute) => {
+      const targetRoute = typeof pageOrRoute === 'string'
+        ? pageOrRoute
+        : pageOrRoute.route
+      return website.isRouteActive(targetRoute, currentRoute)
     },
 
     /**
      * Check if a page or any of its descendants is active
-     * Useful for highlighting parent nav items when child is active
+     * Useful for highlighting parent nav items when child is active.
+     * Delegates to Website.isRouteActiveOrAncestor() for consistent logic.
      *
-     * @param {Object} page - Page object with isActiveOrAncestor() or route property
+     * @param {Object|string} pageOrRoute - Page object or route string
      * @returns {boolean}
      */
-    isActiveOrAncestor: (page) => {
-      if (typeof page.isActiveOrAncestor === 'function') {
-        return page.isActiveOrAncestor(route)
-      }
-      // Fallback for page info objects from getPageHierarchy
-      const pageRoute = normalizeRoute(page.route)
-      if (pageRoute === route) return true
-      if (pageRoute === '') return true // Root is ancestor of all
-      return route.startsWith(pageRoute + '/')
+    isActiveOrAncestor: (pageOrRoute) => {
+      const targetRoute = typeof pageOrRoute === 'string'
+        ? pageOrRoute
+        : pageOrRoute.route
+      return website.isRouteActiveOrAncestor(targetRoute, currentRoute)
     },
   }
 }

package/src/hooks/useWebsite.js

@@ -14,25 +14,23 @@
 import { getUniweb } from '@uniweb/core'
 
 /**
- * Get the current website instance and utilities
+ * Get the current website instance and utilities.
+ * This hook assumes the runtime is properly initialized.
+ *
  * @returns {Object} Website utilities
+ * @throws {Error} If called before runtime initialization
  */
 export function useWebsite() {
   const uniweb = getUniweb()
+  const website = uniweb?.activeWebsite
 
-  if (!uniweb) {
-    console.warn('[Kit] Runtime not initialized. Components require @uniweb/runtime.')
-    return {
-      website: null,
-      localize: (val, defaultVal = '') => defaultVal,
-      makeHref: (href) => href,
-      getLanguage: () => 'en',
-      getLanguages: () => []
-    }
+  if (!website) {
+    throw new Error(
+      '[Kit] useWebsite() called before runtime initialization. ' +
+      'Components must be rendered within a properly initialized Uniweb runtime.'
+    )
   }
 
-  const website = uniweb.activeWebsite
-
   return {
     /**
      * The active Website instance