diff --git a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java index ed4fec4f49e..28546fdeca8 100644 --- a/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java +++ b/javascript/extractor/src/com/semmle/js/ast/DeclarationFlags.java @@ -45,7 +45,7 @@ public class DeclarationFlags { "has_private_keyword", "has_protected_keyword", "is_optional_member", - "hasDefiniteAssignmentAssertion", + "has_definite_assignment_assertion", "has_declare_keyword"); public static boolean isComputed(int flags) { diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll index 54a1480712e..d8a71937d1f 100644 --- a/javascript/ql/src/semmle/javascript/Aliases.qll +++ b/javascript/ql/src/semmle/javascript/Aliases.qll @@ -200,3 +200,8 @@ deprecated predicate hasTypeKeyword(ASTNode id) { has_type_keyword(id) } * Use `FieldDeclaration#isOptional()` instead. */ deprecated predicate isOptionalMember(Property id) { is_optional_member(id) } +/** + * Alias for the predicate `has_definite_assignment_assertion` defined in the .dbscheme. + * Use the `hasDefiniteAssignmentAssertion` method on the `FieldDeclaration`/`VariableDeclarator` classes instead. + */ +deprecated predicate hasDefiniteAssignmentAssertion(ASTNode id) { has_definite_assignment_assertion(id) } diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll index 2153ce22fb9..5a4849b5537 100644 --- a/javascript/ql/src/semmle/javascript/Classes.qll +++ b/javascript/ql/src/semmle/javascript/Classes.qll @@ -1046,7 +1046,7 @@ class FieldDeclaration extends MemberDeclaration, @field { predicate isOptional() { is_optional_member(this) } /** Holds if this is a TypeScript field marked as definitely assigned with the `!` operator. */ - predicate hasDefiniteAssignmentAssertion() { hasDefiniteAssignmentAssertion(this) } + predicate hasDefiniteAssignmentAssertion() { has_definite_assignment_assertion(this) } } /** diff --git a/javascript/ql/src/semmle/javascript/Variables.qll b/javascript/ql/src/semmle/javascript/Variables.qll index faa8f785e38..adb433deb12 100644 --- a/javascript/ql/src/semmle/javascript/Variables.qll +++ b/javascript/ql/src/semmle/javascript/Variables.qll @@ -645,7 +645,7 @@ class VariableDeclarator extends Expr, @vardeclarator { } /** Holds if this is a TypeScript variable marked as definitely assigned with the `!` operator. */ - predicate hasDefiniteAssignmentAssertion() { hasDefiniteAssignmentAssertion(this) } + predicate hasDefiniteAssignmentAssertion() { has_definite_assignment_assertion(this) } /** Gets the declaration statement this declarator belongs to, if any. */ DeclStmt getDeclStmt() { this = result.getADecl() } diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index becfc296e47..7094f895327 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -526,7 +526,7 @@ has_protected_keyword (int id: @property ref); has_readonly_keyword (int id: @property ref); has_type_keyword (int id: @import_or_export_declaration ref); is_optional_member (int id: @property ref); -hasDefiniteAssignmentAssertion (int id: @field_or_vardeclarator ref); +has_definite_assignment_assertion (int id: @field_or_vardeclarator ref); isOptionalParameterDeclaration (unique int parameter: @pattern ref); #keyset[constructor, param_index] diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 3897d512c11..b6d37e176e4 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -8018,7 +8018,7 @@ -hasDefiniteAssignmentAssertion +has_definite_assignment_assertion 100 diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties index d18b3b2c300..8675148972c 100644 --- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties +++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties @@ -54,3 +54,5 @@ has_type_keyword.rel: reorder hasTypeKeyword.rel(int id) id hasTypeKeyword.rel: delete is_optional_member.rel: reorder isOptionalMember.rel(int id) id isOptionalMember.rel: delete +has_definite_assignment_assertion.rel: reorder hasDefiniteAssignmentAssertion.rel(int id) id +hasDefiniteAssignmentAssertion.rel: delete