@eventra_dev/eventra-cli 0.0.12 → 0.0.14

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/config.js

@@ -16,6 +16,7 @@ function normalizeConfig(config) {
         events: config.events ?? [],
         wrappers: config.wrappers ?? [],
         functionWrappers: config.functionWrappers ?? [],
+        aliases: config.aliases ?? {},
         sync: config.sync ?? {
             include: [
                 "**/*.{ts,tsx,js,jsx,vue,svelte,astro}"

package/dist/utils/extract.js

@@ -15,28 +15,92 @@ function extractExpression(expr) {
         ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral) {
         return {
             values: [
-                expr
-                    .getText()
-                    .replace(/`/g, "")
+                expr.getText().replace(/`/g, "")
             ],
             dynamic: false
         };
     }
-    // identifier
+    // identifier (TEST)
     if (ts_morph_1.Node.isIdentifier(expr)) {
+        const name = expr.getText();
+        const defs = "getDefinitions" in expr
+            ? expr.getDefinitions()
+            : [];
+        if (defs && defs.length > 0) {
+            const decl = defs[0]?.getDeclarationNode();
+            if (decl && ts_morph_1.Node.isVariableDeclaration(decl)) {
+                const initializer = decl.getInitializer();
+                // const TEST = "event"
+                if (initializer &&
+                    ts_morph_1.Node.isStringLiteral(initializer)) {
+                    return {
+                        values: [initializer.getLiteralText()],
+                        dynamic: false
+                    };
+                }
+                // const TEST = `event`
+                if (initializer &&
+                    initializer.getKind() ===
+                        ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral) {
+                    return {
+                        values: [
+                            initializer.getText().replace(/`/g, "")
+                        ],
+                        dynamic: false
+                    };
+                }
+            }
+        }
         return {
-            values: [expr.getText()],
+            values: [name],
             dynamic: true
         };
     }
-    // property access (ROUTES.ACCOUNT)
+    // property access (EVENTS.CLICK)
     if (ts_morph_1.Node.isPropertyAccessExpression(expr)) {
+        const fullName = expr.getText(); // EVENTS.CLICK
+        const propName = expr.getName(); // CLICK
+        const defs = "getDefinitions" in expr
+            ? expr.getDefinitions()
+            : [];
+        if (defs && defs.length > 0) {
+            const decl = defs[0]?.getDeclarationNode();
+            // const EVENTS = { CLICK: "event" }
+            if (decl && ts_morph_1.Node.isVariableDeclaration(decl)) {
+                const init = decl.getInitializer();
+                if (init && ts_morph_1.Node.isObjectLiteralExpression(init)) {
+                    const prop = init.getProperty(propName);
+                    if (prop &&
+                        ts_morph_1.Node.isPropertyAssignment(prop)) {
+                        const value = prop.getInitializer();
+                        if (value &&
+                            ts_morph_1.Node.isStringLiteral(value)) {
+                            return {
+                                values: [value.getLiteralText()],
+                                dynamic: false
+                            };
+                        }
+                    }
+                }
+            }
+            // fallback
+            if (decl && ts_morph_1.Node.isPropertyAssignment(decl)) {
+                const initializer = decl.getInitializer();
+                if (initializer &&
+                    ts_morph_1.Node.isStringLiteral(initializer)) {
+                    return {
+                        values: [initializer.getLiteralText()],
+                        dynamic: false
+                    };
+                }
+            }
+        }
         return {
-            values: [expr.getText()],
+            values: [fullName],
             dynamic: true
         };
     }
-    // ternary
+    // ternary (a ? b : c)
     if (ts_morph_1.Node.isConditionalExpression(expr)) {
         const values = [];
         const whenTrue = extractExpression(expr.getWhenTrue());
@@ -50,20 +114,20 @@ function extractExpression(expr) {
             dynamic: true
         };
     }
-    // template
+    // template `${}`
     if (ts_morph_1.Node.isTemplateExpression(expr)) {
         return {
-            values: [expr.getText()],
+            values: [
+                expr.getText().replace(/`/g, "")
+            ],
             dynamic: true
         };
     }
-    // call
+    // call (fn())
     if (ts_morph_1.Node.isCallExpression(expr)) {
         return {
             values: [
-                expr
-                    .getExpression()
-                    .getText()
+                expr.getExpression().getText()
             ],
             dynamic: true
         };

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.14",
   "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/config.ts

@@ -13,6 +13,7 @@ export function normalizeConfig(
     wrappers: config.wrappers ?? [],
     functionWrappers:
       config.functionWrappers ?? [],
+    aliases: config.aliases ?? {},
     sync: config.sync ?? {
       include: [
         "**/*.{ts,tsx,js,jsx,vue,svelte,astro}"

package/src/utils/extract.ts

@@ -27,59 +27,133 @@ export function extractExpression(
   ) {
     return {
       values: [
-        expr
-          .getText()
-          .replace(/`/g, "")
+        expr.getText().replace(/`/g, "")
       ],
       dynamic: false
     };
   }
 
-  // identifier
-  if (
-    Node.isIdentifier(expr)
-  ) {
+  // identifier (TEST)
+  if (Node.isIdentifier(expr)) {
+    const name = expr.getText();
+
+    const defs =
+      "getDefinitions" in expr
+        ? (expr as any).getDefinitions()
+        : [];
+
+    if (defs && defs.length > 0) {
+      const decl = defs[0]?.getDeclarationNode();
+
+      if (decl && Node.isVariableDeclaration(decl)) {
+        const initializer = decl.getInitializer();
+
+        // const TEST = "event"
+        if (
+          initializer &&
+          Node.isStringLiteral(initializer)
+        ) {
+          return {
+            values: [initializer.getLiteralText()],
+            dynamic: false
+          };
+        }
+
+        // const TEST = `event`
+        if (
+          initializer &&
+          initializer.getKind() ===
+          SyntaxKind.NoSubstitutionTemplateLiteral
+        ) {
+          return {
+            values: [
+              initializer.getText().replace(/`/g, "")
+            ],
+            dynamic: false
+          };
+        }
+      }
+    }
+
     return {
-      values: [expr.getText()],
+      values: [name],
       dynamic: true
     };
   }
 
-  // property access (ROUTES.ACCOUNT)
-  if (
-    Node.isPropertyAccessExpression(expr)
-  ) {
+  // property access (EVENTS.CLICK)
+  if (Node.isPropertyAccessExpression(expr)) {
+    const fullName = expr.getText(); // EVENTS.CLICK
+    const propName = expr.getName(); // CLICK
+
+    const defs =
+      "getDefinitions" in expr
+        ? (expr as any).getDefinitions()
+        : [];
+
+    if (defs && defs.length > 0) {
+      const decl = defs[0]?.getDeclarationNode();
+
+      // const EVENTS = { CLICK: "event" }
+      if (decl && Node.isVariableDeclaration(decl)) {
+        const init = decl.getInitializer();
+
+        if (init && Node.isObjectLiteralExpression(init)) {
+          const prop = init.getProperty(propName);
+
+          if (
+            prop &&
+            Node.isPropertyAssignment(prop)
+          ) {
+            const value = prop.getInitializer();
+
+            if (
+              value &&
+              Node.isStringLiteral(value)
+            ) {
+              return {
+                values: [value.getLiteralText()],
+                dynamic: false
+              };
+            }
+          }
+        }
+      }
+
+      // fallback
+      if (decl && Node.isPropertyAssignment(decl)) {
+        const initializer = decl.getInitializer();
+
+        if (
+          initializer &&
+          Node.isStringLiteral(initializer)
+        ) {
+          return {
+            values: [initializer.getLiteralText()],
+            dynamic: false
+          };
+        }
+      }
+    }
+
     return {
-      values: [expr.getText()],
+      values: [fullName],
       dynamic: true
     };
   }
 
-  // ternary
-  if (
-    Node.isConditionalExpression(expr)
-  ) {
+  // ternary (a ? b : c)
+  if (Node.isConditionalExpression(expr)) {
     const values: string[] = [];
 
     const whenTrue =
-      extractExpression(
-        expr.getWhenTrue()
-      );
+      extractExpression(expr.getWhenTrue());
 
     const whenFalse =
-      extractExpression(
-        expr.getWhenFalse()
-      );
+      extractExpression(expr.getWhenFalse());
 
-    if (whenTrue)
-      values.push(
-        ...whenTrue.values
-      );
-
-    if (whenFalse)
-      values.push(
-        ...whenFalse.values
-      );
+    if (whenTrue) values.push(...whenTrue.values);
+    if (whenFalse) values.push(...whenFalse.values);
 
     return {
       values,
@@ -87,25 +161,21 @@ export function extractExpression(
     };
   }
 
-  // template
-  if (
-    Node.isTemplateExpression(expr)
-  ) {
+  // template `${}`
+  if (Node.isTemplateExpression(expr)) {
     return {
-      values: [expr.getText()],
+      values: [
+        expr.getText().replace(/`/g, "")
+      ],
       dynamic: true
     };
   }
 
-  // call
-  if (
-    Node.isCallExpression(expr)
-  ) {
+  // call (fn())
+  if (Node.isCallExpression(expr)) {
     return {
       values: [
-        expr
-          .getExpression()
-          .getText()
+        expr.getExpression().getText()
       ],
       dynamic: true
     };

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,
+      })
     );
   }