TypeScriptToLua
diff --git a/‎src/LuaTransformer.ts‎
Lines changed: 9 additions & 4 deletions b/‎src/LuaTransformer.ts‎
Lines changed: 9 additions & 4 deletions
diff --git a/‎src/TSTLErrors.ts‎
Lines changed: 3 additions & 0 deletions b/‎src/TSTLErrors.ts‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/diagnostics.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/diagnostics.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎test/unit/outFile.spec.ts‎
Lines changed: 15 additions & 0 deletions b/‎test/unit/outFile.spec.ts‎
Lines changed: 15 additions & 0 deletions
@@ -142,10 +142,15 @@ export class LuaTransformer {
 
         if (this.options.luaEntry) {
             const requireCalls = this.options.luaEntry.map(entry => {
-                const formattedEntryName = tsHelper.formatPathToLuaPath(entry.replace(/.ts$/, ""));
-                return tstl.createExpressionStatement(
-                    this.createModuleRequire(ts.createStringLiteral(formattedEntryName), false)
-                );
+                const sourceFile = this.program.getSourceFile(entry);
+                if (sourceFile) {
+                    const formattedEntryName = tsHelper.getExportPath(sourceFile.fileName, this.options);
+                    return tstl.createExpressionStatement(
+                        this.createModuleRequire(ts.createStringLiteral(formattedEntryName), false)
+                    );
+                } else {
+                    throw TSTLErrors.LuaEntryNotFound(entry);
+                }
             });
             combinedStatements.push(...requireCalls);
         }
 
@@ -60,6 +60,9 @@ export const InvalidThrowExpression = (node: ts.Node) =>
 export const ForbiddenStaticClassPropertyName = (node: ts.Node, name: string) =>
     new TranspileError(`Cannot use "${name}" as a static class property or method name.`, node);
 
+export const LuaEntryNotFound = (entryName: string) =>
+    new TranspileError(`Could not find luaEntry file '${entryName}'.`, ts.createNode(ts.SyntaxKind.Unknown));
+
 export const MissingClassName = (node: ts.Node) => new TranspileError(`Class declarations must have a name.`, node);
 
 export const MissingForOfVariables = (node: ts.Node) =>
 
@@ -2,9 +2,9 @@ import * as ts from "typescript";
 import { TranspileError } from "./TranspileError";
 
 export const transpileError = (error: TranspileError): ts.Diagnostic => ({
-    file: error.node.getSourceFile(),
-    start: error.node.getStart(),
-    length: error.node.getWidth(),
+    file: error.node.kind === ts.SyntaxKind.Unknown ? undefined : error.node.getSourceFile(),
+    start: error.node.kind === ts.SyntaxKind.Unknown ? undefined : error.node.getStart(),
+    length: error.node.kind === ts.SyntaxKind.Unknown ? undefined : error.node.getWidth(),
     category: ts.DiagnosticCategory.Error,
     code: 0,
     source: "typescript-to-lua",
 
@@ -1,5 +1,6 @@
 import * as util from "../util";
 import * as ts from "typescript";
+import * as TSTLErrors from "../../src/TSTLErrors";
 import { CompilerOptions } from "../../src/CompilerOptions";
 
 const exportValueSource = "export const value = true;";
@@ -115,4 +116,18 @@ describe("outFile", () => {
             .setOptions(outFileOptionsWithEntry("main.ts"))
             .expectNoExecutionError();
     });
+
+    test("luaEntry doesn't exist", () => {
+        util.testBundle``
+            .setOptions(outFileOptionsWithEntry("entry.ts"))
+            .expectToHaveDiagnosticOfError(TSTLErrors.LuaEntryNotFound("entry.ts"));
+    });
+
+    test("luaEntry resolved from path specified in tsconfig", () => {
+        util.testBundle``
+            .addExtraFile("src/main.ts", "")
+            .addExtraFile("src/module.ts", "")
+            .setOptions({ rootDir: "src", ...outFileOptionsWithEntry("src/main.ts") })
+            .expectToHaveNoDiagnostics();
+    });
 });