TypeScriptToLua
diff --git a/‎package-lock.json‎
Lines changed: 21 additions & 0 deletions b/‎package-lock.json‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎package.json‎
Lines changed: 1 addition & 0 deletions b/‎package.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/transpilation/transpiler.ts‎
Lines changed: 12 additions & 34 deletions b/‎src/transpilation/transpiler.ts‎
Lines changed: 12 additions & 34 deletions
diff --git a/‎src/transpilation/utils.ts‎
Lines changed: 4 additions & 1 deletion b/‎src/transpilation/utils.ts‎
Lines changed: 4 additions & 1 deletion
@@ -36,6 +36,7 @@
         "node": ">=12.13.0"
     },
     "dependencies": {
+        "enhanced-resolve": "^5.2.0",
         "resolve": "^1.15.1",
         "source-map": "^0.7.3",
         "typescript": "^3.9.2"
 
@@ -1,5 +1,6 @@
+import { ResolverFactory } from "enhanced-resolve";
+import * as fs from "fs";
 import * as path from "path";
-import * as resolve from "resolve";
 import * as ts from "typescript";
 import { CompilerOptions, isBundleEnabled, LuaTarget } from "../CompilerOptions";
 import { getLuaLibBundle } from "../LuaLib";
@@ -53,9 +54,6 @@ export class Transpiler {
     }
 }
 
-// TODO: JIT -> jit?
-type PackageLuaField = string | Record<LuaTarget, string>;
-
 class Transpilation {
     public readonly diagnostics: ts.Diagnostic[] = [];
     private seenFiles = new Set<string>();
@@ -130,37 +128,17 @@ class Transpilation {
         this.files.push(file);
     }
 
-    protected resolveRequest(request: string, issuer: string) {
-        const resolved = resolve.sync(request, {
-            basedir: path.dirname(issuer),
-            extensions: [".lua", ".ts", ".tsx", ".js", ".jsx"],
-            packageFilter: (pkg, pkgFile) => {
-                delete pkg.main;
-
-                const lua: PackageLuaField = pkg.lua;
-                if (lua !== undefined) {
-                    if (typeof lua === "string") {
-                        pkg.main = lua;
-                    } else if (typeof lua === "object") {
-                        const luaTarget = this.options.luaTarget ?? LuaTarget.Universal;
-                        pkg.main = lua[luaTarget];
-                        if (pkg.main === undefined) {
-                            throw new Error(`${pkgFile} not supports Lua ${luaTarget} target.`);
-                        }
-                    } else {
-                        throw new Error(`${pkgFile} has invalid "lua" field value.`);
-                    }
-                }
-
-                return pkg;
-            },
-        });
-
-        if (resolve.isCore(resolved)) {
-            throw new Error(`"${resolved}" is builtin Node.js module.`);
-        }
+    protected resolver = ResolverFactory.createResolver({
+        extensions: [".lua", ".ts", ".tsx", ".js", ".jsx"],
+        conditionNames: ["lua", `lua:${this.options.luaTarget ?? LuaTarget.Universal}`],
+        fileSystem: this.emitHost.fileSystem ?? fs,
+        useSyncFileSystemCalls: true,
+    });
 
-        return resolved;
+    protected resolveRequest(request: string, issuer: string) {
+        const result = this.resolver.resolveSync({}, path.dirname(issuer), request);
+        assert(typeof result === "string");
+        return result;
     }
 
     protected toGeneratedFileName(fileName: string) {
 
@@ -1,3 +1,4 @@
+import * as fs from "fs";
 import * as path from "path";
 import * as resolve from "resolve";
 import { SourceNode } from "source-map";
@@ -7,7 +8,9 @@ import * as cliDiagnostics from "../cli/diagnostics";
 import * as lua from "../LuaAST";
 import * as diagnosticFactories from "./diagnostics";
 
-export type EmitHost = Pick<ts.System, "getCurrentDirectory" | "readFile" | "writeFile">;
+export interface EmitHost extends Pick<ts.System, "getCurrentDirectory" | "readFile" | "writeFile"> {
+    fileSystem?: typeof fs;
+}
 
 interface BaseFile {
     code: string;