@eventra_dev/eventra-cli 0.1.12 → 0.1.14

package/dist/commands/watch.js

@@ -13,6 +13,7 @@ const config_1 = require("../utils/config");
 const engine_1 = require("../engine/engine");
 const processFile_1 = require("../utils/processFile");
 async function watch() {
+    process.env.EVENTRA_WATCH = "1";
     const config = await (0, config_1.loadConfig)();
     if (!config)
         return;
@@ -42,27 +43,34 @@ async function watch() {
     config.events = engine.getAllEvents().sort();
     await (0, config_1.saveConfig)(config);
     console.log(chalk_1.default.gray(`Initial: ${config.events.length} events\n`));
-    // WATCH STATE
     let locked = false;
     let queued = new Set();
     let timer = null;
-    // RUN BATCH
     const run = async () => {
         if (locked)
             return;
         locked = true;
         const batch = [...queued];
         queued.clear();
+        const touched = new Set();
         for (const file of batch) {
             try {
-                const raw = await promises_1.default.readFile(file, "utf-8");
-                const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
-                engine.updateFile(virtualFile, content, config);
+                const abs = path_1.default.resolve(file);
+                const raw = await promises_1.default.readFile(abs, "utf-8");
+                const { content, virtualFile } = (0, processFile_1.processFile)(abs, raw);
+                engine["ts"].updateFile(virtualFile, content);
+                touched.add(virtualFile);
             }
             catch {
                 console.log(chalk_1.default.gray(`skip: ${file}`));
             }
         }
+        for (const file of engine["ts"]["fileNames"]) {
+            const content = engine["ts"].getFileContent(file);
+            if (!content)
+                continue;
+            engine.scanFile(file, content, config);
+        }
         const next = engine.getAllEvents();
         const added = next.filter(e => !config.events.includes(e));
         const removed = config.events.filter(e => !next.includes(e));
@@ -75,7 +83,6 @@ async function watch() {
         }
         locked = false;
     };
-    // SCHEDULER
     const schedule = (file) => {
         const abs = path_1.default.resolve(file);
         queued.add(abs);
@@ -83,7 +90,6 @@ async function watch() {
             clearTimeout(timer);
         timer = setTimeout(run, 100);
     };
-    // WATCHER
     const watcher = chokidar_1.default.watch(config.sync.include, {
         ignored: config.sync.exclude,
         ignoreInitial: true,

package/dist/engine/engine.js

@@ -19,8 +19,9 @@ class EventraEngine {
     // SCAN FILE
     scanFile(file, content, config) {
         const h = (0, hash_1.hash)(content);
+        const isWatch = process.env.EVENTRA_WATCH === "1";
         // skip unchanged
-        if (this.fileHash.get(file) === h) {
+        if (this.fileHash.get(file) === h && !isWatch) {
             return (this.fileResults.get(file) ?? {
                 events: new Set(),
                 detectedFunctionWrappers: new Set(),
@@ -60,8 +61,9 @@ class EventraEngine {
             if (!depContent)
                 continue;
             const h = (0, hash_1.hash)(depContent);
+            const isWatch = process.env.EVENTRA_WATCH === "1";
             // skip unchanged dependents
-            if (this.fileHash.get(dep) === h)
+            if (this.fileHash.get(dep) === h && !isWatch)
                 continue;
             this.fileHash.set(dep, h);
             this.graph.update(dep, source);
@@ -96,8 +98,9 @@ class EventraEngine {
             if (!content)
                 continue;
             const h = (0, hash_1.hash)(content);
+            const isWatch = process.env.EVENTRA_WATCH === "1";
             // skip unchanged
-            if (this.fileHash.get(dep) === h)
+            if (this.fileHash.get(dep) === h && !isWatch)
                 continue;
             this.fileHash.set(dep, h);
             const r = (0, scanner_1.scanSource)(source, checker, config ?? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventra_dev/eventra-cli",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Eventra CLI",
   "type": "commonjs",
   "bin": {

package/src/commands/watch.ts

@@ -9,6 +9,8 @@ import { EventraEngine } from "../engine/engine";
 import { processFile } from "../utils/processFile";
 
 export async function watch() {
+  process.env.EVENTRA_WATCH = "1";
+
   const config = await loadConfig();
   if (!config) return;
 
@@ -50,12 +52,10 @@ export async function watch() {
     chalk.gray(`Initial: ${config.events.length} events\n`)
   );
 
-  // WATCH STATE
   let locked = false;
   let queued = new Set<string>();
   let timer: NodeJS.Timeout | null = null;
 
-  // RUN BATCH
   const run = async () => {
     if (locked) return;
     locked = true;
@@ -63,18 +63,31 @@ export async function watch() {
     const batch = [...queued];
     queued.clear();
 
+    const touched = new Set<string>();
+
     for (const file of batch) {
       try {
-        const raw = await fs.readFile(file, "utf-8");
-        const { content, virtualFile } = processFile(file, raw);
+        const abs = path.resolve(file);
+
+        const raw = await fs.readFile(abs, "utf-8");
+        const { content, virtualFile } = processFile(abs, raw);
+
+        engine["ts"].updateFile(virtualFile, content);
 
-        engine.updateFile(virtualFile, content, config);
+        touched.add(virtualFile);
 
       } catch {
         console.log(chalk.gray(`skip: ${file}`));
       }
     }
 
+    for (const file of engine["ts"]["fileNames"]) {
+      const content = engine["ts"].getFileContent(file);
+      if (!content) continue;
+
+      engine.scanFile(file, content, config);
+    }
+
     const next = engine.getAllEvents();
 
     const added = next.filter(e => !config.events.includes(e));
@@ -95,17 +108,14 @@ export async function watch() {
     locked = false;
   };
 
-  // SCHEDULER
   const schedule = (file: string) => {
     const abs = path.resolve(file);
-
     queued.add(abs);
 
     if (timer) clearTimeout(timer);
     timer = setTimeout(run, 100);
   };
 
-  // WATCHER
   const watcher = chokidar.watch(config.sync.include, {
     ignored: config.sync.exclude,
     ignoreInitial: true,

package/src/engine/engine.ts

@@ -26,9 +26,10 @@ export class EventraEngine {
     config: EventraConfig
   ): ScanResult {
     const h = hash(content);
+    const isWatch = process.env.EVENTRA_WATCH === "1";
 
     // skip unchanged
-    if (this.fileHash.get(file) === h) {
+    if (this.fileHash.get(file) === h && !isWatch) {
       return (
         this.fileResults.get(file) ?? {
           events: new Set(),
@@ -85,9 +86,10 @@ export class EventraEngine {
       if (!depContent) continue;
 
       const h = hash(depContent);
+      const isWatch = process.env.EVENTRA_WATCH === "1";
 
       // skip unchanged dependents
-      if (this.fileHash.get(dep) === h) continue;
+      if (this.fileHash.get(dep) === h && !isWatch) continue;
 
       this.fileHash.set(dep, h);
 
@@ -131,9 +133,10 @@ export class EventraEngine {
       if (!content) continue;
 
       const h = hash(content);
+      const isWatch = process.env.EVENTRA_WATCH === "1";
 
       // skip unchanged
-      if (this.fileHash.get(dep) === h) continue;
+      if (this.fileHash.get(dep) === h && !isWatch) continue;
 
       this.fileHash.set(dep, h);