@constela/start 1.2.7 → 1.2.8

package/dist/{chunk-RA772QBZ.js → chunk-ZJMQ6IJY.js}

@@ -1523,7 +1523,7 @@ async function loadJsonPage(baseDir, pagePath, options) {
   validateVersion(page.version);
   const pageDir = dirname2(filePath);
   const resolvedImports = await resolveImports(pageDir, page.imports, baseDir);
-  const patternBaseDir = options?.routesDir ?? pageDir;
+  const patternBaseDir = pageDir;
   const normalizedData = normalizeDataSourcePatterns(baseDir, patternBaseDir, page.data);
   const loadedData = await loadPageData(baseDir, normalizedData, { imports: resolvedImports });
   const widgets = await loadWidgets(pageDir, page.widgets, baseDir);
@@ -2414,6 +2414,76 @@ function normalizeViewNode(node) {
   }
   return nodeObj;
 }
+function substituteLayoutParamsInExpr(expr, layoutParams) {
+  if (!expr || typeof expr !== "object") {
+    return expr;
+  }
+  const exprObj = expr;
+  if (exprObj["expr"] === "param" && typeof exprObj["name"] === "string") {
+    const paramName = exprObj["name"];
+    const paramValue = layoutParams[paramName];
+    if (paramValue !== void 0) {
+      if (typeof exprObj["path"] === "string") {
+        return {
+          expr: "get",
+          base: paramValue,
+          path: exprObj["path"]
+        };
+      }
+      return paramValue;
+    }
+  }
+  const result = {};
+  for (const [key, value] of Object.entries(exprObj)) {
+    if (key === "expr") {
+      result[key] = value;
+    } else if (value && typeof value === "object") {
+      if (Array.isArray(value)) {
+        result[key] = value.map((item) => substituteLayoutParamsInExpr(item, layoutParams));
+      } else {
+        result[key] = substituteLayoutParamsInExpr(value, layoutParams);
+      }
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+function substituteLayoutParamsInNode(node, layoutParams) {
+  if (!node || typeof node !== "object") {
+    return node;
+  }
+  const nodeObj = node;
+  const result = {};
+  for (const [key, value] of Object.entries(nodeObj)) {
+    if (key === "children" && Array.isArray(value)) {
+      result[key] = value.map((child) => substituteLayoutParamsInNode(child, layoutParams));
+    } else if (key === "props" && value && typeof value === "object") {
+      const props = {};
+      for (const [propKey, propValue] of Object.entries(value)) {
+        props[propKey] = substituteLayoutParamsInExpr(propValue, layoutParams);
+      }
+      result[key] = props;
+    } else if (key === "value" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInExpr(value, layoutParams);
+    } else if (key === "items" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInExpr(value, layoutParams);
+    } else if (key === "condition" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInExpr(value, layoutParams);
+    } else if (key === "content" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInExpr(value, layoutParams);
+    } else if (key === "then" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInNode(value, layoutParams);
+    } else if (key === "else" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInNode(value, layoutParams);
+    } else if (key === "body" && value && typeof value === "object") {
+      result[key] = substituteLayoutParamsInNode(value, layoutParams);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 function replaceSlot(node, content) {
   if (!node || typeof node !== "object") {
     return node;
@@ -2437,7 +2507,11 @@ async function processLayouts(pageInfo, layoutsDir) {
   }
   const layout = await loadLayout2(layoutName, layoutsDir);
   const normalizedLayoutView = normalizeViewNode(structuredClone(layout.view));
-  const wrappedView = applyLayout(pageInfo.page.view, normalizedLayoutView);
+  let wrappedView = applyLayout(pageInfo.page.view, normalizedLayoutView);
+  const layoutParams = pageInfo.page.route?.layoutParams;
+  if (layoutParams && Object.keys(layoutParams).length > 0) {
+    wrappedView = substituteLayoutParamsInNode(wrappedView, layoutParams);
+  }
   let updatedRoute;
   if (pageInfo.page.route) {
     const { layout: _layout, ...routeWithoutLayout } = pageInfo.page.route;

package/dist/cli/index.js

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

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/start",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Meta-framework for Constela applications",
   "type": "module",
   "main": "./dist/index.js",
@@ -42,9 +42,9 @@
     "vite": "^6.0.0",
     "@constela/compiler": "0.7.0",
     "@constela/core": "0.7.0",
-    "@constela/server": "3.0.1",
+    "@constela/router": "8.0.0",
     "@constela/runtime": "0.10.1",
-    "@constela/router": "8.0.0"
+    "@constela/server": "3.0.1"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",