@uniweb/core 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/core",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Core classes for the Uniweb platform - Uniweb, Website, Page, Block",
   "type": "module",
   "exports": {

package/src/entity-store.js

@@ -40,6 +40,27 @@ export default class EntityStore {
     return null
   }
 
+  /**
+   * Return a localized copy of a fetch config for collection data.
+   * For non-default locales, prepends /{locale} to /data/ paths so the
+   * client fetches the translated JSON (e.g. /fr/data/articles.json).
+   *
+   * @param {Object} cfg - Fetch config
+   * @param {import('./website.js').default|null} website
+   * @returns {Object} Localized config (or original if no change needed)
+   */
+  _localizeConfig(cfg, website) {
+    if (!cfg.path || !website) return cfg
+
+    const locale = website.getActiveLocale()
+    const defaultLocale = website.getDefaultLocale()
+    if (!locale || locale === defaultLocale) return cfg
+
+    if (!cfg.path.startsWith('/data/')) return cfg
+
+    return { ...cfg, path: `/${locale}${cfg.path}` }
+  }
+
   /**
    * Walk the hierarchy to find fetch configs for requested schemas.
    * Order: block.fetch → page.fetch → parent.fetch → site config.fetch
@@ -77,6 +98,8 @@ export default class EntityStore {
       sources.push(siteFetch)
     }
 
+    const website = block.website
+
     for (const source of sources) {
       // Normalize: single config or array of configs
       const configList = Array.isArray(source) ? source : [source]
@@ -86,7 +109,7 @@ export default class EntityStore {
         if (configs.has(cfg.schema)) continue // first match wins
 
         if (collectAll || requested.includes(cfg.schema)) {
-          configs.set(cfg.schema, cfg)
+          configs.set(cfg.schema, this._localizeConfig(cfg, website))
         }
       }
     }

package/src/website.js

@@ -18,21 +18,19 @@ export default class Website {
     this.description = config.description || ''
     this.url = config.url || ''
 
-    // Store special pages (layout areas)
+    // Store layout panels (header, footer, left, right)
     // These come from top-level properties set by content-collector
-    // Fallback to searching pages array for backwards compatibility
-    this.headerPage = header || pages.find((p) => p.route === '/@header') || null
-    this.footerPage = footer || pages.find((p) => p.route === '/@footer') || null
-    this.leftPage = left || pages.find((p) => p.route === '/@left') || null
-    this.rightPage = right || pages.find((p) => p.route === '/@right') || null
+    this.headerPage = header || null
+    this.footerPage = footer || null
+    this.leftPage = left || null
+    this.rightPage = right || null
 
     // Store 404 page (for SPA routing)
     // Convention: pages/404/ directory
     this.notFoundPage = notFound || pages.find((p) => p.route === '/404') || null
 
-    // Filter out special pages from regular pages array
-    const specialRoutes = ['/@header', '/@footer', '/@left', '/@right', '/404']
-    const regularPages = pages.filter((page) => !specialRoutes.includes(page.route))
+    // Filter out 404 from regular pages array
+    const regularPages = pages.filter((page) => page.route !== '/404')
 
     // Store original page data for dynamic pages (needed to create instances on-demand)
     this._dynamicPageData = new Map()
@@ -792,9 +790,6 @@ export default class Website {
 
     // Filter pages based on navigation type and visibility
     const isPageVisible = (page) => {
-      // Always exclude special pages (header/footer are already separated)
-      if (page.route.startsWith('/@')) return false
-
       // Always exclude dynamic route template pages (e.g., /blog/:slug)
       // These are templates for generating pages, not actual navigable pages
       if (page.route.includes(':')) return false