Merge pull request #159 from codecov/dana/js-import-lines

search for imports, add them to the JS analyzer

Author: dana-yaish

codecov_cli/services/staticanalysis/analyzers/general.py

@@ -54,3 +54,9 @@ def _get_parent_chain(self, node):
         while cur:
             yield cur
             cur = cur.parent
+
+    def get_import_lines(self, root_node, imports_query):
+        import_lines = set()
+        for (a, _) in imports_query.captures(root_node):
+            import_lines.add((a.start_point[0] + 1, a.end_point[0] - a.start_point[0]))
+        return import_lines

codecov_cli/services/staticanalysis/analyzers/javascript_es6/__init__.py

@@ -13,6 +13,11 @@
 (method_definition) @elemen
 """
 
+imports_query_str = """
+(import_statement) @elemen
+(import) @elemen
+"""
+
 
 class ES6Analyzer(BaseAnalyzer):
     condition_statements = [
@@ -35,6 +40,7 @@ def __init__(self, path, actual_code, **options):
         self.JS_LANGUAGE = Language(staticcodecov_languages.__file__, "javascript")
         self.parser = Parser()
         self.parser.set_language(self.JS_LANGUAGE)
+        self.import_lines = set()
 
     def get_code_hash(self, start_byte, end_byte):
         j = hashlib.md5()
@@ -47,6 +53,7 @@ def process(self):
         root_node = tree.root_node
         function_query = self.JS_LANGUAGE.query(function_query_str)
         method_query = self.JS_LANGUAGE.query(method_query_str)
+        imports_query = self.JS_LANGUAGE.query(imports_query_str)
         combined_results = function_query.captures(root_node) + method_query.captures(
             root_node
         )
@@ -63,6 +70,9 @@ def process(self):
                     "complexity_metrics": self._get_complexity_metrics(body_node),
                 }
             )
+
+        self.import_lines = self.get_import_lines(root_node, imports_query)
+
         h = hashlib.md5()
         h.update(self.actual_code)
         return {
@@ -73,4 +83,5 @@ def process(self):
             "hash": h.hexdigest(),
             "filename": str(self.path),
             "language": "javascript",
+            "import_lines": sorted(self.import_lines),
         }

codecov_cli/services/staticanalysis/analyzers/python/__init__.py

@@ -93,10 +93,9 @@ def process(self):
             self.definitions_lines.add(
                 (a.start_point[0] + 1, a.end_point[0] - a.start_point[0])
             )
-        for (a, _) in imports_query.captures(root_node):
-            self.import_lines.add(
-                (a.start_point[0] + 1, a.end_point[0] - a.start_point[0])
-            )
+
+        self.import_lines = self.get_import_lines(root_node, imports_query)
+
         h = hashlib.md5()
         h.update(self.actual_code)
         statements = sorted(

samples/example_module.js

@@ -0,0 +1,12 @@
+// Default export
+export default function greet(name) {
+    console.log(`Hello, ${name}!`);
+}
+  
+// Named exports
+export function sum(a, b) {
+    return a + b;
+}
+
+export const pi = 3.14159;
+  

samples/inputs/sample_003.js

@@ -95,4 +95,34 @@ async function getData() {
   }
 }
 
+// Importing a default export
+import greet from '../example_module.js';
+
+// Importing named exports
+import { sum, pi } from '../example_module.js';
+
+// Importing a default export and renaming it
+import { default as renamedGreet } from '../example_module.js';
+
+// Importing everything from a module
+import * as moduleExports from '../example_module.js';
+
+// Importing a default export and specific named exports together
+import greet, { pi as constantPi } from '../example_module.js';
+
+//Dynamic import by using import(), which is different from the previous imports (static imports)
+let myModule;
+if (typeof window === "undefined") {
+  myModule = await import("../example_module.js");
+} else {
+  myModule = await import("../example_module.js");
+}
+greet('Alice');
+console.log(sum(2, 3));
+console.log(pi);
+console.log(renamedGreet('Bob'));
+console.log(moduleExports.sum(4, 5));
+console.log(moduleExports.pi);
+console.log(greet('Charlie'));
+console.log(constantPi);
 getData();

samples/outputs/sample_003.json

@@ -17,13 +17,19 @@
             75,
             79,
             88,
-            97
+            97,
+            100,
+            103,
+            106,
+            109,
+            112
         ],
         "executable_lines": [],
-        "number_lines": 98,
-        "hash": "ad3f8572135398ba290dcb36ff0410c2",
+        "number_lines": 128,
+        "hash": "6cfa011ad0c3793848438c3fff8bd5b3",
         "filename": "samples/inputs/sample_003.js",
         "language": "javascript",
+        "import_lines": [[99, 0], [102, 0], [105, 0], [108, 0], [111, 0], [116, 0], [118, 0]],
         "functions": [
             {
                 "identifier": "myFunction",