diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll index e6cb3a6f56f..988a80ee77e 100644 --- a/javascript/ql/src/semmle/javascript/TypeScript.qll +++ b/javascript/ql/src/semmle/javascript/TypeScript.qll @@ -56,7 +56,7 @@ class NamespaceDefinition extends Stmt, @namespacedefinition, AST::ValueNode { * For example, `declare module "X" {...}` is an external module declaration. * These are represented by `ExternalModuleDeclaration`. */ -class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespacedeclaration { +class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespace_declaration { /** Gets the name of this namespace. */ override Identifier getIdentifier() { result = getChildExpr(-1) } diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index ddc63324ee9..3ed3be04528 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -146,7 +146,7 @@ jump_targets (unique int jump: @stmt ref, int target: @stmt ref); @stmt_parent = @stmt | @toplevel | @function_expr | @arrow_function_expr; -@stmt_container = @toplevel | @function | @namespacedeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration; +@stmt_container = @toplevel | @function | @namespace_declaration | @externalmoduledeclaration | @globalaugmentationdeclaration; case @stmt.kind of 0 = @emptystmt @@ -180,7 +180,7 @@ case @stmt.kind of | 28 = @exportalldeclaration | 29 = @exportdefaultdeclaration | 30 = @exportnameddeclaration -| 31 = @namespacedeclaration +| 31 = @namespace_declaration | 32 = @importequalsdeclaration | 33 = @exportassigndeclaration | 34 = @interfacedeclaration @@ -195,12 +195,12 @@ case @stmt.kind of @exportdeclaration = @exportalldeclaration | @exportdefaultdeclaration | @exportnameddeclaration; -@namespacedefinition = @namespacedeclaration | @enumdeclaration; +@namespacedefinition = @namespace_declaration | @enumdeclaration; @typedefinition = @classdefinition | @interfacedeclaration | @enumdeclaration | @typealiasdeclaration | @enum_member; -is_instantiated(unique int decl: @namespacedeclaration ref); +is_instantiated(unique int decl: @namespace_declaration ref); -@declarable_node = @declstmt | @namespacedeclaration | @classdeclstmt | @functiondeclstmt | @enumdeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration | @field; +@declarable_node = @declstmt | @namespace_declaration | @classdeclstmt | @functiondeclstmt | @enumdeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration | @field; has_declare_keyword(unique int stmt: @declarable_node ref); is_for_await_of(unique int forof: @forofstmt ref); @@ -1130,7 +1130,7 @@ xmllocations( @xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace; -@dataflownode = @expr | @functiondeclstmt | @classdeclstmt | @namespacedeclaration | @enumdeclaration | @property; +@dataflownode = @expr | @functiondeclstmt | @classdeclstmt | @namespace_declaration | @enumdeclaration | @property; @optionalchainable = @callexpr | @propaccess; diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 54354df6c93..5efbfe272ea 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -610,7 +610,7 @@ 5 -@namespacedeclaration +@namespace_declaration 5