Added more in-project dependency checks to sourceDir test

Perryvw · Perryvw · commit 7a7988112957 · 2021-05-24T17:23:05.000+02:00
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -84,31 +84,33 @@ describe("basic module resolution", () => {
 
 describe("module resolution with chained dependencies", () => {
     const projectPath = path.resolve(__dirname, "module-resolution", "project-with-dependency-chain");
+    const expectedResult = { result: "dependency3" };
 
     test("can resolve dependencies in chain", () => {
         util.testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(path.join(projectPath, "main.ts"))
-            .expectToEqual({ result: "dependency3" });
+            .expectToEqual(expectedResult);
     });
 
     test("resolved package dependency included in bundle", () => {
         const mainFile = path.join(projectPath, "main.ts");
         util.testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(mainFile)
             .setOptions({ luaBundle: "bundle.lua", luaBundleEntry: mainFile })
-            .expectToEqual({ result: "dependency3" });
+            .expectToEqual(expectedResult);
     });
 });
 
 describe("module resolution with outDir", () => {
     const projectPath = path.resolve(__dirname, "module-resolution", "project-with-dependency-chain");
+    const expectedResult = { result: "dependency3" };
 
     test("emits files in outDir", () => {
         const builder = util
             .testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(path.join(projectPath, "main.ts"))
             .setOptions({ outDir: "tstl-out" })
-            .expectToEqual({ result: "dependency3" });
+            .expectToEqual(expectedResult);
 
         // Get the output paths relative to the project path
         const outPaths = builder.getLuaResult().transpiledFiles.map(f => path.relative(projectPath, f.outPath));
@@ -126,7 +128,7 @@ describe("module resolution with outDir", () => {
             .testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(mainFile)
             .setOptions({ outDir: "tstl-out", luaBundle: "bundle.lua", luaBundleEntry: mainFile })
-            .expectToEqual({ result: "dependency3" });
+            .expectToEqual(expectedResult);
 
         // Get the output paths relative to the project path
         const outPaths = builder.getLuaResult().transpiledFiles.map(f => path.relative(projectPath, f.outPath));
@@ -137,19 +139,26 @@ describe("module resolution with outDir", () => {
 
 describe("module resolution with sourceDir", () => {
     const projectPath = path.resolve(__dirname, "module-resolution", "project-with-sourceDir");
+    const expectedResult = {
+        result: "dependency3",
+        functionInSubDir: "non-node_modules import",
+        functionReExportedFromSubDir: "nested func result",
+        nestedFunctionInSubDirOfSubDir: "nested func result",
+        nestedFunctionUsingFunctionFromParentDir: "nested func: non-node_modules import 2",
+    };
 
     test("can resolve dependencies with sourceDir", () => {
         util.testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(path.join(projectPath, "src", "main.ts"))
             .setOptions({ outDir: "tstl-out" })
-            .expectToEqual({ result: "dependency3", result2: "non-node_modules import" });
+            .expectToEqual(expectedResult);
     });
 
     test("can resolve dependencies and bundle files with sourceDir", () => {
         const mainFile = path.join(projectPath, "src", "main.ts");
         util.testProject(path.join(projectPath, "tsconfig.json"))
             .setMainFileName(mainFile)
             .setOptions({ luaBundle: "bundle.lua", luaBundleEntry: mainFile })
-            .expectToEqual({ result: "dependency3", result2: "non-node_modules import" });
+            .expectToEqual(expectedResult);
     });
 });
diff --git a/test/transpile/module-resolution/project-with-sourceDir/src/main.ts b/test/transpile/module-resolution/project-with-sourceDir/src/main.ts
@@ -1,5 +1,9 @@
 import * as dependency1 from "dependency1";
-import { func } from "./subdir/otherfile";
+import { func, nestedFunc } from "./subdir/otherfile";
+import { nestedFunc as nestedFuncOriginal, nestedFuncUsingParent } from "./subdir/subdirofsubdir/nestedfile";
 
 export const result = dependency1.f1();
-export const result2 = func();
+export const functionInSubDir = func();
+export const functionReExportedFromSubDir = nestedFunc();
+export const nestedFunctionInSubDirOfSubDir = nestedFuncOriginal();
+export const nestedFunctionUsingFunctionFromParentDir = nestedFuncUsingParent();
diff --git a/test/transpile/module-resolution/project-with-sourceDir/src/subdir/otherfile.ts b/test/transpile/module-resolution/project-with-sourceDir/src/subdir/otherfile.ts
@@ -1,3 +1,5 @@
 export function func() {
     return "non-node_modules import";
 }
+
+export { nestedFunc } from "./subdirofsubdir/nestedfile";
diff --git a/test/transpile/module-resolution/project-with-sourceDir/src/subdir/otherfile2.ts b/test/transpile/module-resolution/project-with-sourceDir/src/subdir/otherfile2.ts
@@ -0,0 +1,3 @@
+export function func2() {
+    return "non-node_modules import 2";
+}
diff --git a/test/transpile/module-resolution/project-with-sourceDir/src/subdir/subdirofsubdir/nestedfile.ts b/test/transpile/module-resolution/project-with-sourceDir/src/subdir/subdirofsubdir/nestedfile.ts
@@ -0,0 +1,9 @@
+import { func2 } from "../otherfile2";
+
+export function nestedFunc() {
+    return "nested func result";
+}
+
+export function nestedFuncUsingParent() {
+    return `nested func: ${func2()}`;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`export function func() {`
`2`	`2`	`return "non-node_modules import";`
`3`	`3`	`}`
	`4`	`+`
	`5`	`+export { nestedFunc } from "./subdirofsubdir/nestedfile";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function func2() {`
	`2`	`+ return "non-node_modules import 2";`
	`3`	`+}`