@eventra_dev/eventra-cli 0.0.12 → 0.0.13

package/dist/commands/sync.js

@@ -45,7 +45,7 @@ async function sync() {
             : file + ".tsx";
         const source = project.createSourceFile(virtualFile, content, { overwrite: true });
         const found = [
-            ...(0, track_1.scanTrack)(source),
+            ...(0, track_1.scanTrack)(source, config),
             ...(0, function_wrappers_1.scanFunctionWrappers)(source, config.functionWrappers ?? []),
             ...(0, component_wrappers_1.scanComponentWrappers)(source, config.wrappers ?? [])
         ];

package/dist/utils/scanners/track.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanTrack = scanTrack;
 const ts_morph_1 = require("ts-morph");
 const extract_1 = require("../extract");
-function scanTrack(source) {
+function scanTrack(source, config) {
     const events = new Set();
     const calls = source.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression);
     for (const call of calls) {
@@ -11,16 +11,32 @@ function scanTrack(source) {
         let isTrack = false;
         // track()
         if (ts_morph_1.Node.isIdentifier(expr)) {
-            isTrack =
-                expr.getText() === "track";
+            isTrack = expr.getText() === "track";
         }
         // analytics.track()
         if (ts_morph_1.Node.isPropertyAccessExpression(expr)) {
-            isTrack =
-                expr.getName() === "track";
+            isTrack = expr.getName() === "track";
         }
         if (!isTrack)
             continue;
+        const func = call.getFirstAncestorByKind(ts_morph_1.SyntaxKind.FunctionDeclaration) ||
+            call.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ArrowFunction) ||
+            call.getFirstAncestorByKind(ts_morph_1.SyntaxKind.FunctionExpression);
+        let fnName;
+        if (func) {
+            if (ts_morph_1.Node.isFunctionDeclaration(func)) {
+                fnName = func.getName();
+            }
+            if (ts_morph_1.Node.isArrowFunction(func) ||
+                ts_morph_1.Node.isFunctionExpression(func)) {
+                const varDecl = func.getFirstAncestorByKind(ts_morph_1.SyntaxKind.VariableDeclaration);
+                fnName = varDecl?.getName();
+            }
+        }
+        if (fnName &&
+            config.functionWrappers?.some((w) => w.name === fnName)) {
+            continue;
+        }
         const arg = call.getArguments()[0];
         if (!arg)
             continue;
@@ -29,7 +45,7 @@ function scanTrack(source) {
             continue;
         result.values.forEach((value) => events.add({
             value,
-            dynamic: result.dynamic
+            dynamic: result.dynamic,
         }));
     }
     return events;

package/package.json

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

package/src/commands/sync.ts

@@ -81,7 +81,7 @@ export async function sync() {
       );
 
     const found: ExtractedEvent[] = [
-      ...scanTrack(source),
+      ...scanTrack(source, config),
       ...scanFunctionWrappers(
         source,
         config.functionWrappers ?? []

package/src/utils/scanners/track.ts

@@ -2,67 +2,81 @@ import {
   SourceFile,
   SyntaxKind,
   Node,
-  CallExpression,
-  PropertyAccessExpression
 } from "ts-morph";
 
-import { ExtractedEvent } from "../../types";
+import { ExtractedEvent, EventraConfig } from "../../types";
 import { extractExpression } from "../extract";
 
 export function scanTrack(
-  source: SourceFile
+  source: SourceFile,
+  config: EventraConfig
 ) {
-  const events =
-    new Set<ExtractedEvent>();
+  const events = new Set<ExtractedEvent>();
 
-  const calls =
-    source.getDescendantsOfKind(
-      SyntaxKind.CallExpression
-    );
+  const calls = source.getDescendantsOfKind(
+    SyntaxKind.CallExpression
+  );
 
   for (const call of calls) {
-    const expr =
-      call.getExpression();
+    const expr = call.getExpression();
 
     let isTrack = false;
 
     // track()
-    if (
-      Node.isIdentifier(expr)
-    ) {
-      isTrack =
-        expr.getText() === "track";
+    if (Node.isIdentifier(expr)) {
+      isTrack = expr.getText() === "track";
     }
 
     // analytics.track()
-    if (
-      Node.isPropertyAccessExpression(
-        expr
-      )
-    ) {
-      isTrack =
-        expr.getName() === "track";
+    if (Node.isPropertyAccessExpression(expr)) {
+      isTrack = expr.getName() === "track";
     }
 
     if (!isTrack) continue;
 
-    const arg =
-      call.getArguments()[0];
+    const func =
+      call.getFirstAncestorByKind(SyntaxKind.FunctionDeclaration) ||
+      call.getFirstAncestorByKind(SyntaxKind.ArrowFunction) ||
+      call.getFirstAncestorByKind(SyntaxKind.FunctionExpression);
 
-    if (!arg) continue;
+    let fnName: string | undefined;
+
+    if (func) {
+      if (Node.isFunctionDeclaration(func)) {
+        fnName = func.getName();
+      }
 
-    const result =
-      extractExpression(arg);
+      if (
+        Node.isArrowFunction(func) ||
+        Node.isFunctionExpression(func)
+      ) {
+        const varDecl = func.getFirstAncestorByKind(
+          SyntaxKind.VariableDeclaration
+        );
+        fnName = varDecl?.getName();
+      }
+    }
+
+    if (
+      fnName &&
+      config.functionWrappers?.some(
+        (w) => w.name === fnName
+      )
+    ) {
+      continue;
+    }
+
+    const arg = call.getArguments()[0];
+    if (!arg) continue;
 
+    const result = extractExpression(arg);
     if (!result) continue;
 
-    result.values.forEach(
-      (value) =>
-        events.add({
-          value,
-          dynamic:
-          result.dynamic
-        })
+    result.values.forEach((value) =>
+      events.add({
+        value,
+        dynamic: result.dynamic,
+      })
     );
   }