Skip to content

Commit 26525fc

Browse files
semmle-qlcisemmle-qlci
authored
Merge pull request #929 from asger-semmle/typescript-no-expansion
Approved by xiemaisi
2 parents 92a6e7e + 0444fa3 commit 26525fc

File tree

13 files changed

+2
-85
lines changed

13 files changed

+2
-85
lines changed

‎javascript/extractor/lib/typescript/src/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ function handlePrepareFilesCommand(command: PrepareFilesCommand) {
409409

410410
function reset() {
411411
state = new State();
412-
state.typeTable.restrictedExpansion = getEnvironmentVariable("SEMMLE_TYPESCRIPT_NO_EXPANSION", Boolean, false);
412+
state.typeTable.restrictedExpansion = getEnvironmentVariable("SEMMLE_TYPESCRIPT_NO_EXPANSION", Boolean, true);
413413
}
414414

415415
function getEnvironmentVariable<T>(name: string, parse: (x: string) => T, defaultValue: T) {

‎javascript/ql/test/library-tests/TypeScript/ArrayTypes/ArrayTypes.expected‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
1-
| (ConcatArray<T> \| ConcatArray<ConcatArray<T>>)[] | `ConcatArray<T> \| ConcatArray<ConcatArray<T>>` |
2-
| (ConcatArray<number> \| ConcatArray<ConcatArray<... | `ConcatArray<number> \| ConcatArray<ConcatArray<n...` |
3-
| (ConcatArray<string \| number> \| ConcatArray<Con... | `ConcatArray<string \| number> \| ConcatArray<Conc...` |
4-
| (S \| ConcatArray<S>)[] | `S \| ConcatArray<S>` |
5-
| (T \| ConcatArray<T> \| ConcatArray<T \| ConcatArr... | `T \| ConcatArray<T> \| ConcatArray<T \| ConcatArra...` |
61
| (T \| ConcatArray<T>)[] | `T \| ConcatArray<T>` |
7-
| (T \| ConcatArray<T>)[] | `T \| ConcatArray<T>` |
8-
| (U \| ConcatArray<U>)[] | `U \| ConcatArray<U>` |
9-
| (number \| ConcatArray<number> \| ConcatArray<num... | `number \| ConcatArray<number> \| ConcatArray<numb...` |
102
| (number \| ConcatArray<number>)[] | `number \| ConcatArray<number>` |
113
| (string \| ConcatArray<string>)[] | `string \| ConcatArray<string>` |
124
| (string \| number \| ConcatArray<string \| number>)[] | `string \| number \| ConcatArray<string \| number>` |
13-
| (string \| number \| ConcatArray<string \| number>... | `string \| number \| ConcatArray<string \| number> ...` |
145
| (string \| number)[] | `string \| number` |
15-
| ConcatArray<ConcatArray<T>>[] | `ConcatArray<ConcatArray<T>>` |
16-
| ConcatArray<ConcatArray<number>>[] | `ConcatArray<ConcatArray<number>>` |
17-
| ConcatArray<ConcatArray<string \| number>>[] | `ConcatArray<ConcatArray<string \| number>>` |
18-
| ConcatArray<S>[] | `ConcatArray<S>` |
19-
| ConcatArray<T \| ConcatArray<T>>[] | `ConcatArray<T \| ConcatArray<T>>` |
20-
| ConcatArray<T>[] | `ConcatArray<T>` |
216
| ConcatArray<T>[] | `ConcatArray<T>` |
22-
| ConcatArray<U>[] | `ConcatArray<U>` |
23-
| ConcatArray<number \| ConcatArray<number>>[] | `ConcatArray<number \| ConcatArray<number>>` |
247
| ConcatArray<number>[] | `ConcatArray<number>` |
25-
| ConcatArray<string \| number \| ConcatArray<strin... | `ConcatArray<string \| number \| ConcatArray<strin...` |
268
| ConcatArray<string \| number>[] | `ConcatArray<string \| number>` |
279
| ConcatArray<string>[] | `ConcatArray<string>` |
2810
| ReadonlyArray<T> | `T` |
2911
| ReadonlyArray<number> | `number` |
3012
| S[] | `S` |
3113
| T[] | `T` |
32-
| T[] | `T` |
33-
| T[] | `T` |
3414
| U[] | `U` |
3515
| [number, string] | `string \| number` |
3616
| any[] | `any` |

‎javascript/ql/test/library-tests/TypeScript/ArrayTypes/NumberIndexTypes.expected‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,21 @@
1-
| (ConcatArray<T> \| ConcatArray<ConcatArray<T>>)[] | ConcatArray<T> \| ConcatArray<ConcatArray<T>> |
2-
| (ConcatArray<number> \| ConcatArray<ConcatArray<... | ConcatArray<number> \| ConcatArray<ConcatArray<n... |
3-
| (ConcatArray<string \| number> \| ConcatArray<Con... | ConcatArray<string \| number> \| ConcatArray<Conc... |
4-
| (S \| ConcatArray<S>)[] | S \| ConcatArray<S> |
5-
| (T \| ConcatArray<T> \| ConcatArray<T \| ConcatArr... | T \| ConcatArray<T> \| ConcatArray<T \| ConcatArra... |
61
| (T \| ConcatArray<T>)[] | T \| ConcatArray<T> |
7-
| (T \| ConcatArray<T>)[] | T \| ConcatArray<T> |
8-
| (U \| ConcatArray<U>)[] | U \| ConcatArray<U> |
9-
| (number \| ConcatArray<number> \| ConcatArray<num... | number \| ConcatArray<number> \| ConcatArray<numb... |
102
| (number \| ConcatArray<number>)[] | number \| ConcatArray<number> |
113
| (string \| ConcatArray<string>)[] | string \| ConcatArray<string> |
124
| (string \| number \| ConcatArray<string \| number>)[] | string \| number \| ConcatArray<string \| number> |
13-
| (string \| number \| ConcatArray<string \| number>... | string \| number \| ConcatArray<string \| number> ... |
145
| (string \| number)[] | string \| number |
15-
| (string \| number)[] \| ConcatArray<string \| numb... | string \| number \| ConcatArray<string \| number> |
16-
| ConcatArray<ConcatArray<T>>[] | ConcatArray<ConcatArray<T>> |
17-
| ConcatArray<ConcatArray<number>>[] | ConcatArray<ConcatArray<number>> |
18-
| ConcatArray<ConcatArray<string \| number>>[] | ConcatArray<ConcatArray<string \| number>> |
19-
| ConcatArray<S>[] | ConcatArray<S> |
20-
| ConcatArray<T \| ConcatArray<T>>[] | ConcatArray<T \| ConcatArray<T>> |
21-
| ConcatArray<T> | T |
22-
| ConcatArray<T> | T |
23-
| ConcatArray<T> \| ConcatArray<ConcatArray<T>> | T \| ConcatArray<T> |
24-
| ConcatArray<T>[] | ConcatArray<T> |
256
| ConcatArray<T>[] | ConcatArray<T> |
26-
| ConcatArray<U>[] | ConcatArray<U> |
27-
| ConcatArray<number \| ConcatArray<number>>[] | ConcatArray<number \| ConcatArray<number>> |
28-
| ConcatArray<number> | number |
29-
| ConcatArray<number> \| ConcatArray<ConcatArray<n... | number \| ConcatArray<number> |
307
| ConcatArray<number>[] | ConcatArray<number> |
31-
| ConcatArray<string \| number \| ConcatArray<strin... | ConcatArray<string \| number \| ConcatArray<strin... |
32-
| ConcatArray<string \| number> | string \| number |
33-
| ConcatArray<string \| number> \| ConcatArray<Conc... | string \| number \| ConcatArray<string \| number> |
348
| ConcatArray<string \| number>[] | ConcatArray<string \| number> |
359
| ConcatArray<string>[] | ConcatArray<string> |
3610
| NumberIndexable | object |
3711
| ReadonlyArray<T> | T |
3812
| ReadonlyArray<number> | number |
3913
| S[] | S |
4014
| T[] | T |
41-
| T[] | T |
42-
| T[] | T |
43-
| T[] \| ConcatArray<T>[] | T \| ConcatArray<T> |
4415
| U[] | U |
4516
| [number, string] | string \| number |
4617
| any[] | any |
4718
| number[] | number |
48-
| number[] \| ConcatArray<number>[] | number \| ConcatArray<number> |
4919
| string | string |
5020
| string \| ConcatArray<string> | string |
5121
| string \| string[] | string |

‎javascript/ql/test/library-tests/TypeScript/BaseTypes/BaseTypes.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
| IMulti | IGenericBase |
1414
| IStringSub | IGenericBase |
1515
| ISub | IBase |
16-
| RegExpExecArray | Array |
1716
| RegExpMatchArray | Array |

‎javascript/ql/test/library-tests/TypeScript/BaseTypes/SelfTypes.expected‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
| Array | T[] |
21
| CBase | CBase |
32
| CEverything | CEverything<S, T> |
43
| CGenericBase | CGenericBase<T> |
@@ -9,7 +8,6 @@
98
| CStringSub | CStringSub |
109
| CSub | CSub |
1110
| CollatorOptions | CollatorOptions |
12-
| ConcatArray | ConcatArray<T> |
1311
| Function | Function |
1412
| IBase | IBase |
1513
| IEmpty | IEmpty |
@@ -22,5 +20,4 @@
2220
| NumberFormatOptions | NumberFormatOptions |
2321
| Object | Object |
2422
| RegExp | RegExp |
25-
| RegExpExecArray | RegExpExecArray |
2623
| RegExpMatchArray | RegExpMatchArray |

‎javascript/ql/test/library-tests/TypeScript/ExpansiveTypes/ExpansiveTypes.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
| Box in shared_non_expansive.ts | has no properties |
12
| Box in through_non_expansive.ts | has no properties |
23
| C in expansive_class.ts | has no properties |
34
| Expand in through_non_expansive.ts | has no properties |

‎javascript/ql/test/library-tests/TypeScript/ExpansiveTypes/NonExpansiveTypes.expected‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
| Box in shared_non_expansive.ts | has properties |
77
| Box in through_non_expansive.ts | has properties |
88
| C in expansive_class.ts | has properties |
9-
| ConcatArray in global scope | has properties |
109
| Expand in through_non_expansive.ts | has properties |
1110
| ExpandUsingObjectLiteral in expansive_object_literal.ts | has properties |
1211
| Expansive in leading_into_expansion.ts | has properties |
@@ -32,6 +31,3 @@
3231
| Intl.NumberFormatOptions in global scope | has properties |
3332
| NonExpansive in shared_non_expansive.ts | has properties |
3433
| Object in global scope | has properties |
35-
| RegExp in global scope | has properties |
36-
| RegExpExecArray in global scope | has properties |
37-
| RegExpMatchArray in global scope | has properties |

‎javascript/ql/test/library-tests/TypeScript/ExternalTypes/GlobalQualifiedNames.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
| ModernGlobals.ModernSubclass | ModernSubclass |
77
| Object | Object |
88
| RegExp | RegExp |
9-
| RegExpExecArray | RegExpExecArray |
109
| RegExpMatchArray | RegExpMatchArray |
1110
| __Legacy.LegacyClass | LegacyClass |

‎javascript/ql/test/library-tests/TypeScript/ExternalTypes/Types.expected‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
| Object | has no definition |
1313
| OtherClass | has no definition |
1414
| RegExp | has no definition |
15-
| RegExpExecArray | has no definition |
1615
| RegExpMatchArray | has no definition |
1716
| UtilClass | has no definition |
1817
| UtilExtraClass | has no definition |

‎javascript/ql/test/library-tests/TypeScript/TypeVariableTypes/CanonicalTypeVariables.expected‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
| T | Array.T in global scope |
2-
| T | ConcatArray.T in global scope |
31
| T | GenericMethods.T in global scope |
42
| T | Repeated.T in global scope |

0 commit comments

Comments
 (0)