Skip to content

Commit b5c6d3a

Browse files
PerryvwPerryvw
authored
Resolve lua required directory init.lua files (#1089)
1 parent 716a237 commit b5c6d3a

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

‎src/transpilation/resolve.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ function resolveDependency(
188188
const possibleLuaProjectFiles = [
189189
resolvedPath + ".lua", // lua file in sources
190190
path.join(resolvedPath, "index.lua"), // lua index file in sources
191+
path.join(resolvedPath, "init.lua"), // lua looks for <require>/init.lua if it cannot find <require>.lua
191192
];
192193

193194
for (const possibleFile of possibleLuaProjectFiles) {

‎test/transpile/module-resolution.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ describe("dependency with complicated inner structure", () => {
286286
otherFileUtil: "util",
287287
subsubresult: "result from subsub dir",
288288
utilResult: "util",
289+
subdirwithInitResult: "a",
289290
};
290291

291292
// Test fix for https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1055

‎test/transpile/module-resolution/project-with-complicated-dependency/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export const otherFileResult = dependency1.otherFileFromDependency1();
44
export const utilResult = dependency1.callUtil();
55
export const otherFileUtil = dependency1.otherFileUtil();
66
export const subsubresult = dependency1.subsubdirfileResult;
7+
export const subdirwithInitResult = dependency1.subdirWithInitResult;

‎test/transpile/module-resolution/project-with-complicated-dependency/node_modules/dependency1/index.d.ts‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/transpile/module-resolution/project-with-complicated-dependency/node_modules/dependency1/index.lua‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/transpile/module-resolution/project-with-complicated-dependency/node_modules/dependency1/subdirwithinit/init.lua‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)