Js/Yaml: add getFile() predicate

aibaars · aibaars · commit 83cd55cb29bf · 2023-04-11T16:01:44.000+01:00
diff --git a/javascript/ql/lib/semmle/javascript/Actions.qll b/javascript/ql/lib/semmle/javascript/Actions.qll
@@ -32,7 +32,7 @@ module Actions {
     string getName() { result = this.lookup("name").(YamlString).getValue() }
 
     /** Gets the name of the workflow file. */
-    string getFileName() { result = this.getLocation().getFile().getBaseName() }
+    string getFileName() { result = this.getFile().getBaseName() }
 
     /** Gets the `on:` in this workflow. */
     On getOn() { result = this.lookup("on") }
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/ServerLess.qll b/javascript/ql/lib/semmle/javascript/frameworks/ServerLess.qll
@@ -15,7 +15,7 @@ private module ServerLess {
    * `codeURI` defaults to the empty string if no explicit value is set in the configuration.
    */
   private predicate hasServerlessHandler(File ymlFile, string handler, string codeUri) {
-    exists(YamlMapping resource | ymlFile = resource.getLocation().getFile() |
+    exists(YamlMapping resource | ymlFile = resource.getFile() |
       // There exists at least "AWS::Serverless::Function" and "Aliyun::Serverless::Function"
       resource.lookup("Type").(YamlScalar).getValue().regexpMatch(".*::Serverless::Function") and
       exists(YamlMapping properties | properties = resource.lookup("Properties") |
diff --git a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
@@ -62,7 +62,7 @@ module ESLint {
   /** An `.eslintrc.yaml` file. */
   private class EslintrcYaml extends Configuration instanceof YamlMapping {
     EslintrcYaml() {
-      exists(string n | n = this.getFile().getBaseName() |
+      exists(string n | n = getFile().getBaseName() |
         n = ".eslintrc.yaml" or n = ".eslintrc.yml" or n = ".eslintrc"
       )
     }
diff --git a/shared/yaml/codeql/yaml/Yaml.qll b/shared/yaml/codeql/yaml/Yaml.qll
@@ -150,6 +150,9 @@ module Make<InputSig Input> {
    * ```
    */
   class YamlNode instanceof Input::NodeBase {
+    /** Gets the file this node comes from. */
+    Input::File getFile() { result = this.getLocation().getFile() }
+
     /**
      * Gets the `Location` of this node.
      */

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ module ESLint {`
`62`	`62`	/** An `.eslintrc.yaml` file. */
`63`	`63`	`private class EslintrcYaml extends Configuration instanceof YamlMapping {`
`64`	`64`	`EslintrcYaml() {`
`65`		`- exists(string n \| n = this.getFile().getBaseName() \|`
	`65`	`+ exists(string n \| n = getFile().getBaseName() \|`
`66`	`66`	`n = ".eslintrc.yaml" or n = ".eslintrc.yml" or n = ".eslintrc"`
`67`	`67`	`)`
`68`	`68`	`}`