Skip to content

Commit 1cc0127

Browse files
asgerfasgerf
committed
More tests
1 parent ea5f429 commit 1cc0127

File tree

10 files changed

+80
-29
lines changed

10 files changed

+80
-29
lines changed

‎javascript/ql/test/library-tests/PathResolution/DirnameImports/main.js‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
// Test for imports using __dirname
22
const path = require('path');
33

4-
// Using __dirname directly
5-
const direct = require(__dirname + '/target.js'); // $ importTarget=DirnameImports/target.js
4+
require(__dirname + '/target.js'); // $ importTarget=DirnameImports/target.js
5+
require(__dirname + '/nested/target.js'); // $ importTarget=DirnameImports/nested/target.js
6+
require(__dirname + '/../import-packages.ts'); // $ importTarget=import-packages.ts
7+
require(__dirname + '/' + 'target.js'); // $ importTarget=DirnameImports/target.js
68

7-
// Using __dirname with path.join
8-
const withPathJoin = require(path.join(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
9+
require(path.join(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
10+
require(path.resolve(__dirname, 'target.js')); // $ importTarget=DirnameImports/target.js
911

10-
// Using __dirname with nested path
11-
const nested = require(__dirname + '/nested/target.js'); // $ importTarget=DirnameImports/nested/target.js
12-
13-
// Using __dirname with parent directory
14-
const parent = require(__dirname + '/../import-packages.ts'); // $ importTarget=import-packages.ts
15-
16-
// Using __dirname with path concat and variable
1712
const subdir = 'nested';
18-
const dynamic = require(__dirname + '/' + subdir + '/target.js'); // $ importTarget=DirnameImports/nested/target.js
13+
require(__dirname + '/' + subdir + '/target.js'); // $ importTarget=DirnameImports/nested/target.js
1914

20-
// Using __dirname in an AddExpr chain
21-
const chainedAdd = require(__dirname + '/' + 'target.js'); // $ importTarget=DirnameImports/target.js
15+
require(`${__dirname}/target.js`); // $ importTarget=DirnameImports/target.js

‎javascript/ql/test/library-tests/PathResolution/Fallback/src/main.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import "@/both" // $ MISSING: importTarget=Fallback/lib1/both.ts
2-
import "@/only1" // $ MISSING: importTarget=Fallback/lib1/only1.ts
3-
import "@/only2" // $ MISSING: importTarget=Fallback/lib2/only2.ts
4-
import "@/differentExtension" // $ MISSING: importTarget=Fallback/lib2/differentExtension.ts
5-
import "@/differentExtension.js" // $ MISSING: importTarget=Fallback/lib2/differentExtension.ts
1+
import "@/both" // $ importTarget=Fallback/lib1/both.ts SPURIOUS: importTarget=Fallback/lib2/both.ts
2+
import "@/only1" // $ importTarget=Fallback/lib1/only1.ts
3+
import "@/only2" // $ importTarget=Fallback/lib2/only2.ts
4+
import "@/differentExtension" // $ importTarget=Fallback/lib2/differentExtension.ts SPURIOUS: importTarget=Fallback/lib1/differentExtension.js
5+
import "@/differentExtension.js" // $ importTarget=Fallback/lib2/differentExtension.ts SPURIOUS: importTarget=Fallback/lib1/differentExtension.js
66

7-
import "@/subdir" // $ MISSING: importTarget=Fallback/lib1/subdir/index.ts
8-
import "@/subdir/both" // $ MISSING: importTarget=Fallback/lib1/subdir/both.ts
9-
import "@/subdir/only1" // $ MISSING: importTarget=Fallback/lib1/subdir/only1.ts
10-
import "@/subdir/only2" // $ MISSING: importTarget=Fallback/lib2/subdir/only2.ts
7+
import "@/subdir" // $ importTarget=Fallback/lib1/subdir/index.ts SPURIOUS: importTarget=Fallback/lib2/subdir/index.ts
8+
import "@/subdir/both" // $ importTarget=Fallback/lib1/subdir/both.ts SPURIOUS: importTarget=Fallback/lib2/subdir/both.ts
9+
import "@/subdir/only1" // $ importTarget=Fallback/lib1/subdir/only1.ts
10+
import "@/subdir/only2" // $ importTarget=Fallback/lib2/subdir/only2.ts

‎javascript/ql/test/library-tests/PathResolution/JSDocProvide/lib.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* @providesModule jsdoc-provided-module/foo/bar/baz
3+
*/
4+
5+
export const x = 1;

‎javascript/ql/test/library-tests/PathResolution/JSDocProvide/main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import 'jsdoc-provided-module/foo/bar/baz'; // $ importTarget=JSDocProvide/lib.js

‎javascript/ql/test/library-tests/PathResolution/MinifiedMain/package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"main": "dist/library.min.js"
3+
}

‎javascript/ql/test/library-tests/PathResolution/MinifiedMain/src/library.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const x = 1;

‎javascript/ql/test/library-tests/PathResolution/RootDir/my-root/foo.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const x = 1;

‎javascript/ql/test/library-tests/PathResolution/RootDir/tsconfig.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"include": ["my-root","my-tests"],
3+
"compilerOptions": {
4+
"rootDir": "./my-root",
5+
"outDir": "./my-out",
6+
}
7+
}

‎javascript/ql/test/library-tests/PathResolution/import-packages.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ import './MainIsFolder'; // $ importTarget=MainIsFolder/src/index.ts
2929
import '@example/main-is-folder'; // $ importTarget=MainIsFolder/src/index.ts
3030

3131
import './DistContainsSrc'; // $ importTarget=DistContainsSrc/src/foo.ts
32+
33+
import './MinifiedMain'; // $ importTarget=MinifiedMain/src/library.ts
34+
35+
import './RootDir/my-out/foo.js'; // $ importTarget=RootDir/my-root/foo.ts

‎javascript/ql/test/library-tests/PathResolution/test.expected‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
importTarget
2+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/index.js:1:1:1:20 | import f from '~/a'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/a.js |
3+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/nested/tst.js:1:1:1:20 | import f from '~/a'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/a.js |
4+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst2/index.js:1:1:1:23 | import ... /b.js'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst2/src/js/b.js |
5+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst2/index.js:2:1:2:20 | import f from '#/a'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/a.js |
6+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst3/index.js:1:1:1:30 | import ... /b.js'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst3/src/b.js |
7+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst4/index.js:1:1:1:23 | import ... /b.js'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst4/src/js/b.js |
8+
| BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst4/index.js:2:1:2:20 | import f from '#/a'; | BabelRootImport/BabelRootImport.testproj/srcBabelRootImport/tst1/a.js |
9+
| BabelRootImport/tst1/index.js:1:1:1:20 | import f from '~/a'; | BabelRootImport/tst1/a.js |
10+
| BabelRootImport/tst1/nested/tst.js:1:1:1:20 | import f from '~/a'; | BabelRootImport/tst1/a.js |
11+
| BabelRootImport/tst2/index.js:1:1:1:23 | import ... /b.js'; | BabelRootImport/tst2/src/js/b.js |
12+
| BabelRootImport/tst2/index.js:2:1:2:20 | import f from '#/a'; | BabelRootImport/tst1/a.js |
13+
| BabelRootImport/tst3/index.js:1:1:1:30 | import ... /b.js'; | BabelRootImport/tst3/src/b.js |
14+
| BabelRootImport/tst4/index.js:1:1:1:23 | import ... /b.js'; | BabelRootImport/tst4/src/js/b.js |
15+
| BabelRootImport/tst4/index.js:2:1:2:20 | import f from '#/a'; | BabelRootImport/tst1/a.js |
116
| BaseUrl/src/main.ts:2:1:2:26 | import ... /file"; | BaseUrl/base/lib/file.ts |
217
| BaseUrl/src/main.ts:3:1:3:29 | import ... le.ts"; | BaseUrl/base/lib/file.ts |
318
| BaseUrl/src/main.ts:4:1:4:29 | import ... le.js"; | BaseUrl/base/lib/file.ts |
@@ -40,12 +55,14 @@
4055
| DeclarationFiles/src/main.ts:5:1:5:27 | import ... cript"; | DeclarationFiles/lib/typescript.ts |
4156
| DeclarationFiles/src/main.ts:6:1:6:30 | import ... pt.js"; | DeclarationFiles/lib/typescript.ts |
4257
| DeclarationFiles/src/main.ts:7:1:7:32 | import ... .d.ts"; | DeclarationFiles/lib/typescript.d.ts |
43-
| DirnameImports/main.js:5:16:5:48 | require ... et.js') | DirnameImports/target.js |
44-
| DirnameImports/main.js:8:22:8:63 | require ... t.js')) | DirnameImports/target.js |
45-
| DirnameImports/main.js:11:16:11:55 | require ... et.js') | DirnameImports/nested/target.js |
46-
| DirnameImports/main.js:14:16:14:60 | require ... es.ts') | import-packages.ts |
47-
| DirnameImports/main.js:18:17:18:64 | require ... et.js') | DirnameImports/nested/target.js |
48-
| DirnameImports/main.js:21:20:21:57 | require ... et.js') | DirnameImports/target.js |
58+
| DirnameImports/main.js:4:1:4:33 | require ... et.js') | DirnameImports/target.js |
59+
| DirnameImports/main.js:5:1:5:40 | require ... et.js') | DirnameImports/nested/target.js |
60+
| DirnameImports/main.js:6:1:6:45 | require ... es.ts') | import-packages.ts |
61+
| DirnameImports/main.js:7:1:7:38 | require ... et.js') | DirnameImports/target.js |
62+
| DirnameImports/main.js:9:1:9:42 | require ... t.js')) | DirnameImports/target.js |
63+
| DirnameImports/main.js:10:1:10:45 | require ... t.js')) | DirnameImports/target.js |
64+
| DirnameImports/main.js:13:1:13:48 | require ... et.js') | DirnameImports/nested/target.js |
65+
| DirnameImports/main.js:15:1:15:33 | require ... et.js`) | DirnameImports/target.js |
4966
| Extended/src/main.ts:2:1:2:21 | import ... /file"; | Extended/lib/file.ts |
5067
| Extended/src/main.ts:3:1:3:24 | import ... le.ts"; | Extended/lib/file.ts |
5168
| Extended/src/main.ts:4:1:4:24 | import ... le.js"; | Extended/lib/file.ts |
@@ -67,6 +84,21 @@
6784
| Extended/src/main.ts:24:1:24:17 | import "@/index"; | Extended/lib/index.ts |
6885
| Extended/src/main.ts:25:1:25:20 | import "@/index.ts"; | Extended/lib/index.ts |
6986
| Extended/src/main.ts:26:1:26:20 | import "@/index.js"; | Extended/lib/index.ts |
87+
| Fallback/src/main.ts:1:1:1:15 | import "@/both" | Fallback/lib1/both.ts |
88+
| Fallback/src/main.ts:1:1:1:15 | import "@/both" | Fallback/lib2/both.ts |
89+
| Fallback/src/main.ts:2:1:2:16 | import "@/only1" | Fallback/lib1/only1.ts |
90+
| Fallback/src/main.ts:3:1:3:16 | import "@/only2" | Fallback/lib2/only2.ts |
91+
| Fallback/src/main.ts:4:1:4:29 | import ... ension" | Fallback/lib1/differentExtension.js |
92+
| Fallback/src/main.ts:4:1:4:29 | import ... ension" | Fallback/lib2/differentExtension.ts |
93+
| Fallback/src/main.ts:5:1:5:32 | import ... ion.js" | Fallback/lib1/differentExtension.js |
94+
| Fallback/src/main.ts:5:1:5:32 | import ... ion.js" | Fallback/lib2/differentExtension.ts |
95+
| Fallback/src/main.ts:7:1:7:17 | import "@/subdir" | Fallback/lib1/subdir/index.ts |
96+
| Fallback/src/main.ts:7:1:7:17 | import "@/subdir" | Fallback/lib2/subdir/index.ts |
97+
| Fallback/src/main.ts:8:1:8:22 | import ... r/both" | Fallback/lib1/subdir/both.ts |
98+
| Fallback/src/main.ts:8:1:8:22 | import ... r/both" | Fallback/lib2/subdir/both.ts |
99+
| Fallback/src/main.ts:9:1:9:23 | import ... /only1" | Fallback/lib1/subdir/only1.ts |
100+
| Fallback/src/main.ts:10:1:10:23 | import ... /only2" | Fallback/lib2/subdir/only2.ts |
101+
| JSDocProvide/main.js:1:1:1:43 | import ... r/baz'; | JSDocProvide/lib.js |
70102
| NoBaseUrl/src/main.ts:2:1:2:21 | import ... /file"; | NoBaseUrl/lib/file.ts |
71103
| NoBaseUrl/src/main.ts:3:1:3:24 | import ... le.ts"; | NoBaseUrl/lib/file.ts |
72104
| NoBaseUrl/src/main.ts:4:1:4:24 | import ... le.js"; | NoBaseUrl/lib/file.ts |
@@ -104,3 +136,6 @@
104136
| import-packages.ts:28:1:28:24 | import ... older'; | MainIsFolder/src/index.ts |
105137
| import-packages.ts:29:1:29:33 | import ... older'; | MainIsFolder/src/index.ts |
106138
| import-packages.ts:31:1:31:27 | import ... nsSrc'; | DistContainsSrc/src/foo.ts |
139+
| import-packages.ts:33:1:33:24 | import ... dMain'; | MinifiedMain/src/library.ts |
140+
| import-packages.ts:35:1:35:33 | import ... oo.js'; | RootDir/my-root/foo.ts |
141+
testFailures

0 commit comments

Comments
 (0)