Fix module resolution exploding (#1220)

Perryvw · web-flow · commit 88a947859dbd · 2022-03-01T23:23:30.000+01:00
* Fix module resolution exploding

* updated snapshot
diff --git a/src/transpilation/resolve.ts b/src/transpilation/resolve.ts
@@ -161,7 +161,7 @@ function resolveFileDependencies(file: ProcessedFile, context: ResolutionContext
         dependencies.push(...resolvedDependency.resolvedFiles);
         diagnostics.push(...resolvedDependency.diagnostics);
     }
-    return { resolvedFiles: dependencies, diagnostics };
+    return { resolvedFiles: deduplicateResolvedFiles(dependencies), diagnostics };
 }
 
 function resolveDependency(
@@ -174,7 +174,7 @@ function resolveDependency(
 
     const fileDirectory = path.dirname(requiringFile.fileName);
     if (options.tstlVerbose) {
-        console.log(`Resolving "${dependency}" from ${normalizeSlashes(fileDirectory)}`);
+        console.log(`Resolving "${dependency}" from ${normalizeSlashes(requiringFile.fileName)}`);
     }
 
     // Check if the import is relative
diff --git a/test/transpile/__snapshots__/project.spec.ts.snap b/test/transpile/__snapshots__/project.spec.ts.snap
@@ -11,7 +11,7 @@ Array [
   "Constructing emit plan",
   "Resolving dependencies for <cwd>/test/transpile/project/otherFile.ts",
   "Resolving dependencies for <cwd>/test/transpile/project/index.ts",
-  "Resolving \\"./otherFile\\" from <cwd>/test/transpile/project",
+  "Resolving \\"./otherFile\\" from <cwd>/test/transpile/project/index.ts",
   "Resolved ./otherFile to <cwd>/test/transpile/project/otherFile.ts",
   "Emitting output",
   "Emitting <cwd>/test/transpile/project/otherFile.lua",

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ function resolveFileDependencies(file: ProcessedFile, context: ResolutionContext`
`161`	`161`	`dependencies.push(...resolvedDependency.resolvedFiles);`
`162`	`162`	`diagnostics.push(...resolvedDependency.diagnostics);`
`163`	`163`	`}`
`164`		`- return { resolvedFiles: dependencies, diagnostics };`
	`164`	`+ return { resolvedFiles: deduplicateResolvedFiles(dependencies), diagnostics };`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`function resolveDependency(`
`@@ -174,7 +174,7 @@ function resolveDependency(`
`174`	`174`
`175`	`175`	`const fileDirectory = path.dirname(requiringFile.fileName);`
`176`	`176`	`if (options.tstlVerbose) {`
`177`		- console.log(`Resolving "${dependency}" from ${normalizeSlashes(fileDirectory)}`);
	`177`	+ console.log(`Resolving "${dependency}" from ${normalizeSlashes(requiringFile.fileName)}`);
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// Check if the import is relative`