Apply suggestions from code review

aibaars · erik-krogh · aibaars · commit ead8108aed77 · 2023-04-13T11:11:55.000+02:00
Co-authored-by: Erik Krogh Kristensen &lt;erik-krogh@github.com&gt;
diff --git a/javascript/ql/lib/semmle/javascript/linters/ESLint.qll b/javascript/ql/lib/semmle/javascript/linters/ESLint.qll
@@ -60,7 +60,7 @@ module ESLint {
   }
 
   /** An `.eslintrc.yaml` file. */
-  private class EslintrcYaml extends Configuration instanceof YamlMapping {
+  private class EslintrcYaml extends Configuration instanceof YamlMapping, YamlDocument {
     EslintrcYaml() {
       exists(string n | n = getFile().getBaseName() |
         n = ".eslintrc.yaml" or n = ".eslintrc.yml" or n = ".eslintrc"
@@ -72,7 +72,9 @@ module ESLint {
 
   /** An ESLint configuration object in YAML format. */
   private class YamlConfigurationObject extends ConfigurationObject instanceof YamlMapping {
-    override Configuration getConfiguration() { this = result.(YamlMapping).getValue(_) }
+    override Configuration getConfiguration() {
+      this = result.(EslintrcYaml).(YamlMapping).getValue(_)
+    }
 
     override boolean getBooleanProperty(string p) {
       exists(string v | v = super.lookup(p).(YamlBool).getValue() |
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
@@ -2,5 +2,3 @@ name: codeql/yaml
 version: 0.0.1-dev
 groups: shared
 library: true
-dependencies: 
-  codeql/util: ${workspace}
