@stati/core 1.28.0 → 1.29.1

package/dist/core/isg/index.d.ts

@@ -7,8 +7,9 @@
  * @module isg
  */
 export { loadCacheManifest, saveCacheManifest, createEmptyManifest } from './manifest.js';
-export { shouldRebuildPage, createCacheEntry, updateCacheEntry } from './builder.js';
+export { shouldRebuildPage, createCacheEntry, updateCacheEntry, hasRecordedReads, } from './builder.js';
 export type { RenderedAssets } from './builder.js';
+export { pruneOrphanedPages } from './prune.js';
 export { BuildLockManager, withBuildLock } from './build-lock.js';
 export { DevServerLockManager } from './dev-server-lock.js';
 export { CircularDependencyError, trackTemplateDependencies, resolveTemplatePath, clearTemplatePathCache, } from './deps.js';

package/dist/core/isg/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/isg/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAG1F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrF,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,EACZ,eAAe,GAChB,MAAM,UAAU,CAAC;AAGlB,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/isg/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAG1F,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,EACZ,eAAe,GAChB,MAAM,UAAU,CAAC;AAGlB,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,iBAAiB,CAAC"}

package/dist/core/isg/index.js

@@ -9,7 +9,9 @@
 // Manifest management
 export { loadCacheManifest, saveCacheManifest, createEmptyManifest } from './manifest.js';
 // Build decision logic
-export { shouldRebuildPage, createCacheEntry, updateCacheEntry } from './builder.js';
+export { shouldRebuildPage, createCacheEntry, updateCacheEntry, hasRecordedReads, } from './builder.js';
+// Removal of pages that no longer exist
+export { pruneOrphanedPages } from './prune.js';
 // Build locking
 export { BuildLockManager, withBuildLock } from './build-lock.js';
 export { DevServerLockManager } from './dev-server-lock.js';

package/dist/core/isg/manifest.js

@@ -237,6 +237,12 @@ function validateCacheEntry(entry, path) {
             return false;
         }
     }
