patch upper-case acronyms to be PascalCase

javascript/ql/test/library-tests/ES20xxFeatures/ES20xxFeatures.ql

@@ -1,5 +1,5 @@
 import Metrics.ES20xxFeatures
 
-from ASTNode nd, int version, string category
+from AstNode nd, int version, string category
 where isES20xxFeature(nd, version, category)
 select nd, version, category

javascript/ql/test/library-tests/Expr/getParent.qll

@@ -1,3 +1,3 @@
 import javascript
 
-query predicate test_getParent(Expr e, ASTNode res) { res = e.getParent() }
+query predicate test_getParent(Expr e, AstNode res) { res = e.getParent() }

javascript/ql/test/library-tests/Externs/tests.ql

@@ -10,7 +10,7 @@ query predicate externalDecl(ExternalDecl decl) { any() }
 
 query predicate externalTypedef(ExternalTypedef typ) { any() }
 
-query predicate externalVarDecl_getInit(ExternalVarDecl decl, ASTNode init) {
+query predicate externalVarDecl_getInit(ExternalVarDecl decl, AstNode init) {
   decl.getInit() = init
 }
 

javascript/ql/test/library-tests/JSON/JSONError.ql

@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONParseError jpe
+from JsonParseError jpe
 select jpe

javascript/ql/test/library-tests/JSON/JSONObject.ql

@@ -1,6 +1,6 @@
 import semmle.javascript.JSON
 
-from JSONObject obj, string prop, JSONValue val, string strval
+from JsonObject obj, string prop, JsonValue val, string strval
 where
   val = obj.getPropValue(prop) and
   (

javascript/ql/test/library-tests/JSON/JSONValue.ql

@@ -1,4 +1,4 @@
 import semmle.javascript.JSON
 
-from JSONValue v
+from JsonValue v
 select v

javascript/ql/test/library-tests/JSX/tests.ql

@@ -1,22 +1,22 @@
 import javascript
 
-query predicate htmlElements(JSXElement e) { e.getNameExpr() instanceof Label }
+query predicate htmlElements(JsxElement e) { e.getNameExpr() instanceof Label }
 
-query predicate jsxElementAttribute(JSXElement elt, int i, JSXAttribute attr) {
+query predicate jsxElementAttribute(JsxElement elt, int i, JsxAttribute attr) {
   attr = elt.getAttribute(i)
 }
 
-query predicate jsxElementAttributeName(JSXElement elt, int i, string name) {
+query predicate jsxElementAttributeName(JsxElement elt, int i, string name) {
   name = elt.getAttribute(i).getName()
 }
 
-query predicate jsxElementBody(JSXElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
+query predicate jsxElementBody(JsxElement elt, int i, Expr body) { elt.getBodyElement(i) = body }
 
-query predicate jsxElementName(JSXElement elt, JSXName nameExpr, string name) {
+query predicate jsxElementName(JsxElement elt, JsxName nameExpr, string name) {
   elt.getNameExpr() = nameExpr and
   name = elt.getName()
 }
 
-query predicate jsxFragments(JSXFragment fragment, int i, Expr body) {
+query predicate jsxFragments(JsxFragment fragment, int i, Expr body) {
   fragment.getBodyElement(i) = body
 }

javascript/ql/test/library-tests/MalformedPackageJson/Test.ql

@@ -2,4 +2,4 @@ import javascript
 
 query File files() { any() }
 
-query PackageJSON packageJsons() { any() }
+query PackageJson packageJsons() { any() }

javascript/ql/test/library-tests/NPM/tests.ql

@@ -1,7 +1,7 @@
 import javascript
 import semmle.javascript.dependencies.Dependencies
 
-query predicate dependencies(PackageJSON pkgjson, string pkg, string version) {
+query predicate dependencies(PackageJson pkgjson, string pkg, string version) {
   pkgjson.declaresDependency(pkg, version)
 }
 
@@ -9,22 +9,22 @@ query predicate importedFile(Require r, File f) { f = r.getImportedFile() }
 
 query predicate importedModule(Require r, Module m) { m = r.getImportedModule() }
 
-query predicate modules(NPMPackage pkg, string name, Module mod) {
+query predicate modules(NpmPackage pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getAModule()
 }
 
-query predicate npm(PackageJSON pkg, string name, string version) {
+query predicate npm(PackageJson pkg, string name, string version) {
   name = pkg.getPackageName() and
   version = pkg.getVersion()
 }
 
-query predicate getMainModule(PackageJSON pkg, string name, Module mod) {
+query predicate getMainModule(PackageJson pkg, string name, Module mod) {
   name = pkg.getPackageName() and
   mod = pkg.getMainModule()
 }
 
-query predicate packageJSON(PackageJSON json) { any() }
+query predicate packageJson(PackageJson json) { any() }
 
 query predicate dependencyInfo(Dependency dep, string name, string version) {
   dep.info(name, version)

javascript/ql/test/library-tests/SourceMaps/SourceMaps.ql

@@ -1,4 +1,4 @@
 import semmle.javascript.SourceMaps
 
 from SourceMappingComment smc
-select smc, smc.getSourceMappingURL()
+select smc, smc.getSourceMappingUrl()

javascript/ql/test/library-tests/TypeScript/CallSignatures/test.ql

@@ -1,7 +1,7 @@
 import javascript
 
 query predicate test_CallSignature(
-  CallSignature call, string declType, ASTNode body, string abstractness
+  CallSignature call, string declType, AstNode body, string abstractness
 ) {
   (if call.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = call.getDeclaringType().describe() and
@@ -9,7 +9,7 @@ query predicate test_CallSignature(
 }
 
 query predicate test_IndexSignature(
-  IndexSignature sig, string declType, ASTNode body, string abstractness
+  IndexSignature sig, string declType, AstNode body, string abstractness
 ) {
   (if sig.isAbstract() then abstractness = "abstract" else abstractness = "not abstract") and
   declType = sig.getDeclaringType().describe() and

javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql

@@ -6,4 +6,4 @@ query predicate resolveableImport(Import imp, Module mod) {
   not mod.getTopLevel().isExterns()
 }
 
-query Module getMain(PackageJSON json) { result = json.getMainModule() }
+query Module getMain(PackageJson json) { result = json.getMainModule() }

javascript/ql/test/library-tests/TypeScript/LocalTypeResolution/tests.ql

@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 

javascript/ql/test/library-tests/TypeScript/PathMapping/Imports.ql

@@ -1,6 +1,6 @@
 import javascript
 
-query predicate symbols(ASTNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
+query predicate symbols(AstNode astNode, CanonicalName symbol) { ast_node_symbol(astNode, symbol) }
 
 from Import imprt
 select imprt, imprt.getImportedModule()

javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ChildIndex.qll

@@ -1,7 +1,7 @@
 import javascript
 
-query predicate test_ChildIndex(ASTNode node, string res) {
-  exists(ASTNode child1, ASTNode child2, int index |
+query predicate test_ChildIndex(AstNode node, string res) {
+  exists(AstNode child1, AstNode child2, int index |
     node.getChild(index) = child1 and node.getChild(index) = child2 and child1 != child2
   |
     res = "There are two different children at index " + index.toString()

javascript/ql/test/library-tests/TypeScript/TypeAnnotations/Containers.qll

@@ -1,6 +1,6 @@
 import javascript
 
-abstract class Violation extends ASTNode {
+abstract class Violation extends AstNode {
   abstract string reason();
 }
 

javascript/ql/test/library-tests/frameworks/ReactJS/ReactName.qll

@@ -1,17 +1,20 @@
 import semmle.javascript.frameworks.React
 
-query predicate test_JSXname(JSXElement element, JSXName jsxname, string name, string type) {
+query predicate test_JSXname(JsxElement element, JsxName jsxname, string name, string type) {
   name = jsxname.getValue() and
   (
     jsxname instanceof Identifier and type = "Identifier"
     or
     jsxname instanceof ThisExpr and type = "thisExpr"
     or
-    jsxname.(DotExpr).getBase() instanceof JSXName and type = "dot"
+    jsxname.(DotExpr).getBase() instanceof JsxName and type = "dot"
     or
-    jsxname instanceof JSXQualifiedName and type = "qualifiedName"
+    jsxname instanceof JsxQualifiedName and type = "qualifiedName"
   ) and
   element.getNameExpr() = jsxname
 }
 
-query ThisExpr test_JSXName_this(JSXElement element) { result.getParentExpr+() = element }
+query ThisExpr test_JsxName_this(JsxElement element) { result.getParentExpr+() = element }
+
+/** DEPRECATED: Alias for test_JsxName_this */
+deprecated ThisExpr test_JSXName_this(JSXElement element) { result = test_JsxName_this(element) }