@eventra_dev/eventra-cli 0.0.8 → 0.0.9

package/dist/commands/sync.js

@@ -49,14 +49,7 @@ async function sync() {
             ...(0, component_wrappers_1.scanComponentWrappers)(source, config.wrappers ?? [])
         ];
         for (const event of found) {
-            if (!event)
-                continue;
-            const value = typeof event === "string"
-                ? event
-                : event.value;
-            const dynamic = typeof event === "string"
-                ? false
-                : event.dynamic;
+            const { value, dynamic } = event;
             // alias exists
             if (aliases[value]) {
                 events.add(aliases[value]);

package/dist/utils/extract.js

@@ -3,64 +3,68 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractExpression = extractExpression;
 const ts_morph_1 = require("ts-morph");
 function extractExpression(expr) {
-    // "signup"
+    // "event"
     if (ts_morph_1.Node.isStringLiteral(expr)) {
         return {
-            value: expr.getLiteralText(),
+            values: [expr.getLiteralText()],
             dynamic: false
         };
     }
-    // `signup`
+    // `event`
     if (expr.getKind() ===
         ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral) {
         return {
-            value: expr
-                .getText()
-                .replace(/`/g, ""),
+            values: [
+                expr
+                    .getText()
+                    .replace(/`/g, "")
+            ],
             dynamic: false
         };
     }
-    // template `${event}`
-    if (ts_morph_1.Node.isTemplateExpression(expr)) {
+    // identifier
+    if (ts_morph_1.Node.isIdentifier(expr)) {
         return {
-            value: expr.getText(),
+            values: [expr.getText()],
             dynamic: true
         };
     }
-    // ROUTES.APP
+    // property access (ROUTES.ACCOUNT)
     if (ts_morph_1.Node.isPropertyAccessExpression(expr)) {
         return {
-            value: expr.getText(),
-            dynamic: true
-        };
-    }
-    // EVENT
-    if (ts_morph_1.Node.isIdentifier(expr)) {
-        return {
-            value: expr.getText(),
+            values: [expr.getText()],
             dynamic: true
         };
     }
-    // getEvent()
-    if (ts_morph_1.Node.isCallExpression(expr)) {
+    // ternary
+    if (ts_morph_1.Node.isConditionalExpression(expr)) {
+        const values = [];
+        const whenTrue = extractExpression(expr.getWhenTrue());
+        const whenFalse = extractExpression(expr.getWhenFalse());
+        if (whenTrue)
+            values.push(...whenTrue.values);
+        if (whenFalse)
+            values.push(...whenFalse.values);
         return {
-            value: expr
-                .getExpression()
-                .getText(),
+            values,
             dynamic: true
         };
     }
-    // condition ? "a" : "b"
-    if (ts_morph_1.Node.isConditionalExpression(expr)) {
+    // template
+    if (ts_morph_1.Node.isTemplateExpression(expr)) {
         return {
-            value: expr.getText(),
+            values: [expr.getText()],
             dynamic: true
         };
     }
-    // array[index]
-    if (ts_morph_1.Node.isElementAccessExpression(expr)) {
+    // call
+    if (ts_morph_1.Node.isCallExpression(expr)) {
         return {
-            value: expr.getText(),
+            values: [
+                expr
+                    .getExpression()
+                    .getText()
+            ],
             dynamic: true
         };
     }

package/dist/utils/scanners/component-wrappers.js

@@ -33,21 +33,25 @@ function scanComponentWrappers(source, wrappers) {
                 const init = attrNode.getInitializer();
                 if (!init)
                     continue;
-                // event="signup"
+                // string
                 if (ts_morph_1.Node.isStringLiteral(init)) {
                     events.add({
                         value: init.getLiteralText(),
                         dynamic: false
                     });
                 }
-                // event={...}
+                // jsx expression
                 if (ts_morph_1.Node.isJsxExpression(init)) {
                     const expr = init.getExpression();
                     if (!expr)
                         continue;
                     const result = (0, extract_1.extractExpression)(expr);
-                    if (result)
-                        events.add(result);
+                    if (!result)
+                        continue;
+                    result.values.forEach((value) => events.add({
+                        value,
+                        dynamic: result.dynamic
+                    }));
                 }
             }
         }

package/dist/utils/scanners/function-wrappers.js

@@ -13,9 +13,10 @@ function scanFunctionWrappers(source, wrappers) {
         for (const wrapper of wrappers) {
             if (wrapper.name !== name)
                 continue;
-            const result = extractEventFromArgs(call, wrapper.event);
-            if (result)
-                events.add(result);
+            const results = extractEventFromArgs(call, wrapper.event);
+            if (!results)
+                continue;
+            results.forEach((r) => events.add(r));
         }
     }
     return events;
@@ -43,15 +44,20 @@ function getDeepName(node) {
 }
 function extractEventFromArgs(call, event) {
     const args = call.getArguments();
+    const events = [];
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
         // track("event")
         if (!event) {
             const result = (0, extract_1.extractExpression)(arg);
-            if (result)
-                return result;
+            if (!result)
+                continue;
+            result.values.forEach((value) => events.push({
+                value,
+                dynamic: result.dynamic
+            }));
         }
-        // track({ event: "..." })
+        // track({event})
         if (event) {
             const obj = arg.asKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression);
             if (!obj)
@@ -63,9 +69,17 @@ function extractEventFromArgs(call, event) {
                 const init = prop.getInitializer();
                 if (!init)
                     continue;
-                return (0, extract_1.extractExpression)(init);
+                const result = (0, extract_1.extractExpression)(init);
+                if (!result)
+                    continue;
+                result.values.forEach((value) => events.push({
+                    value,
+                    dynamic: result.dynamic
+                }));
             }
         }
     }
-    return null;
+    return events.length
+        ? events
+        : null;
 }

package/dist/utils/scanners/track.js

@@ -2,6 +2,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) {
     const events = new Set();
     const calls = source.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression);
@@ -9,34 +10,27 @@ function scanTrack(source) {
         const expr = call.getExpression();
         let isTrack = false;
         // track()
-        if (expr.getKind() ===
-            ts_morph_1.SyntaxKind.Identifier) {
+        if (ts_morph_1.Node.isIdentifier(expr)) {
             isTrack =
                 expr.getText() === "track";
         }
         // analytics.track()
-        if (expr.getKind() ===
-            ts_morph_1.SyntaxKind.PropertyAccessExpression) {
-            const prop = expr.asKindOrThrow(ts_morph_1.SyntaxKind.PropertyAccessExpression);
+        if (ts_morph_1.Node.isPropertyAccessExpression(expr)) {
             isTrack =
-                prop.getName() === "track";
+                expr.getName() === "track";
         }
         if (!isTrack)
             continue;
         const arg = call.getArguments()[0];
         if (!arg)
             continue;
-        if (arg.getKind() ===
-            ts_morph_1.SyntaxKind.StringLiteral) {
-            const value = arg.asKindOrThrow(ts_morph_1.SyntaxKind.StringLiteral);
-            events.add(value.getLiteralText());
-        }
-        // template literal
-        if (arg.getKind() ===
-            ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral) {
-            const value = arg.asKindOrThrow(ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral);
-            events.add(value.getLiteralText());
-        }
+        const result = (0, extract_1.extractExpression)(arg);
+        if (!result)
+            continue;
+        result.values.forEach((value) => events.add({
+            value,
+            dynamic: result.dynamic
+        }));
     }
     return events;
 }

package/package.json

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

package/src/commands/sync.ts

@@ -18,6 +18,8 @@ import { scanTrack } from "../utils/scanners/track";
 import { scanFunctionWrappers } from "../utils/scanners/function-wrappers";
 import { scanComponentWrappers } from "../utils/scanners/component-wrappers";
 
+import { ExtractedEvent } from "../types";
+
 export async function sync() {
   const config = await loadConfig();
 
@@ -76,7 +78,7 @@ export async function sync() {
         { overwrite: true }
       );
 
-    const found = [
+    const found: ExtractedEvent[] = [
       ...scanTrack(source),
       ...scanFunctionWrappers(
         source,
@@ -89,17 +91,7 @@ export async function sync() {
     ];
 
     for (const event of found) {
-      if (!event) continue;
-
-      const value =
-        typeof event === "string"
-          ? event
-          : event.value;
-
-      const dynamic =
-        typeof event === "string"
-          ? false
-          : event.dynamic;
+      const { value, dynamic } = event;
 
       // alias exists
       if (aliases[value]) {

package/src/utils/extract.ts

@@ -3,92 +3,110 @@ import {
   SyntaxKind
 } from "ts-morph";
 
-import { ExtractedEvent } from "../types";
+export type ExtractResult = {
+  values: string[];
+  dynamic: boolean;
+};
 
 export function extractExpression(
   expr: Node
-): ExtractedEvent | null {
+): ExtractResult | null {
 
-  // "signup"
+  // "event"
   if (Node.isStringLiteral(expr)) {
     return {
-      value: expr.getLiteralText(),
+      values: [expr.getLiteralText()],
       dynamic: false
     };
   }
 
-  // `signup`
+  // `event`
   if (
     expr.getKind() ===
     SyntaxKind.NoSubstitutionTemplateLiteral
   ) {
     return {
-      value: expr
-        .getText()
-        .replace(/`/g, ""),
+      values: [
+        expr
+          .getText()
+          .replace(/`/g, "")
+      ],
       dynamic: false
     };
   }
 
-  // template `${event}`
+  // identifier
   if (
-    Node.isTemplateExpression(expr)
+    Node.isIdentifier(expr)
   ) {
     return {
-      value: expr.getText(),
+      values: [expr.getText()],
       dynamic: true
     };
   }
 
-  // ROUTES.APP
+  // property access (ROUTES.ACCOUNT)
   if (
     Node.isPropertyAccessExpression(expr)
   ) {
     return {
-      value: expr.getText(),
+      values: [expr.getText()],
       dynamic: true
     };
   }
 
-  // EVENT
+  // ternary
   if (
-    Node.isIdentifier(expr)
+    Node.isConditionalExpression(expr)
   ) {
-    return {
-      value: expr.getText(),
-      dynamic: true
-    };
-  }
+    const values: string[] = [];
+
+    const whenTrue =
+      extractExpression(
+        expr.getWhenTrue()
+      );
+
+    const whenFalse =
+      extractExpression(
+        expr.getWhenFalse()
+      );
+
+    if (whenTrue)
+      values.push(
+        ...whenTrue.values
+      );
+
+    if (whenFalse)
+      values.push(
+        ...whenFalse.values
+      );
 
-  // getEvent()
-  if (
-    Node.isCallExpression(expr)
-  ) {
     return {
-      value:
-        expr
-          .getExpression()
-          .getText(),
+      values,
       dynamic: true
     };
   }
 
-  // condition ? "a" : "b"
+  // template
   if (
-    Node.isConditionalExpression(expr)
+    Node.isTemplateExpression(expr)
   ) {
     return {
-      value: expr.getText(),
+      values: [expr.getText()],
       dynamic: true
     };
   }
 
-  // array[index]
+  // call
   if (
-    Node.isElementAccessExpression(expr)
+    Node.isCallExpression(expr)
   ) {
     return {
-      value: expr.getText(),
+      values: [
+        expr
+          .getExpression()
+          .getText()
+      ],
       dynamic: true
     };
   }

package/src/utils/scanners/component-wrappers.ts

@@ -4,7 +4,11 @@ import {
   Node
 } from "ts-morph";
 
-import { ComponentWrapper, ExtractedEvent } from "../../types";
+import {
+  ComponentWrapper,
+  ExtractedEvent
+} from "../../types";
+
 import { extractExpression } from "../extract";
 
 export function scanComponentWrappers(
@@ -64,7 +68,7 @@ export function scanComponentWrappers(
 
         if (!init) continue;
 
-        // event="signup"
+        // string
         if (
           Node.isStringLiteral(init)
         ) {
@@ -75,7 +79,7 @@ export function scanComponentWrappers(
           });
         }
 
-        // event={...}
+        // jsx expression
         if (
           Node.isJsxExpression(init)
         ) {
@@ -87,8 +91,16 @@ export function scanComponentWrappers(
           const result =
             extractExpression(expr);
 
-          if (result)
-            events.add(result);
+          if (!result) continue;
+
+          result.values.forEach(
+            (value) =>
+              events.add({
+                value,
+                dynamic:
+                result.dynamic
+              })
+          );
         }
       }
     }

package/src/utils/scanners/function-wrappers.ts

@@ -6,8 +6,12 @@ import {
   PropertyAccessExpression,
 } from "ts-morph";
 
+import {
+  FunctionWrapper,
+  ExtractedEvent
+} from "../../types";
+
 import { extractExpression } from "../extract";
-import { FunctionWrapper, ExtractedEvent } from "../../types";
 
 export function scanFunctionWrappers(
   source: SourceFile,
@@ -31,14 +35,17 @@ export function scanFunctionWrappers(
       if (wrapper.name !== name)
         continue;
 
-      const result =
+      const results =
         extractEventFromArgs(
           call,
           wrapper.event
         );
 
-      if (result)
-        events.add(result);
+      if (!results) continue;
+
+      results.forEach(
+        (r) => events.add(r)
+      );
     }
   }
 
@@ -48,11 +55,14 @@ export function scanFunctionWrappers(
 function getFunctionName(
   call: CallExpression
 ): string | null {
+
   const expression =
     call.getExpression();
 
   if (
-    Node.isIdentifier(expression)
+    Node.isIdentifier(
+      expression
+    )
   ) {
     return expression.getText();
   }
@@ -73,6 +83,7 @@ function getFunctionName(
 function getDeepName(
   node: PropertyAccessExpression
 ): string {
+
   let current:
     | Node
     | undefined = node;
@@ -97,11 +108,13 @@ function getDeepName(
 function extractEventFromArgs(
   call: CallExpression,
   event?: string
-): ExtractedEvent | null {
+): ExtractedEvent[] | null {
 
   const args =
     call.getArguments();
 
+  const events: ExtractedEvent[] = [];
+
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
 
@@ -110,11 +123,19 @@ function extractEventFromArgs(
       const result =
         extractExpression(arg);
 
-      if (result)
-        return result;
+      if (!result) continue;
+
+      result.values.forEach(
+        (value) =>
+          events.push({
+            value,
+            dynamic:
+            result.dynamic
+          })
+      );
     }
 
-    // track({ event: "..." })
+    // track({event})
     if (event) {
       const obj =
         arg.asKind(
@@ -136,12 +157,24 @@ function extractEventFromArgs(
 
         if (!init) continue;
 
-        return extractExpression(
-          init
+        const result =
+          extractExpression(init);
+
+        if (!result) continue;
+
+        result.values.forEach(
+          (value) =>
+            events.push({
+              value,
+              dynamic:
+              result.dynamic
+            })
         );
       }
     }
   }
 
-  return null;
+  return events.length
+    ? events
+    : null;
 }

package/src/utils/scanners/track.ts

@@ -1,13 +1,19 @@
 import {
   SourceFile,
-  SyntaxKind
+  SyntaxKind,
+  Node,
+  CallExpression,
+  PropertyAccessExpression
 } from "ts-morph";
 
+import { ExtractedEvent } from "../../types";
+import { extractExpression } from "../extract";
+
 export function scanTrack(
   source: SourceFile
 ) {
   const events =
-    new Set<string>();
+    new Set<ExtractedEvent>();
 
   const calls =
     source.getDescendantsOfKind(
@@ -22,8 +28,7 @@ export function scanTrack(
 
     // track()
     if (
-      expr.getKind() ===
-      SyntaxKind.Identifier
+      Node.isIdentifier(expr)
     ) {
       isTrack =
         expr.getText() === "track";
@@ -31,16 +36,12 @@ export function scanTrack(
 
     // analytics.track()
     if (
-      expr.getKind() ===
-      SyntaxKind.PropertyAccessExpression
+      Node.isPropertyAccessExpression(
+        expr
+      )
     ) {
-      const prop =
-        expr.asKindOrThrow(
-          SyntaxKind.PropertyAccessExpression
-        );
-
       isTrack =
-        prop.getName() === "track";
+        expr.getName() === "track";
     }
 
     if (!isTrack) continue;
@@ -50,34 +51,19 @@ export function scanTrack(
 
     if (!arg) continue;
 
-    if (
-      arg.getKind() ===
-      SyntaxKind.StringLiteral
-    ) {
-      const value =
-        arg.asKindOrThrow(
-          SyntaxKind.StringLiteral
-        );
-
-      events.add(
-        value.getLiteralText()
-      );
-    }
+    const result =
+      extractExpression(arg);
 
-    // template literal
-    if (
-      arg.getKind() ===
-      SyntaxKind.NoSubstitutionTemplateLiteral
-    ) {
-      const value =
-        arg.asKindOrThrow(
-          SyntaxKind.NoSubstitutionTemplateLiteral
-        );
+    if (!result) continue;
 
-      events.add(
-        value.getLiteralText()
-      );
-    }
+    result.values.forEach(
+      (value) =>
+        events.add({
+          value,
+          dynamic:
+          result.dynamic
+        })
+    );
   }
 
   return events;