@pikku/cli 0.12.112 → 0.12.113

package/dist/src/functions/commands/watch.js

@@ -13,48 +13,67 @@ export const watch = pikkuSessionlessFunc({
                 logger,
             });
         }
-        const configWatcher = chokidar.watch(watchDirectories, {
+        const watcher = chokidar.watch(watchDirectories, {
             ignoreInitial: true,
             ignored: /.*\.gen\.tsx?/,
         });
-        let watcher = new chokidar.FSWatcher({});
-        const generatorWatcher = () => {
-            watcher.close();
-            logger.info(`• Watching directories: \n  - ${watchDirectories.join('\n  - ')}`);
-            watcher = chokidar.watch(watchDirectories, {
-                ignoreInitial: true,
-                ignored: /.*\.gen\.ts/,
-            });
-            watcher.on('ready', async () => {
-                const handle = async () => {
+        logger.info(`• Watching directories: \n  - ${watchDirectories.join('\n  - ')}`);
+        watcher.on('ready', async () => {
+            const handle = async () => {
+                try {
+                    const start = Date.now();
+                    invalidateInspectorState();
+                    await rpc.invoke('all');
+                    logger.info({
+                        message: `✓ Generated in ${Date.now() - start}ms`,
+                        type: 'timing',
+                    });
+                }
+                catch (err) {
+                    console.error(err);
+                    logger.error('Error running watch');
+                }
+            };
+            // A codegen pass holds a whole ts.Program, so two overlapping passes double
+            // the peak RSS. Coalesce instead: changes arriving mid-pass schedule exactly
+            // one more run after it.
+            let inFlight;
+            let queued = false;
+            const runHandle = async () => {
+                if (inFlight) {
+                    queued = true;
+                    return;
+                }
+                do {
+                    queued = false;
+                    inFlight = handle();
                     try {
-                        const start = Date.now();
-                        invalidateInspectorState();
-                        await rpc.invoke('all');
-                        logger.info({
-                            message: `✓ Generated in ${Date.now() - start}ms`,
-                            type: 'timing',
-                        });
-                    }
-                    catch (err) {
-                        console.error(err);
-                        logger.error('Error running watch');
+                        await inFlight;
                     }
-                };
-                await handle();
-                let timeout;
-                const deduped = (_file) => {
-                    if (timeout) {
-                        clearTimeout(timeout);
+                    finally {
+                        inFlight = undefined;
                     }
-                    timeout = setTimeout(handle, 1000);
-                };
-                watcher.on('change', deduped);
-                watcher.on('add', deduped);
-                watcher.on('unlink', deduped);
-            });
-        };
-        configWatcher.on('ready', generatorWatcher);
-        configWatcher.on('change', generatorWatcher);
+                } while (queued);
+            };
+            await runHandle();
+            let timeout;
+            const deduped = (_file) => {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
+                timeout = setTimeout(runHandle, 1000);
+            };
+            watcher.on('change', deduped);
+            watcher.on('add', deduped);
+            watcher.on('unlink', deduped);
+        });
+        process.once('SIGINT', async () => {
+            await watcher.close();
+            process.exit(0);
+        });
+        // Without this the command returns the moment the handlers are registered and
+        // the process exits, taking the watcher with it — chokidar's `ready` never
+        // fires, so `pikku watch` regenerated nothing at all.
+        await new Promise(() => { });
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.12.112",
+  "version": "0.12.113",
   "description": "Pikku CLI — code generation, dev server, migrations and deployment",
   "author": "yasser.fadl@gmail.com",
   "license": "BUSL-1.1",

package/surface.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.12.112",
+  "version": "0.12.113",
   "entryPoints": [
     {
       "id": "app",