@stati/core 1.3.2 → 1.5.0

package/dist/core/templates.js

@@ -1,9 +1,13 @@
 import { Eta } from 'eta';
-import { join, dirname, relative, basename } from 'path';
+import { join, dirname, relative, basename, posix } from 'path';
 import glob from 'fast-glob';
 import { TEMPLATE_EXTENSION } from '../constants.js';
+import { getStatiVersion } from './utils/version.js';
+import { getEnv } from '../env.js';
 import { isCollectionIndexPage, discoverLayout, getCollectionPathForPage, } from './utils/template-discovery.js';
 import { resolveSrcDir } from './utils/paths.js';
+import { createTemplateError } from './utils/template-errors.js';
+import { createValidatingPartialsProxy } from './utils/partial-validation.js';
 /**
  * Groups pages by their tags for aggregation purposes.
  *
@@ -146,7 +150,7 @@ async function discoverPartials(pagePath, config) {
                 const fullPath = join(folderPath, etaFile);
                 // Get relative path from srcDir to the partial file
                 const relativePath = relative(srcDir, fullPath);
-                partials[partialName] = relativePath;
+                partials[partialName] = posix.normalize(relativePath);
             }
         }
     }
@@ -156,7 +160,9 @@ export function createTemplateEngine(config) {
     const templateDir = resolveSrcDir(config);
     const eta = new Eta({
         views: templateDir,
-        cache: process.env.NODE_ENV === 'production',
+        cache: getEnv() === 'production',
+        cacheFilepaths: getEnv() === 'production',
+        varName: 'stati',
     });
     return eta;
 }
@@ -188,22 +194,83 @@ export async function renderPage(page, body, config, eta, navigation, allPages)
         collection: collectionData, // Add collection data for index pages
         // Add custom filters to context
         ...(config.eta?.filters || {}),
+        generator: {
+            version: getStatiVersion(),
+        },
     };
     // Render partials and store their content
+    // Use multiple passes to allow partials to reference other partials
     const renderedPartials = {};
-    for (const [partialName, partialPath] of Object.entries(partialPaths)) {
-        try {
-            const renderedContent = await eta.renderAsync(partialPath, baseContext);
-            renderedPartials[partialName] = renderedContent;
+    const maxPasses = 3; // Prevent infinite loops
+    for (let pass = 0; pass < maxPasses; pass++) {
+        let partialsToRender;
+        if (pass === 0) {
+            // First pass: render all partials
+            partialsToRender = { ...partialPaths };
+        }
+        else {
+            // Subsequent passes: re-render partials that might need updated dependencies
+            // For simplicity, re-render all partials to ensure they have access to all previously rendered ones
+            // TODO: Optimize by tracking which partials changed or have dependencies
+            partialsToRender = { ...partialPaths };
+        }
+        if (Object.keys(partialsToRender).length === 0) {
+            break;
+        }
+        let progressMade = false;
+        const passRenderedPartials = {};
+        for (const [partialName, partialPath] of Object.entries(partialsToRender)) {
+            try {
+                // Create context with all previously rendered partials available
+                const combinedPartials = { ...renderedPartials, ...passRenderedPartials };
+                const partialContext = {
+                    ...baseContext,
+                    partials: createValidatingPartialsProxy(combinedPartials), // Include both previous and current pass partials with validation
+                };
+                const renderedContent = await eta.renderAsync(partialPath, partialContext);
+                passRenderedPartials[partialName] = renderedContent;
+                progressMade = true;
+            }
+            catch (error) {
+                // If this is the last pass, log the error and create placeholder
+                if (pass === maxPasses - 1) {
+                    console.warn(`Warning: Failed to render partial ${partialName} at ${partialPath}:`, error);
+                    // In development mode, throw enhanced template error for partials too
+                    if (getEnv() === 'development') {
+                        const templateError = createTemplateError(error instanceof Error ? error : new Error(String(error)), partialPath);
+                        throw templateError;
+                    }
+                    passRenderedPartials[partialName] = `<!-- Error rendering partial: ${partialName} -->`;
+                    progressMade = true;
+                }
+                // Otherwise, use existing content if available, or skip for retry
+                else if (renderedPartials[partialName]) {
+                    passRenderedPartials[partialName] = renderedPartials[partialName];
+                }
+                // For failed partials on non-last pass, still count as progress to allow retries
+                else {
+                    progressMade = true;
+                }
+            }
         }
-        catch (error) {
-            console.warn(`Warning: Failed to render partial ${partialName} at ${partialPath}:`, error);
-            renderedPartials[partialName] = `<!-- Error rendering partial: ${partialName} -->`;
+        // Update the rendered partials with this pass's results
+        Object.assign(renderedPartials, passRenderedPartials);
+        // If no progress was made, break to avoid infinite loop
+        if (!progressMade) {
+            break;
+        }
+        // If this is pass 0, always do at least one more pass to allow interdependencies
+        if (pass === 0) {
+            continue;
+        }
+        // For subsequent passes, only continue if we're not at max passes yet
+        if (pass >= maxPasses - 1) {
+            break;
         }
     }
     const context = {
         ...baseContext,
-        partials: renderedPartials, // Add rendered partials to template context
+        partials: createValidatingPartialsProxy(renderedPartials), // Add rendered partials with validation
     };
     try {
         if (!layoutPath) {
@@ -214,6 +281,11 @@ export async function renderPage(page, body, config, eta, navigation, allPages)
     }
     catch (error) {
         console.error(`Error rendering layout ${layoutPath || 'unknown'}:`, error);
+        // In development mode, throw enhanced template error for better debugging
+        if (getEnv() === 'development') {
+            const templateError = createTemplateError(error instanceof Error ? error : new Error(String(error)), layoutPath || undefined);
+            throw templateError;
+        }
         return createFallbackHtml(page, body);
     }
 }

package/dist/core/utils/error-overlay.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Error overlay utility for displaying pretty errors in development mode.
+ * Provides a user-friendly interface for template rendering and build errors.
+ */
+export interface ErrorDetails {
+    type: 'template' | 'build' | 'markdown' | 'config';
+    message: string;
+    stack?: string;
+    file?: string;
+    line?: number;
+    column?: number;
+    code?: string;
+    context?: {
+        before?: string[];
+        after?: string[];
+    };
+    suggestions?: string[];
+}
+/**
+ * Creates a styled error overlay HTML that displays comprehensive error information.
+ *
+ * @param error - The error details to display
+ * @param requestPath - The path that triggered the error
+ * @returns HTML string for the error overlay
+ */
+export declare function createErrorOverlay(error: ErrorDetails, requestPath: string): string;
+/**
+ * Parses error information from various error types to create structured ErrorDetails.
+ */
+export declare function parseErrorDetails(error: Error, type: ErrorDetails['type'], filePath?: string): ErrorDetails;
+//# sourceMappingURL=error-overlay.d.ts.map

package/dist/core/utils/error-overlay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error-overlay.d.ts","sourceRoot":"","sources":["../../../src/core/utils/error-overlay.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE;QACR,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAwbnF;AA0DD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,EAC1B,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,CAkCd"}