@eventra_dev/eventra-cli 0.1.11 → 0.1.13

package/dist/commands/watch.js

@@ -8,10 +8,12 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const chalk_1 = __importDefault(require("chalk"));
 const promises_1 = __importDefault(require("fs/promises"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const path_1 = __importDefault(require("path"));
 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;
@@ -20,16 +22,24 @@ async function watch() {
         ignore: config.sync.exclude,
     });
     const engine = new engine_1.EventraEngine(process.cwd());
+    const fileCache = [];
+    // PRELOAD TS
     for (const file of files) {
         try {
-            const raw = await promises_1.default.readFile(file, "utf-8");
-            const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
-            engine.scanFile(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);
+            fileCache.push({ file: virtualFile, content });
+            engine["ts"].updateFile(virtualFile, content);
         }
         catch {
             console.log(chalk_1.default.gray(`skip: ${file}`));
         }
     }
+    // INITIAL SCAN
+    for (const { file, content } of fileCache) {
+        engine.scanFile(file, content, config);
+    }
     config.events = engine.getAllEvents().sort();
     await (0, config_1.saveConfig)(config);
     console.log(chalk_1.default.gray(`Initial: ${config.events.length} events\n`));
@@ -44,8 +54,10 @@ async function watch() {
         queued.clear();
         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);
+                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);
                 engine.updateFile(virtualFile, content, config);
             }
             catch {
@@ -65,7 +77,8 @@ async function watch() {
         locked = false;
     };
     const schedule = (file) => {
-        queued.add(file);
+        const abs = path_1.default.resolve(file);
+        queued.add(abs);
         if (timer)
             clearTimeout(timer);
         timer = setTimeout(run, 100);
@@ -78,12 +91,14 @@ async function watch() {
         .on("add", schedule)
         .on("change", schedule)
         .on("unlink", async (file) => {
+        const abs = path_1.default.resolve(file);
         console.log(chalk_1.default.gray(`remove: ${file}`));
-        const { virtualFile } = (0, processFile_1.processFile)(file, "");
-        engine.removeFile(virtualFile);
+        const { virtualFile } = (0, processFile_1.processFile)(abs, "");
+        engine.removeFile(virtualFile, config);
         const next = engine.getAllEvents();
         config.events = next.sort();
         await (0, config_1.saveConfig)(config);
+        console.log(chalk_1.default.gray(`Total: ${config.events.length} events\n`));
     });
     process.on("SIGINT", async () => {
         console.log(chalk_1.default.yellow("\nStopping watcher..."));

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.11",
+  "version": "0.1.13",
   "description": "Eventra CLI",
   "type": "commonjs",
   "bin": {

package/src/commands/watch.ts

@@ -2,12 +2,15 @@ import chokidar from "chokidar";
 import chalk from "chalk";
 import fs from "fs/promises";
 import fg from "fast-glob";
+import path from "path";
 
 import { loadConfig, saveConfig } from "../utils/config";
 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;
 
@@ -19,19 +22,29 @@ export async function watch() {
 
   const engine = new EventraEngine(process.cwd());
 
+  const fileCache: { file: string; content: string }[] = [];
+
+  // PRELOAD TS
   for (const file of files) {
     try {
-      const raw = await fs.readFile(file, "utf-8");
+      const abs = path.resolve(file);
+      const raw = await fs.readFile(abs, "utf-8");
 
-      const { content, virtualFile } = processFile(file, raw);
+      const { content, virtualFile } = processFile(abs, raw);
 
-      engine.scanFile(virtualFile, content, config);
+      fileCache.push({ file: virtualFile, content });
 
+      engine["ts"].updateFile(virtualFile, content);
     } catch {
       console.log(chalk.gray(`skip: ${file}`));
     }
   }
 
+  // INITIAL SCAN
+  for (const { file, content } of fileCache) {
+    engine.scanFile(file, content, config);
+  }
+
   config.events = engine.getAllEvents().sort();
   await saveConfig(config);
 
@@ -52,10 +65,13 @@ export async function watch() {
 
     for (const file of batch) {
       try {
-        const raw = await fs.readFile(file, "utf-8");
+        const abs = path.resolve(file);
+
+        const raw = await fs.readFile(abs, "utf-8");
 
-        const { content, virtualFile } = processFile(file, raw);
+        const { content, virtualFile } = processFile(abs, raw);
 
+        engine["ts"].updateFile(virtualFile, content);
         engine.updateFile(virtualFile, content, config);
 
       } catch {
@@ -84,10 +100,10 @@ export async function watch() {
   };
 
   const schedule = (file: string) => {
-    queued.add(file);
+    const abs = path.resolve(file);
+    queued.add(abs);
 
     if (timer) clearTimeout(timer);
-
     timer = setTimeout(run, 100);
   };
 
@@ -100,16 +116,22 @@ export async function watch() {
     .on("add", schedule)
     .on("change", schedule)
     .on("unlink", async (file) => {
+      const abs = path.resolve(file);
+
       console.log(chalk.gray(`remove: ${file}`));
 
-      const { virtualFile } = processFile(file, "");
+      const { virtualFile } = processFile(abs, "");
 
-      engine.removeFile(virtualFile);
+      engine.removeFile(virtualFile, config);
 
       const next = engine.getAllEvents();
 
       config.events = next.sort();
       await saveConfig(config);
+
+      console.log(
+        chalk.gray(`Total: ${config.events.length} events\n`)
+      );
     });
 
   process.on("SIGINT", async () => {

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);