Merge pull request github#5586 from asgerf/js/tsconfig-file-inclusion-handling

Approved by esbena

Author: codeql-ci

javascript/change-notes/2021-04-01-tsconfig-file-inclusion-handling.md

@@ -0,0 +1,5 @@
+lgtm,codescanning
+* Fixed a bug which caused some imports to be resolved incorrectly
+  for projects containing multiple `tsconfig.json` files.
+* Fixed a bug which could cause some files in the `node_modules` folder
+  to be extracted even though they should be excluded.

javascript/extractor/src/com/semmle/js/parser/ParsedProject.java

@@ -21,7 +21,7 @@ public File getTsConfigFile() {
 
   /** Absolute paths to the files included in this project. */
   public Set<File> getOwnFiles() {
-    return allFiles;
+    return ownFiles;
   }
 
   /** Absolute paths to the files included in or referenced by this project. */

javascript/ql/src/meta/alerts/ImportGraph.ql

@@ -0,0 +1,15 @@
+/**
+ * @name Import graph
+ * @description An edge in the import graph.
+ * @kind problem
+ * @problem.severity recommendation
+ * @id js/meta/alerts/import-graph
+ * @tags meta
+ * @precision very-low
+ */
+
+import javascript
+
+from Import imprt, Module target
+where target = imprt.getImportedModule()
+select imprt, "Import targeting $@", target, target.getFile().getRelativePath()

javascript/ql/test/library-tests/TypeScript/BaseUrl/A/index.ts

@@ -0,0 +1 @@
+import { Foo } from "../B/src/foo";

javascript/ql/test/library-tests/TypeScript/BaseUrl/A/tsconfig.json

@@ -0,0 +1,3 @@
+{
+    "include": ["."]
+}

javascript/ql/test/library-tests/TypeScript/BaseUrl/B/src/foo.ts

@@ -0,0 +1,3 @@
+import { Bar } from "lib/bar";
+
+export class Foo {}

javascript/ql/test/library-tests/TypeScript/BaseUrl/B/src/lib/bar.ts

@@ -0,0 +1,3 @@
+import { Foo } from "foo";
+
+export class Bar {}

javascript/ql/test/library-tests/TypeScript/BaseUrl/B/tsconfig.json

@@ -0,0 +1,6 @@
+{
+    "include": ["."],
+    "compilerOptions": {
+        "baseUrl": "./src"
+    }
+}

javascript/ql/test/library-tests/TypeScript/BaseUrl/test.expected

@@ -0,0 +1,3 @@
+| A/index.ts:1:1:1:35 | import  ... c/foo"; | B/src/foo.ts:1:1:4:0 | <toplevel> |
+| B/src/foo.ts:1:1:1:30 | import  ... b/bar"; | B/src/lib/bar.ts:1:1:4:0 | <toplevel> |
+| B/src/lib/bar.ts:1:1:1:26 | import  ...  "foo"; | B/src/foo.ts:1:1:4:0 | <toplevel> |

javascript/ql/test/library-tests/TypeScript/BaseUrl/test.ql

@@ -0,0 +1,3 @@
+import javascript
+
+query Module getImportedModule(Import imprt) { result = imprt.getImportedModule() }