diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll index 2769834e4bc..8d1881f1ce9 100644 --- a/javascript/ql/src/semmle/javascript/TypeScript.qll +++ b/javascript/ql/src/semmle/javascript/TypeScript.qll @@ -1312,7 +1312,7 @@ class ImportTypeExpr extends TypeExpr, @importtypeexpr { string getPath() { result = getPathExpr().(StringLiteralTypeExpr).getValue() } /** Holds if this import is used in the context of a type, such as in `let x: import("foo")`. */ - predicate isTypeAccess() { this instanceof @importtypeaccess } + predicate isTypeAccess() { this instanceof @import_type_access } /** Holds if this import is used in the context of a namespace, such as in `let x: import("http").ServerRequest"`. */ predicate isNamespaceAccess() { this instanceof @importnamespaceaccess } @@ -1324,7 +1324,7 @@ class ImportTypeExpr extends TypeExpr, @importtypeexpr { /** * An import used in the context of a type, such as in `let x: import("foo")`. */ -class ImportTypeAccess extends TypeAccess, ImportTypeExpr, @importtypeaccess { } +class ImportTypeAccess extends TypeAccess, ImportTypeExpr, @import_type_access { } /** * An import used in the context of a namespace inside a type annotation, such as in `let x: import("http").ServerRequest`. diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index ee529dbfcee..a6a5fabb148 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -577,7 +577,7 @@ case @typeexpr.kind of | 27 = @mapped_typeexpr | 28 = @conditional_typeexpr | 29 = @infer_typeexpr -| 30 = @importtypeaccess +| 30 = @import_type_access | 31 = @importnamespaceaccess | 32 = @importvartypeaccess | 33 = @optionaltypeexpr @@ -590,10 +590,10 @@ case @typeexpr.kind of @typeidentifier = @type_decl | @local_type_access | @type_label | @local_var_type_access | @local_namespace_access; @typeexpr_parent = @expr | @stmt | @property | @typeexpr; @literaltypeexpr = @string_literal_typeexpr | @number_literal_typeexpr | @boolean_literal_typeexpr | @bigintliteraltypeexpr; -@typeaccess = @local_type_access | @qualified_type_access | @importtypeaccess; +@typeaccess = @local_type_access | @qualified_type_access | @import_type_access; @vartypeaccess = @local_var_type_access | @qualified_var_type_access | @this_var_type_access | @importvartypeaccess; @namespaceaccess = @local_namespace_access | @qualified_namespace_access | @importnamespaceaccess; -@importtypeexpr = @importtypeaccess | @importnamespaceaccess | @importvartypeaccess; +@importtypeexpr = @import_type_access | @importnamespaceaccess | @importvartypeaccess; @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 cdff813a95a..9f0c8dbb5dd 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -814,7 +814,7 @@ 100 -@importtypeaccess +@import_type_access 100