@constela/start 1.8.0 → 1.8.2

package/dist/{chunk-TXTTXC4B.js → chunk-T3HWPPLG.js}

@@ -768,7 +768,7 @@ async function mdxContentToNode(content, options) {
 
 // src/data/loader.ts
 import { existsSync as existsSync3, readFileSync } from "fs";
-import { basename, extname as extname2, join as join3 } from "path";
+import { basename, dirname, extname as extname2, join as join3 } from "path";
 import fg2 from "fast-glob";
 var mdxContentToNode2 = mdxContentToNode;
 function resolveJsonRefs(json) {
@@ -953,7 +953,18 @@ async function transformMdx(content, file, options) {
     options?.components ? { components: options.components } : void 0
   );
   const fmSlug = frontmatter["slug"];
-  const slug = typeof fmSlug === "string" ? fmSlug : basename(file, extname2(file));
+  let slug;
+  if (typeof fmSlug === "string") {
+    slug = fmSlug;
+  } else {
+    const filename = basename(file, extname2(file));
+    if (filename === "index") {
+      const dir = dirname(file);
+      slug = dir === "." ? "index" : basename(dir);
+    } else {
+      slug = filename;
+    }
+  }
   return {
     file,
     raw: content,
@@ -1424,7 +1435,7 @@ function createAdapter(options) {
 
 // src/layout/resolver.ts
 import { existsSync as existsSync5, statSync as statSync3, readFileSync as readFileSync3 } from "fs";
-import { join as join5, basename as basename2, dirname } from "path";
+import { join as join5, basename as basename2, dirname as dirname2 } from "path";
 import fg3 from "fast-glob";
 import { isLayoutProgram } from "@constela/core";
 
@@ -1506,7 +1517,7 @@ async function loadLayout(layoutFile) {
       const parsed = JSON.parse(content);
       const importsValue = parsed["imports"];
       if (importsValue && typeof importsValue === "object" && Object.keys(importsValue).length > 0) {
-        const layoutDir = dirname(layoutFile);
+        const layoutDir = dirname2(layoutFile);
         const resolvedImports = await resolveImports(
           layoutDir,
           importsValue
@@ -1622,7 +1633,7 @@ import { isCookieInitialExpr as isCookieInitialExpr2, ConstelaError } from "@con
 
 // src/json-page-loader.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname2, join as join6, relative, resolve as resolve3 } from "path";
+import { dirname as dirname3, join as join6, relative, resolve as resolve3 } from "path";
 function validateVersion(version) {
   if (version !== "1.0") {
     throw new Error(`Unsupported version: ${version}. Only version "1.0" is supported.`);
@@ -1776,7 +1787,7 @@ async function loadJsonPage(baseDir, pagePath, options) {
     throw new Error(`Missing required field "view" in page: ${filePath}`);
   }
   validateVersion(page.version);
-  const pageDir = dirname2(filePath);
+  const pageDir = dirname3(filePath);
   const resolvedImports = await resolveImports(pageDir, page.imports, baseDir);
   const patternBaseDir = pageDir;
   const normalizedData = normalizeDataSourcePatterns(baseDir, patternBaseDir, page.data);
@@ -2851,7 +2862,7 @@ async function resolveConfig(fileConfig, cliOptions) {
 // src/build/index.ts
 import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
 import { mkdir as mkdir2, writeFile, cp, readdir } from "fs/promises";
-import { join as join11, dirname as dirname5, relative as relative5, basename as basename4, isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
+import { join as join11, dirname as dirname6, relative as relative5, basename as basename4, isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
 import { isCookieInitialExpr as isCookieInitialExpr3 } from "@constela/core";
 
 // src/build/bundler.ts
@@ -2859,15 +2870,15 @@ import * as esbuild from "esbuild";
 import { existsSync as existsSync8 } from "fs";
 import { mkdir, readFile } from "fs/promises";
 import { createRequire } from "module";
-import { join as join10, dirname as dirname4, isAbsolute as isAbsolute2, relative as relative4 } from "path";
+import { join as join10, dirname as dirname5, isAbsolute as isAbsolute2, relative as relative4 } from "path";
 import { fileURLToPath } from "url";
-var __dirname = dirname4(fileURLToPath(import.meta.url));
+var __dirname = dirname5(fileURLToPath(import.meta.url));
 async function bundleRuntime(options) {
   const entryContent = `
     export { hydrateApp, createApp } from '@constela/runtime';
   `;
   const outFile = join10(options.outDir, "_constela", "runtime.js");
-  await mkdir(dirname4(outFile), { recursive: true });
+  await mkdir(dirname5(outFile), { recursive: true });
   try {
     await esbuild.build({
       stdin: {
@@ -2893,7 +2904,7 @@ async function bundleCSS(options) {
   const cssFiles = Array.isArray(options.css) ? options.css : [options.css];
   const outFile = join10(options.outDir, "_constela", "styles.css");
   const shouldMinify = options.minify ?? true;
-  await mkdir(dirname4(outFile), { recursive: true });
+  await mkdir(dirname5(outFile), { recursive: true });
   const resolvedCssFiles = cssFiles.map((f) => isAbsolute2(f) ? f : join10(process.cwd(), f));
   for (const fullPath of resolvedCssFiles) {
     if (!existsSync8(fullPath)) {
@@ -2932,10 +2943,10 @@ async function bundleCSS(options) {
         );
       }
     }
-    const sourceDir = dirname4(firstCssFile);
+    const sourceDir = dirname5(firstCssFile);
     const sourceDirectives = options.content.map((contentPath) => {
       const absolutePath = isAbsolute2(contentPath) ? contentPath : join10(process.cwd(), contentPath);
-      const srcPath = absolutePath.includes("*") ? dirname4(absolutePath.split("*")[0] ?? absolutePath) : absolutePath;
+      const srcPath = absolutePath.includes("*") ? dirname5(absolutePath.split("*")[0] ?? absolutePath) : absolutePath;
       const relativePath = relative4(sourceDir, srcPath);
       return `@source "${relativePath}";`;
     }).join("\n");
@@ -3033,7 +3044,7 @@ function paramsToOutputPath(basePattern, params, outDir) {
   return join11(outDir, relativePath, "index.html");
 }
 async function loadGetStaticPaths(pageFile) {
-  const dir = dirname5(pageFile);
+  const dir = dirname6(pageFile);
   const baseName = basename4(pageFile, ".json");
   const pathsFile = join11(dir, `${baseName}.paths.ts`);
   if (!existsSync9(pathsFile)) {
@@ -3084,7 +3095,7 @@ async function loadLayout2(layoutName, layoutsDir) {
     const content = readFileSync6(layoutPath, "utf-8");
     const parsed = JSON.parse(content);
     if (parsed.imports && Object.keys(parsed.imports).length > 0) {
-      const layoutDir = dirname5(layoutPath);
+      const layoutDir = dirname6(layoutPath);
       const resolvedImports = await resolveImports(layoutDir, parsed.imports);
       return { ...parsed, importData: resolvedImports };
     }
@@ -3416,13 +3427,13 @@ async function processLayouts(pageInfo, layoutsDir, routeParams = {}) {
   };
   return updatedPageInfo;
 }
-async function renderPageToHtml(program, params, runtimePath, cssPath, externalImports, widgets, lang) {
+async function renderPageToHtml(program, params, routePath, runtimePath, cssPath, externalImports, widgets, lang) {
   const normalizedProgram = {
     ...program,
     view: normalizeViewNode(structuredClone(program.view))
   };
   const ctx = {
-    url: "/",
+    url: routePath,
     params,
     query: new URLSearchParams()
   };
@@ -3430,12 +3441,12 @@ async function renderPageToHtml(program, params, runtimePath, cssPath, externalI
   const routeContext = {
     params,
     query: {},
-    path: "/"
+    path: routePath
   };
   const metaTags = generateMetaTags(normalizedProgram.route, {
     params,
     query: {},
-    path: "/"
+    path: routePath
   });
   const cssLinkTag = cssPath ? `<link rel="stylesheet" href="${cssPath}">` : void 0;
   const head = [metaTags, cssLinkTag].filter(Boolean).join("\n") || void 0;
@@ -3489,7 +3500,7 @@ async function copyDirRecursive(srcDir, destDir, skipFiles) {
       if (skipFiles.has(destPath)) {
         continue;
       }
-      await mkdir2(dirname5(destPath), { recursive: true });
+      await mkdir2(dirname6(destPath), { recursive: true });
       await cp(srcPath, destPath);
     }
   }
@@ -3549,7 +3560,7 @@ async function build2(options) {
     });
   }
   const absoluteRoutesDir = isAbsolute3(routesDir) ? routesDir : resolve4(routesDir);
-  const projectRoot = dirname5(dirname5(absoluteRoutesDir));
+  const projectRoot = dirname6(dirname6(absoluteRoutesDir));
   const config = await loadConfig(projectRoot);
   const seoLang = options?.seo?.lang ?? config.seo?.lang;
   for (const route of jsonPages) {
@@ -3579,6 +3590,11 @@ async function build2(options) {
       for (const pathEntry of staticPathsResult) {
         const params = pathEntry.params;
         const outputPath = paramsToOutputPath(route.pattern, params, outDir);
+        let routePath = route.pattern;
+        for (const [key, value] of Object.entries(params)) {
+          routePath = routePath.replace(`:${key}`, value);
+          routePath = routePath.replace("*", value);
+        }
         let boundPageInfo = pageInfo;
         if (pathEntry.data && pageInfo.page.getStaticPaths?.source) {
           const source = pageInfo.page.getStaticPaths.source;
@@ -3598,32 +3614,27 @@ async function build2(options) {
           processedPageInfo = await processLayouts(boundPageInfo, layoutsDir, params);
         }
         const program = await convertToCompiledProgram(processedPageInfo);
-        const html = await renderPageToHtml(program, params, runtimePath, cssPath, processedPageInfo.page.externalImports, processedPageInfo.widgets, seoLang);
-        await mkdir2(dirname5(outputPath), { recursive: true });
+        const html = await renderPageToHtml(program, params, routePath, runtimePath, cssPath, processedPageInfo.page.externalImports, processedPageInfo.widgets, seoLang);
+        await mkdir2(dirname6(outputPath), { recursive: true });
         await writeFile(outputPath, html, "utf-8");
         generatedFiles.push(outputPath);
         const slugValue = params["slug"];
         if (slugValue && (slugValue === "index" || slugValue.endsWith("/index"))) {
-          const parentOutputPath = join11(dirname5(dirname5(outputPath)), "index.html");
+          const parentOutputPath = join11(dirname6(dirname6(outputPath)), "index.html");
           if (!generatedFiles.includes(parentOutputPath)) {
-            await mkdir2(dirname5(parentOutputPath), { recursive: true });
+            await mkdir2(dirname6(parentOutputPath), { recursive: true });
             await writeFile(parentOutputPath, html, "utf-8");
             generatedFiles.push(parentOutputPath);
           }
         }
-        let routePath = route.pattern;
-        for (const [key, value] of Object.entries(params)) {
-          routePath = routePath.replace(`:${key}`, value);
-          routePath = routePath.replace("*", value);
-        }
         routes.push(routePath);
       }
     } else {
       const loader = new JsonPageLoader(projectRoot, { routesDir: absoluteRoutesDir });
       let pageInfo = await loader.loadPage(relPathFromProjectRoot);
       let outputPath;
+      const routePath = pageInfo.page.route?.path ?? route.pattern;
       if (pageInfo.page.route?.path) {
-        const routePath = pageInfo.page.route.path;
         const relativePath = routePath.startsWith("/") ? routePath.slice(1) : routePath;
         if (relativePath === "" || relativePath === "/") {
           outputPath = join11(outDir, "index.html");
@@ -3637,8 +3648,8 @@ async function build2(options) {
         pageInfo = await processLayouts(pageInfo, layoutsDir, {});
       }
       const program = await convertToCompiledProgram(pageInfo);
-      const html = await renderPageToHtml(program, {}, runtimePath, cssPath, pageInfo.page.externalImports, pageInfo.widgets, seoLang);
-      await mkdir2(dirname5(outputPath), { recursive: true });
+      const html = await renderPageToHtml(program, {}, routePath, runtimePath, cssPath, pageInfo.page.externalImports, pageInfo.widgets, seoLang);
+      await mkdir2(dirname6(outputPath), { recursive: true });
       await writeFile(outputPath, html, "utf-8");
       generatedFiles.push(outputPath);
     }

package/dist/cli/index.js

@@ -4,7 +4,7 @@ import {
   hyperlink,
   loadConfig,
   resolveConfig
-} from "../chunk-TXTTXC4B.js";
+} from "../chunk-T3HWPPLG.js";
 import "../chunk-3GFRJEKD.js";
 
 // src/cli/index.ts

package/dist/index.js

@@ -28,7 +28,7 @@ import {
   transformCsv,
   transformMdx,
   transformYaml
-} from "./chunk-TXTTXC4B.js";
+} from "./chunk-T3HWPPLG.js";
 import {
   evaluateMetaExpression,
   generateHydrationScript,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/start",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Meta-framework for Constela applications",
   "type": "module",
   "main": "./dist/index.js",