diff --git a/javascript/ql/test/library-tests/Modules/arbitarySpecifier.js b/javascript/ql/test/library-tests/Modules/jsArbitrarySpecifier.js similarity index 100% rename from javascript/ql/test/library-tests/Modules/arbitarySpecifier.js rename to javascript/ql/test/library-tests/Modules/jsArbitrarySpecifier.js diff --git a/javascript/ql/test/library-tests/Modules/tests.expected b/javascript/ql/test/library-tests/Modules/tests.expected index fd7c1fb3620..8ea0ff3daf5 100644 --- a/javascript/ql/test/library-tests/Modules/tests.expected +++ b/javascript/ql/test/library-tests/Modules/tests.expected @@ -3,7 +3,6 @@ test_BulkReExportDeclarations test_ExportDeclarations | a.js:1:1:3:1 | export ... n 23;\\n} | | a.js:5:1:5:32 | export ... } = o; | -| arbitarySpecifier.js:5:1:5:32 | export ... :new" } | | arbitrarySpecifier.ts:5:1:5:32 | export ... :new" } | | b.js:5:1:5:18 | export { f as g }; | | b.js:7:1:7:21 | export ... './a'; | @@ -13,6 +12,7 @@ test_ExportDeclarations | es2015_require.js:3:1:3:25 | export ... ss C {} | | export-in-mjs.mjs:1:1:1:34 | export ... s = 42; | | f.ts:5:1:5:24 | export ... oo() {} | +| jsArbitrarySpecifier.js:5:1:5:32 | export ... :new" } | | m/c.js:5:1:5:30 | export ... '../b'; | | reExportNamespace.js:1:1:1:26 | export ... "./a"; | | tst.html:7:3:7:22 | export const y = 42; | @@ -20,12 +20,12 @@ test_ExportDefaultDeclarations | a.js:1:1:3:1 | export ... n 23;\\n} | | es2015_require.js:3:1:3:25 | export ... ss C {} | test_ExportSpecifiers -| arbitarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | arbitarySpecifier.js:5:10:5:16 | Foo_new | arbitarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | | arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | arbitrarySpecifier.ts:5:10:5:16 | Foo_new | arbitrarySpecifier.ts:5:21:5:30 | "Foo::new" | | b.js:5:10:5:15 | f as g | b.js:5:10:5:10 | f | b.js:5:15:5:15 | g | | e.js:2:10:2:10 | x | e.js:2:10:2:10 | x | e.js:2:10:2:10 | x | | e.js:2:13:2:13 | y | e.js:2:13:2:13 | y | e.js:2:13:2:13 | y | | e.js:3:10:3:21 | default as g | e.js:3:10:3:16 | default | e.js:3:21:3:21 | g | +| jsArbitrarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | jsArbitrarySpecifier.js:5:10:5:16 | Foo_new | jsArbitrarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | | m/c.js:5:10:5:15 | g as h | m/c.js:5:10:5:10 | g | m/c.js:5:15:5:15 | h | test_GlobalVariableRef | a.js:5:31:5:31 | o | @@ -45,7 +45,6 @@ test_ImportNamespaceSpecifier | exports.js:1:8:1:17 | * as dummy | | m/c.js:1:8:1:13 | * as b | test_ImportSpecifiers -| arbitarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | arbitarySpecifier.js:1:24:1:30 | Foo_new | | arbitrarySpecifier.ts:1:10:1:30 | "Foo::n ... Foo_new | arbitrarySpecifier.ts:1:24:1:30 | Foo_new | | b.js:1:8:1:8 | f | b.js:1:8:1:8 | f | | d.js:1:10:1:21 | default as g | d.js:1:21:1:21 | g | @@ -56,12 +55,12 @@ test_ImportSpecifiers | import-in-mjs.mjs:1:8:1:24 | exported_from_mjs | import-in-mjs.mjs:1:8:1:24 | exported_from_mjs | | import-ts-with-js-extension.ts:1:10:1:12 | foo | import-ts-with-js-extension.ts:1:10:1:12 | foo | | importcss.js:1:8:1:8 | A | importcss.js:1:8:1:8 | A | +| jsArbitrarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | jsArbitrarySpecifier.js:1:24:1:30 | Foo_new | | m/c.js:1:8:1:13 | * as b | m/c.js:1:13:1:13 | b | | reExportNamespaceClient.js:1:10:1:11 | ns | reExportNamespaceClient.js:1:10:1:11 | ns | | tst.html:5:10:5:10 | f | tst.html:5:10:5:10 | f | | unresolved.js:1:8:1:8 | f | unresolved.js:1:8:1:8 | f | test_Imports -| arbitarySpecifier.js:1:1:1:50 | import ... o.wasm" | arbitarySpecifier.js:1:39:1:50 | "./foo.wasm" | 1 | | arbitrarySpecifier.ts:1:1:1:50 | import ... o.wasm" | arbitrarySpecifier.ts:1:39:1:50 | "./foo.wasm" | 1 | | b.js:1:1:1:20 | import f from './a'; | b.js:1:15:1:19 | './a' | 1 | | d.js:1:1:1:43 | import ... './a'; | d.js:1:38:1:42 | './a' | 2 | @@ -72,6 +71,7 @@ test_Imports | import-in-mjs.mjs:1:1:1:46 | import ... n-mjs'; | import-in-mjs.mjs:1:31:1:45 | 'export-in-mjs' | 1 | | import-ts-with-js-extension.ts:1:1:1:29 | import ... /f.js"; | import-ts-with-js-extension.ts:1:21:1:28 | "./f.js" | 1 | | importcss.js:1:1:1:24 | import ... a.css"; | importcss.js:1:15:1:23 | "./a.css" | 1 | +| jsArbitrarySpecifier.js:1:1:1:50 | import ... o.wasm" | jsArbitrarySpecifier.js:1:39:1:50 | "./foo.wasm" | 1 | | m/c.js:1:1:1:26 | import ... '../b'; | m/c.js:1:20:1:25 | '../b' | 1 | | reExportNamespaceClient.js:1:1:1:41 | import ... space"; | reExportNamespaceClient.js:1:20:1:40 | "./reEx ... espace" | 1 | | tst.html:5:3:5:20 | import f from 'a'; | tst.html:5:17:5:19 | 'a' | 1 | @@ -80,7 +80,6 @@ test_Module_exports | a.js:1:1:5:32 | | default | a.js:1:16:3:1 | functio ... n 23;\\n} | | a.js:1:1:5:32 | | x | a.js:5:18:5:20 | f() | | a.js:1:1:5:32 | | y | a.js:5:25:5:25 | y | -| arbitarySpecifier.js:1:1:5:32 | | Foo::new | arbitarySpecifier.js:5:10:5:16 | Foo_new | | arbitrarySpecifier.ts:1:1:5:32 | | Foo::new | arbitrarySpecifier.ts:5:10:5:16 | Foo_new | | b.js:1:1:8:0 | | f2 | a.js:1:16:3:1 | functio ... n 23;\\n} | | b.js:1:1:8:0 | | g | b.js:5:10:5:10 | f | @@ -90,16 +89,17 @@ test_Module_exports | es2015_require.js:1:1:3:25 | | default | es2015_require.js:3:16:3:25 | class C {} | | export-in-mjs.mjs:1:1:1:34 | | exported_from_mjs | export-in-mjs.mjs:1:32:1:33 | 42 | | f.ts:1:1:6:0 | | foo | f.ts:5:8:5:24 | function foo() {} | +| jsArbitrarySpecifier.js:1:1:5:32 | | Foo::new | jsArbitrarySpecifier.js:5:10:5:16 | Foo_new | | m/c.js:1:1:6:0 | | h | b.js:5:10:5:10 | f | | reExportNamespace.js:1:1:2:0 | | ns | reExportNamespace.js:1:8:1:14 | * as ns | | tst.html:4:23:8:0 | | y | tst.html:7:20:7:21 | 42 | test_NamedImportSpecifier -| arbitarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | | arbitrarySpecifier.ts:1:10:1:30 | "Foo::n ... Foo_new | | d.js:1:10:1:21 | default as g | | d.js:1:24:1:29 | x as y | | g.ts:1:9:1:11 | foo | | import-ts-with-js-extension.ts:1:10:1:12 | foo | +| jsArbitrarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | | reExportNamespaceClient.js:1:10:1:11 | ns | test_OtherImports | es2015_require.js:1:11:1:24 | require('./d') | d.js:1:1:5:0 | | @@ -123,17 +123,16 @@ test_getAnImportedModule | library-tests/Modules/m/c.js | library-tests/Modules/b.js | | library-tests/Modules/reExportNamespaceClient.js | library-tests/Modules/reExportNamespace.js | test_getExportedName -| arbitarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | Foo::new | | arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo::new | | b.js:5:10:5:15 | f as g | g | | b.js:7:8:7:9 | f2 | f2 | | e.js:2:10:2:10 | x | x | | e.js:2:13:2:13 | y | y | | e.js:3:10:3:21 | default as g | g | +| jsArbitrarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | Foo::new | | m/c.js:5:10:5:15 | g as h | h | | reExportNamespace.js:1:8:1:14 | * as ns | ns | test_getImportedName -| arbitarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | Foo::new | | arbitrarySpecifier.ts:1:10:1:30 | "Foo::n ... Foo_new | Foo::new | | b.js:1:8:1:8 | f | default | | d.js:1:10:1:21 | default as g | default | @@ -143,23 +142,23 @@ test_getImportedName | import-in-mjs.mjs:1:8:1:24 | exported_from_mjs | default | | import-ts-with-js-extension.ts:1:10:1:12 | foo | foo | | importcss.js:1:8:1:8 | A | default | +| jsArbitrarySpecifier.js:1:10:1:30 | "Foo::n ... Foo_new | Foo::new | | reExportNamespaceClient.js:1:10:1:11 | ns | ns | | tst.html:5:10:5:10 | f | default | | unresolved.js:1:8:1:8 | f | default | test_getLocalName -| arbitarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | Foo_new | | arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo_new | | b.js:5:10:5:15 | f as g | f | | b.js:7:8:7:9 | f2 | default | | e.js:2:10:2:10 | x | x | | e.js:2:13:2:13 | y | y | | e.js:3:10:3:21 | default as g | default | +| jsArbitrarySpecifier.js:5:10:5:30 | Foo_new ... o::new" | Foo_new | | m/c.js:5:10:5:15 | g as h | g | test_getSourceNode | a.js:1:1:3:1 | export ... n 23;\\n} | default | a.js:1:16:3:1 | functio ... n 23;\\n} | | a.js:5:1:5:32 | export ... } = o; | x | a.js:5:18:5:20 | f() | | a.js:5:1:5:32 | export ... } = o; | y | a.js:5:25:5:25 | y | -| arbitarySpecifier.js:5:1:5:32 | export ... :new" } | Foo::new | arbitarySpecifier.js:5:10:5:16 | Foo_new | | arbitrarySpecifier.ts:5:1:5:32 | export ... :new" } | Foo::new | arbitrarySpecifier.ts:5:10:5:16 | Foo_new | | b.js:5:1:5:18 | export { f as g }; | g | b.js:5:10:5:10 | f | | b.js:7:1:7:21 | export ... './a'; | f2 | a.js:1:16:3:1 | functio ... n 23;\\n} | @@ -169,6 +168,7 @@ test_getSourceNode | es2015_require.js:3:1:3:25 | export ... ss C {} | default | es2015_require.js:3:16:3:25 | class C {} | | export-in-mjs.mjs:1:1:1:34 | export ... s = 42; | exported_from_mjs | export-in-mjs.mjs:1:32:1:33 | 42 | | f.ts:5:1:5:24 | export ... oo() {} | foo | f.ts:5:8:5:24 | function foo() {} | +| jsArbitrarySpecifier.js:5:1:5:32 | export ... :new" } | Foo::new | jsArbitrarySpecifier.js:5:10:5:16 | Foo_new | | m/c.js:5:1:5:30 | export ... '../b'; | h | b.js:5:10:5:10 | f | | reExportNamespace.js:1:1:1:26 | export ... "./a"; | ns | reExportNamespace.js:1:8:1:14 | * as ns | | tst.html:7:3:7:22 | export const y = 42; | y | tst.html:7:20:7:21 | 42 |