add test for outDir

erik-krogh · erik-krogh · commit 39028f62a39e · 2020-10-30T10:37:10.000+01:00
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/index.js b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/index.js
@@ -0,0 +1,4 @@
+var foo1 = require('./lib/src/foo.js');
+var foo1 = require('./lib/src2/foo.js');
+var foo2 = require('./src/foo.ts');
+var foo2 = require('./src2/foo.ts');
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/src/foo.ts b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/src/foo.ts
@@ -0,0 +1 @@
+export default class Foo {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/src2/foo.ts b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/src2/foo.ts
@@ -0,0 +1 @@
+export default class Foo {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/nonUniqueInclude/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "outDir": "lib"
+    },
+    "include": [
+        "src/**/*.ts",
+        "src2/**/*.ts"
+    ]
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/options b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/options
@@ -0,0 +1 @@
+semmle-extractor-options: --include **/tsconfig.json
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/index.js b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/index.js
@@ -0,0 +1,2 @@
+var foo1 = require('./lib/index.js');
+var foo2 = require('./src/index.ts');
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/src/index.ts b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/src/index.ts
@@ -0,0 +1 @@
+export default class Foo {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDir/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "outDir": "lib",
+        "rootDir": "src"
+    },
+    "include": [
+        "**/*.ts"
+    ]
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/foo.ts b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/foo.ts
@@ -0,0 +1 @@
+export default class Foo {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/index.js b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/index.js
@@ -0,0 +1,2 @@
+var foo1 = require('./lib/foo.js');
+var foo2 = require('./foo.ts');
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/rootDirIsDot/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "outDir": "lib",
+        "rootDir": "."
+    },
+    "include": [
+        "**/*.ts"
+    ]
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/index.js b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/index.js
@@ -0,0 +1,5 @@
+var foo1 = require('./lib/index.js');
+var foo2 = require('./src/index.ts');
+
+var foo3 = require('./lib/index');
+var foo4 = require('./src/index');
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/src/index.ts b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/src/index.ts
@@ -0,0 +1 @@
+export default class Foo {}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/simpleOutDir/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "outDir": "lib"
+    },
+    "include": [
+        "src/**/*.ts"
+    ]
+}
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.expected b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.expected
@@ -0,0 +1,12 @@
+| nonUniqueInclude/index.js:1:12:1:38 | require ... oo.js') | nonUniqueInclude/src/foo.ts:1:1:1:27 | <toplevel> |
+| nonUniqueInclude/index.js:2:12:2:39 | require ... oo.js') | nonUniqueInclude/src2/foo.ts:1:1:1:27 | <toplevel> |
+| nonUniqueInclude/index.js:3:12:3:34 | require ... oo.ts') | nonUniqueInclude/src/foo.ts:1:1:1:27 | <toplevel> |
+| nonUniqueInclude/index.js:4:12:4:35 | require ... oo.ts') | nonUniqueInclude/src2/foo.ts:1:1:1:27 | <toplevel> |
+| rootDir/index.js:1:12:1:36 | require ... ex.js') | rootDir/src/index.ts:1:1:1:27 | <toplevel> |
+| rootDir/index.js:2:12:2:36 | require ... ex.ts') | rootDir/src/index.ts:1:1:1:27 | <toplevel> |
+| rootDirIsDot/index.js:1:12:1:34 | require ... oo.js') | rootDirIsDot/foo.ts:1:1:1:27 | <toplevel> |
+| rootDirIsDot/index.js:2:12:2:30 | require('./foo.ts') | rootDirIsDot/foo.ts:1:1:1:27 | <toplevel> |
+| simpleOutDir/index.js:1:12:1:36 | require ... ex.js') | simpleOutDir/src/index.ts:1:1:1:27 | <toplevel> |
+| simpleOutDir/index.js:2:12:2:36 | require ... ex.ts') | simpleOutDir/src/index.ts:1:1:1:27 | <toplevel> |
+| simpleOutDir/index.js:4:12:4:33 | require ... index') | simpleOutDir/src/index.ts:1:1:1:27 | <toplevel> |
+| simpleOutDir/index.js:5:12:5:33 | require ... index') | simpleOutDir/src/index.ts:1:1:1:27 | <toplevel> |
diff --git a/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql b/javascript/ql/test/library-tests/TypeScript/ImportOutDir/tests.ql
@@ -0,0 +1,7 @@
+import javascript
+
+query predicate resolveableImport(Import imp, Module mod) {
+  mod = imp.getImportedModule() and
+  not imp.getTopLevel().isExterns() and
+  not mod.getTopLevel().isExterns()
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+semmle-extractor-options: --include **/tsconfig.json`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var foo1 = require('./lib/index.js');`
	`2`	`+var foo2 = require('./src/index.ts');`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+var foo1 = require('./lib/foo.js');`
	`2`	`+var foo2 = require('./foo.ts');`