Merge pull request #2098 from github/henrymercer/update-internal-queries

henrymercer · web-flow · commit bd67d8d6b209 · 2024-01-24T13:08:34.000Z
Internal queries: Replace deprecated predicates
diff --git a/queries/required-action-input.ql b/queries/required-action-input.ql
@@ -19,37 +19,26 @@ class ActionDeclaration extends File {
     getRelativePath().matches("%/action.yml")
   }
 
-  YAMLDocument getRootNode() {
+  YamlDocument getRootNode() {
     result.getFile() = this
   }
 
   /**
    * The name of any input to this action.
    */
   string getAnInput() {
-    result = getRootNode().(YAMLMapping).lookup("inputs").(YAMLMapping).getKey(_).(YAMLString).getValue()
+    result = getRootNode().(YamlMapping).lookup("inputs").(YamlMapping).getKey(_).(YamlString).getValue()
   }
 
   /**
    * The given input always has a value, either because it is required,
    * or because it has a default value.
    */
   predicate inputAlwaysHasValue(string input) {
-    exists(YAMLMapping value |
-      value = getRootNode().(YAMLMapping).lookup("inputs").(YAMLMapping).lookup(input) and
+    exists(YamlMapping value |
+      value = getRootNode().(YamlMapping).lookup("inputs").(YamlMapping).lookup(input) and
       (exists(value.lookup("default")) or
-       value.lookup("required").(YAMLBool).getBoolValue() = true))
-  }
-
-  /**
-   * The function that is the entrypoint to this action.
-   */
-  FunctionDeclStmt getEntrypoint() {
-    result.getFile().getRelativePath() = getRootNode().
-      (YAMLMapping).lookup("runs").
-      (YAMLMapping).lookup("main").
-      (YAMLString).getValue().regexpReplaceAll("\\.\\./lib/(.*)\\.js", "src/$1.ts") and
-    result.getName() = "run"
+       value.lookup("required").(YamlBool).getBoolValue() = true))
   }
 }
 
diff --git a/queries/undeclared-action-input.ql b/queries/undeclared-action-input.ql
@@ -24,25 +24,25 @@ class ActionDeclaration extends File {
     result = getRelativePath().regexpCapture("(.*)/action.yml", 1)
   }
 
-  YAMLDocument getRootNode() {
+  YamlDocument getRootNode() {
     result.getFile() = this
   }
 
   /**
    * The name of any input to this action.
    */
   string getAnInput() {
-    result = getRootNode().(YAMLMapping).lookup("inputs").(YAMLMapping).getKey(_).(YAMLString).getValue()
+    result = getRootNode().(YamlMapping).lookup("inputs").(YamlMapping).getKey(_).(YamlString).getValue()
   }
 
   /**
    * The function that is the entrypoint to this action.
    */
   FunctionDeclStmt getEntrypoint() {
     result.getFile().getRelativePath() = getRootNode().
-      (YAMLMapping).lookup("runs").
-      (YAMLMapping).lookup("main").
-      (YAMLString).getValue().regexpReplaceAll("\\.\\./lib/(.*)\\.js", "src/$1.ts") and
+      (YamlMapping).lookup("runs").
+      (YamlMapping).lookup("main").
+      (YamlString).getValue().regexpReplaceAll("\\.\\./lib/(.*)\\.js", "src/$1.ts") and
     result.getName() = "run"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,25 +24,25 @@ class ActionDeclaration extends File {`
`24`	`24`	`result = getRelativePath().regexpCapture("(.*)/action.yml", 1)`
`25`	`25`	`}`
`26`	`26`
`27`		`- YAMLDocument getRootNode() {`
	`27`	`+ YamlDocument getRootNode() {`
`28`	`28`	`result.getFile() = this`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* The name of any input to this action.`
`33`	`33`	`*/`
`34`	`34`	`string getAnInput() {`
`35`		`- result = getRootNode().(YAMLMapping).lookup("inputs").(YAMLMapping).getKey(_).(YAMLString).getValue()`
	`35`	`+ result = getRootNode().(YamlMapping).lookup("inputs").(YamlMapping).getKey(_).(YamlString).getValue()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`	`39`	`* The function that is the entrypoint to this action.`
`40`	`40`	`*/`
`41`	`41`	`FunctionDeclStmt getEntrypoint() {`
`42`	`42`	`result.getFile().getRelativePath() = getRootNode().`
`43`		`- (YAMLMapping).lookup("runs").`
`44`		`- (YAMLMapping).lookup("main").`
`45`		`- (YAMLString).getValue().regexpReplaceAll("\\.\\./lib/(.*)\\.js", "src/$1.ts") and`
	`43`	`+ (YamlMapping).lookup("runs").`
	`44`	`+ (YamlMapping).lookup("main").`
	`45`	`+ (YamlString).getValue().regexpReplaceAll("\\.\\./lib/(.*)\\.js", "src/$1.ts") and`
`46`	`46`	`result.getName() = "run"`
`47`	`47`	`}`
`48`	`48`	`}`