TypeScriptToLua
diff --git a/‎package-lock.json‎
Lines changed: 3 additions & 10 deletions b/‎package-lock.json‎
Lines changed: 3 additions & 10 deletions
diff --git a/‎package.json‎
Lines changed: 0 additions & 2 deletions b/‎package.json‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/transpilation/transpilation.ts‎
Lines changed: 17 additions & 10 deletions b/‎src/transpilation/transpilation.ts‎
Lines changed: 17 additions & 10 deletions
diff --git a/‎src/transpilation/utils.ts‎
Lines changed: 13 additions & 4 deletions b/‎src/transpilation/utils.ts‎
Lines changed: 13 additions & 4 deletions
@@ -37,7 +37,6 @@
     },
     "dependencies": {
         "enhanced-resolve": "^5.2.0",
-        "resolve": "^1.15.1",
         "source-map": "^0.7.3",
         "typescript": "^3.9.2"
     },
@@ -46,7 +45,6 @@
         "@types/glob": "^7.1.1",
         "@types/jest": "^25.1.3",
         "@types/node": "^13.7.7",
-        "@types/resolve": "1.14.0",
         "@typescript-eslint/eslint-plugin": "^2.31.0",
         "@typescript-eslint/parser": "^2.31.0",
         "eslint": "^6.8.0",
 
@@ -11,6 +11,7 @@ import { createResolutionErrorDiagnostic } from "./diagnostics";
 import { buildModule, Module } from "./module";
 import { applyBailPlugin, applySinglePlugin, getPlugins, Plugin } from "./plugins";
 import { Transpiler, TranspilerHost } from "./transpiler";
+import { isResolveError } from "./utils";
 
 export class Transpilation {
     public readonly diagnostics: ts.Diagnostic[] = [];
@@ -70,26 +71,32 @@ export class Transpilation {
 
     private buildModule(module: Module) {
         buildModule(module, request => {
-            let resolvedModule: Module;
-            try {
-                resolvedModule = this.resolveRequestToModule(module.request, request);
-            } catch (error) {
-                this.diagnostics.push(createResolutionErrorDiagnostic(error.message, request, module.request));
-                return { error: error.message };
+            const result = this.resolveRequestToModule(module.request, request);
+            if ("error" in result) {
+                this.diagnostics.push(result.error);
+                return { error: ts.flattenDiagnosticMessageText(result.error.messageText, "\n") };
             }
 
-            return this.getModuleId(resolvedModule);
+            return this.getModuleId(result);
         });
     }
 
     private resolveRequestToModule(issuer: string, request: string) {
-        const resolvedPath = this.resolver.resolveSync({}, path.dirname(issuer), request);
-        assert(typeof resolvedPath === "string", `Invalid resolution result: ${resolvedPath}`);
+        let resolvedPath: string;
+        try {
+            const result = this.resolver.resolveSync({}, path.dirname(issuer), request);
+            assert(typeof result === "string", `Invalid resolution result: ${result}`);
+            resolvedPath = result;
+        } catch (error) {
+            if (!isResolveError(error)) throw error;
+            return { error: createResolutionErrorDiagnostic(error.message, request, issuer) };
+        }
 
         let module = this.modules.find(m => m.request === resolvedPath);
         if (!module) {
             if (!resolvedPath.endsWith(".lua")) {
-                throw new Error(`Resolved source file '${resolvedPath}' is not a part of the project.`);
+                const messageText = `Resolved source file '${resolvedPath}' is not a part of the project.`;
+                return { error: createResolutionErrorDiagnostic(messageText, request, issuer) };
             }
 
             // TODO: Load source map files
 
@@ -1,9 +1,16 @@
-import * as resolve from "resolve";
+import { create as createResolve } from "enhanced-resolve";
 import * as ts from "typescript";
 // TODO: Don't depend on CLI?
 import * as cliDiagnostics from "../cli/diagnostics";
+import { assert } from "../utils";
 import * as diagnosticFactories from "./diagnostics";
 
+// https://github.com/webpack/enhanced-resolve/blob/0001f80dacf033ac4a0e690b2766e0965c458266/lib/Resolver.js#L280-L288
+export const isResolveError = (error: unknown): error is Error & { details: string } =>
+    error instanceof Error && "details" in error;
+
+const resolveImport = createResolve.sync({ extensions: [".js", ".ts", ".tsx"] });
+
 export function resolveConfigImport(
     kind: string,
     optionName: string,
@@ -17,9 +24,11 @@ export function resolveConfigImport(
 
     let resolved: string;
     try {
-        resolved = resolve.sync(query, { basedir, extensions: [".js", ".ts", ".tsx"] });
-    } catch (err) {
-        if (err.code !== "MODULE_NOT_FOUND") throw err;
+        const result = resolveImport({}, basedir, query);
+        assert(typeof result === "string");
+        resolved = result;
+    } catch (error) {
+        if (!isResolveError(error)) throw error;
         return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };
     }