@constela/start 1.2.15 → 1.2.17

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

@@ -2448,13 +2448,39 @@ 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}`);
   }
 }
-function applyLayout(pageView, layoutView) {
-  return replaceSlot(layoutView, pageView);
+function applyLayout(pageView, layoutView, namedSlots) {
+  return replaceSlot(layoutView, pageView, namedSlots);
+}
+function extractMdxContentSlot2(loadedData, dataSourceName, routeParams) {
+  const dataSource = loadedData[dataSourceName];
+  if (!Array.isArray(dataSource)) {
+    return void 0;
+  }
+  const slug = routeParams["slug"] || "index";
+  const item = dataSource.find(
+    (entry) => typeof entry === "object" && entry !== null && "slug" in entry && entry.slug === slug
+  );
+  if (!item || typeof item !== "object" || !("content" in item)) {
+    return void 0;
+  }
+  return { "mdx-content": item.content };
+}
+function isEventHandler(value) {
+  return typeof value === "object" && value !== null && "event" in value && typeof value.event === "string" && "action" in value && typeof value.action === "string";
 }
 function normalizeProps(props) {
   if (!props || typeof props !== "object") {
@@ -2464,6 +2490,8 @@ function normalizeProps(props) {
   for (const [key, value] of Object.entries(props)) {
     if (value && typeof value === "object" && "expr" in value) {
       normalized[key] = value;
+    } else if (isEventHandler(value)) {
+      normalized[key] = value;
     } else if (value !== void 0 && value !== null) {
       normalized[key] = { expr: "lit", value };
     }
@@ -2570,59 +2598,127 @@ function substituteLayoutParamsInNode(node, layoutParams) {
   }
   return result;
 }
-function replaceSlot(node, content) {
+function replaceSlot(node, content, namedSlots) {
   if (!node || typeof node !== "object") {
     return node;
   }
   const nodeObj = node;
   if (nodeObj["kind"] === "slot") {
-    return content;
+    const slotName = nodeObj["name"];
+    if (slotName && namedSlots && slotName in namedSlots) {
+      return namedSlots[slotName];
+    }
+    if (!slotName || slotName === "default") {
+      return content;
+    }
+    return node;
   }
   if (Array.isArray(nodeObj["children"])) {
     return {
       ...nodeObj,
-      children: nodeObj["children"].map((child) => replaceSlot(child, content))
+      children: nodeObj["children"].map((child) => replaceSlot(child, content, namedSlots))
     };
   }
   return node;
 }
-async function processLayouts(pageInfo, layoutsDir) {
+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, routeParams = {}) {
   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 namedSlots;
+  let effectiveRouteParams = routeParams;
+  if (!routeParams["slug"] && pageInfo.page.route?.path) {
+    const pathSegments = pageInfo.page.route.path.split("/").filter(Boolean);
+    const lastSegment = pathSegments[pathSegments.length - 1];
+    if (lastSegment && !lastSegment.startsWith(":")) {
+      effectiveRouteParams = { ...routeParams, slug: lastSegment };
+    }
+  }
+  if (pageInfo.loadedData && Object.keys(pageInfo.loadedData).length > 0) {
+    for (const dataSourceName of Object.keys(pageInfo.loadedData)) {
+      const slots = extractMdxContentSlot2(pageInfo.loadedData, dataSourceName, effectiveRouteParams);
+      if (slots) {
+        namedSlots = namedSlots ? { ...namedSlots, ...slots } : slots;
+        break;
+      }
+    }
+  }
+  if (!namedSlots && pageInfo.resolvedImports && Object.keys(pageInfo.resolvedImports).length > 0) {
+    for (const importName of Object.keys(pageInfo.resolvedImports)) {
+      const slots = extractMdxContentSlot2(
+        pageInfo.resolvedImports,
+        importName,
+        effectiveRouteParams
+      );
+      if (slots) {
+        namedSlots = slots;
+        break;
+      }
+    }
+  }
+  const pageWithImportData = pageInfo.page;
+  if (!namedSlots && pageWithImportData.importData && Object.keys(pageWithImportData.importData).length > 0) {
+    for (const importName of Object.keys(pageWithImportData.importData)) {
+      const slots = extractMdxContentSlot2(
+        pageWithImportData.importData,
+        importName,
+        effectiveRouteParams
+      );
+      if (slots) {
+        namedSlots = slots;
+        break;
+      }
+    }
+  }
+  let currentView = pageInfo.page.view;
+  for (const layout of layoutChain) {
+    const normalizedLayoutView = normalizeViewNode(structuredClone(layout.view));
+    currentView = applyLayout(currentView, normalizedLayoutView, namedSlots);
+  }
   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) {
@@ -2748,13 +2844,14 @@ async function build2(options) {
       if (!staticPathsResult || staticPathsResult.length === 0) {
         continue;
       }
-      if (layoutsDir) {
-        pageInfo = await processLayouts(pageInfo, layoutsDir);
-      }
       for (const pathEntry of staticPathsResult) {
         const params = pathEntry.params;
         const outputPath = paramsToOutputPath(route.pattern, params, outDir);
-        const program = await convertToCompiledProgram(pageInfo);
+        let processedPageInfo = pageInfo;
+        if (layoutsDir) {
+          processedPageInfo = await processLayouts(pageInfo, layoutsDir, params);
+        }
+        const program = await convertToCompiledProgram(processedPageInfo);
         const html = await renderPageToHtml(program, params, runtimePath, cssPath);
         await mkdir2(dirname5(outputPath), { recursive: true });
         await writeFile(outputPath, html, "utf-8");
@@ -2767,11 +2864,22 @@ async function build2(options) {
         routes.push(routePath);
       }
     } else {
-      const outputPath = getOutputPath(relPathFromRoutesDir, outDir);
       const loader = new JsonPageLoader(projectRoot, { routesDir: absoluteRoutesDir });
       let pageInfo = await loader.loadPage(relPathFromProjectRoot);
+      let outputPath;
+      if (pageInfo.page.route?.path) {
+        const routePath = pageInfo.page.route.path;
+        const relativePath = routePath.startsWith("/") ? routePath.slice(1) : routePath;
+        if (relativePath === "" || relativePath === "/") {
+          outputPath = join9(outDir, "index.html");
+        } else {
+          outputPath = join9(outDir, relativePath, "index.html");
+        }
+      } else {
+        outputPath = getOutputPath(relPathFromRoutesDir, outDir);
+      }
       if (layoutsDir) {
-        pageInfo = await processLayouts(pageInfo, layoutsDir);
+        pageInfo = await processLayouts(pageInfo, layoutsDir, {});
       }
       const program = await convertToCompiledProgram(pageInfo);
       const html = await renderPageToHtml(program, {}, runtimePath, cssPath);

package/dist/cli/index.js

@@ -3,7 +3,7 @@ import {
   createDevServer,
   loadConfig,
   resolveConfig
-} from "../chunk-7KQYNZ2A.js";
+} from "../chunk-CRQMVEYP.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-CRQMVEYP.js";
 import {
   generateHydrationScript,
   renderPage,

package/package.json

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