Remove remaining TranspileError handling code

ark120202 · ark120202 · commit d70666f4a861 · 2019-12-12T17:10:57.000Z
diff --git a/src/index.ts b/src/index.ts
@@ -6,5 +6,4 @@ export * from "./LuaAST";
 export { LuaLibFeature } from "./LuaLib";
 export * from "./LuaPrinter";
 export * from "./transformation/context";
-export { TranspileError } from "./transformation/utils/errors";
 export * from "./transpilation";
diff --git a/src/transformation/index.ts b/src/transformation/index.ts
@@ -3,20 +3,9 @@ import * as lua from "../LuaAST";
 import { LuaLibFeature } from "../LuaLib";
 import { getOrUpdate } from "../utils";
 import { ObjectVisitor, TransformationContext, VisitorMap, Visitors } from "./context";
-import { TranspileError } from "./utils/errors";
 import { getUsedLuaLibFeatures } from "./utils/lualib";
 import { standardVisitors } from "./visitors";
 
-const transpileErrorDiagnostic = (error: TranspileError): ts.Diagnostic => ({
-    file: error.node.getSourceFile(),
-    start: error.node.getStart(),
-    length: error.node.getWidth(),
-    category: ts.DiagnosticCategory.Error,
-    code: 0,
-    source: "typescript-to-lua",
-    messageText: error.message,
-});
-
 export function createVisitorMap(customVisitors: Visitors[]): VisitorMap {
     const visitorMap: VisitorMap = new Map();
     for (const visitors of [standardVisitors, ...customVisitors]) {
@@ -52,27 +41,11 @@ export function transformSourceFile(
     visitorMap: VisitorMap
 ): TransformSourceFileResult {
     const context = new TransformationContext(program, sourceFile, visitorMap);
+    const [luaAst] = context.transformNode(sourceFile) as [lua.Block];
 
-    // TODO: Remove once we'll get rid of all `TranspileError`s
-    try {
-        const [luaAst] = context.transformNode(sourceFile) as [lua.Block];
-
-        return {
-            luaAst,
-            luaLibFeatures: getUsedLuaLibFeatures(context),
-            diagnostics: context.diagnostics,
-        };
-    } catch (error) {
-        if (!(error instanceof TranspileError)) throw error;
-
-        return {
-            luaAst: lua.createBlock([
-                lua.createExpressionStatement(
-                    lua.createCallExpression(lua.createIdentifier("error"), [lua.createStringLiteral(error.message)])
-                ),
-            ]),
-            luaLibFeatures: new Set(),
-            diagnostics: [transpileErrorDiagnostic(error)],
-        };
-    }
+    return {
+        luaAst,
+        luaLibFeatures: getUsedLuaLibFeatures(context),
+        diagnostics: context.diagnostics,
+    };
 }
diff --git a/src/transformation/utils/errors.ts b/src/transformation/utils/errors.ts
diff --git a/test/setup.ts b/test/setup.ts
@@ -1,36 +1,15 @@
 import * as ts from "typescript";
 import * as tstl from "../src";
-import * as util from "./util";
 
 declare global {
     namespace jest {
         interface Matchers<R, T> {
-            toThrowExactError(error: Error): R;
             toHaveDiagnostics(): R;
         }
     }
 }
 
 expect.extend({
-    toThrowExactError(callback: () => void, error: Error): jest.CustomMatcherResult {
-        if (this.isNot) {
-            return { pass: true, message: () => "Inverted toThrowExactError is not implemented" };
-        }
-
-        let executionError: Error | undefined;
-        try {
-            callback();
-        } catch (err) {
-            executionError = err;
-        }
-
-        // TODO:
-        if (util.expectToBeDefined(executionError)) {
-            expect(executionError.message).toContain(error.message);
-        }
-
-        return { pass: true, message: () => "" };
-    },
     toHaveDiagnostics(diagnostics: ts.Diagnostic[]): jest.CustomMatcherResult {
         expect(diagnostics).toBeInstanceOf(Array);
         // @ts-ignore
diff --git a/test/util.ts b/test/util.ts
@@ -60,7 +60,7 @@ export function testEachVersion<T extends TestBuilder>(
         test(testName, () => {
             const builder = common();
             builder.setOptions({ luaTarget: version });
-            if (typeof specialBuilder === 'function') {
+            if (typeof specialBuilder === "function") {
                 specialBuilder(builder);
             }
         });
@@ -151,7 +151,6 @@ export class ExecutionError extends Error {
 
 export type ExecutableTranspiledFile = tstl.TranspiledFile & { lua: string; sourceMap: string };
 export type TapCallback = (builder: TestBuilder) => void;
-export type DiagnosticMatcher = (diagnostic: ts.Diagnostic) => boolean;
 export abstract class TestBuilder {
     constructor(protected _tsCode: string) {}
 
@@ -339,47 +338,21 @@ export abstract class TestBuilder {
         return this;
     }
 
-    public expectToHaveDiagnostic(matcher: DiagnosticMatcher): this {
-        expect(this.getLuaDiagnostics().find(matcher)).toBeDefined();
-        return this;
-    }
-
-    public expectToHaveExactDiagnostic(diagnostic: ts.Diagnostic): this {
-        expect(this.getLuaDiagnostics()).toContainEqual(diagnostic);
-        return this;
-    }
+    private diagnosticsChecked = false;
 
     public expectToHaveDiagnostics(): this {
-        expect(this.getLuaDiagnostics()).toHaveDiagnostics();
-        return this;
-    }
+        if (this.diagnosticsChecked) return this;
+        this.diagnosticsChecked = true;
 
-    public expectToHaveDiagnosticOfError(error: Error): this {
-        this.expectToHaveDiagnostics();
-        expect(this.getLuaDiagnostics()).toHaveLength(1);
-        const firstDiagnostic = this.getLuaDiagnostics()[0];
-        expect(firstDiagnostic).toMatchObject({ messageText: error.message });
+        expect(this.getLuaDiagnostics()).toHaveDiagnostics();
         return this;
     }
 
     public expectToHaveNoDiagnostics(): this {
-        expect(this.getLuaDiagnostics()).not.toHaveDiagnostics();
-        return this;
-    }
-
-    public expectDiagnosticsToMatchSnapshot(diagnosticsOnly = false): this {
-        this.expectToHaveDiagnostics();
-
-        const diagnosticMessages = ts.formatDiagnostics(
-            this.getLuaDiagnostics().map(tstl.prepareDiagnosticForFormatting),
-            { getCurrentDirectory: () => "", getCanonicalFileName: fileName => fileName, getNewLine: () => "\n" }
-        );
-
-        expect(diagnosticMessages.trim()).toMatchSnapshot("diagnostics");
-        if (!diagnosticsOnly) {
-            expect(this.getMainLuaCodeChunk()).toMatchSnapshot("code");
-        }
+        if (this.diagnosticsChecked) return this;
+        this.diagnosticsChecked = true;
 
+        expect(this.getLuaDiagnostics()).not.toHaveDiagnostics();
         return this;
     }
 
@@ -416,9 +389,19 @@ export abstract class TestBuilder {
         return this;
     }
 
-    public expectResultToMatchSnapshot(): this {
-        this.expectToHaveNoDiagnostics();
-        expect(this.getLuaExecutionResult()).toMatchSnapshot();
+    public expectDiagnosticsToMatchSnapshot(diagnosticsOnly = false): this {
+        this.expectToHaveDiagnostics();
+
+        const diagnosticMessages = ts.formatDiagnostics(
+            this.getLuaDiagnostics().map(tstl.prepareDiagnosticForFormatting),
+            { getCurrentDirectory: () => "", getCanonicalFileName: fileName => fileName, getNewLine: () => "\n" }
+        );
+
+        expect(diagnosticMessages.trim()).toMatchSnapshot("diagnostics");
+        if (!diagnosticsOnly) {
+            expect(this.getMainLuaCodeChunk()).toMatchSnapshot("code");
+        }
+
         return this;
     }
 
