Skip to content

Commit 725059d

Browse files
author
Max Schaefer
committed
JavaScript: Remove --source-type module extractor options.
1 parent 3ad5af7 commit 725059d

File tree

18 files changed

+35
-41
lines changed

18 files changed

+35
-41
lines changed

‎javascript/ql/test/library-tests/DataFlow/flowStep.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@
142142
| tst.js:111:29:111:31 | o2c | tst.js:111:6:111:38 | v2c |
143143
| tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ... = o2c] |
144144
| tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
145-
| tst.ts:1:1:1:1 | A | tst.ts:1:11:1:11 | A |
145+
| tst.ts:1:1:1:1 | A | tst.ts:1:18:1:18 | A |
146146
| tst.ts:1:1:1:1 | A | tst.ts:7:1:7:0 | A |
147-
| tst.ts:1:1:5:1 | A | tst.ts:7:1:7:0 | A |
148-
| tst.ts:1:1:5:1 | A | tst.ts:11:11:11:11 | A |
149-
| tst.ts:1:1:5:1 | namespa ... lysed\\n} | tst.ts:1:1:5:1 | A |
147+
| tst.ts:1:8:5:1 | A | tst.ts:7:1:7:0 | A |
148+
| tst.ts:1:8:5:1 | A | tst.ts:11:11:11:11 | A |
149+
| tst.ts:1:8:5:1 | namespa ... lysed\\n} | tst.ts:1:8:5:1 | A |
150150
| tst.ts:2:14:2:19 | x | tst.ts:4:3:4:3 | x |
151151
| tst.ts:2:18:2:19 | 42 | tst.ts:2:14:2:19 | x |
152152
| tst.ts:7:1:7:0 | A | tst.ts:8:3:8:3 | A |

