@stati/core 1.15.2 → 1.16.0

package/dist/core/build.js

@@ -58,7 +58,7 @@ async function copyStaticAssetsWithLogging(sourceDir, destDir, logger, basePath
         if (item.isDirectory()) {
             // Recursively copy directories
             await ensureDir(destPath);
-            filesCopied += await copyStaticAssetsWithLogging(sourcePath, destPath, logger, relativePath);
+            filesCopied += await copyStaticAssetsWithLogging(sourcePath, destPath, logger);
         }
         else {
             // Copy individual files

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA2B7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AA4SD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CA+axF"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/core/dev.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA2B7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;CACb;AAiXD,wBAAsB,eAAe,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAudxF"}

package/dist/core/dev.js

@@ -61,15 +61,32 @@ async function performInitialBuild(configPath, logger, onError) {
     }
 }
 /**
- * Performs incremental rebuild when files change, using ISG logic for smart rebuilds
+ * Performs incremental rebuild when files change, using ISG logic for smart rebuilds.
+ * Uses a pending changes queue to ensure no file changes are lost when builds are in progress.
+ *
+ * @param changedPath - The path of the file that changed
+ * @param eventType - The type of change: 'add', 'change', or 'unlink'
+ * @param configPath - Optional path to the stati config file
+ * @param staticDir - The static assets directory path
+ * @param logger - Logger instance for output
+ * @param wsServer - WebSocket server for live reload notifications
+ * @param isBuildingRef - Mutable reference tracking whether a build is currently in progress
+ * @param pendingChangesRef - Mutable reference holding queued file changes that occurred during an
+ *   active build. The `changes` Map stores file paths as keys and their event types as values,
+ *   ensuring each file is only processed once with its most recent event type.
+ * @param onError - Optional callback invoked when build errors occur
+ * @param batchedChanges - Array of changes to process in a single batch (used for pending queue processing)
  */
