JS: Add test and fix bug in pipe parser

asgerf · asgerf · commit ed27c8b13f21 · 2021-01-18T12:16:13.000Z
diff --git a/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java b/javascript/extractor/src/com/semmle/jcorn/AngularExpressionParser.java
@@ -41,9 +41,9 @@ protected Expression buildBinary(
       }
       SourceLocation loc = new SourceLocation(startLoc);
       if (right instanceof Identifier) {
-        right = new AngularPipeRef(right.getLoc(), (Identifier)right);
+        right = new AngularPipeRef(new SourceLocation(right.getLoc()), (Identifier)right);
       }
-      return this.finishNode(new CallExpression(loc, right, null, arguments, false, false));
+      return this.finishNode(new CallExpression(loc, right, new ArrayList<>(), arguments, false, false));
     }
     return super.buildBinary(startPos, startLoc, left, right, op, logical);
   }
diff --git a/javascript/ql/test/library-tests/frameworks/Angular2/foo.component.html b/javascript/ql/test/library-tests/frameworks/Angular2/foo.component.html
@@ -0,0 +1,4 @@
+<other-component
+    [prop]="foo | bar"
+    [prop2]="foo | bar:'baz'"
+></other-component>
diff --git a/javascript/ql/test/library-tests/frameworks/Angular2/foo.component.ts b/javascript/ql/test/library-tests/frameworks/Angular2/foo.component.ts
@@ -0,0 +1,13 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "foo-component",
+    templateUrl: "./foo.component.html"
+})
+export class Foo {
+    foo: string;
+
+    constructor() {
+        this.foo = "hello";
+    }
+}
diff --git a/javascript/ql/test/library-tests/frameworks/Angular2/test.expected b/javascript/ql/test/library-tests/frameworks/Angular2/test.expected
@@ -0,0 +1,10 @@
+pipeRef
+| foo.component.html:2:19:2:21 | bar |
+| foo.component.html:3:20:3:28 | bar:'baz' |
+pipeCall
+| foo.component.html:2:13:2:21 | foo \| bar |
+| foo.component.html:3:14:3:28 | foo \| bar:'baz' |
+pipeCallArg
+| 0 | foo.component.html:2:13:2:15 | foo | foo.component.html:2:13:2:21 | foo \| bar |
+| 0 | foo.component.html:3:14:3:16 | foo | foo.component.html:3:14:3:28 | foo \| bar:'baz' |
+| 1 | foo.component.html:3:24:3:28 | 'baz' | foo.component.html:3:14:3:28 | foo \| bar:'baz' |
diff --git a/javascript/ql/test/library-tests/frameworks/Angular2/test.ql b/javascript/ql/test/library-tests/frameworks/Angular2/test.ql
@@ -0,0 +1,12 @@
+import javascript
+
+query Angular2::PipeRefExpr pipeRef() { any() }
+
+query CallExpr pipeCall() {
+  result.getCallee() instanceof Angular2::PipeRefExpr
+}
+
+query CallExpr pipeCallArg(int i, Expr arg) {
+  result.getCallee() instanceof Angular2::PipeRefExpr and
+  result.getArgument(i) = arg
+}

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ protected Expression buildBinary(`
`41`	`41`	`}`
`42`	`42`	`SourceLocation loc = new SourceLocation(startLoc);`
`43`	`43`	`if (right instanceof Identifier) {`
`44`		`- right = new AngularPipeRef(right.getLoc(), (Identifier)right);`
	`44`	`+ right = new AngularPipeRef(new SourceLocation(right.getLoc()), (Identifier)right);`
`45`	`45`	`}`
`46`		`- return this.finishNode(new CallExpression(loc, right, null, arguments, false, false));`
	`46`	`+ return this.finishNode(new CallExpression(loc, right, new ArrayList<>(), arguments, false, false));`
`47`	`47`	`}`
`48`	`48`	`return super.buildBinary(startPos, startLoc, left, right, op, logical);`
`49`	`49`	`}`