hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-02 20:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

TypeScript: support syntax for rest elements in tuple types

Browse Source
This commit is contained in:
Asger F
2018-08-20 14:27:48 +01:00
parent 204b2a3002
commit 241ce10da4
6 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/ql/src/semmle/javascript/TypeScript.qll
View File

@@ -1081,6 +1081,17 @@ class OptionalTypeExpr extends @optionaltypeexpr, TypeExpr {
TypeExpr getElementType() { result = getChildTypeExpr(0) }
}
/**
* A rest element in a tuple type, such as `...string[]` in `[number, ...string[]]`.
*/
class RestTypeExpr extends @resttypeexpr, TypeExpr {
/** Gets the type `T[]` in `...T[]`, such as `string[]` in `[number, ...string[]]`. */
TypeExpr getArrayType() { result = getChildTypeExpr(0) }
/** Gets the type `T` in `...T[]`, such as `string` in `[number, ...string[]]`. */
TypeExpr getElementType() { result = getArrayType().(ArrayTypeExpr).getElementType() }
}
/**
* A possibly qualified name that refers to a variable from inside a type.
*

1
javascript/ql/src/semmlecode.javascript.dbscheme
View File

@@ -558,6 +558,7 @@ case @typeexpr.kind of
| 31 = @importnamespaceaccess
| 32 = @importvartypeaccess
| 33 = @optionaltypeexpr
| 34 = @resttypeexpr
;
@typeref = @typeaccess | @typedecl;

2
javascript/ql/test/library-tests/TypeScript/TypeAnnotations/ArrayTypeExpr.expected
View File

@@ -6,3 +6,5 @@
| tst.ts:40:17:40:28 | string[][][] | tst.ts:40:17:40:26 | string[][] |
| tst.ts:80:49:80:54 | Leaf[] | tst.ts:80:49:80:52 | Leaf |
| tst.ts:81:27:81:34 | string[] | tst.ts:81:27:81:32 | string |
| tst.ts:135:39:135:46 | string[] | tst.ts:135:39:135:44 | string |
| tst.ts:136:60:136:67 | number[] | tst.ts:136:60:136:65 | number |

5
javascript/ql/test/library-tests/TypeScript/TypeAnnotations/TupleTypeExpr.expected
View File

@@ -6,3 +6,8 @@
| tst.ts:133:31:133:55 | [number ... umber?] | 0 | 3 | tst.ts:133:32:133:37 | number |
| tst.ts:133:31:133:55 | [number ... umber?] | 1 | 3 | tst.ts:133:40:133:45 | string |
| tst.ts:133:31:133:55 | [number ... umber?] | 2 | 3 | tst.ts:133:48:133:54 | number? |
| tst.ts:135:27:135:47 | [number ... ring[]] | 0 | 2 | tst.ts:135:28:135:33 | number |
| tst.ts:135:27:135:47 | [number ... ring[]] | 1 | 2 | tst.ts:135:36:135:46 | ...string[] |
| tst.ts:136:39:136:68 | [number ... mber[]] | 0 | 3 | tst.ts:136:40:136:45 | number |
| tst.ts:136:39:136:68 | [number ... mber[]] | 1 | 3 | tst.ts:136:48:136:54 | string? |
| tst.ts:136:39:136:68 | [number ... mber[]] | 2 | 3 | tst.ts:136:57:136:67 | ...number[] |

2
javascript/ql/test/library-tests/TypeScript/TypeAnnotations/VariableTypes.expected
View File

@@ -71,3 +71,5 @@
| tst.ts:128:5:128:35 | importe ... tespace | importedQualifiedTypeWhitespace | tst.ts:131:4:131:6 | bar |
| tst.ts:133:5:133:28 | tupleWi ... Element | tupleWithOptionalElement | tst.ts:133:31:133:55 | [number ... umber?] |
| tst.ts:134:5:134:14 | emptyTuple | emptyTuple | tst.ts:134:17:134:18 | [] |
| tst.ts:135:5:135:24 | tupleWithRestElement | tupleWithRestElement | tst.ts:135:27:135:47 | [number ... ring[]] |
| tst.ts:136:5:136:36 | tupleWi ... lements | tupleWithOptionalAndRestElements | tst.ts:136:39:136:68 | [number ... mber[]] |

2
javascript/ql/test/library-tests/TypeScript/TypeAnnotations/tst.ts
View File

@@ -132,3 +132,5 @@ var importedQualifiedTypeWhitespace: import(
let tupleWithOptionalElement: [number, string, number?];
let emptyTuple: [];
let tupleWithRestElement: [number, ...string[]];
let tupleWithOptionalAndRestElements: [number, string?, ...number[]];