@eventra_dev/eventra-cli 0.1.14 → 0.1.16

package/dist/commands/sync.js

@@ -30,8 +30,8 @@ async function sync() {
         try {
             const raw = await promises_1.default.readFile(file, "utf-8");
             const { content, virtualFile } = (0, processFile_1.processFile)(file, raw);
-            fileCache.push({ file: virtualFile, content });
             engine["ts"].updateFile(virtualFile, content);
+            fileCache.push({ file: virtualFile, content });
         }
         catch {
             // ignore

package/dist/commands/watch.js

@@ -12,6 +12,11 @@ const path_1 = __importDefault(require("path"));
 const config_1 = require("../utils/config");
 const engine_1 = require("../engine/engine");
 const processFile_1 = require("../utils/processFile");
+const toVirtual = async (file) => {
+    const abs = path_1.default.resolve(file);
+    const raw = await promises_1.default.readFile(abs, "utf-8");
+    return (0, processFile_1.processFile)(abs, raw);
+};
 async function watch() {
     process.env.EVENTRA_WATCH = "1";
     const config = await (0, config_1.loadConfig)();
@@ -29,8 +34,8 @@ async function watch() {
             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);
+            fileCache.push({ file: virtualFile, content });
         }
         catch {
             console.log(chalk_1.default.gray(`skip: ${file}`));
@@ -52,25 +57,15 @@ async function watch() {
         locked = true;
         const batch = [...queued];
         queued.clear();
-        const touched = new Set();
         for (const file of batch) {
             try {
-                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);
+                const { content, virtualFile } = await toVirtual(file);
+                engine.updateFile(virtualFile, content, config);
             }
             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));
@@ -84,11 +79,10 @@ async function watch() {
         locked = false;
     };
     const schedule = (file) => {
-        const abs = path_1.default.resolve(file);
-        queued.add(abs);
+        queued.add(path_1.default.resolve(file));
         if (timer)
             clearTimeout(timer);
-        timer = setTimeout(run, 100);
+        timer = setTimeout(run, 200);
     };
     const watcher = chokidar_1.default.watch(config.sync.include, {
         ignored: config.sync.exclude,

package/dist/engine/engine.js

@@ -19,9 +19,8 @@ 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 && !isWatch) {
+        if (this.fileHash.get(file) === h) {
             return (this.fileResults.get(file) ?? {
                 events: new Set(),
                 detectedFunctionWrappers: new Set(),
@@ -39,7 +38,6 @@ class EventraEngine {
                 detectedComponentWrappers: new Map(),
             };
         }
-        // update dependency graph
         this.graph.update(file, source);
         const res = (0, scanner_1.scanSource)(source, checker, config);
         this.fileResults.set(file, res);
@@ -47,25 +45,24 @@ class EventraEngine {
     }
     // UPDATE FILE (incremental)
     updateFile(file, content, config) {
+        // сначала обновляем текущий файл
         const res = this.scanFile(file, content, config);
         const dependents = this.graph.getAllDependentsDeep(file);
         for (const dep of dependents) {
-            // skip external files
             if ((0, boundary_1.isExternalFile)(dep))
                 continue;
-            const source = this.ts.getSourceFile(dep);
-            const checker = this.ts.getChecker();
-            if (!source || !checker)
-                continue;
             const depContent = this.ts.getFileContent(dep);
             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 && !isWatch)
+            if (this.fileHash.get(dep) === h)
                 continue;
             this.fileHash.set(dep, h);
+            this.ts.updateFile(dep, depContent);
+            const source = this.ts.getSourceFile(dep);
+            const checker = this.ts.getChecker();
+            if (!source || !checker)
+                continue;
             this.graph.update(dep, source);
             const r = (0, scanner_1.scanSource)(source, checker, config);
             this.fileResults.set(dep, r);
@@ -90,19 +87,18 @@ class EventraEngine {
         for (const dep of dependents) {
             if ((0, boundary_1.isExternalFile)(dep))
                 continue;
-            const source = this.ts.getSourceFile(dep);
-            const checker = this.ts.getChecker();
-            if (!source || !checker)
-                continue;
             const content = this.ts.getFileContent(dep);
             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 && !isWatch)
+            if (this.fileHash.get(dep) === h)
                 continue;
             this.fileHash.set(dep, h);
+            this.ts.updateFile(dep, content);
+            const source = this.ts.getSourceFile(dep);
+            const checker = this.ts.getChecker();
+            if (!source || !checker)
+                continue;
             const r = (0, scanner_1.scanSource)(source, checker, config ?? {
                 events: [],
                 wrappers: [],

package/package.json

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

package/src/commands/sync.ts

@@ -32,10 +32,8 @@ export async function sync() {
     try {
       const raw = await fs.readFile(file, "utf-8");
       const { content, virtualFile } = processFile(file, raw);
-
-      fileCache.push({ file: virtualFile, content });
-
       engine["ts"].updateFile(virtualFile, content);
+      fileCache.push({ file: virtualFile, content });
     } catch {
       // ignore
     }

package/src/commands/watch.ts

@@ -8,6 +8,12 @@ import { loadConfig, saveConfig } from "../utils/config";
 import { EventraEngine } from "../engine/engine";
 import { processFile } from "../utils/processFile";
 
+const toVirtual = async (file: string) => {
+  const abs = path.resolve(file);
+  const raw = await fs.readFile(abs, "utf-8");
+  return processFile(abs, raw);
+};
+
 export async function watch() {
   process.env.EVENTRA_WATCH = "1";
 
@@ -29,12 +35,9 @@ export async function watch() {
     try {
       const abs = path.resolve(file);
       const raw = await fs.readFile(abs, "utf-8");
-
       const { content, virtualFile } = processFile(abs, raw);
-
-      fileCache.push({ file: virtualFile, content });
-
       engine["ts"].updateFile(virtualFile, content);
+      fileCache.push({ file: virtualFile, content });
     } catch {
       console.log(chalk.gray(`skip: ${file}`));
     }
@@ -63,31 +66,17 @@ export async function watch() {
     const batch = [...queued];
     queued.clear();
 
-    const touched = new Set<string>();
-
     for (const file of batch) {
       try {
-        const abs = path.resolve(file);
-
-        const raw = await fs.readFile(abs, "utf-8");
-        const { content, virtualFile } = processFile(abs, raw);
-
-        engine["ts"].updateFile(virtualFile, content);
+        const { content, virtualFile } = await toVirtual(file);
 
-        touched.add(virtualFile);
+        engine.updateFile(virtualFile, content, config);
 
       } 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));
@@ -109,11 +98,10 @@ export async function watch() {
   };
 
   const schedule = (file: string) => {
-    const abs = path.resolve(file);
-    queued.add(abs);
+    queued.add(path.resolve(file));
 
     if (timer) clearTimeout(timer);
-    timer = setTimeout(run, 100);
+    timer = setTimeout(run, 200);
   };
 
   const watcher = chokidar.watch(config.sync.include, {

package/src/engine/engine.ts

@@ -26,10 +26,9 @@ 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 && !isWatch) {
+    if (this.fileHash.get(file) === h) {
       return (
         this.fileResults.get(file) ?? {
           events: new Set(),
@@ -53,11 +52,9 @@ export class EventraEngine {
       };
     }
 
-    // update dependency graph
     this.graph.update(file, source);
 
     const res = scanSource(source, checker, config);
-
     this.fileResults.set(file, res);
 
     return res;
@@ -69,29 +66,28 @@ export class EventraEngine {
     content: string,
     config: EventraConfig
   ) {
+    // сначала обновляем текущий файл
     const res = this.scanFile(file, content, config);
 
     const dependents = this.graph.getAllDependentsDeep(file);
 
     for (const dep of dependents) {
-      // skip external files
       if (isExternalFile(dep)) continue;
 
-      const source = this.ts.getSourceFile(dep);
-      const checker = this.ts.getChecker();
-
-      if (!source || !checker) continue;
-
       const depContent = this.ts.getFileContent(dep);
       if (!depContent) continue;
 
       const h = hash(depContent);
-      const isWatch = process.env.EVENTRA_WATCH === "1";
 
-      // skip unchanged dependents
-      if (this.fileHash.get(dep) === h && !isWatch) continue;
+      if (this.fileHash.get(dep) === h) continue;
 
       this.fileHash.set(dep, h);
+      this.ts.updateFile(dep, depContent);
+
+      const source = this.ts.getSourceFile(dep);
+      const checker = this.ts.getChecker();
+
+      if (!source || !checker) continue;
 
       this.graph.update(dep, source);
 
@@ -119,26 +115,26 @@ export class EventraEngine {
     this.fileResults.delete(file);
     this.fileHash.delete(file);
     this.graph.remove(file);
+
     const dependents = this.graph.getAllDependentsDeep(file);
 
     for (const dep of dependents) {
       if (isExternalFile(dep)) continue;
 
-      const source = this.ts.getSourceFile(dep);
-      const checker = this.ts.getChecker();
-
-      if (!source || !checker) continue;
-
       const content = this.ts.getFileContent(dep);
       if (!content) continue;
 
       const h = hash(content);
-      const isWatch = process.env.EVENTRA_WATCH === "1";
 
-      // skip unchanged
-      if (this.fileHash.get(dep) === h && !isWatch) continue;
+      if (this.fileHash.get(dep) === h) continue;
 
       this.fileHash.set(dep, h);
+      this.ts.updateFile(dep, content);
+
+      const source = this.ts.getSourceFile(dep);
+      const checker = this.ts.getChecker();
+
+      if (!source || !checker) continue;
 
       const r = scanSource(
         source,