support chained fns for custom tracking

Author: skarim

src/analyze/javascript/detectors/analytics-source.js

@@ -45,20 +45,23 @@ function detectAnalyticsSource(node, customFunction) {
 function isCustomFunction(node, customFunction) {
   if (!customFunction) return false;
 
-  // Support dot-separated names like "CustomModule.track"
-  const parts = customFunction.split('.');
+  // Support dot-separated names like "CustomModule.track" and chained calls like "getTrackingService().track"
+  // Normalize each segment by stripping trailing parentheses
+  const parts = customFunction.split('.').map(p => p.replace(/\(\s*\)$/, ''));
 
   // Simple identifier (no dot)
   if (parts.length === 1) {
-    return node.callee.type === NODE_TYPES.IDENTIFIER && node.callee.name === customFunction;
+    return node.callee.type === NODE_TYPES.IDENTIFIER && node.callee.name === parts[0];
   }
 
-  // For dot-separated names, the callee should be a MemberExpression chain.
-  if (node.callee.type !== NODE_TYPES.MEMBER_EXPRESSION) {
+  // For dot-separated names, the callee should be a MemberExpression chain,
+  // but we also allow CallExpression in the chain (e.g., getService().track)
+  const callee = node.callee;
+  if (callee.type !== NODE_TYPES.MEMBER_EXPRESSION && callee.type !== NODE_TYPES.CALL_EXPRESSION) {
     return false;
   }
 
-  return matchesMemberChain(node.callee, parts);
+  return matchesMemberChain(callee, parts);
 }
 
 /**
@@ -75,26 +78,34 @@ function matchesMemberChain(memberExpr, parts) {
   while (currentNode && idx >= 0) {
     const expectedPart = parts[idx];
 
-    // property should match current expectedPart
     if (currentNode.type === NODE_TYPES.MEMBER_EXPRESSION) {
-      // Ensure property is Identifier and matches
+      // Ensure property is Identifier and matches the expected part
       if (
         currentNode.property.type !== NODE_TYPES.IDENTIFIER ||
         currentNode.property.name !== expectedPart
       ) {
         return false;
       }
 
-      // Move to the object of the MemberExpression
+      // Move to the object (which could itself be a MemberExpression, Identifier, or CallExpression)
       currentNode = currentNode.object;
       idx -= 1;
-    } else if (currentNode.type === NODE_TYPES.IDENTIFIER) {
-      // We reached the leftmost Identifier; it should match the first part
+      continue;
+    }
+
+    // If we encounter a CallExpression in the chain (e.g., getService().track),
+    // step into its callee without consuming an expected part.
+    if (currentNode.type === NODE_TYPES.CALL_EXPRESSION) {
+      currentNode = currentNode.callee;
+      continue;
+    }
+
+    if (currentNode.type === NODE_TYPES.IDENTIFIER) {
       return idx === 0 && currentNode.name === expectedPart;
-    } else {
-      // Unexpected node type (e.g., ThisExpression, CallExpression, etc.)
-      return false;
     }
+
+    // Unexpected node type (e.g., ThisExpression, Literal, etc.)
+    return false;
   }
 
   return false;

src/analyze/javascript/extractors/event-extractor.js

@@ -257,7 +257,11 @@ function getStringValue(node, constantMap = {}) {
     return node.value;
   }
   if (node.type === NODE_TYPES.MEMBER_EXPRESSION) {
-    return resolveMemberExpressionToString(node, constantMap);
+    const resolved = resolveMemberExpressionToString(node, constantMap);
+    if (resolved) return resolved;
+    // Fallback: return a dotted path for member expressions when we cannot
+    // resolve to a literal (e.g., imported constants like TELEMETRY_EVENTS.X)
+    return memberExpressionToPath(node);
   }
   return null;
 }
@@ -315,6 +319,25 @@ function resolveMemberExpressionToString(node, constantMap) {
   return null;
 }
 
+// Build a dotted path string for a MemberExpression (e.g., OBJ.KEY.SUBKEY)
+function memberExpressionToPath(node) {
+  if (!node || node.type !== NODE_TYPES.MEMBER_EXPRESSION) return null;
+  const parts = [];
+  let current = node;
+  while (current && current.type === NODE_TYPES.MEMBER_EXPRESSION && !current.computed) {
+    if (current.property && current.property.type === NODE_TYPES.IDENTIFIER) {
+      parts.unshift(current.property.name);
+    } else if (current.property && current.property.type === NODE_TYPES.LITERAL) {
+      parts.unshift(String(current.property.value));
+    }
+    current = current.object;
+  }
+  if (current && current.type === NODE_TYPES.IDENTIFIER) {
+    parts.unshift(current.name);
+  }
+  return parts.length ? parts.join('.') : null;
+}
+
 module.exports = {
   extractEventData,
   processEventData

src/analyze/javascript/parser.js

@@ -12,6 +12,7 @@ const { PARSER_OPTIONS, NODE_TYPES } = require('./constants');
 const { detectAnalyticsSource } = require('./detectors');
 const { extractEventData, processEventData } = require('./extractors');
 const { findWrappingFunction } = require('./utils/function-finder');
+const { collectImportedConstantStringMap } = require('./utils/import-resolver');
 
 // Extend walker to support JSX
 extend(walk.base);
@@ -82,19 +83,15 @@ function parseFile(filePath) {
 function nodeMatchesCustomFunction(node, fnName) {
   if (!fnName || !node.callee) return false;
 
-  const parts = fnName.split('.');
+  // Support chained calls in function name by stripping trailing parens from each segment
+  const parts = fnName.split('.').map(p => p.replace(/\(\s*\)$/, ''));
 
   // Simple identifier case
   if (parts.length === 1) {
-    return node.callee.type === NODE_TYPES.IDENTIFIER && node.callee.name === fnName;
+    return node.callee.type === NODE_TYPES.IDENTIFIER && node.callee.name === parts[0];
   }
 
-  // Member expression chain case
-  if (node.callee.type !== NODE_TYPES.MEMBER_EXPRESSION) {
-    return false;
-  }
-
-  // Walk the chain from the right-most property to the leftmost object
+  // Allow MemberExpression and CallExpression within the chain (e.g., getService().track)
   let currentNode = node.callee;
   let idx = parts.length - 1;
 
@@ -108,13 +105,23 @@ function nodeMatchesCustomFunction(node, fnName) {
       ) {
         return false;
       }
+      // step to the object; do not decrement idx for call expressions yet
       currentNode = currentNode.object;
       idx -= 1;
-    } else if (currentNode.type === NODE_TYPES.IDENTIFIER) {
+      continue;
+    }
+
+    if (currentNode.type === NODE_TYPES.CALL_EXPRESSION) {
+      // descend into the callee of the call without consuming a part
+      currentNode = currentNode.callee;
+      continue;
+    }
+
+    if (currentNode.type === NODE_TYPES.IDENTIFIER) {
       return idx === 0 && currentNode.name === expected;
-    } else {
-      return false;
     }
+
+    return false;
   }
 
   return false;
@@ -183,8 +190,11 @@ function collectConstantStringMap(ast) {
 function findTrackingEvents(ast, filePath, customConfigs = []) {
   const events = [];
 
-  // Collect constant mappings once per file
-  const constantMap = collectConstantStringMap(ast);
+  // Collect constant mappings once per file (locals + imported)
+  const constantMap = {
+    ...collectConstantStringMap(ast),
+    ...collectImportedConstantStringMap(filePath, ast)
+  };
 
   walk.ancestor(ast, {
     [NODE_TYPES.CALL_EXPRESSION]: (node, ancestors) => {