Merge pull request #3834 from asger-semmle/js/vue-classification

semmle-qlci · web-flow · commit 15a0297ca2e8 · 2020-06-30T13:14:25.000+01:00
Approved by erik-krogh
diff --git a/javascript/ql/src/filters/ClassifyFiles.qll b/javascript/ql/src/filters/ClassifyFiles.qll
@@ -80,6 +80,8 @@ predicate classify(File f, string category) {
   or
   // Polymer templates
   exists(HTML::Element elt | elt.getName() = "template" |
-    f = elt.getFile() and category = "template"
+    f = elt.getFile() and
+    category = "template" and
+    not f.getExtension() = "vue"
   )
 }
diff --git a/javascript/ql/src/semmle/javascript/GeneratedCode.qll b/javascript/ql/src/semmle/javascript/GeneratedCode.qll
@@ -164,7 +164,10 @@ private int countStartingHtmlElements(File f, int l) {
 /**
  * Holds if the base name of `f` is a number followed by a single extension.
  */
-predicate isGeneratedFileName(File f) { f.getStem().regexpMatch("[0-9]+") }
+predicate isGeneratedFileName(File f) {
+  f.getStem().regexpMatch("[0-9]+") and
+  not f.getExtension() = "vue"
+}
 
 /**
  * Holds if `tl` looks like it contains generated code.
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/MyComponent.vue b/javascript/ql/test/query-tests/filters/ClassifyFiles/MyComponent.vue
@@ -0,0 +1,6 @@
+<template>
+  <span>hey</span>
+</template>
+<script>
+export default { data: 42 }
+</script>

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ predicate classify(File f, string category) {`
`80`	`80`	`or`
`81`	`81`	`// Polymer templates`
`82`	`82`	`exists(HTML::Element elt \| elt.getName() = "template" \|`
`83`		`- f = elt.getFile() and category = "template"`
	`83`	`+ f = elt.getFile() and`
	`84`	`+ category = "template" and`
	`85`	`+ not f.getExtension() = "vue"`
`84`	`86`	`)`
`85`	`87`	`}`