‎javascript/ql/test/library-tests/DataFlow/tst.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace A {
1+
export namespace A {
22
export let x = 42;
33
setX();
44
x; // global namespace exports are incompletely analysed
@@ -11,5 +11,3 @@ function setX() {
1111
var nd2 = A.x as number; // flow through type assertions
1212

1313
class StringList extends List<string> {} // flow through expressions with type arguments
14-
15-
// semmle-extractor-options: --source-type module

‎javascript/ql/test/library-tests/Flow/AbstractValues.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
| n.js:2:1:2:15 | function g |
195195
| n.js:2:1:2:15 | instance of function g |
196196
| n.js:3:16:3:23 | object literal |
197-
| namespace-reexport.js:1:1:4:0 | exports object of module namespace-reexport |
198-
| namespace-reexport.js:1:1:4:0 | module object of module namespace-reexport |
197+
| namespace-reexport.js:1:1:2:0 | exports object of module namespace-reexport |
198+
| namespace-reexport.js:1:1:2:0 | module object of module namespace-reexport |
199199
| nestedImport.js:1:1:13:0 | exports object of module nestedImport |
200200
| nestedImport.js:1:1:13:0 | module object of module nestedImport |
201201
| nestedImport.js:9:1:12:1 | function tst |
@@ -235,14 +235,14 @@
235235
| objlit.js:43:12:45:3 | object literal |
236236
| reexport-d.js:1:1:2:0 | exports object of module reexport-d |
237237
| reexport-d.js:1:1:2:0 | module object of module reexport-d |
238-
| reexport-mixins.js:1:1:4:0 | exports object of module reexport-mixins |
239-
| reexport-mixins.js:1:1:4:0 | module object of module reexport-mixins |
238+
| reexport-mixins.js:1:1:2:0 | exports object of module reexport-mixins |
239+
| reexport-mixins.js:1:1:2:0 | module object of module reexport-mixins |
240240
| reexport-unknown.js:1:1:2:0 | exports object of module reexport-unknown |
241241
| reexport-unknown.js:1:1:2:0 | module object of module reexport-unknown |
242242
| reexport/client/src/index.js:1:1:3:0 | exports object of module index |
243243
| reexport/client/src/index.js:1:1:3:0 | module object of module index |
244-
| reexport/lib/index.js:1:1:4:0 | exports object of module index |
245-
| reexport/lib/index.js:1:1:4:0 | module object of module index |
244+
| reexport/lib/index.js:1:1:2:0 | exports object of module index |
245+
| reexport/lib/index.js:1:1:2:0 | module object of module index |
246246
| reexport/lib/src/utils/util.js:1:1:3:0 | exports object of module util |
247247
| reexport/lib/src/utils/util.js:1:1:3:0 | module object of module util |
248248
| refinements.js:1:1:8:1 | function f1 |
@@ -341,8 +341,8 @@
341341
| tst.js:174:1:183:1 | function awaitFlow |
342342
| tst.mjs:1:1:4:0 | exports object of module tst |
343343
| tst.mjs:1:1:4:0 | module object of module tst |
344-
| tst.ts:1:1:15:0 | exports object of module tst |
345-
| tst.ts:1:1:15:0 | module object of module tst |
344+
| tst.ts:1:1:13:0 | exports object of module tst |
345+
| tst.ts:1:1:13:0 | module object of module tst |
346346
| tst.ts:8:1:10:1 | function setX |
347347
| tst.ts:8:1:10:1 | instance of function setX |
348348
| with.js:1:1:17:1 | function f |

‎javascript/ql/test/library-tests/Flow/tst.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace A {
1+
export namespace A {
22
export let x = 42;
33
setX();
44
let x2 = x;
@@ -10,5 +10,3 @@ function setX() {
1010
}
1111

1212
let a = A;
13-
14-
// semmle-extractor-options: --source-type module

‎javascript/ql/test/library-tests/InterProceduralFlow/callback.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ let source3 = "source3";
2828
call2(source3, store);
2929
call2(source3, confounder);
3030

31-
// semmle-extractor-options: --source-type module
31+
export default 0;

‎javascript/ql/test/library-tests/InterProceduralFlow/properties2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ var o5 = {};
4242
setP(o5, "not a source");
4343
var sink10 = getP(o5);
4444

45-
// semmle-extractor-options: --source-type module
45+
export default 0;

‎javascript/ql/test/library-tests/NPM/ImportedModule.expected‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| src/lib/tst2.js:1:1:1:13 | require("..") | src/index.js:1:1:5:0 | <toplevel> |
2-
| src/node_modules/nested/tst3.js:1:1:1:29 | require ... odule') | src/node_modules/third-party-module/fancy.js:1:1:5:0 | <toplevel> |
1+
| src/lib/tst2.js:1:1:1:13 | require("..") | src/index.js:1:1:4:0 | <toplevel> |
2+
| src/node_modules/nested/tst3.js:1:1:1:29 | require ... odule') | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |
33
| src/node_modules/nested/tst3.js:2:1:2:12 | require('a') | src/node_modules/nested/node_modules/a/index.js:1:1:1:25 | <toplevel> |
4-
| src/node_modules/tst2.js:1:1:1:38 | require ... cy.js') | src/node_modules/third-party-module/fancy.js:1:1:5:0 | <toplevel> |
5-
| src/tst2.js:1:1:1:12 | require(".") | src/index.js:1:1:5:0 | <toplevel> |
6-
| src/tst.js:1:1:1:38 | require ... cy.js') | src/node_modules/third-party-module/fancy.js:1:1:5:0 | <toplevel> |
4+
| src/node_modules/tst2.js:1:1:1:38 | require ... cy.js') | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |
5+
| src/tst2.js:1:1:1:12 | require(".") | src/index.js:1:1:4:0 | <toplevel> |
6+
| src/tst.js:1:1:1:38 | require ... cy.js') | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |

‎javascript/ql/test/library-tests/NPM/Modules.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
| b | src/node_modules/b/lib/index.js:1:1:2:0 | <toplevel> |
22
| b | src/node_modules/b/lib/index.ts:1:1:2:0 | <toplevel> |
33
| c | src/node_modules/c/src/index.js:1:1:2:0 | <toplevel> |
4-
| test-package | src/index.js:1:1:5:0 | <toplevel> |
4+
| test-package | src/index.js:1:1:4:0 | <toplevel> |
55
| test-package | src/lib/tst2.js:1:1:1:14 | <toplevel> |
6-
| test-package | src/lib/tst.js:1:1:5:0 | <toplevel> |
6+
| test-package | src/lib/tst.js:1:1:4:0 | <toplevel> |
77
| test-package | src/tst2.js:1:1:1:13 | <toplevel> |
88
| test-package | src/tst.js:1:1:2:38 | <toplevel> |
9-
| third-party-module | src/node_modules/third-party-module/fancy.js:1:1:5:0 | <toplevel> |
9+
| third-party-module | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |

‎javascript/ql/test/library-tests/NPM/NPMPackage_getMainModule.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
| b | src/node_modules/b/lib/index.ts:1:1:2:0 | <toplevel> |
22
| c | src/node_modules/c/src/index.js:1:1:2:0 | <toplevel> |
3-
| test-package | src/index.js:1:1:5:0 | <toplevel> |
4-
| third-party-module | src/node_modules/third-party-module/fancy.js:1:1:5:0 | <toplevel> |
3+
| test-package | src/index.js:1:1:4:0 | <toplevel> |
4+
| third-party-module | src/node_modules/third-party-module/fancy.js:1:1:4:0 | <toplevel> |

‎javascript/ql/test/library-tests/NPM/src/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
alert("Hello");
22

3-
// semmle-extractor-options: --platform
4-
// semmle-extractor-options: node
3+
require("process");

0 commit comments

Comments
 (0)