@flisk/analyze-tracking 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flisk/analyze-tracking",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Analyzes tracking code in a project and generates data schemas",
   "main": "src/index.js",
   "bin": {

package/src/analyze/analyzeJsFile.js

@@ -10,47 +10,61 @@ const parserOptions = { ecmaVersion: 'latest', sourceType: 'module', locations:
 extend(walk.base);
 
 function analyzeJsFile(filePath, customFunction) {
-  const code = fs.readFileSync(filePath, 'utf8');
-  const ast = parser.parse(code, parserOptions);
-  const events = [];
-
-  walk.ancestor(ast, {
-    CallExpression(node, ancestors) {
-      const source = detectSourceJs(node, customFunction);
-      if (source === 'unknown') return;
-
-      let eventName = null;
-      let propertiesNode = null;
-
-      if (source === 'googleanalytics' && node.arguments.length >= 3) {
-        eventName = node.arguments[1]?.value || null;
-        propertiesNode = node.arguments[2];
-      } else if (source === 'snowplow' && node.arguments.length >= 2) {
-        const actionProperty = node.arguments[1].properties.find(prop => prop.key.name === 'action');
-        eventName = actionProperty ? actionProperty.value.value : null;
-        propertiesNode = node.arguments[1];
-      } else if (node.arguments.length >= 2) {
-        eventName = node.arguments[0]?.value || null;
-        propertiesNode = node.arguments[1];
-      }
-
-      const line = node.loc.start.line;
-      const functionName = findWrappingFunctionJs(node, ancestors);
-
-      if (eventName && propertiesNode && propertiesNode.type === 'ObjectExpression') {
-        const properties = extractJsProperties(propertiesNode);
-
-        events.push({
-          eventName,
-          source,
-          properties,
-          filePath,
-          line,
-          functionName
-        });
-      }
-    },
-  });
+  let events = [];
+  try {
+    const code = fs.readFileSync(filePath, 'utf8');
+    let ast;
+    try {
+      ast = parser.parse(code, parserOptions);
+    } catch (parseError) {
+      console.error(`Error parsing file ${filePath}`);
+      return events; // Return empty events array if parsing fails
+    }
+
+    walk.ancestor(ast, {
+      CallExpression(node, ancestors) {
+        try {
+          const source = detectSourceJs(node, customFunction);
+          if (source === 'unknown') return;
+
+          let eventName = null;
+          let propertiesNode = null;
+
+          if (source === 'googleanalytics' && node.arguments.length >= 3) {
+            eventName = node.arguments[1]?.value || null;
+            propertiesNode = node.arguments[2];
+          } else if (source === 'snowplow' && node.arguments.length >= 2) {
+            const actionProperty = node.arguments[1].properties.find(prop => prop.key.name === 'action');
+            eventName = actionProperty ? actionProperty.value.value : null;
+            propertiesNode = node.arguments[1];
+          } else if (node.arguments.length >= 2) {
+            eventName = node.arguments[0]?.value || null;
+            propertiesNode = node.arguments[1];
+          }
+
+          const line = node.loc.start.line;
+          const functionName = findWrappingFunctionJs(node, ancestors);
+
+          if (eventName && propertiesNode && propertiesNode.type === 'ObjectExpression') {
+            const properties = extractJsProperties(propertiesNode);
+
+            events.push({
+              eventName,
+              source,
+              properties,
+              filePath,
+              line,
+              functionName
+            });
+          }
+        } catch (nodeError) {
+          console.error(`Error processing node in ${filePath}`);
+        }
+      },
+    });
+  } catch (fileError) {
+    console.error(`Error reading or processing file ${filePath}`);
+  }
 
   return events;
 }

package/src/analyze/analyzeTsFile.js

@@ -2,49 +2,66 @@ const ts = require('typescript');
 const { detectSourceTs, findWrappingFunctionTs, extractTsProperties } = require('./helpers');
 
 function analyzeTsFile(filePath, program, customFunction) {
-  const sourceFile = program.getSourceFile(filePath);
-  const checker = program.getTypeChecker();
-  const events = [];
-
-  function visit(node) {
-    if (ts.isCallExpression(node)) {
-      const source = detectSourceTs(node, customFunction);
-      if (source === 'unknown') return;
-
-      let eventName = null;
-      let propertiesNode = null;
-
-      if (source === 'googleanalytics' && node.arguments.length >= 3) {
-        eventName = node.arguments[1]?.text || null;
-        propertiesNode = node.arguments[2];
-      } else if (source === 'snowplow' && node.arguments.length >= 2) {
-        const actionProperty = node.arguments[1].properties.find(prop => prop.name.escapedText === 'action');
-        eventName = actionProperty ? actionProperty.initializer.text : null;
-        propertiesNode = node.arguments[1];
-      } else if (node.arguments.length >= 2) {
-        eventName = node.arguments[0]?.text || null;
-        propertiesNode = node.arguments[1];
-      }
+  let events = [];
+  try {
+    const sourceFile = program.getSourceFile(filePath);
+    if (!sourceFile) {
+      console.error(`Error: Unable to get source file for ${filePath}`);
+      return events;
+    }
+
+    const checker = program.getTypeChecker();
+
+    function visit(node) {
+      try {
+        if (ts.isCallExpression(node)) {
+          const source = detectSourceTs(node, customFunction);
+          if (source === 'unknown') return;
+
+          let eventName = null;
+          let propertiesNode = null;
 
-      const line = sourceFile.getLineAndCharacterOfPosition(node.getStart()).line + 1;
-      const functionName = findWrappingFunctionTs(node);
-
-      if (eventName && propertiesNode && ts.isObjectLiteralExpression(propertiesNode)) {
-        const properties = extractTsProperties(checker, propertiesNode);
-        events.push({
-          eventName,
-          source,
-          properties,
-          filePath,
-          line,
-          functionName
-        });
+          if (source === 'googleanalytics' && node.arguments.length >= 3) {
+            eventName = node.arguments[1]?.text || null;
+            propertiesNode = node.arguments[2];
+          } else if (source === 'snowplow' && node.arguments.length >= 2) {
+            const actionProperty = node.arguments[1].properties.find(prop => prop.name.escapedText === 'action');
+            eventName = actionProperty ? actionProperty.initializer.text : null;
+            propertiesNode = node.arguments[1];
+          } else if (node.arguments.length >= 2) {
+            eventName = node.arguments[0]?.text || null;
+            propertiesNode = node.arguments[1];
+          }
+
+          const line = sourceFile.getLineAndCharacterOfPosition(node.getStart()).line + 1;
+          const functionName = findWrappingFunctionTs(node);
+
+          if (eventName && propertiesNode && ts.isObjectLiteralExpression(propertiesNode)) {
+            try {
+              const properties = extractTsProperties(checker, propertiesNode);
+              events.push({
+                eventName,
+                source,
+                properties,
+                filePath,
+                line,
+                functionName
+              });
+            } catch (propertyError) {
+              console.error(`Error extracting properties in ${filePath} at line ${line}`);
+            }
+          }
+        }
+        ts.forEachChild(node, visit);
+      } catch (nodeError) {
+        console.error(`Error processing node in ${filePath}`);
       }
     }
-    ts.forEachChild(node, visit);
-  }
 
-  ts.forEachChild(sourceFile, visit);
+    ts.forEachChild(sourceFile, visit);
+  } catch (fileError) {
+    console.error(`Error analyzing TypeScript file ${filePath}`);
+  }
 
   return events;
 }

package/src/repoDetails.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const git = require('isomorphic-git');
+const { execSync } = require('child_process');
 
 async function getRepositoryUrl(targetDir) {
   try {
@@ -10,8 +11,13 @@ async function getRepositoryUrl(targetDir) {
     });
     return repoUrl.trim();
   } catch (error) {
-    console.warn('Could not determine repository URL. Will exclude.');
-    return null;
+    try {
+      const repoUrl = execSync('git config --get remote.origin.url', { cwd: targetDir, encoding: 'utf8' });
+      return repoUrl.trim();
+    } catch (error) {
+      console.warn('Could not determine repository URL. Will exclude.');
+      return null;
+    }
   }
 }
 
@@ -24,8 +30,13 @@ async function getCommitHash(targetDir) {
     });
     return commitHash.trim();
   } catch (error) {
-    console.warn('Could not determine latest commit hash. Will exclude.');
-    return null;
+    try {
+      const commitHash = execSync('git rev-parse HEAD', { cwd: targetDir, encoding: 'utf8' });
+      return commitHash.trim();
+    } catch (error) {
+      console.warn('Could not determine latest commit hash. Will exclude.');
+      return null;
+    }
   }
 }
 
@@ -39,8 +50,14 @@ async function getCommitTimestamp(targetDir, commitHash) {
     const unixTimeSeconds = commit.committer.timestamp;
     return new Date(unixTimeSeconds * 1000);
   } catch (error) {
-    console.warn('Could not retrieve commit timestamp. Using current timestamp as default.');
-    return new Date();
+    try {
+      const commitTimestamp = execSync(`git --no-pager show -s --format=%ct ${commitHash}`, { cwd: targetDir, encoding: 'utf8' });
+      const unixTimeSeconds = commitTimestamp.trim();
+      return new Date(unixTimeSeconds * 1000);
+    } catch (error) {
+      console.warn('Could not retrieve commit timestamp. Using current timestamp as default.');
+      return new Date();
+    }
   }
 }