Skip to content

Commit 0d15445

Browse files
dana-yaishdana-yaish
authored
Merge pull request #160 from codecov/dana/all-func-types-js
add all types of JS functions to function_query_str
2 parents d35d0e6 + 4a9600a commit 0d15445

File tree

6 files changed

+256
-16
lines changed

6 files changed

+256
-16
lines changed

‎codecov_cli/services/staticanalysis/analyzers/general.py

+23-15
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,29 @@ def _get_complexity_metrics(self, body_node):
3232

3333
def _get_name(self, node):
3434
name_node = node.child_by_field_name("name")
35-
actual_name = self.actual_code[
36-
name_node.start_byte : name_node.end_byte
37-
].decode()
38-
try:
39-
wrapping_class = next(
40-
x for x in self._get_parent_chain(node) if x.type in self.wrappers
41-
)
42-
except StopIteration:
43-
wrapping_class = None
44-
if wrapping_class is not None:
45-
class_name_node = wrapping_class.child_by_field_name("name")
46-
class_name = self.actual_code[
47-
class_name_node.start_byte : class_name_node.end_byte
48-
].decode()
49-
return f"{class_name}::{actual_name}"
35+
body_node = node.child_by_field_name("body")
36+
actual_name = (
37+
self.actual_code[name_node.start_byte : name_node.end_byte].decode()
38+
if name_node
39+
else f"Anonymous_{body_node.start_point[0] + 1}_{body_node.end_point[0] - body_node.start_point[0]}"
40+
)
41+
wrapping_classes = [
42+
x for x in self._get_parent_chain(node) if x.type in self.wrappers
43+
]
44+
wrapping_classes.reverse()
45+
if wrapping_classes:
46+
parents_actual_names = ""
47+
48+
for x in wrapping_classes:
49+
name = x.child_by_field_name("name")
50+
body = x.child_by_field_name("body")
51+
class_name = (
52+
self.actual_code[name.start_byte : name.end_byte].decode()
53+
if name
54+
else f"Anonymous_{body.start_point[0] + 1}_{body.end_point[0] - body.start_point[0]}"
55+
)
56+
parents_actual_names = parents_actual_names + class_name + "::"
57+
return f"{parents_actual_names}{actual_name}"
5058
return actual_name
5159

5260
def _get_parent_chain(self, node):

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

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77

88
function_query_str = """
99
(function_declaration) @elemen
10+
(generator_function_declaration) @elemen2
11+
(function) @elemen3
12+
(generator_function) @elemen4
13+
(arrow_function) @elemen5
1014
"""
1115

