@constela/start 1.2.15 → 1.2.16

package/dist/{chunk-7KQYNZ2A.js → chunk-RBEPA2Z2.js}

@@ -2448,8 +2448,17 @@ async function loadLayout2(layoutName, layoutsDir) {
   }
   try {
     const content = readFileSync5(layoutPath, "utf-8");
-    return JSON.parse(content);
-  } catch {
+    const parsed = JSON.parse(content);
+    if (parsed.imports && Object.keys(parsed.imports).length > 0) {
+      const layoutDir = dirname5(layoutPath);
+      const resolvedImports = await resolveImports(layoutDir, parsed.imports);
+      return { ...parsed, importData: resolvedImports };
+    }
+    return parsed;
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("not found")) {
+      throw error;
+    }
     throw new Error(`Invalid JSON in layout file: ${layoutPath}`);
   }
 }
@@ -2586,43 +2595,59 @@ function replaceSlot(node, content) {
   }
   return node;
 }
+async function collectLayoutChain(layoutName, layoutsDir, visited = /* @__PURE__ */ new Set()) {
+  if (visited.has(layoutName)) {
+    throw new Error(`Circular layout reference detected: ${layoutName}`);
+  }
+  visited.add(layoutName);
+  const layout = await loadLayout2(layoutName, layoutsDir);
+  const chain = [layout];
+  if (layout.layout) {
+    const parentChain = await collectLayoutChain(layout.layout, layoutsDir, visited);
+    chain.push(...parentChain);
+  }
+  return chain;
+}
 async function processLayouts(pageInfo, layoutsDir) {
   const layoutName = pageInfo.page.route?.layout;
   if (!layoutName || !layoutsDir) {
     return pageInfo;
   }
-  const layout = await loadLayout2(layoutName, layoutsDir);
-  const normalizedLayoutView = normalizeViewNode(structuredClone(layout.view));
-  let wrappedView = applyLayout(pageInfo.page.view, normalizedLayoutView);
+  const layoutChain = await collectLayoutChain(layoutName, layoutsDir);
+  let mergedImports = { ...pageInfo.resolvedImports };
+  for (let i = layoutChain.length - 1; i >= 0; i--) {
+    const layout = layoutChain[i];
+    if (layout?.importData) {
+      mergedImports = {
+        ...layout.importData,
+        ...mergedImports
+        // Inner layout/page imports take precedence
+      };
+    }
+  }
+  let currentView = pageInfo.page.view;
+  for (const layout of layoutChain) {
+    const normalizedLayoutView = normalizeViewNode(structuredClone(layout.view));
+    currentView = applyLayout(currentView, normalizedLayoutView);
+  }
   const layoutParams = pageInfo.page.route?.layoutParams;
   if (layoutParams && Object.keys(layoutParams).length > 0) {
-    wrappedView = substituteLayoutParamsInNode(wrappedView, layoutParams);
+    currentView = substituteLayoutParamsInNode(currentView, layoutParams);
   }
   let updatedRoute;
   if (pageInfo.page.route) {
     const { layout: _layout, ...routeWithoutLayout } = pageInfo.page.route;
     updatedRoute = routeWithoutLayout;
   }
-  let updatedPageInfo = {
+  const updatedPageInfo = {
     ...pageInfo,
+    resolvedImports: mergedImports,
     page: {
       ...pageInfo.page,
-      view: wrappedView,
+      view: currentView,
       route: updatedRoute
     }
   };
-  if (layout.layout) {
-    const parentLayout = await loadLayout2(layout.layout, layoutsDir);
-    const normalizedParentLayoutView = normalizeViewNode(structuredClone(parentLayout.view));
-    const doubleWrappedView = applyLayout(updatedPageInfo.page.view, normalizedParentLayoutView);
-    updatedPageInfo = {
-      ...updatedPageInfo,
-      page: {
-        ...updatedPageInfo.page,
-        view: doubleWrappedView
-      }
-    };
-  }
   return updatedPageInfo;
 }
 async function renderPageToHtml(program, params, runtimePath, cssPath) {

package/dist/cli/index.js

@@ -3,7 +3,7 @@ import {
   createDevServer,
   loadConfig,
   resolveConfig
-} from "../chunk-7KQYNZ2A.js";
+} from "../chunk-RBEPA2Z2.js";
 import "../chunk-PUTC5BCP.js";
 
 // src/cli/index.ts

package/dist/index.js

@@ -23,7 +23,7 @@ import {
   transformCsv,
   transformMdx,
   transformYaml
-} from "./chunk-7KQYNZ2A.js";
+} from "./chunk-RBEPA2Z2.js";
 import {
   generateHydrationScript,
   renderPage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/start",
-  "version": "1.2.15",
+  "version": "1.2.16",
   "description": "Meta-framework for Constela applications",
   "type": "module",
   "main": "./dist/index.js",
@@ -43,11 +43,11 @@
     "postcss": "^8.5.0",
     "@tailwindcss/postcss": "^4.0.0",
     "tailwindcss": "^4.0.0",
-    "@constela/core": "0.7.0",
     "@constela/compiler": "0.7.1",
+    "@constela/core": "0.7.0",
     "@constela/router": "8.0.0",
-    "@constela/runtime": "0.10.2",
-    "@constela/server": "3.0.1"
+    "@constela/server": "3.0.1",
+    "@constela/runtime": "0.10.2"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",