diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java index 1272f5f1935..6470ae04459 100644 --- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java +++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java @@ -1944,7 +1944,7 @@ public class ASTExtractor { visitAll(nd.getMembers(), key, IdContext.varAndTypeDecl, 1, 1); scopeManager.leaveScope(); if (nd.isConst()) { - trapwriter.addTuple("isConstEnum", key); + trapwriter.addTuple("is_const_enum", key); } if (nd.hasDeclareKeyword()) { trapwriter.addTuple("has_declare_keyword", key); diff --git a/javascript/extractor/tests/ts/output/trap/enum.ts.trap b/javascript/extractor/tests/ts/output/trap/enum.ts.trap index 2927e3cdf16..3f9eab0e26d 100644 --- a/javascript/extractor/tests/ts/output/trap/enum.ts.trap +++ b/javascript/extractor/tests/ts/output/trap/enum.ts.trap @@ -757,7 +757,7 @@ expr_containers(#20264,#20001) literals("b","b",#20264) decl(#20264,#20254) typedecl(#20264,#20255) -isConstEnum(#20249) +is_const_enum(#20249) #20265=* stmts(#20265,36,#20001,3,"declare ... a, b }") hasLocation(#20265,#20011) @@ -805,7 +805,7 @@ expr_containers(#20275,#20001) literals("b","b",#20275) decl(#20275,#20270) typedecl(#20275,#20271) -isConstEnum(#20265) +is_const_enum(#20265) has_declare_keyword(#20265) #20276=* stmts(#20276,17,#20001,4,"functio ... rn x; }") diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll index b8219b06c8d..8a7ebd450da 100644 --- a/javascript/ql/src/semmle/javascript/Aliases.qll +++ b/javascript/ql/src/semmle/javascript/Aliases.qll @@ -160,3 +160,8 @@ deprecated predicate isStatic(Property prop) { is_static(prop) } * Use `MemberDeclaration#isAbstract()` instead. */ deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop) } +/** + * Alias for the predicate `is_const_enum` defined in the .dbscheme. + * Use `EnumDeclaration#isConst()` instead. + */ +deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) } diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll index d2275cfa7de..c8f275e8fef 100644 --- a/javascript/ql/src/semmle/javascript/TypeScript.qll +++ b/javascript/ql/src/semmle/javascript/TypeScript.qll @@ -1409,7 +1409,7 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN int getNumDecorator() { result = count(getADecorator()) } /** Holds if this enumeration is declared with the `const` keyword. */ - predicate isConst() { isConstEnum(this) } + predicate isConst() { is_const_enum(this) } override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() } } diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index 91780095de4..82a4e785ae1 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -517,7 +517,7 @@ is_computed (int id: @property ref); is_method (int id: @property ref); is_static (int id: @property ref); is_abstract_member (int id: @property ref); -isConstEnum (int id: @enumdeclaration ref); +is_const_enum (int id: @enumdeclaration ref); isAbstractClass (int id: @classdeclstmt ref); hasPublicKeyword (int id: @property ref); diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 183a33eef36..4c9ef4108c0 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -8396,7 +8396,7 @@ -isConstEnum +is_const_enum 62 diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties index 9198f9627ea..6269625d9a9 100644 --- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties +++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties @@ -38,3 +38,5 @@ is_static.rel: reorder isStatic.rel(int prop) prop isStatic.rel: delete is_abstract_member.rel: reorder isAbstractMember.rel(int prop) prop isAbstractMember.rel: delete +is_const_enum.rel: reorder isConstEnum.rel(int id) id +isConstEnum.rel: delete