@constela/start 1.2.2 → 1.2.4

package/dist/{chunk-3LUPO6QC.js → chunk-MP2KUHWS.js}

@@ -1492,7 +1492,7 @@ function normalizeDataSourcePatterns(projectRoot, pageDir, dataSources) {
   }
   return result;
 }
-async function loadJsonPage(baseDir, pagePath) {
+async function loadJsonPage(baseDir, pagePath, options) {
   const filePath = join6(baseDir, pagePath);
   const resolvedBase = resolve3(baseDir);
   const resolvedPath = resolve3(filePath);
@@ -1523,7 +1523,8 @@ async function loadJsonPage(baseDir, pagePath) {
   validateVersion(page.version);
   const pageDir = dirname2(filePath);
   const resolvedImports = await resolveImports(pageDir, page.imports, baseDir);
-  const normalizedData = normalizeDataSourcePatterns(baseDir, pageDir, page.data);
+  const patternBaseDir = options?.routesDir ?? pageDir;
+  const normalizedData = normalizeDataSourcePatterns(baseDir, patternBaseDir, page.data);
   const loadedData = await loadPageData(baseDir, normalizedData, { imports: resolvedImports });
   const widgets = await loadWidgets(pageDir, page.widgets, baseDir);
   return {
@@ -1831,9 +1832,11 @@ async function convertToCompiledProgram(pageInfo) {
 }
 var JsonPageLoader = class {
   projectRoot;
+  routesDir;
   cache = /* @__PURE__ */ new Map();
-  constructor(projectRoot) {
+  constructor(projectRoot, options) {
     this.projectRoot = projectRoot;
+    this.routesDir = options?.routesDir;
   }
   /**
    * Load a JSON page with full resolution
@@ -1842,7 +1845,9 @@ var JsonPageLoader = class {
     if (this.cache.has(pagePath)) {
       return this.cache.get(pagePath);
     }
-    const pageInfo = await loadJsonPage(this.projectRoot, pagePath);
+    const pageInfo = await loadJsonPage(this.projectRoot, pagePath, {
+      routesDir: this.routesDir
+    });
     this.cache.set(pagePath, pageInfo);
     return pageInfo;
   }
@@ -2168,14 +2173,15 @@ h1 { color: #666; }
 }
 
 // src/build/index.ts
-import { existsSync as existsSync7, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
 import { mkdir as mkdir2, writeFile, cp, readdir } from "fs/promises";
-import { join as join9, dirname as dirname5, relative as relative2, basename as basename4, isAbsolute as isAbsolute2, resolve as resolve4 } from "path";
+import { join as join9, dirname as dirname5, relative as relative2, basename as basename4, isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
 
 // src/build/bundler.ts
 import * as esbuild from "esbuild";
+import { existsSync as existsSync7 } from "fs";
 import { mkdir } from "fs/promises";
-import { join as join8, dirname as dirname4 } from "path";
+import { join as join8, dirname as dirname4, isAbsolute as isAbsolute2 } from "path";
 import { fileURLToPath } from "url";
 var __dirname = dirname4(fileURLToPath(import.meta.url));
 async function bundleRuntime(options) {
@@ -2205,8 +2211,47 @@ async function bundleRuntime(options) {
   }
   return "/_constela/runtime.js";
 }
+async function bundleCSS(options) {
+  const cssFiles = Array.isArray(options.css) ? options.css : [options.css];
+  const outFile = join8(options.outDir, "_constela", "styles.css");
+  await mkdir(dirname4(outFile), { recursive: true });
+  const resolvedCssFiles = cssFiles.map((f) => isAbsolute2(f) ? f : join8(process.cwd(), f));
+  for (const fullPath of resolvedCssFiles) {
+    if (!existsSync7(fullPath)) {
+      throw new Error(`CSS file not found: ${fullPath}`);
+    }
+  }
+  try {
+    if (resolvedCssFiles.length === 1) {
+      await esbuild.build({
+        entryPoints: resolvedCssFiles,
+        bundle: true,
+        outfile: outFile,
+        minify: options.minify ?? true,
+        loader: { ".css": "css" }
+      });
+    } else {
+      const virtualEntry = resolvedCssFiles.map((f) => `@import "${f}";`).join("\n");
+      await esbuild.build({
+        stdin: {
+          contents: virtualEntry,
+          loader: "css",
+          resolveDir: process.cwd()
+        },
+        bundle: true,
+        outfile: outFile,
+        minify: options.minify ?? true
+      });
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to bundle CSS to ${outFile}: ${message}`);
+  }
+  return "/_constela/styles.css";
+}
 
 // src/build/index.ts
+var DEFAULT_PUBLIC_DIR2 = "public";
 function isDynamicRoute(pattern) {
   return pattern.includes(":") || pattern.includes("*");
 }
@@ -2233,7 +2278,7 @@ async function loadGetStaticPaths(pageFile) {
   const dir = dirname5(pageFile);
   const baseName = basename4(pageFile, ".json");
   const pathsFile = join9(dir, `${baseName}.paths.ts`);
-  if (!existsSync7(pathsFile)) {
+  if (!existsSync8(pathsFile)) {
     return null;
   }
   try {
@@ -2274,7 +2319,7 @@ async function loadGetStaticPaths(pageFile) {
 }
 async function loadLayout2(layoutName, layoutsDir) {
   const layoutPath = join9(layoutsDir, `${layoutName}.json`);
-  if (!existsSync7(layoutPath)) {
+  if (!existsSync8(layoutPath)) {
     throw new Error(`Layout "${layoutName}" not found at ${layoutPath}`);
   }
   try {
@@ -2382,7 +2427,7 @@ async function processLayouts(pageInfo, layoutsDir) {
   }
   return updatedPageInfo;
 }
-async function renderPageToHtml(program, params, runtimePath) {
+async function renderPageToHtml(program, params, runtimePath, cssPath) {
   const normalizedProgram = {
     ...program,
     view: normalizeViewNode(structuredClone(program.view))
@@ -2398,11 +2443,12 @@ async function renderPageToHtml(program, params, runtimePath) {
     query: {},
     path: "/"
   };
+  const cssLinkTag = cssPath ? `<link rel="stylesheet" href="${cssPath}">` : void 0;
   const hydrationScript = generateHydrationScript(normalizedProgram, void 0, routeContext);
-  return wrapHtml(content, hydrationScript, void 0, runtimePath ? { runtimePath } : void 0);
+  return wrapHtml(content, hydrationScript, cssLinkTag, runtimePath ? { runtimePath } : void 0);
 }
 async function copyPublicDir(publicDir, outDir, generatedFiles) {
-  if (!existsSync7(publicDir)) {
+  if (!existsSync8(publicDir)) {
     return;
   }
   await copyDirRecursive(publicDir, outDir, generatedFiles);
@@ -2440,7 +2486,7 @@ function validateJsonPage(content, filePath) {
 async function build2(options) {
   const outDir = options?.outDir ?? "dist";
   const routesDir = options?.routesDir ?? "src/routes";
-  const publicDir = options?.publicDir;
+  const publicDir = options?.publicDir ?? DEFAULT_PUBLIC_DIR2;
   const layoutsDir = options?.layoutsDir;
   const generatedFiles = [];
   await mkdir2(outDir, { recursive: true });
@@ -2470,7 +2516,14 @@ async function build2(options) {
     };
   }
   const runtimePath = await bundleRuntime({ outDir });
-  const absoluteRoutesDir = isAbsolute2(routesDir) ? routesDir : resolve4(routesDir);
+  let cssPath;
+  if (options?.css) {
+    cssPath = await bundleCSS({
+      outDir,
+      css: options.css
+    });
+  }
+  const absoluteRoutesDir = isAbsolute3(routesDir) ? routesDir : resolve4(routesDir);
   const projectRoot = dirname5(dirname5(absoluteRoutesDir));
   for (const route of jsonPages) {
     const relPathFromRoutesDir = relative2(absoluteRoutesDir, route.file);
@@ -2478,23 +2531,31 @@ async function build2(options) {
     const content = readFileSync5(route.file, "utf-8");
     const page = validateJsonPage(content, route.file);
     if (isDynamicRoute(route.pattern)) {
-      const staticPaths = await loadGetStaticPaths(route.file);
-      if (!staticPaths) {
+      const loader = new JsonPageLoader(projectRoot, { routesDir: absoluteRoutesDir });
+      let pageInfo = await loader.loadPage(relPathFromProjectRoot);
+      let staticPathsResult = null;
+      if (pageInfo.page.getStaticPaths) {
+        staticPathsResult = await generateStaticPathsFromPage(
+          pageInfo.page,
+          pageInfo.loadedData
+        );
+      } else {
+        const externalPaths = await loadGetStaticPaths(route.file);
+        if (externalPaths) {
+          staticPathsResult = externalPaths.paths.map((p) => ({ params: p.params }));
+        }
+      }
+      if (!staticPathsResult || staticPathsResult.length === 0) {
         continue;
       }
-      if (!staticPaths.paths || !Array.isArray(staticPaths.paths)) {
-        throw new Error(`Invalid getStaticPaths format in ${route.file}`);
+      if (layoutsDir) {
+        pageInfo = await processLayouts(pageInfo, layoutsDir);
       }
-      for (const pathEntry of staticPaths.paths) {
+      for (const pathEntry of staticPathsResult) {
         const params = pathEntry.params;
         const outputPath = paramsToOutputPath(route.pattern, params, outDir);
-        const loader = new JsonPageLoader(projectRoot);
-        let pageInfo = await loader.loadPage(relPathFromProjectRoot);
-        if (layoutsDir) {
-          pageInfo = await processLayouts(pageInfo, layoutsDir);
-        }
         const program = await convertToCompiledProgram(pageInfo);
-        const html = await renderPageToHtml(program, params, runtimePath);
+        const html = await renderPageToHtml(program, params, runtimePath, cssPath);
         await mkdir2(dirname5(outputPath), { recursive: true });
         await writeFile(outputPath, html, "utf-8");
         generatedFiles.push(outputPath);
@@ -2507,13 +2568,13 @@ async function build2(options) {
       }
     } else {
       const outputPath = getOutputPath(relPathFromRoutesDir, outDir);
-      const loader = new JsonPageLoader(projectRoot);
+      const loader = new JsonPageLoader(projectRoot, { routesDir: absoluteRoutesDir });
       let pageInfo = await loader.loadPage(relPathFromProjectRoot);
       if (layoutsDir) {
         pageInfo = await processLayouts(pageInfo, layoutsDir);
       }
       const program = await convertToCompiledProgram(pageInfo);
-      const html = await renderPageToHtml(program, {}, runtimePath);
+      const html = await renderPageToHtml(program, {}, runtimePath, cssPath);
       await mkdir2(dirname5(outputPath), { recursive: true });
       await writeFile(outputPath, html, "utf-8");
       generatedFiles.push(outputPath);
@@ -2531,12 +2592,12 @@ async function build2(options) {
 }
 
 // src/config/config-loader.ts
-import { existsSync as existsSync8, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
 import { join as join10 } from "path";
 var CONFIG_FILENAME = "constela.config.json";
 async function loadConfig(projectRoot) {
   const configPath = join10(projectRoot, CONFIG_FILENAME);
-  if (!existsSync8(configPath)) {
+  if (!existsSync9(configPath)) {
     return {};
   }
   let content;

package/dist/cli/index.js

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

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constela/start",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Meta-framework for Constela applications",
   "type": "module",
   "main": "./dist/index.js",
@@ -42,8 +42,8 @@
     "vite": "^6.0.0",
     "@constela/compiler": "0.7.0",
     "@constela/core": "0.7.0",
-    "@constela/router": "8.0.0",
     "@constela/runtime": "0.10.1",
+    "@constela/router": "8.0.0",
     "@constela/server": "3.0.0"
   },
   "devDependencies": {