-async function performIncrementalRebuild(changedPath, configPath, logger, wsServer, isBuildingRef, onError) {
+async function performIncrementalRebuild(changedPath, eventType, configPath, staticDir, logger, wsServer, isBuildingRef, pendingChangesRef, onError, batchedChanges = []) {
+    // If a build is in progress, queue this change for processing after the current build
     if (isBuildingRef.value) {
-        logger.info?.('Build in progress, skipping...');
+        pendingChangesRef.changes.set(changedPath, eventType);
         return;
     }
     isBuildingRef.value = true;
     const startTime = Date.now();
+    // All changes being processed in this build (primary + batched)
+    const allChanges = [{ path: changedPath, eventType }, ...batchedChanges];
     // Create a quiet logger for dev builds that suppresses verbose output
     const devLogger = {
         info: () => { }, // Suppress info messages
@@ -80,11 +97,15 @@ async function performIncrementalRebuild(changedPath, configPath, logger, wsServ
         processing: () => { }, // Suppress processing messages
         stats: () => { }, // Suppress stats messages
     };
+    // Helper to check if a path is a static asset
+    const normalizedStaticDir = staticDir.replace(/\\/g, '/');
+    const isStaticAsset = (path) => {
+        const normalizedPath = path.replace(/\\/g, '/');
+        return normalizedPath.startsWith(normalizedStaticDir);
+    };
+    // Helper to get relative path
+    const getRelativePath = (path) => path.replace(process.cwd(), '').replace(/\\/g, '/').replace(/^\//, '');
     try {
-        const relativePath = changedPath
-            .replace(process.cwd(), '')
-            .replace(/\\/g, '/')
-            .replace(/^\//, '');
         // Check if the changed file is a template/partial
         if (changedPath.endsWith(TEMPLATE_EXTENSION) || changedPath.includes('_partials')) {
             await handleTemplateChange(changedPath, configPath, devLogger);
@@ -116,7 +137,22 @@ async function performIncrementalRebuild(changedPath, configPath, logger, wsServ
             });
         }
         const duration = Date.now() - startTime;
-        logger.info?.(`⚡ ${relativePath} rebuilt in ${duration}ms`);
+        // Log all files that were processed in this batch
+        for (const change of allChanges) {
+            const relativePath = getRelativePath(change.path);
+            let action;
+            if (change.eventType === 'unlink') {
+                action = 'deleted';
+            }
+            else if (isStaticAsset(change.path)) {
+                action = 'copied';
+            }
+            else {
+                action = 'rebuilt';
+            }
+            logger.info?.(`⚡ ${relativePath} ${action}`);
+        }
+        logger.info?.(`   Done in ${duration}ms`);
     }
     catch (error) {
         const buildError = error instanceof Error ? error : new Error(String(error));
@@ -129,6 +165,18 @@ async function performIncrementalRebuild(changedPath, configPath, logger, wsServ
     }
     finally {
         isBuildingRef.value = false;
+        // Check if there are pending changes that occurred during this build
+        if (pendingChangesRef.changes.size > 0) {
+            // Get all pending changes - the build will process all of them at once
+            const pendingChanges = Array.from(pendingChangesRef.changes.entries()).map(([path, evtType]) => ({ path, eventType: evtType }));
+            pendingChangesRef.changes.clear();
+            // Trigger another rebuild with all batched changes
+            // The build() call will copy all static assets and rebuild all affected pages
+            const [first, ...remaining] = pendingChanges;
+            if (first) {
+                void performIncrementalRebuild(first.path, first.eventType, configPath, staticDir, logger, wsServer, isBuildingRef, pendingChangesRef, onError, remaining);
+            }
+        }
     }
 }
 /**
@@ -291,8 +339,10 @@ export async function createDevServer(options = {}) {
         lastBuildError = error;
     };
     let watcher = null;
+    let cssWatcher = null;
     let tsWatchers = [];
     const isBuildingRef = { value: false };
+    const pendingChangesRef = { changes: new Map() };
     let isStopping = false;
     /**
      * Gets MIME type for a file based on its extension
@@ -564,14 +614,34 @@ export async function createDevServer(options = {}) {
                 persistent: true,
                 ignoreInitial: true,
             });
+            // Set up separate watcher for CSS files in output directory
+            // This enables live reload when external tools (like Tailwind CLI) update CSS
+            cssWatcher = chokidar.watch([join(outDir, '**/*.css')], {
+                ignored: /(^|[/\\])\../, // ignore dotfiles
+                persistent: true,
+                ignoreInitial: true,
+            });
+            cssWatcher.on('change', (path) => {
+                const relativePath = path.replace(process.cwd(), '').replace(/\\/g, '/').replace(/^\//, '');
+                logger.info?.(`⚡ ${relativePath} updated`);
+                // Just notify clients to reload - no rebuild needed since CSS was already compiled
+                if (wsServer) {
+                    wsServer.clients.forEach((client) => {
+                        const ws = client;
+                        if (ws.readyState === 1) {
+                            ws.send(JSON.stringify({ type: 'reload' }));
+                        }
+                    });
+                }
+            });
             watcher.on('change', (path) => {
-                void performIncrementalRebuild(path, configPath, logger, wsServer, isBuildingRef, setLastBuildError);
+                void performIncrementalRebuild(path, 'change', configPath, staticDir, logger, wsServer, isBuildingRef, pendingChangesRef, setLastBuildError);
             });
             watcher.on('add', (path) => {
-                void performIncrementalRebuild(path, configPath, logger, wsServer, isBuildingRef, setLastBuildError);
+                void performIncrementalRebuild(path, 'add', configPath, staticDir, logger, wsServer, isBuildingRef, pendingChangesRef, setLastBuildError);
             });
             watcher.on('unlink', (path) => {
-                void performIncrementalRebuild(path, configPath, logger, wsServer, isBuildingRef, setLastBuildError);
+                void performIncrementalRebuild(path, 'unlink', configPath, staticDir, logger, wsServer, isBuildingRef, pendingChangesRef, setLastBuildError);
             });
             logger.success?.(`Dev server running at ${url}`);
             logger.info?.(`\nServing:`);
@@ -598,6 +668,11 @@ export async function createDevServer(options = {}) {
                 await watcher.close();
                 watcher = null;
             }
+            // Clean up CSS watcher
+            if (cssWatcher) {
+                await cssWatcher.close();
+                cssWatcher = null;
+            }
             // Clean up TypeScript watchers
             if (tsWatchers.length > 0) {
                 await Promise.all(tsWatchers.map(async (w) => {

package/dist/core/utils/callable-partials.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callable-partials.utils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/callable-partials.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IAC1C,QAAQ,IAAI,MAAM,CAAC;IACnB,OAAO,IAAI,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,eAAe,EAAE,MAAM,GACtB,eAAe,CAqDjB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAcjC"}
+{"version":3,"file":"callable-partials.utils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/callable-partials.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IAC1C,QAAQ,IAAI,MAAM,CAAC;IACnB,OAAO,IAAI,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,eAAe,EAAE,MAAM,GACtB,eAAe,CAqDjB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CA8BjC"}

package/dist/core/utils/callable-partials.utils.js

@@ -96,13 +96,23 @@ export function makeCallablePartial(eta, partialPath, baseContext, renderedConte
  */
 export function wrapPartialsAsCallable(eta, partials, partialPaths, baseContext) {
     const callablePartials = {};
+    // Create a context that will have partials updated to the callable versions
+    // This enables nested callable partial calls
+    const contextWithCallablePartials = {
+        ...baseContext,
+        // The partials property will be updated after all callables are created
+        get partials() {
+            return callablePartials;
+        },
+    };
     for (const [name, renderedContent] of Object.entries(partials)) {
         const partialPath = partialPaths[name];
         if (!partialPath) {
             console.warn(`No path found for partial "${name}", skipping callable wrapper`);
             continue;
         }
-        callablePartials[name] = makeCallablePartial(eta, partialPath, baseContext, renderedContent);
+        // Pass the context that has dynamic access to all callable partials
+        callablePartials[name] = makeCallablePartial(eta, partialPath, contextWithCallablePartials, renderedContent);
     }
     return callablePartials;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stati/core",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",