supports .ts files in nested dirs

Author: christianscott

__tests__/fixtures/tsconfigs/simple/a.ts renamed to __tests__/fixtures/tsconfigs/project/a.ts

@@ -0,0 +1,3 @@
+{
+    "include": ["../includes/a.d.ts"]
+}

__tests__/fixtures/tsconfigs/project/nested/b.ts

@@ -502,21 +502,26 @@ describe('dependencyTree', () => {
 
   describe('tsconfig', () => {
     beforeEach(() => {
-      dependencyTree = new DependencyTree([fixture('tsconfig')]);
+      dependencyTree = new DependencyTree([fixture('tsconfigs')]);
     });
 
-    it('lists includes/a.d.ts as a dependency of simple/a.ts', async () => {
+    it('adds files in `include` from nearest tsconfig.json', async () => {
       expect.hasAssertions();
       const result = await dependencyTree.gather();
       expect(result).toStrictEqual({
-        missing: expect.any(Map),
+        missing: new Map(),
         resolved: new Map([
           [
-            fixture('simple', 'a.ts'),
-            new Set([fixture('includes', 'a.d.ts')]),
+            fixture('tsconfigs', 'project', 'a.ts'),
+            new Set([fixture('tsconfigs', 'includes', 'a.d.ts')]),
           ],
+          [
+            fixture('tsconfigs', 'project', 'nested', 'b.ts'),
+            new Set([fixture('tsconfigs', 'includes', 'a.d.ts')]),
+          ],
+          [fixture('tsconfigs', 'includes', 'a.d.ts'), new Set([])],
         ]),
       });
     });
-  })
+  });
 });

__tests__/fixtures/tsconfigs/project/tsconfig.json

@@ -110,14 +110,7 @@ export class TypeScriptFileProcessor implements FileProcessor {
     if (TypeScriptFileProcessor.isEntryPointFileName(file)) {
       filesList.push(TypeScriptFileProcessor.getEntryPointImport(file));
     }
-
-    const includes = this.includesFromNearestTsconfigFile(file);
-    if (includes.length) {
-      // only include non-globbed includes
-      // TODO: support globbed includes
-      const nonGlobIncludes = includes.filter(maybeGlob => !maybeGlob.includes('*'));
-      filesList.push(...nonGlobIncludes);
-    }
+    filesList.push(...(await this.includesFromNearestTsconfigFile(file)));
 
     for (const fileName of filesList) {
       const referencedFile = dependencyTree.transformReference(fileName, file);
@@ -201,20 +194,44 @@ export class TypeScriptFileProcessor implements FileProcessor {
    * Finds the tsconfig.json that this file is included by. Does this by searching in the same directory,
    * and then searching in each dir all the way to the root directory.
    */
-  private includesFromNearestTsconfigFile = memoize(async (file: Path): Promise<string[]> => {
-    const segments = path.dirname(path.relative(this.rootDir, file)).split(path.sep);
-    while (segments.length > 0) {
-      const maybeTsconfig = path.join(this.rootDir, ...segments, 'tsconfig.json');
-      try {
-        const contents = JSON.parse(await fs.promises.readFile(file, 'utf8'));
-        return 'includes' in contents ? (contents['includes'] as string[]) : [];
-      } catch (err) {
-        segments.pop(); // go up one dir
-        continue;
+  private includesFromNearestTsconfigFile = memoize(
+    async (file: Path): Promise<string[]> => {
+      const segments = path
+        .dirname(path.relative(this.rootDir, file))
+        .split(path.sep);
+      while (segments.length > 0) {
+        const maybeTsconfig = path.join(
+          this.rootDir,
+          ...segments,
+          'tsconfig.json',
+        );
+        let contents: string;
+        try {
+          contents = await fs.promises.readFile(maybeTsconfig, 'utf8');
+        } catch (err) {
+          segments.pop(); // go up one dir
+          continue;
+        }
+
+        const json = JSON.parse(contents);
+        if (!('include' in json)) {
+          return [];
+        }
+
+        const include = json['include'] as string[];
+        const tsconfigDir = path.dirname(maybeTsconfig);
+        return (
+          include
+            // filter out globbed includes
+            // TODO: support globbed includes
+            .filter((maybeGlob) => !maybeGlob.includes('*'))
+            // make the includes absolute
+            .map((include) => path.join(tsconfigDir, include))
+        );
       }
-    }
-    throw new Error(`could not find tsconfig.json for ${file}`);
-  });
+      return [];
+    },
+  );
 
   // Finds an implicit 'import' in the entry point object literal, like:
   //