diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll index 100b054fc95..ffd0c1605d0 100644 --- a/javascript/ql/src/semmle/javascript/TypeScript.qll +++ b/javascript/ql/src/semmle/javascript/TypeScript.qll @@ -1318,7 +1318,7 @@ class ImportTypeExpr extends TypeExpr, @importtypeexpr { predicate isNamespaceAccess() { this instanceof @import_namespace_access } /** Holds if this import is used in the context of a variable type, such as `let x: typeof import("fs")`. */ - predicate isVarTypeAccess() { this instanceof @importvartypeaccess } + predicate isVarTypeAccess() { this instanceof @import_var_type_access } } /** @@ -1334,7 +1334,7 @@ class ImportNamespaceAccess extends NamespaceAccess, ImportTypeExpr, @import_nam /** * An import used in the context of a variable type, such as in `let x: typeof import("fs")`. */ -class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @importvartypeaccess { } +class ImportVarTypeAccess extends VarTypeAccess, ImportTypeExpr, @import_var_type_access { } /** * A TypeScript enum declaration, such as the following declaration: diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index 776644dc788..e66a33f3ef2 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -579,7 +579,7 @@ case @typeexpr.kind of | 29 = @infer_typeexpr | 30 = @import_type_access | 31 = @import_namespace_access -| 32 = @importvartypeaccess +| 32 = @import_var_type_access | 33 = @optionaltypeexpr | 34 = @resttypeexpr | 35 = @bigintliteraltypeexpr @@ -591,9 +591,9 @@ case @typeexpr.kind of @typeexpr_parent = @expr | @stmt | @property | @typeexpr; @literaltypeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigintliteraltypeexpr; @typeaccess = @local_type_access | @qualified_type_access | @import_type_access; -@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @importvartypeaccess; +@vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @import_var_type_access; @namespaceaccess = @local_namespace_access | @qualified_namespace_access | @import_namespace_access; -@importtypeexpr = @import_type_access | @import_namespace_access | @importvartypeaccess; +@importtypeexpr = @import_type_access | @import_namespace_access | @import_var_type_access; @functiontypeexpr = @plain_function_typeexpr | @constructor_typeexpr; diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 92e7a323595..9057b4fd47e 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -818,7 +818,7 @@ 100 -@importvartypeaccess +@import_var_type_access 100