TypeScriptToLua
diff --git a/‎src/transformation/utils/errors.ts‎
Lines changed: 0 additions & 2 deletions b/‎src/transformation/utils/errors.ts‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/transformation/visitors/sourceFile.ts‎
Lines changed: 10 additions & 5 deletions b/‎src/transformation/visitors/sourceFile.ts‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎test/unit/json.spec.ts‎
Lines changed: 2 additions & 12 deletions b/‎test/unit/json.spec.ts‎
Lines changed: 2 additions & 12 deletions
diff --git a/‎test/util.ts‎
Lines changed: 4 additions & 2 deletions b/‎test/util.ts‎
Lines changed: 4 additions & 2 deletions
@@ -43,8 +43,6 @@ export const InvalidExportsExtension = (node: ts.Node) =>
 export const InvalidInstanceOfExtension = (node: ts.Node) =>
     new TranspileError(`Cannot use instanceof on classes with '@extension' or '@metaExtension' annotation.`, node);
 
-export const InvalidJsonFileContent = (node: ts.Node) => new TranspileError("Invalid JSON file content", node);
-
 export const MissingForOfVariables = (node: ts.Node) =>
     new TranspileError("Transpiled ForOf variable declaration list contains no declarations.", node);
 
 
@@ -1,7 +1,7 @@
 import * as ts from "typescript";
 import * as lua from "../../LuaAST";
+import { assert } from "../../utils";
 import { FunctionVisitor } from "../context";
-import { InvalidJsonFileContent } from "../utils/errors";
 import { createExportsIdentifier } from "../utils/lua-ast";
 import { performHoisting, popScope, pushScope, ScopeType } from "../utils/scope";
 import { hasExportEquals } from "../utils/typescript";
@@ -10,11 +10,16 @@ export const transformSourceFileNode: FunctionVisitor<ts.SourceFile> = (node, co
     let statements: lua.Statement[] = [];
     if (node.flags & ts.NodeFlags.JsonFile) {
         const [statement] = node.statements;
-        if (!statement || !ts.isExpressionStatement(statement)) {
-            throw InvalidJsonFileContent(node);
-        }
+        if (statement) {
+            assert(ts.isExpressionStatement(statement));
+            statements.push(lua.createReturnStatement([context.transformExpression(statement.expression)]));
+        } else {
+            const errorCall = lua.createCallExpression(lua.createIdentifier("error"), [
+                lua.createStringLiteral("Unexpected end of JSON input"),
+            ]);
 
-        statements.push(lua.createReturnStatement([context.transformExpression(statement.expression)]));
+            statements.push(lua.createExpressionStatement(errorCall));
+        }
     } else {
         pushScope(context, ScopeType.File);
         statements = performHoisting(context, context.transformStatements(node.statements));
 
@@ -1,23 +1,13 @@
-import * as ts from "typescript";
-import { InvalidJsonFileContent } from "../../src/transformation/utils/errors";
 import * as util from "../util";
 
-const jsonOptions = {
-    resolveJsonModule: true,
-    noHeader: true,
-    moduleResolution: ts.ModuleResolutionKind.NodeJs,
-};
-
 test.each([0, "", [], [1, "2", []], { a: "b" }, { a: { b: "c" } }])("JSON (%p)", json => {
     util.testModule(JSON.stringify(json))
-        .setOptions(jsonOptions)
         .setMainFileName("main.json")
         .expectToEqual(json);
 });
 
-test("Empty JSON", () => {
+test("Empty JSON file error", () => {
     util.testModule("")
-        .setOptions(jsonOptions)
         .setMainFileName("main.json")
-        .expectToHaveDiagnosticOfError(InvalidJsonFileContent(util.nodeStub));
+        .expectToEqual(new util.ExecutionError("Unexpected end of JSON input"));
 });
@@ -190,6 +190,8 @@ export abstract class TestBuilder {
         skipLibCheck: true,
         target: ts.ScriptTarget.ES2017,
         lib: ["lib.esnext.d.ts"],
+        moduleResolution: ts.ModuleResolutionKind.NodeJs,
+        resolveJsonModule: true,
         experimentalDecorators: true,
     };
     public setOptions(options: tstl.CompilerOptions = {}): this {
@@ -371,8 +373,8 @@ export abstract class TestBuilder {
             { getCurrentDirectory: () => "", getCanonicalFileName: fileName => fileName, getNewLine: () => "\n" }
         );
 
-        expect(this.getMainLuaCodeChunk()).toMatchSnapshot('code');
-        expect(diagnosticMessages.trim()).toMatchSnapshot('diagnostics');
+        expect(this.getMainLuaCodeChunk()).toMatchSnapshot("code");
+        expect(diagnosticMessages.trim()).toMatchSnapshot("diagnostics");
 
         return this;
     }