From 3a139cd1931649cf86b4b3fc20e345ce42b65737 Mon Sep 17 00:00:00 2001
From: Ben Awad <benawad97@gmail.com>
Date: Wed, 12 Aug 2020 21:52:55 -0500
Subject: [PATCH] fix: handle edge cases where linked file is not found

---
 src/index/generateTrees/toFractalTree.ts | 29 +++++++++++++++++++++++-
 src/index/shared/fileWithoutExtension.ts |  4 ++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/index/shared/fileWithoutExtension.ts

diff --git a/src/index/generateTrees/toFractalTree.ts b/src/index/generateTrees/toFractalTree.ts
index 0d6fb11..43cdc95 100644
--- a/src/index/generateTrees/toFractalTree.ts
+++ b/src/index/generateTrees/toFractalTree.ts
@@ -7,6 +7,8 @@ import { hasCycle } from "./toFractalTree/hasCycle";
 import { RootOption } from "../shared/RootOption";
 import { isLinkedFile, linkedFileToOriginal } from "./shared/isLinkedFile";
 import chalk from "chalk";
+import { fileWithoutExtension } from "../shared/fileWithoutExtension";
+import { isTestFile } from "./shared/isTestFile";
 
 export function toFractalTree(graph: Graph, entryPoints: string[]) {
   const tree: RootOption["tree"] = {};
@@ -130,6 +132,8 @@ export function toFractalTree(graph: Graph, entryPoints: string[]) {
     });
   }
 
+  const treeKeys = Object.keys(tree);
+
   if (linkedFiles.size > 0) {
     // const globalTests = [];
 
@@ -141,7 +145,30 @@ export function toFractalTree(graph: Graph, entryPoints: string[]) {
         path.basename(sourceFile)
       );
       // source file will either be in the current dir or one up
-      const sourceFilePath = tree[sourceFile] || tree[oneDirUp];
+      let sourceFilePath = tree[sourceFile] || tree[oneDirUp];
+
+      // sometimes the test is add.test.jsx and the source is add.test.js
+      // so we have to do a linear search to find source key
+      // we could probably optimize this if needed by doing some work in the fn above
+      if (!sourceFilePath) {
+        const sourceFileWithoutFileExtension = fileWithoutExtension(sourceFile);
+        for (const key of treeKeys) {
+          if (path.basename(key).startsWith(sourceFileWithoutFileExtension)) {
+            sourceFilePath = tree[key];
+            break;
+          }
+        }
+      }
+
+      if (!sourceFilePath && isTestFile(linkedFile)) {
+        // could not link by filename
+        // so the backup is linking by first relative import
+        const [firstRelativeImport] = graph[linkedFile];
+        if (firstRelativeImport) {
+          sourceFilePath = tree[firstRelativeImport];
+        }
+      }
+
       if (!sourceFilePath) {
         logger.warn(
           `could not find source file that is linked to ${chalk.blueBright(
diff --git a/src/index/shared/fileWithoutExtension.ts b/src/index/shared/fileWithoutExtension.ts
new file mode 100644
index 0000000..a58e66e
--- /dev/null
+++ b/src/index/shared/fileWithoutExtension.ts
@@ -0,0 +1,4 @@
+import path from "path";
+
+export const fileWithoutExtension = (f: string) =>
+  path.basename(f, path.extname(f));