@eventra_dev/eventra-cli 0.1.8 → 0.1.10

package/dist/commands/sync.js

@@ -25,11 +25,21 @@ async function sync() {
     const engine = new engine_1.EventraEngine(process.cwd());
     const detectedFn = new Set();
     const detectedCmp = new Map();
+    const fileCache = [];
     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);
-            const res = engine.scanFile(virtualFile, content, config);
+            fileCache.push({ file: virtualFile, content });
+            engine["ts"].updateFile(virtualFile, content);
+        }
+        catch {
+            // ignore
+        }
+    }
+    for (const { file, content } of fileCache) {
+        try {
+            const res = engine.scanFile(file, content, config);
             for (const w of res.detectedFunctionWrappers) {
                 detectedFn.add(w);
             }

package/dist/engine/languageService.js

@@ -48,9 +48,6 @@ class TSService {
             },
             getScriptVersion: (file) => this.files.get(file)?.version.toString() ?? "0",
             getScriptSnapshot: (file) => {
-                if (!this.fileNames.has(file)) {
-                    return undefined;
-                }
                 const f = this.files.get(file);
                 if (f) {
                     return typescript_1.default.ScriptSnapshot.fromString(f.content);

package/dist/engine/scanner.js

@@ -37,11 +37,14 @@ function isPropUsedInTracking(fn, prop) {
     function visit(node) {
         if (typescript_1.default.isCallExpression(node)) {
             const name = getCallName(node.expression);
-            if (!TRACKING_NAMES.has(name))
+            if (!TRACKING_NAMES.has(name)) {
+                typescript_1.default.forEachChild(node, visit);
                 return;
+            }
             for (const arg of node.arguments) {
                 if ((typescript_1.default.isIdentifier(arg) && arg.text === prop) ||
-                    (typescript_1.default.isPropertyAccessExpression(arg) && arg.name.text === prop)) {
+                    (typescript_1.default.isPropertyAccessExpression(arg) &&
+                        arg.name.text === prop)) {
                     found = true;
                 }
             }
@@ -51,7 +54,7 @@ function isPropUsedInTracking(fn, prop) {
     visit(fn);
     return found;
 }
-function scanSource(source, checker, config, visited = new Set(), depth = 0) {
+function scanSource(source, checker, config, visited = new Set(), depth = 0, inheritedParamMap) {
     const events = new Set();
     const detectedFunctionWrappers = new Set();
     const detectedComponentWrappers = new Map();
@@ -64,19 +67,40 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
         if (typescript_1.default.isCallExpression(node)) {
             const name = getCallName(node.expression);
             const isKnownWrapper = config.functionWrappers.some(w => w.name === name);
-            const fn = (0, callResolver_1.resolveFunctionFromCall)(node.expression, checker);
-            const isAutoWrapper = fn && (0, functionAnalyzer_1.findTrackParamIndex)(fn) !== null;
+            let resolvedFn = (0, callResolver_1.resolveFunctionFromCall)(node.expression, checker);
+            // fallback: tracker.track(...)
+            if (!resolvedFn && typescript_1.default.isPropertyAccessExpression(node.expression)) {
+                const symbol = checker.getSymbolAtLocation(node.expression.name);
+                if (symbol) {
+                    const decls = symbol.getDeclarations();
+                    if (decls?.length) {
+                        const d = decls[0];
+                        if (typescript_1.default.isMethodDeclaration(d) ||
+                            typescript_1.default.isFunctionDeclaration(d) ||
+                            typescript_1.default.isFunctionExpression(d) ||
+                            typescript_1.default.isArrowFunction(d)) {
+                            resolvedFn = d;
+                        }
+                    }
+                }
+            }
+            const isAutoWrapper = resolvedFn && (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn) !== null;
             const isTracking = isKnownWrapper ||
                 TRACKING_NAMES.has(name) ||
-                (isAutoWrapper && fn && !(0, boundary_1.isExternalFile)(fn.getSourceFile().fileName));
-            if (!isTracking)
+                (isAutoWrapper &&
+                    resolvedFn &&
+                    !(0, boundary_1.isExternalFile)(resolvedFn.getSourceFile().fileName));
+            if (!isTracking) {
+                typescript_1.default.forEachChild(node, visit);
                 return;
+            }
             if (!isKnownWrapper && isAutoWrapper && !TRACKING_NAMES.has(name)) {
                 detectedFunctionWrappers.add(name);
             }
-            const paramMap = new Map();
-            if (fn && typescript_1.default.isFunctionLike(fn)) {
-                fn.parameters.forEach((param, i) => {
+            // paramMap (chain support)
+            const paramMap = new Map(inheritedParamMap ?? []);
+            if (resolvedFn && typescript_1.default.isFunctionLike(resolvedFn)) {
+                resolvedFn.parameters.forEach((param, i) => {
                     const arg = node.arguments[i];
                     if (!arg)
                         return;
@@ -86,8 +110,8 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                 });
             }
             let handled = false;
-            if (fn) {
-                const idx = (0, functionAnalyzer_1.findTrackParamIndex)(fn);
+            if (resolvedFn) {
+                const idx = (0, functionAnalyzer_1.findTrackParamIndex)(resolvedFn);
                 if (idx !== null && node.arguments[idx]) {
                     const res = (0, resolver_1.resolveNodeValue)(node.arguments[idx], checker, paramMap);
                     res?.values.forEach(v => {
@@ -106,15 +130,16 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                     });
                 }
             }
-            if (fn) {
-                const sf = fn.getSourceFile();
+            // cross-file with paramMap
+            if (resolvedFn) {
+                const sf = resolvedFn.getSourceFile();
                 if (!visited.has(sf.fileName)) {
-                    const res = scanSource(sf, checker, config, visited, depth + 1);
+                    const res = scanSource(sf, checker, config, visited, depth + 1, paramMap);
                     res.events.forEach(e => events.add(e));
                 }
             }
         }
-        // JSX
+        // JSX COMPONENTS
         if (typescript_1.default.isJsxSelfClosingElement(node) ||
             typescript_1.default.isJsxOpeningElement(node)) {
             const tagNode = typescript_1.default.isPropertyAccessExpression(node.tagName)
@@ -127,8 +152,10 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
             if (symbol && (symbol.flags & typescript_1.default.SymbolFlags.Alias)) {
                 symbol = checker.getAliasedSymbol(symbol);
             }
-            if (!symbol)
+            if (!symbol) {
+                typescript_1.default.forEachChild(node, visit);
                 return;
+            }
             const tagName = typescript_1.default.isPropertyAccessExpression(node.tagName)
                 ? node.tagName.name.getText()
                 : node.tagName.getText();
@@ -138,7 +165,8 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                     fn = decl;
                 if (typescript_1.default.isVariableDeclaration(decl) && decl.initializer) {
                     const init = decl.initializer;
-                    if (typescript_1.default.isArrowFunction(init) || typescript_1.default.isFunctionExpression(init)) {
+                    if (typescript_1.default.isArrowFunction(init) ||
+                        typescript_1.default.isFunctionExpression(init)) {
                         fn = init;
                     }
                 }
@@ -165,11 +193,10 @@ function scanSource(source, checker, config, visited = new Set(), depth = 0) {
                         : attr.initializer;
                     if (!expr)
                         continue;
-                    const res = (0, resolver_1.resolveNodeValue)(expr, checker);
-                    res?.values.forEach(v => {
-                        if (isValidEvent(v))
-                            events.add(v);
-                    });
+                    const paramMap = new Map();
+                    paramMap.set(prop, expr);
+                    const res = scanSource(fn.getSourceFile(), checker, config, visited, depth + 1, paramMap);
+                    res.events.forEach(e => events.add(e));
                     detectedComponentWrappers.set(tagName, prop);
                 }
             }

package/package.json

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

package/src/commands/sync.ts

@@ -26,13 +26,24 @@ export async function sync() {
   const detectedFn = new Set<string>();
   const detectedCmp = new Map<string, string>();
 
+  const fileCache: { file: string; content: string }[] = [];
+
   for (const file of files) {
     try {
       const raw = await fs.readFile(file, "utf-8");
-
       const { content, virtualFile } = processFile(file, raw);
 
-      const res = engine.scanFile(virtualFile, content, config);
+      fileCache.push({ file: virtualFile, content });
+
+      engine["ts"].updateFile(virtualFile, content);
+    } catch {
+      // ignore
+    }
+  }
+
+  for (const { file, content } of fileCache) {
+    try {
+      const res = engine.scanFile(file, content, config);
 
       for (const w of res.detectedFunctionWrappers) {
         detectedFn.add(w);

package/src/engine/languageService.ts

@@ -62,10 +62,6 @@ export class TSService {
         this.files.get(file)?.version.toString() ?? "0",
 
       getScriptSnapshot: (file) => {
-        if (!this.fileNames.has(file)) {
-          return undefined;
-        }
-
         const f = this.files.get(file);
 
         if (f) {

package/src/engine/scanner.ts

@@ -40,12 +40,16 @@ function isPropUsedInTracking(
     if (ts.isCallExpression(node)) {
       const name = getCallName(node.expression);
 
-      if (!TRACKING_NAMES.has(name)) return;
+      if (!TRACKING_NAMES.has(name)) {
+        ts.forEachChild(node, visit);
+        return;
+      }
 
       for (const arg of node.arguments) {
         if (
           (ts.isIdentifier(arg) && arg.text === prop) ||
-          (ts.isPropertyAccessExpression(arg) && arg.name.text === prop)
+          (ts.isPropertyAccessExpression(arg) &&
+            arg.name.text === prop)
         ) {
           found = true;
         }
@@ -70,7 +74,8 @@ export function scanSource(
   checker: ts.TypeChecker,
   config: EventraConfig,
   visited = new Set<string>(),
-  depth = 0
+  depth = 0,
+  inheritedParamMap?: Map<string, ts.Expression>
 ): ScanResult {
   const events = new Set<string>();
   const detectedFunctionWrappers = new Set<string>();
@@ -91,26 +96,54 @@ export function scanSource(
         w => w.name === name
       );
 
-      const fn = resolveFunctionFromCall(node.expression, checker);
+      let resolvedFn = resolveFunctionFromCall(node.expression, checker);
+
+      // fallback: tracker.track(...)
+      if (!resolvedFn && ts.isPropertyAccessExpression(node.expression)) {
+        const symbol = checker.getSymbolAtLocation(node.expression.name);
+
+        if (symbol) {
+          const decls = symbol.getDeclarations();
+
+          if (decls?.length) {
+            const d = decls[0];
+
+            if (
+              ts.isMethodDeclaration(d) ||
+              ts.isFunctionDeclaration(d) ||
+              ts.isFunctionExpression(d) ||
+              ts.isArrowFunction(d)
+            ) {
+              resolvedFn = d;
+            }
+          }
+        }
+      }
 
       const isAutoWrapper =
-        fn && findTrackParamIndex(fn) !== null;
+        resolvedFn && findTrackParamIndex(resolvedFn) !== null;
 
       const isTracking =
         isKnownWrapper ||
         TRACKING_NAMES.has(name) ||
-        (isAutoWrapper && fn && !isExternalFile(fn.getSourceFile().fileName));
+        (isAutoWrapper &&
+          resolvedFn &&
+          !isExternalFile(resolvedFn.getSourceFile().fileName));
 
-      if (!isTracking) return;
+      if (!isTracking) {
+        ts.forEachChild(node, visit);
+        return;
+      }
 
       if (!isKnownWrapper && isAutoWrapper && !TRACKING_NAMES.has(name)) {
         detectedFunctionWrappers.add(name);
       }
 
-      const paramMap = new Map<string, ts.Expression>();
+      // paramMap (chain support)
+      const paramMap = new Map(inheritedParamMap ?? []);
 
-      if (fn && ts.isFunctionLike(fn)) {
-        fn.parameters.forEach((param, i) => {
+      if (resolvedFn && ts.isFunctionLike(resolvedFn)) {
+        resolvedFn.parameters.forEach((param, i) => {
           const arg = node.arguments[i];
           if (!arg) return;
 
@@ -122,8 +155,8 @@ export function scanSource(
 
       let handled = false;
 
-      if (fn) {
-        const idx = findTrackParamIndex(fn);
+      if (resolvedFn) {
+        const idx = findTrackParamIndex(resolvedFn);
 
         if (idx !== null && node.arguments[idx]) {
           const res = resolveNodeValue(
@@ -150,8 +183,9 @@ export function scanSource(
         }
       }
 
-      if (fn) {
-        const sf = fn.getSourceFile();
+      // cross-file with paramMap
+      if (resolvedFn) {
+        const sf = resolvedFn.getSourceFile();
 
         if (!visited.has(sf.fileName)) {
           const res = scanSource(
@@ -159,7 +193,8 @@ export function scanSource(
             checker,
             config,
             visited,
-            depth + 1
+            depth + 1,
+            paramMap
           );
 
           res.events.forEach(e => events.add(e));
@@ -167,7 +202,7 @@ export function scanSource(
       }
     }
 
-    // JSX
+    // JSX COMPONENTS
     if (
       ts.isJsxSelfClosingElement(node) ||
       ts.isJsxOpeningElement(node)
@@ -187,7 +222,10 @@ export function scanSource(
         symbol = checker.getAliasedSymbol(symbol);
       }
 
-      if (!symbol) return;
+      if (!symbol) {
+        ts.forEachChild(node, visit);
+        return;
+      }
 
       const tagName =
         ts.isPropertyAccessExpression(node.tagName)
@@ -201,7 +239,11 @@ export function scanSource(
 
         if (ts.isVariableDeclaration(decl) && decl.initializer) {
           const init = decl.initializer;
-          if (ts.isArrowFunction(init) || ts.isFunctionExpression(init)) {
+
+          if (
+            ts.isArrowFunction(init) ||
+            ts.isFunctionExpression(init)
+          ) {
             fn = init;
           }
         }
@@ -235,11 +277,19 @@ export function scanSource(
 
           if (!expr) continue;
 
-          const res = resolveNodeValue(expr, checker);
+          const paramMap = new Map<string, ts.Expression>();
+          paramMap.set(prop, expr);
 
-          res?.values.forEach(v => {
-            if (isValidEvent(v)) events.add(v);
-          });
+          const res = scanSource(
+            fn.getSourceFile(),
+            checker,
+            config,
+            visited,
+            depth + 1,
+            paramMap
+          );
+
+          res.events.forEach(e => events.add(e));
 
           detectedComponentWrappers.set(tagName, prop);
         }