handle ts custom functions with no properties

Author: skarim

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

@@ -161,11 +161,18 @@ function extractCustomEvent(node, constantMap, customConfig) {
 function processEventData(eventData, source, filePath, line, functionName, customConfig) {
   const { eventName, propertiesNode } = eventData;
 
-  if (!eventName || !propertiesNode || propertiesNode.type !== NODE_TYPES.OBJECT_EXPRESSION) {
+  // Must at least have an event name – properties are optional.
+  if (!eventName) {
     return null;
   }
 
-  let properties = extractProperties(propertiesNode);
+  // Default to empty properties when none are supplied.
+  let properties = {};
+
+  // Only attempt extraction when we have a literal object expression.
+  if (propertiesNode && propertiesNode.type === NODE_TYPES.OBJECT_EXPRESSION) {
+    properties = extractProperties(propertiesNode);
+  }
 
   // Handle custom extra params
   if (source === 'custom' && customConfig && eventData.extraArgs) {

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

@@ -186,26 +186,25 @@ function extractDefaultEvent(node, checker, sourceFile) {
 function processEventData(eventData, source, filePath, line, functionName, checker, sourceFile, customConfig) {
   const { eventName, propertiesNode } = eventData;
 
-  if (!eventName || !propertiesNode) {
+  // Require an event name – properties are optional.
+  if (!eventName) {
     return null;
   }
 
-  let properties = null;
+  let properties = {};
 
-  // Check if properties is an object literal
-  if (ts.isObjectLiteralExpression(propertiesNode)) {
-    properties = extractProperties(checker, propertiesNode);
-  }
-  // Check if properties is an identifier (variable reference)
-  else if (ts.isIdentifier(propertiesNode)) {
-    const resolvedNode = resolveIdentifierToInitializer(checker, propertiesNode, sourceFile);
-    if (resolvedNode && ts.isObjectLiteralExpression(resolvedNode)) {
-      properties = extractProperties(checker, resolvedNode);
+  if (propertiesNode) {
+    // Check if properties is an object literal
+    if (ts.isObjectLiteralExpression(propertiesNode)) {
+      properties = extractProperties(checker, propertiesNode);
+    }
+    // Check if properties is an identifier (variable reference)
+    else if (ts.isIdentifier(propertiesNode)) {
+      const resolvedNode = resolveIdentifierToInitializer(checker, propertiesNode, sourceFile);
+      if (resolvedNode && ts.isObjectLiteralExpression(resolvedNode)) {
+        properties = extractProperties(checker, resolvedNode);
+      }
     }
-  }
-
-  if (!properties) {
-    return null;
   }
 
   // Special handling for Snowplow: remove 'action' from properties

tests/analyzeJavaScript.test.js

@@ -393,4 +393,20 @@ test.describe('analyzeJsFile', () => {
     const builtInProvidersCount = events.filter(e => e.source !== 'custom').length;
     assert.ok(builtInProvidersCount >= 10, 'Should still include built-in events');
   });
+
+  test('should detect events with no properties for custom function', () => {
+    const eventOnlyFile = path.join(fixturesDir, 'javascript', 'event-only.js');
+    const customFunctionSignatures = [parseCustomFunctionSignature('trackUserEvent(EVENT_NAME)')];
+    const events = analyzeJsFile(eventOnlyFile, customFunctionSignatures);
+
+    assert.strictEqual(events.length, 2);
+
+    const literalEvent = events.find(e => e.eventName === 'ViewedEligibilityResults');
+    assert.ok(literalEvent);
+    assert.deepStrictEqual(literalEvent.properties, {});
+
+    const constantEvent = events.find(e => e.eventName === 'ViewedPostShipDashboard');
+    assert.ok(constantEvent);
+    assert.deepStrictEqual(constantEvent.properties, {});
+  });
 });

tests/analyzeTypeScript.test.js

@@ -37,7 +37,7 @@ test.describe('analyzeTsFile', () => {
     // Sort events by line number for consistent ordering
     events.sort((a, b) => a.line - b.line);
 
-    assert.strictEqual(events.length, 19);
+    assert.strictEqual(events.length, 20);
 
     // Test Google Analytics event
     const gaEvent = events.find(e => e.eventName === 'order_completed' && e.source === 'googleanalytics');
@@ -986,4 +986,21 @@ test.describe('analyzeTsFile', () => {
       foo: { type: 'string' }
     });
   });
+
+  test('should detect events with no properties for custom function', () => {
+    const eventOnlyFile = path.join(fixturesDir, 'typescript', 'event-only.ts');
+    const program = createProgram(eventOnlyFile);
+    const customFunctionSignatures = [parseCustomFunctionSignature('trackUserEvent(EVENT_NAME)')];
+    const events = analyzeTsFile(eventOnlyFile, program, customFunctionSignatures);
+
+    assert.strictEqual(events.length, 2);
+
+    const literalEvent = events.find(e => e.eventName === 'ViewedEligibilityResults');
+    assert.ok(literalEvent);
+    assert.deepStrictEqual(literalEvent.properties, {});
+
+    const constantEvent = events.find(e => e.eventName === 'ViewedPostShipDashboard');
+    assert.ok(constantEvent);
+    assert.deepStrictEqual(constantEvent.properties, {});
+  });
 });

tests/fixtures/javascript/event-only.js

@@ -0,0 +1,13 @@
+function trackUserEvent() {
+  // stub implementation for tests
+}
+
+// Direct string literal event name
+trackUserEvent('ViewedEligibilityResults');
+
+// Event name referenced via constant map
+const TELEMETRY_EVENTS = {
+  VIEWED_POST_SHIP_DASHBOARD: 'ViewedPostShipDashboard',
+};
+
+trackUserEvent(TELEMETRY_EVENTS.VIEWED_POST_SHIP_DASHBOARD);

tests/fixtures/tracking-schema-all.yaml

@@ -1121,6 +1121,10 @@ events:
         line: 361
         function: global
         destination: custom
+      - path: typescript/main.ts
+        line: 417
+        function: trackFailedPayment
+        destination: custom
     properties:
       containerSection:
         type: string

tests/fixtures/typescript/event-only.ts

@@ -0,0 +1,14 @@
+// Stub implementation for the test – matches the custom signature under test
+const trackUserEvent = (..._args: any[]): void => {
+  /* no-op */
+};
+
+// Direct string literal event name
+trackUserEvent('ViewedEligibilityResults');
+
+// Event name referenced via constant map
+const TELEMETRY_EVENTS = {
+  VIEWED_POST_SHIP_DASHBOARD: 'ViewedPostShipDashboard' as const,
+};
+
+trackUserEvent(TELEMETRY_EVENTS.VIEWED_POST_SHIP_DASHBOARD);

tests/fixtures/typescript/tracking-schema-typescript.yaml

@@ -441,6 +441,10 @@ events:
         line: 361
         function: global
         destination: custom
+      - path: main.ts
+        line: 417
+        function: trackFailedPayment
+        destination: custom
     properties:
       containerSection:
         type: string