+    for (const field of ['readsCollection', 'readsNav']) {
+        if (entryObj[field] !== undefined && typeof entryObj[field] !== 'boolean') {
+            console.warn(`Invalid cache entry for ${path}: "${field}" must be a boolean if present`);
+            return false;
+        }
+    }
     // Validate that deps and tags arrays contain strings
     if (!entryObj.deps.every((dep) => typeof dep === 'string')) {
         console.warn(`Invalid cache entry for ${path}: all "deps" must be strings`);

package/dist/core/isg/prune.d.ts

@@ -0,0 +1,32 @@
+import type { CacheManifest } from '../../types/index.js';
+/**
+ * Result of {@link pruneOrphanedPages}.
+ */
+export interface PruneResult {
+    /** Cache keys whose output file was deleted */
+    removed: string[];
+    /** Output files that could not be deleted, with the reason */
+    failed: Array<{
+        key: string;
+        message: string;
+    }>;
+}
+/**
+ * Removes the output of pages that no longer exist, such as a deleted post or a tag that no
+ * post uses anymore.
+ *
+ * Every manifest entry whose cache key is not one of this build's pages is an orphan: its
+ * HTML file is deleted, then its entry is dropped from the manifest, and so are the folders
+ * that deleting it leaves empty. Only files the manifest records are deleted, so files from
+ * the static directory or from other tools in the output directory stay. Nothing is deleted
+ * outside the output directory, including through a folder that links to somewhere else, and
+ * neither is a file that one of this build's pages writes under another path.
+ *
+ * @param manifest - The cache manifest; orphaned entries are removed from it, except those
+ *   whose file could not be deleted, so the next build tries again
+ * @param liveKeys - Cache keys of this build's pages, rendered or served from the cache
+ * @param outDir - The output directory
+ * @returns The deleted outputs and the ones that could not be deleted
+ */
+export declare function pruneOrphanedPages(manifest: CacheManifest, liveKeys: ReadonlySet<string>, outDir: string): Promise<PruneResult>;
+//# sourceMappingURL=prune.d.ts.map

package/dist/core/isg/prune.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prune.d.ts","sourceRoot":"","sources":["../../../src/core/isg/prune.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAW1D;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,+CAA+C;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,8DAA8D;IAC9D,MAAM,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,aAAa,EACvB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,WAAW,CAAC,CAuEtB"}

package/dist/core/isg/prune.js

@@ -0,0 +1,113 @@
+import { dirname, resolve } from 'node:path';
+import { isPathWithinDirectory, lstat, pathExists, readdir, realpath, remove, stat, } from '../utils/index.js';
+/**
+ * Removes the output of pages that no longer exist, such as a deleted post or a tag that no
+ * post uses anymore.
+ *
+ * Every manifest entry whose cache key is not one of this build's pages is an orphan: its
+ * HTML file is deleted, then its entry is dropped from the manifest, and so are the folders
+ * that deleting it leaves empty. Only files the manifest records are deleted, so files from
+ * the static directory or from other tools in the output directory stay. Nothing is deleted
+ * outside the output directory, including through a folder that links to somewhere else, and
+ * neither is a file that one of this build's pages writes under another path.
+ *
+ * @param manifest - The cache manifest; orphaned entries are removed from it, except those
+ *   whose file could not be deleted, so the next build tries again
+ * @param liveKeys - Cache keys of this build's pages, rendered or served from the cache
+ * @param outDir - The output directory
+ * @returns The deleted outputs and the ones that could not be deleted
+ */
+export async function pruneOrphanedPages(manifest, liveKeys, outDir) {
+    const result = { removed: [], failed: [] };
+    const outRoot = resolve(outDir);
+    let realRoot;
+    // Files of this build's pages, read the first time a file is about to be deleted. A stale
+    // entry can name one of them by another path: through a linked folder, or in other letter
+    // case after renaming About.md to about.md on a case-insensitive file system.
+    let liveFiles;
+    const isLiveFile = async (path) => {
+        const id = await fileIdentity(path);
+        if (id === undefined) {
+            return false;
+        }
+        if (!liveFiles) {
+            liveFiles = new Set();
+            for (const key of liveKeys) {
+                const liveId = await fileIdentity(resolve(outRoot, key.replace(/^\/+/, '')));
+                if (liveId !== undefined) {
+                    liveFiles.add(liveId);
+                }
+            }
+        }
+        return liveFiles.has(id);
+    };
+    for (const key of Object.keys(manifest.entries)) {
+        if (liveKeys.has(key)) {
+            continue;
+        }
+        // Cache keys are output paths relative to the output directory, such as /blog/post.html
+        const relativePath = key.replace(/^\/+/, '');
+        const outputPath = resolve(outRoot, relativePath);
+        let removed = false;
+        try {
+            if (relativePath.endsWith('.html') &&
+                outputPath !== outRoot &&
+                isPathWithinDirectory(outRoot, outputPath) &&
+                (await pathExists(outputPath)) &&
+                (await stat(outputPath)).isFile()) {
+                // Resolves links, so a folder linked to somewhere outside is left alone
+                realRoot ??= await realpath(outRoot);
+                if (isPathWithinDirectory(realRoot, await realpath(dirname(outputPath))) &&
+                    !(await isLiveFile(outputPath))) {
+                    await remove(outputPath);
+                    removed = true;
+                }
+            }
+        }
+        catch (error) {
+            // The entry stays, so the next build tries again
+            result.failed.push({ key, message: error instanceof Error ? error.message : String(error) });
+            continue;
+        }
+        delete manifest.entries[key];
+        if (removed) {
+            result.removed.push(key);
+            try {
+                await removeEmptyFolders(dirname(outputPath), outRoot);
+            }
+            catch {
+                // An empty folder left behind does no harm
+            }
+        }
+    }
+    return result;
+}
+/**
+ * Identifies a file by its device and file number, which every path to the file shares.
+ *
+ * @returns The identity, or undefined when the file is missing or the file system reports no
+ *   file numbers
+ */
+async function fileIdentity(path) {
+    try {
+        const stats = await stat(path);
+        return stats.ino ? `${stats.dev}:${stats.ino}` : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Deletes a folder and its parents while they are empty, stopping at the output directory
+ * and at links, which stay even when the folder they point to is empty.
+ */
+async function removeEmptyFolders(folder, outRoot) {
+    let current = folder;
+    while (current !== outRoot && isPathWithinDirectory(outRoot, current)) {
+        if ((await lstat(current)).isSymbolicLink() || (await readdir(current)).length > 0) {
+            return;
+        }
+        await remove(current);
+        current = dirname(current);
+    }
+}

package/dist/core/navigation.d.ts

@@ -2,8 +2,10 @@ import type { PageModel, NavNode } from '../types/index.js';
 /**
  * Builds a hierarchical navigation structure from pages.
  * Groups pages by directory structure and sorts them appropriately.
+ * Generated pages are left out unless their template sets `nav: true`, and so are the
+ * later pages of paginated listings.
  *
- * @param pages - Array of page models to build navigation from
+ * @param allPages - Array of page models to build navigation from
  * @returns Array of top-level navigation nodes
  *
  * @example
@@ -17,5 +19,5 @@ import type { PageModel, NavNode } from '../types/index.js';
  * // Results in hierarchical structure with sorted blog posts
  * ```
  */
-export declare function buildNavigation(pages: PageModel[]): NavNode[];
+export declare function buildNavigation(allPages: PageModel[]): NavNode[];
 //# sourceMappingURL=navigation.d.ts.map

package/dist/core/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/core/navigation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAyC7D"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/core/navigation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAe5D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CA2ChE"}

package/dist/core/navigation.js

@@ -1,9 +1,23 @@
 import { basename } from 'node:path';
+import { isVirtualPage } from './utils/index.js';
+/**
+ * Whether a page appears in navigation. Pages generated from a `[param].md` template appear
+ * only when the template sets `nav: true`; later pages of a paginated listing never do.
+ */
+function isInNavigation(page) {
+    if (!isVirtualPage(page)) {
+        return true;
+    }
+    const firstPage = (page.pagination?.pageNumber ?? 1) === 1;
+    return page.generated !== undefined && firstPage && page.frontMatter.nav === true;
+}
 /**
  * Builds a hierarchical navigation structure from pages.
  * Groups pages by directory structure and sorts them appropriately.
+ * Generated pages are left out unless their template sets `nav: true`, and so are the
+ * later pages of paginated listings.
  *
- * @param pages - Array of page models to build navigation from
+ * @param allPages - Array of page models to build navigation from
  * @returns Array of top-level navigation nodes
  *
  * @example
@@ -17,7 +31,8 @@ import { basename } from 'node:path';
  * // Results in hierarchical structure with sorted blog posts
  * ```
  */
-export function buildNavigation(pages) {
+export function buildNavigation(allPages) {
+    const pages = allPages.filter(isInNavigation);
     // Group pages by their collection (directory)
     const collections = new Map();
     for (const page of pages) {

package/dist/core/preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/core/preview.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAa7D,MAAM,WAAW,oBAAoB;IACnC,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AAyBD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,aAAa,CAAC,CAmKxB"}
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../src/core/preview.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAgB7D,MAAM,WAAW,oBAAoB;IACnC,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AAyBD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,aAAa,CAAC,CAwJxB"}

package/dist/core/preview.js

@@ -1,8 +1,7 @@
 import { createServer } from 'node:http';
-import { join, extname } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { loadConfig } from '../config/loader.js';
-import { resolveDevPaths, resolvePrettyUrl, createFallbackLogger, mergeServerOptions, isPathWithinDirectory, assertPortAvailable, toPortUnavailableError, } from './utils/index.js';
+import { resolveDevPaths, resolvePrettyUrl, resolveRequestFile, resolveNotFoundPage, getMimeType, parseRequestPath, createFallbackLogger, mergeServerOptions, assertPortAvailable, toPortUnavailableError, } from './utils/index.js';
 import { DEFAULT_PREVIEW_PORT, DEFAULT_DEV_HOST } from '../constants.js';
 /**
  * Loads and validates configuration for the preview server.
@@ -41,37 +40,13 @@ export async function createPreviewServer(options = {}) {
     });
     const url = `http://${host}:${port}`;
     let httpServer = null;
-    /**
-     * Gets MIME type for a file based on its extension
-     */
-    function getMimeType(filePath) {
-        const ext = extname(filePath).toLowerCase();
-        const mimeTypes = {
-            '.html': 'text/html',
-            '.js': 'application/javascript',
-            '.css': 'text/css',
-            '.json': 'application/json',
-            '.png': 'image/png',
-            '.jpg': 'image/jpeg',
-            '.jpeg': 'image/jpeg',
-            '.gif': 'image/gif',
-            '.svg': 'image/svg+xml',
-            '.ico': 'image/x-icon',
-            '.webp': 'image/webp',
-            '.woff': 'font/woff',
-            '.woff2': 'font/woff2',
-            '.ttf': 'font/ttf',
-            '.eot': 'application/vnd.ms-fontobject',
-        };
-        return mimeTypes[ext] || 'application/octet-stream';
-    }
     /**
      * Serves files from the dist directory
      */
     async function serveFile(requestPath) {
-        const originalFilePath = join(outDir, requestPath === '/' ? 'index.html' : requestPath);
-        // Security: Prevent path traversal attacks
-        if (!isPathWithinDirectory(outDir, originalFilePath)) {
+        // Security: the file the request names, or null when it is outside the output directory
+        const requestFile = resolveRequestFile(outDir, requestPath);
+        if (requestFile === null) {
             return {
                 content: '403 - Forbidden',
                 mimeType: 'text/plain',
@@ -79,8 +54,17 @@ export async function createPreviewServer(options = {}) {
             };
         }
         // Use the shared pretty URL resolver
-        const { filePath, found } = await resolvePrettyUrl(outDir, requestPath, originalFilePath);
+        const { filePath, found } = await resolvePrettyUrl(outDir, requestPath, requestFile);
         if (!found || !filePath) {
+            // Serve the site's 404 page, as static hosts do
+            const notFoundPage = await resolveNotFoundPage(outDir);
+            if (notFoundPage) {
+                return {
+                    content: await readFile(notFoundPage),
+                    mimeType: 'text/html',
+                    statusCode: 404,
+                };
+            }
             return {
                 content: requestPath.endsWith('/')
                     ? '404 - Directory listing not available'
@@ -114,8 +98,13 @@ export async function createPreviewServer(options = {}) {
             await assertPortAvailable(port, host, 'preview.port');
             // Create HTTP server
             httpServer = createServer(async (req, res) => {
-                const requestPath = req.url || '/';
-                logger.processing?.(`${req.method} ${requestPath}`);
+                logger.processing?.(`${req.method} ${req.url || '/'}`);
+                const requestPath = parseRequestPath(req.url);
+                if (requestPath === null) {
+                    res.writeHead(400, { 'Content-Type': 'text/plain' });
+                    res.end('400 - Bad Request');
+                    return;
+                }
                 try {
                     const { content, mimeType, statusCode } = await serveFile(requestPath);
                     res.writeHead(statusCode, {

package/dist/core/templates.d.ts

@@ -1,5 +1,6 @@
 import { Eta } from 'eta';
 import type { StatiConfig, PageModel, NavNode, TocEntry, Logger } from '../types/index.js';
+import type { PageReads } from './collections.js';
 import type { PageImages } from '../images/runtime.js';
 import type { GeneratedOgImage } from '../types/index.js';
 /**
@@ -12,6 +13,8 @@ export interface RenderResult {
     templatesLoaded: number;
     /** Open Graph image generated for the page, if any */
     ogImage?: GeneratedOgImage | undefined;
+    /** Shared data the render read, which the cache entry records */
+    reads: PageReads;
 }
 /**
  * Page-specific state for {@link renderPage}.

package/dist/core/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/core/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACT,OAAO,EAEP,QAAQ,EACR,MAAM,EACP,MAAM,mBAAmB,CAAC;AAkB3B,OAAO,KAAK,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,eAAe,EAAE,MAAM,CAAC;IACxB,sDAAsD;IACtD,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gFAAgF;IAChF,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACjC;AAgOD;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG,CA2B7D;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,GAAG,EACR,UAAU,CAAC,EAAE,OAAO,EAAE,EACtB,QAAQ,CAAC,EAAE,SAAS,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,mBAAmB,EAAE,WAAW,EAChD,GAAG,CAAC,EAAE,QAAQ,EAAE,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,YAAY,CAAC,CA0PvB"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/core/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACT,OAAO,EAEP,QAAQ,EACR,MAAM,EACP,MAAM,mBAAmB,CAAC;AAuB3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,eAAe,EAAE,MAAM,CAAC;IACxB,sDAAsD;IACtD,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACvC,iEAAiE;IACjE,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gFAAgF;IAChF,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CACjC;AAuHD;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG,CA2B7D;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,GAAG,EACR,UAAU,CAAC,EAAE,OAAO,EAAE,EACtB,QAAQ,CAAC,EAAE,SAAS,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,mBAAmB,EAAE,WAAW,EAChD,GAAG,CAAC,EAAE,QAAQ,EAAE,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,YAAY,CAAC,CA8RvB"}

package/dist/core/templates.js

@@ -3,7 +3,8 @@ import { join, dirname, relative, basename, posix } from 'node:path';
 import glob from 'fast-glob';
 import { createFallbackLogger } from './utils/index.js';
 import { TEMPLATE_EXTENSION } from '../constants.js';
-import { getStatiVersion, isCollectionIndexPage, discoverLayout, getCollectionPathForPage, resolveSrcDir, createTemplateError, createValidatingPartialsProxy, createValidatingContextProxy, propValue, wrapPartialsAsCallable, createNavigationHelpers, } from './utils/index.js';
+import { getStatiVersion, isCollectionIndexPage, discoverLayout, resolveSrcDir, createTemplateError, createValidatingPartialsProxy, createValidatingContextProxy, propValue, slugify, wrapPartialsAsCallable, createNavigationHelpers, } from './utils/index.js';
+import { getCollections, resolveCollectionPath, createCollectionView, copyPaginationData, copyGeneratedData, } from './collections.js';
 import { isDevelopment, isProduction } from '../env.js';
 import { generateSEO, resolveGeneratedImagePlaceholders } from '../seo/index.js';
 /**
@@ -22,118 +23,28 @@ function renderPlainImage(src, options = {}) {
     return `<img ${attributes.join(' ')}>`;
 }
 /**
- * Groups pages by their tags for aggregation purposes.
- *
- * @param pages - Pages to group
- * @returns Object mapping tag names to arrays of pages
- */
-function groupPagesByTags(pages) {
-    const pagesByTag = {};
-    for (const page of pages) {
-        const tags = page.frontMatter.tags;
-        if (Array.isArray(tags)) {
-            for (const tag of tags) {
-                if (typeof tag === 'string') {
-                    if (!pagesByTag[tag]) {
-                        pagesByTag[tag] = [];
-                    }
-                    pagesByTag[tag].push(page);
-                }
-            }
-        }
-    }
-    return pagesByTag;
-}
-/**
- * Sorts pages by publishedAt date (most recent first), falling back to alphabetical by title.
- *
- * @param pages - Pages to sort
- * @returns Sorted array of pages
- */
-function sortPagesByDate(pages) {
-    return pages.sort((a, b) => {
-        // Sort by publishedAt (newest first)
-        if (a.publishedAt && b.publishedAt) {
-            return b.publishedAt.getTime() - a.publishedAt.getTime();
-        }
-        if (a.publishedAt && !b.publishedAt)
-            return -1;
-        if (!a.publishedAt && b.publishedAt)
-            return 1;
-        // Fallback to title
-        const titleA = a.frontMatter.title || basename(a.url) || 'Untitled';
-        const titleB = b.frontMatter.title || basename(b.url) || 'Untitled';
-        return titleA.localeCompare(titleB);
-    });
-}
-/**
- * Builds collection aggregation data for index pages.
- * Provides all the data needed for index pages to list and organize their collection's content.
- *
- * @param currentPage - The current page being rendered (must be an index page)
- * @param allPages - All pages in the site
- * @returns Collection data for template rendering
- */
-function buildCollectionData(currentPage, allPages) {
-    const collectionPath = currentPage.url === '/' ? '/' : currentPage.url;
-    const collectionName = collectionPath === '/' ? 'Home' : basename(collectionPath);
-    // Find all pages that belong to this collection
-    const collectionPages = allPages.filter((page) => {
-        if (page.url === currentPage.url) {
-            return false; // Don't include the index page itself
-        }
-        if (collectionPath === '/') {
-            // For root collection, include pages that are direct children of root
-            const pageCollectionPath = getCollectionPathForPage(page.url);
-            return pageCollectionPath === '/';
-        }
-        else {
-            // For other collections, include pages that start with the collection path
-            const pageUrlAsDir = collectionPath.endsWith('/') ? collectionPath : collectionPath + '/';
-            return page.url.startsWith(pageUrlAsDir);
-        }
-    });
-    // Find direct children (one level down)
-    const children = collectionPages.filter((page) => {
-        const relativePath = page.url.substring(collectionPath.length);
-        const cleanPath = relativePath.startsWith('/') ? relativePath.substring(1) : relativePath;
-        return !cleanPath.includes('/'); // No further slashes means direct child
-    });
-    // Sort pages by date for recent posts
-    const recentPages = sortPagesByDate([...collectionPages]);
-    // Group by tags
-    const pagesByTag = groupPagesByTags(collectionPages);
-    return {
-        pages: collectionPages,
-        children,
-        recentPages,
-        pagesByTag,
-        metadata: {
-            totalPages: collectionPages.length,
-            hasChildren: children.length > 0,
-            collectionPath,
-            collectionName,
-        },
-    };
-}
-/**
- * Builds collection data for a child page (showing parent collection data).
- * Finds the parent collection and returns its data.
- *
- * @param currentPage - The current page being rendered
- * @param allPages - All pages in the site
- * @returns Collection data for the parent collection or undefined
+ * Wraps the navigation helpers for one render so that reading any of them sets `reads.nav`.
+ * Like the collection view, it uses accessors on a plain object, so spreading the template
+ * context does not count as a read. The helpers return the shared nodes unchanged.
  */
-function buildParentCollectionData(currentPage, allPages) {
-    // Get the parent collection path
-    const parentPath = getCollectionPathForPage(currentPage.url);
-    // Find the index page for the parent collection
-    const parentIndexPage = allPages.find((p) => p.url === parentPath);
-    if (parentIndexPage) {
-        // Build collection data for the parent
-        return buildCollectionData(parentIndexPage, allPages);
+function createNavView(helpers, reads) {
+    const view = {};
+    for (const [key, initial] of Object.entries(helpers)) {
+        let value = initial;
+        Object.defineProperty(view, key, {
+            enumerable: true,
+            configurable: true,
+            get() {
+                reads.nav = true;
+                return value;
+            },
+            set(next) {
+                reads.nav = true;
+                value = next;
+            },
+        });
     }
-    return undefined;
+    return view;
 }
 /**
  * Discovers partials in the hierarchy for a given page path.
@@ -245,17 +156,19 @@ export async function renderPage(page, body, config, eta, navigation, allPages,
     const partialPaths = await discoverPartials(relativePath, config);
     // Count templates: partials + layout (if found)
     const partialsCount = Object.keys(partialPaths).length;
-    // Build collection data based on page type
+    // What this render reads from shared data, so the cache can rebuild the page when it changes
+    const reads = { collection: false, nav: false };
+    // The page's collection: its own on index pages, the one it belongs to on other pages, or
+    // the one its front matter names. Collections are computed once per page list.
     let collectionData;
     const isIndexPage = allPages && isCollectionIndexPage(page, allPages);
     if (allPages) {
-        if (isIndexPage) {
-            // For index pages, show their own collection data
-            collectionData = buildCollectionData(page, allPages);
-        }
-        else {
-            // For child pages, show parent collection data
-            collectionData = buildParentCollectionData(page, allPages);
+        const collectionPath = resolveCollectionPath(page, allPages);
+        const data = collectionPath !== undefined
+            ? getCollections(allPages).byPath.get(collectionPath)
+            : undefined;
+        if (data) {
+            collectionData = createCollectionView(data, reads);
         }
     }
     // Discover the appropriate layout using hierarchical layout.eta convention
@@ -280,16 +193,28 @@ export async function renderPage(page, body, config, eta, navigation, allPages,
     if (conflictingKeys.length > 0) {
         log.warning(`Frontmatter in "${page.sourcePath}" contains reserved keys that will be overwritten: ${conflictingKeys.join(', ')}`);
     }
+    // The current page's navigation node counts as a navigation read
+    const pageContext = { ...page.frontMatter, ...pageOverrides };
+    Object.defineProperty(pageContext, 'navNode', {
+        enumerable: true,
+        configurable: true,
+        get() {
+            reads.nav = true;
+            return currentNavNode;
+        },
+    });
     // Create base context for partial rendering
     const baseContext = {
         site: config.site,
-        page: {
-            ...page.frontMatter,
-            ...pageOverrides,
-        },
+        page: pageContext,
         content: body,
-        nav: navHelpers, // Replace navigation with nav helpers
+        nav: createNavView(navHelpers, reads), // Replace navigation with nav helpers
         collection: collectionData, // Add collection data
+        // Set on paginated listings and on pages generated from [param].md templates. Placed before
+        // the filters, like slugify, so that an existing filter with the same name keeps working.
+        pagination: page.pagination ? copyPaginationData(page.pagination) : undefined,
+        generated: page.generated ? copyGeneratedData(page.generated) : undefined,
+        slugify,
         // Add custom filters to context
         ...(config.eta?.filters || {}),
         generator: {
@@ -382,10 +307,14 @@ export async function renderPage(page, body, config, eta, navigation, allPages,
     // Render the Open Graph template with the layout's context, minus the page body, so the
     // generated image is known before the layout renders its SEO tags
     if (pageImages && ogState.pending) {
+        // Copy the page's property descriptors so that navNode stays a getter: spreading would
+        // read it and count every page with a card as reading the navigation
+        const ogPage = Object.defineProperties({}, Object.getOwnPropertyDescriptors(baseContext.page));
+        ogPage.content = '';
         const ogBaseContext = {
             ...baseContext,
             content: '',
-            page: { ...baseContext.page, content: '' },
+            page: ogPage,
             og: pageImages.ogSize(),
         };
         const ogContext = createValidatingContextProxy({
@@ -405,13 +334,19 @@ export async function renderPage(page, body, config, eta, navigation, allPages,
     try {
         if (!layoutPath) {
             log.warning('No layout template found, using fallback');
-            return { html: createFallbackHtml(page, body), templatesLoaded, ogImage: ogState.image };
+            return {
+                html: createFallbackHtml(page, body),
+                templatesLoaded,
+                ogImage: ogState.image,
+                reads,
+            };
         }
         const html = await eta.renderAsync(layoutPath, context);
         return {
             html: resolveGeneratedImagePlaceholders(html, ogState.image),
             templatesLoaded,
             ogImage: ogState.image,
+            reads,
         };
     }
     catch (error) {
@@ -421,7 +356,12 @@ export async function renderPage(page, body, config, eta, navigation, allPages,
             const templateError = createTemplateError(error instanceof Error ? error : new Error(String(error)), layoutPath || undefined);
             throw templateError;
         }
-        return { html: createFallbackHtml(page, body), templatesLoaded, ogImage: ogState.image };
+        return {
+            html: createFallbackHtml(page, body),
+            templatesLoaded,
+            ogImage: ogState.image,
+            reads,
+        };
     }
 }
 function createFallbackHtml(page, body) {