1216
method_query_str = """
@@ -29,7 +33,14 @@ class ES6Analyzer(BaseAnalyzer):
2933
"do_statement",
3034
]
3135

32-
wrappers = ["class_declaration", "function_declaration"]
36+
wrappers = [
37+
"class_declaration",
38+
"function_declaration",
39+
"generator_function_declaration",
40+
"function",
41+
"generator_function",
42+
"arrow_function",
43+
]
3344

3445
def __init__(self, path, actual_code, **options):
3546
self.actual_code = actual_code

‎samples/inputs/sample_004.js

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
function outerFunction() {
2+
3+
function innerFunction() {
4+
console.log("Inner function called");
5+
}
6+
innerFunction();
7+
}
8+
9+
outerFunction();
10+
11+
async function foo() {}
12+
13+
class Foo {
14+
async bar() {}
15+
}
16+
17+
// arrow function
18+
async (a) => { return foo; };
19+
20+
//
21+
async function* foo() { yield 1; }
22+
23+
function a () { function b () {} function *c () {} class D {} return }
24+
25+
[
26+
function *() {},
27+
function *generateStuff(arg1, arg2) {
28+
yield;
29+
yield arg2;
30+
yield * foo();
31+
}
32+
]
33+
34+
var b = function() {};
35+

‎samples/outputs/sample_003.json

+24
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,30 @@
6767
"max_nested_conditional": 0
6868
}
6969
},
70+
{
71+
"identifier": "fetchData::Anonymous_82_4",
72+
"start_line": 82,
73+
"end_line": 86,
74+
"code_hash": "843009cc4a83d8d54e0e60e11212cad5",
75+
"complexity_metrics": {
76+
"conditions": 0,
77+
"mccabe_cyclomatic_complexity": 1,
78+
"returns": 0,
79+
"max_nested_conditional": 0
80+
}
81+
},
82+
{
83+
"identifier": "fetchData::Anonymous_82_4::Anonymous_83_2",
84+
"start_line": 83,
85+
"end_line": 85,
86+
"code_hash": "06839ff9cb3f2f8253694bb9143c615d",
87+
"complexity_metrics": {
88+
"conditions": 0,
89+
"mccabe_cyclomatic_complexity": 1,
90+
"returns": 0,
91+
"max_nested_conditional": 0
92+
}
93+
},
7094
{
7195
"identifier": "getData",
7296
"start_line": 89,

‎samples/outputs/sample_004.json

+161
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
{
2+
"result": {
3+
"empty_lines": [
4+
2, 8, 10, 12, 16, 19, 22, 24, 33, 35
5+
],
6+
"executable_lines": [],
7+
"number_lines": 35,
8+
"hash": "1ab313b3c1dd7f13c5beb09d99361481",
9+
"filename": "samples/inputs/sample_004.js",
10+
"language": "javascript",
11+
"import_lines": [],
12+
"functions": [
13+
{
14+
"identifier": "outerFunction",
15+
"start_line": 1,
16+
"end_line": 7,
17+
"code_hash": "410e3cdac877f4d4d96650fd2bdb7302",
18+
"complexity_metrics": {
19+
"conditions": 0,
20+
"mccabe_cyclomatic_complexity": 1,
21+
"returns": 0,
22+
"max_nested_conditional": 0
23+
}
24+
},
25+
{
26+
"identifier": "outerFunction::innerFunction",
27+
"start_line": 3,
28+
"end_line": 5,
29+
"code_hash": "867352b5697c99ec8bf920eace84b90a",
30+
"complexity_metrics": {
31+
"conditions": 0,
32+
"mccabe_cyclomatic_complexity": 1,
33+
"returns": 0,
34+
"max_nested_conditional": 0
35+
}
36+
},
37+
{
38+
"identifier": "foo",
39+
"start_line": 11,
40+
"end_line": 11,
41+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
42+
"complexity_metrics": {
43+
"conditions": 0,
44+
"mccabe_cyclomatic_complexity": 1,
45+
"returns": 0,
46+
"max_nested_conditional": 0
47+
}
48+
},
49+
{
50+
"identifier": "Foo::bar",
51+
"start_line": 14,
52+
"end_line": 14,
53+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
54+
"complexity_metrics": {
55+
"conditions": 0,
56+
"mccabe_cyclomatic_complexity": 1,
57+
"returns": 0,
58+
"max_nested_conditional": 0
59+
}
60+
},
61+
{
62+
"identifier": "Anonymous_18_0",
63+
"start_line": 18,
64+
"end_line": 18,
65+
"code_hash": "8dd5ce440cc0dbf8e9b874e3a9a61951",
66+
"complexity_metrics": {
67+
"conditions": 0,
68+
"mccabe_cyclomatic_complexity": 1,
69+
"returns": 1,
70+
"max_nested_conditional": 0
71+
}
72+
},
73+
{
74+
"identifier": "foo",
75+
"start_line": 21,
76+
"end_line": 21,
77+
"code_hash": "d858b03b04be75bf6f333641e8ef41a5",
78+
"complexity_metrics": {
79+
"conditions": 0,
80+
"mccabe_cyclomatic_complexity": 1,
81+
"returns": 0,
82+
"max_nested_conditional": 0
83+
}
84+
},
85+
{
86+
"identifier": "a",
87+
"start_line": 23,
88+
"end_line": 23,
89+
"code_hash": "a9b5caf33c892637947990938210b544",
90+
"complexity_metrics": {
91+
"conditions": 0,
92+
"mccabe_cyclomatic_complexity": 1,
93+
"returns": 1,
94+
"max_nested_conditional": 0
95+
}
96+
},
97+
{
98+
"identifier": "a::b",
99+
"start_line": 23,
100+
"end_line": 23,
101+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
102+
"complexity_metrics": {
103+
"conditions": 0,
104+
"mccabe_cyclomatic_complexity": 1,
105+
"returns": 0,
106+
"max_nested_conditional": 0
107+
}
108+
},
109+
{
110+
"identifier": "a::c",
111+
"start_line": 23,
112+
"end_line": 23,
113+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
114+
"complexity_metrics": {
115+
"conditions": 0,
116+
"mccabe_cyclomatic_complexity": 1,
117+
"returns": 0,
118+
"max_nested_conditional": 0
119+
}
120+
},
121+
{
122+
"identifier": "Anonymous_26_0",
123+
"start_line": 26,
124+
"end_line": 26,
125+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
126+
"complexity_metrics": {
127+
"conditions": 0,
128+
"mccabe_cyclomatic_complexity": 1,
129+
"returns": 0,
130+
"max_nested_conditional": 0
131+
}
132+
},
133+
{
134+
"identifier": "generateStuff",
135+
"start_line": 27,
136+
"end_line": 31,
137+
"code_hash": "e3ca3f85be0a1ca905c7b5d29c7dc070",
138+
"complexity_metrics": {
139+
"conditions": 0,
140+
"mccabe_cyclomatic_complexity": 1,
141+
"returns": 0,
142+
"max_nested_conditional": 0
143+
}
144+
},
145+
{
146+
"identifier": "Anonymous_34_0",
147+
"start_line": 34,
148+
"end_line": 34,
149+
"code_hash": "99914b932bd37a50b983c5e7c90ae93b",
150+
"complexity_metrics": {
151+
"conditions": 0,
152+
"mccabe_cyclomatic_complexity": 1,
153+
"returns": 0,
154+
"max_nested_conditional": 0
155+
}
156+
}
157+
]
158+
},
159+
"error": null
160+
}
161+

‎tests/services/static_analysis/test_analyse_file.py

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
("samples/inputs/sample_001.py", "samples/outputs/sample_001.json"),
1818
("samples/inputs/sample_002.py", "samples/outputs/sample_002.json"),
1919
("samples/inputs/sample_003.js", "samples/outputs/sample_003.json"),
20+
("samples/inputs/sample_004.js", "samples/outputs/sample_004.json"),
2021
],
2122
)
2223
def test_sample_analysis(input_filename, output_filename):

0 commit comments

Comments
 (0)