@eventra_dev/eventra-cli 0.1.34 → 0.2.2

package/dist/engine/scanner.js

@@ -8,6 +8,7 @@ const typescript_1 = __importDefault(require("typescript"));
 const resolver_1 = require("./resolver");
 const callResolver_1 = require("./callResolver");
 const exportResolver_1 = require("./exportResolver");
+// HELPERS
 function isValidEvent(v) {
     return (v &&
         v.length > 1 &&
@@ -36,6 +37,7 @@ function getJsxAttrName(name) {
         return name.name.text;
     return "";
 }
+// MAIN
 function scanSource(source, checker, config, visited = new Set(), inheritedParamMap, wrapperCache = new Map()) {
     const events = new Set();
     const detectedFunctionWrappers = new Set();
@@ -44,30 +46,38 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
         return { events, detectedFunctionWrappers, detectedComponentWrappers };
     }
     visited.add(source.fileName);
+    // TRACK DETECTION
+    function isTrackCall(expr) {
+        if (typescript_1.default.isIdentifier(expr)) {
+            return expr.text === "track";
+        }
+        if (typescript_1.default.isPropertyAccessExpression(expr)) {
+            return expr.name.text === "track";
+        }
+        return false;
+    }
     function extractTrackCall(node, paramMap) {
-        const expr = node.expression;
-        if (typescript_1.default.isPropertyAccessExpression(expr) && expr.name.text === "track") {
-            const arg = node.arguments[0];
-            if (!arg)
-                return;
-            const res = (0, resolver_1.resolveNodeValue)(arg, checker, paramMap);
-            for (const v of res.values) {
-                if (isValidEvent(v))
-                    events.add(v);
+        if (!isTrackCall(node.expression))
+            return;
+        const arg = node.arguments[0];
+        if (!arg)
+            return;
+        const res = (0, resolver_1.resolveNodeValue)(arg, checker, paramMap);
+        for (const v of res.values) {
+            if (isValidEvent(v)) {
+                events.add(v);
             }
         }
     }
+    // WRAPPER DETECTION
     function isWrapperFunction(fn) {
         let found = false;
         function walk(n) {
             if (found)
                 return;
-            if (typescript_1.default.isCallExpression(n)) {
-                const expr = n.expression;
-                if (typescript_1.default.isPropertyAccessExpression(expr) && expr.name.text === "track") {
-                    found = true;
-                    return;
-                }
+            if (typescript_1.default.isCallExpression(n) && isTrackCall(n.expression)) {
+                found = true;
+                return;
             }
             typescript_1.default.forEachChild(n, walk);
         }
@@ -75,10 +85,12 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
             walk(fn.body);
         return found;
     }
+    // COMPONENT WRAPPER
     function detectComponentWrapper(tag) {
         const tagName = getJsxTagName(tag);
-        if (wrapperCache.has(tagName))
+        if (wrapperCache.has(tagName)) {
             return wrapperCache.get(tagName);
+        }
         let symbol = checker.getSymbolAtLocation(tag);
         if (symbol && (symbol.flags & typescript_1.default.SymbolFlags.Alias)) {
             symbol = checker.getAliasedSymbol(symbol);
@@ -104,14 +116,11 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
             function walk(n) {
                 if (prop)
                     return;
-                if (typescript_1.default.isCallExpression(n)) {
-                    const expr = n.expression;
-                    if (typescript_1.default.isPropertyAccessExpression(expr) && expr.name.text === "track") {
-                        const arg = n.arguments[0];
-                        if (typescript_1.default.isPropertyAccessExpression(arg)) {
-                            prop = arg.name.text;
-                            return;
-                        }
+                if (typescript_1.default.isCallExpression(n) && isTrackCall(n.expression)) {
+                    const arg = n.arguments[0];
+                    if (typescript_1.default.isPropertyAccessExpression(arg)) {
+                        prop = arg.name.text;
+                        return;
                     }
                 }
                 typescript_1.default.forEachChild(n, walk);
@@ -126,6 +135,7 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
         wrapperCache.set(tagName, null);
         return null;
     }
+    // VISITOR
     function visit(node) {
         // JSX
         if (typescript_1.default.isJsxSelfClosingElement(node) || typescript_1.default.isJsxOpeningElement(node)) {
@@ -183,9 +193,7 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
                     }
                 });
             }
-            // direct track
             extractTrackCall(node, paramMap);
-            // wrapper
             if (resolvedFn && isWrapperFunction(resolvedFn)) {
                 const name = getCallName(node.expression);
                 if (name && name !== "track") {
@@ -195,9 +203,14 @@ function scanSource(source, checker, config, visited = new Set(), inheritedParam
                     visit(resolvedFn.body);
                 }
             }
-            for (const arg of node.arguments) {
-                visit(arg);
+            if (resolvedFn && resolvedFn.body) {
+                const sf = resolvedFn.getSourceFile();
+                if (!visited.has(sf.fileName)) {
+                    const res = scanSource(sf, checker, config, visited, paramMap, wrapperCache);
+                    res.events.forEach(e => events.add(e));
+                }
             }
+            node.arguments.forEach(visit);
             visit(node.expression);
             return;
         }

package/dist/utils/processFile.js

@@ -1,8 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFile = processFile;
+const path_1 = __importDefault(require("path"));
 const universal_1 = require("./universal");
+function extractImports(content, file) {
+    return (0, universal_1.parseUniversal)(content, file).deps;
+}
 function processFile(file, content) {
+    const ext = path_1.default.extname(file);
+    if (ext === ".ts" ||
+        ext === ".tsx" ||
+        ext === ".js" ||
+        ext === ".jsx") {
+        return {
+            content,
+            deps: extractImports(content, file),
+        };
+    }
     const parsed = (0, universal_1.parseUniversal)(content, file);
     return {
         content: parsed.code || "",

package/dist/utils/universal.js

@@ -184,7 +184,7 @@ function parseUniversal(content, file) {
     deps.push(...dyn.deps);
     parts.push(...dyn.calls);
     return {
-        code: [...new Set(parts)].join("\n"),
+        code: parts.length ? parts.join("\n") : content,
         deps: [...new Set(deps.filter(Boolean))],
     };
 }

package/package.json

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

package/src/commands/check.ts

@@ -25,28 +25,20 @@ export async function check({ fix = false }: { fix?: boolean }) {
 
   const engine = new EventraEngine(process.cwd());
 
+  const cache = new Map<string, { content: string; deps: string[] }>();
   const toScan = new Set<string>();
 
-  const cache = new Map<
-    string,
-    { content: string; deps: string[] }
-  >();
-
-  // COLLECT + CACHE
+  // COLLECT
   for (const file of files) {
     try {
       const raw = await fs.readFile(file, "utf-8");
-
       if (raw.length > 2_000_000) continue;
 
       const parsed = processFile(file, raw);
 
       cache.set(file, parsed);
       toScan.add(file);
-
-      for (const dep of parsed.deps) {
-        toScan.add(path.resolve(dep));
-      }
+      parsed.deps.forEach(dep => toScan.add(path.resolve(dep)));
 
     } catch {}
   }
@@ -54,17 +46,9 @@ export async function check({ fix = false }: { fix?: boolean }) {
   // PRELOAD
   for (const file of toScan) {
     try {
-      let parsed = cache.get(file);
-
-      if (!parsed) {
-        const raw = await fs.readFile(file, "utf-8");
-        parsed = processFile(file, raw);
-        cache.set(file, parsed);
-      }
-
-      const virtual = getVirtualFile(file);
-      engine.preloadFile(virtual, parsed.content);
-
+      const parsed = cache.get(file);
+      if (!parsed) continue;
+      engine.preloadFile(getVirtualFile(file), parsed.content);
     } catch {}
   }
 
@@ -74,49 +58,34 @@ export async function check({ fix = false }: { fix?: boolean }) {
       const parsed = cache.get(file);
       if (!parsed) continue;
 
-      const virtual = getVirtualFile(file);
-
-      engine.scanFile(virtual, parsed.content, config);
+      engine.scanFile(
+        getVirtualFile(file),
+        parsed.content,
+        config
+      );
 
     } catch {}
   }
 
-  // DIFF
   const found = new Set(engine.getAllEvents());
   const known = new Set(config.events ?? []);
 
-  const newEvents = [...found].filter(e => !known.has(e));
+  const added = [...found].filter(e => !known.has(e));
   const removed = [...known].filter(e => !found.has(e));
 
-  // FIX MODE
   if (fix) {
     config.events = [...found].sort();
     await saveConfig(config);
-
-    console.log(
-      chalk.green(`\nSynced (${config.events.length} events)`)
-    );
+    console.log(chalk.green("Synced"));
     return;
   }
 
-  // CHECK MODE
-  if (newEvents.length || removed.length) {
-    if (newEvents.length) {
-      console.log(chalk.red("\nNew events:"));
-      newEvents.forEach(e =>
-        console.log(chalk.red(`+ ${e}`))
-      );
-    }
-
-    if (removed.length) {
-      console.log(chalk.yellow("\nRemoved events:"));
-      removed.forEach(e =>
-        console.log(chalk.yellow(`- ${e}`))
-      );
-    }
+  if (added.length || removed.length) {
+    added.forEach(e => console.log(chalk.red(`+ ${e}`)));
+    removed.forEach(e => console.log(chalk.yellow(`- ${e}`)));
 
     process.exit(1);
   }
 
-  console.log(chalk.green("\nAll good"));
+  console.log(chalk.green("All good"));
 }

package/src/commands/sync.ts

@@ -19,25 +19,15 @@ export async function sync() {
     absolute: true,
   });
 
-  if (!files.length) {
-    console.log(chalk.yellow("No files found"));
-    return;
-  }
-
   const engine = new EventraEngine(process.cwd());
 
+  const cache = new Map<string, { content: string; deps: string[] }>();
   const toScan = new Set<string>();
 
-  const cache = new Map<
-    string,
-    { content: string; deps: string[] }
-  >();
-
-  // COLLECT + CACHE
+  // COLLECT
   for (const file of files) {
     try {
       const raw = await fs.readFile(file, "utf-8");
-
       if (raw.length > 2_000_000) continue;
 
       const parsed = processFile(file, raw);
@@ -45,9 +35,7 @@ export async function sync() {
       cache.set(file, parsed);
       toScan.add(file);
 
-      for (const dep of parsed.deps) {
-        toScan.add(path.resolve(dep));
-      }
+      parsed.deps.forEach(dep => toScan.add(path.resolve(dep)));
 
     } catch {}
   }
@@ -63,8 +51,7 @@ export async function sync() {
         cache.set(file, parsed);
       }
 
-      const virtual = getVirtualFile(file);
-      engine.preloadFile(virtual, parsed.content);
+      engine.preloadFile(getVirtualFile(file), parsed.content);
 
     } catch {}
   }
@@ -78,21 +65,16 @@ export async function sync() {
       const parsed = cache.get(file);
       if (!parsed) continue;
 
-      const virtual = getVirtualFile(file);
-
-      const res = engine.scanFile(virtual, parsed.content, config);
-
-      res.detectedFunctionWrappers.forEach(w =>
-        detectedFn.add(w)
+      const res = engine.updateFile(
+        getVirtualFile(file),
+        parsed.content,
+        config
       );
 
-      for (const [k, v] of res.detectedComponentWrappers) {
-        detectedCmp.set(k, v);
-      }
+      res.detectedFunctionWrappers.forEach(w => detectedFn.add(w));
+      res.detectedComponentWrappers.forEach((v, k) => detectedCmp.set(k, v));
 
-    } catch {
-      console.log(chalk.gray(`skip: ${file}`));
-    }
+    } catch {}
   }
 
   // RESULT
@@ -108,10 +90,7 @@ export async function sync() {
 
   config.wrappers = mergeUnique(
     config.wrappers ?? [],
-    [...detectedCmp.entries()].map(([name, prop]) => ({
-      name,
-      prop,
-    })),
+    [...detectedCmp.entries()].map(([name, prop]) => ({ name, prop })),
     w => `${w.name}:${w.prop}`
   );
 
@@ -120,17 +99,8 @@ export async function sync() {
   console.log(chalk.green(`Found ${events.length} events`));
 }
 
-// HELPERS
-function mergeUnique<T>(
-  a: T[],
-  b: T[],
-  key: (v: T) => string
-): T[] {
+function mergeUnique<T>(a: T[], b: T[], key: (v: T) => string): T[] {
   const map = new Map<string, T>();
-
-  [...b, ...a].forEach(item => {
-    map.set(key(item), item);
-  });
-
+  [...b, ...a].forEach(item => map.set(key(item), item));
   return [...map.values()];
 }