style: refactor lualib resolution into common function

YoRyan · YoRyan · commit 28cc8cdd5be3 · 2022-08-29T01:12:56.000Z
diff --git a/src/LuaLib.ts b/src/LuaLib.ts
@@ -112,12 +112,16 @@ export interface LuaLibFeatureInfo {
 }
 export type LuaLibModulesInfo = Record<LuaLibFeature, LuaLibFeatureInfo>;
 
+export function resolveLuaLibDir(luaTarget: LuaTarget) {
+    const luaLibDir = luaTarget === LuaTarget.Lua50 ? "lualib-lua50" : "lualib";
+    return path.resolve(__dirname, path.join("..", "dist", luaLibDir));
+}
+
 export const luaLibModulesInfoFileName = "lualib_module_info.json";
 let luaLibModulesInfo: LuaLibModulesInfo | undefined;
 export function getLuaLibModulesInfo(luaTarget: LuaTarget, emitHost: EmitHost): LuaLibModulesInfo {
     if (luaLibModulesInfo === undefined) {
-        const lualibDir = `../dist/${luaTarget === LuaTarget.Lua50 ? "lualib-lua50" : "lualib"}`;
-        const lualibPath = path.resolve(__dirname, `${lualibDir}/${luaLibModulesInfoFileName}`);
+        const lualibPath = path.join(resolveLuaLibDir(luaTarget), luaLibModulesInfoFileName);
         const result = emitHost.readFile(lualibPath);
         if (result !== undefined) {
             luaLibModulesInfo = JSON.parse(result) as LuaLibModulesInfo;
@@ -129,8 +133,7 @@ export function getLuaLibModulesInfo(luaTarget: LuaTarget, emitHost: EmitHost):
 }
 
 export function readLuaLibFeature(feature: LuaLibFeature, luaTarget: LuaTarget, emitHost: EmitHost): string {
-    const lualibDir = `../dist/${luaTarget === LuaTarget.Lua50 ? "lualib-lua50" : "lualib"}`;
-    const featurePath = path.resolve(__dirname, `${lualibDir}/${feature}.lua`);
+    const featurePath = path.join(resolveLuaLibDir(luaTarget), `${feature}.lua`);
     const luaLibFeature = emitHost.readFile(featurePath);
     if (luaLibFeature === undefined) {
         throw new Error(`Could not load lualib feature from '${featurePath}'`);
@@ -215,8 +218,7 @@ export function loadImportedLualibFeatures(
 let luaLibBundleContent: string;
 export function getLuaLibBundle(luaTarget: LuaTarget, emitHost: EmitHost): string {
     if (luaLibBundleContent === undefined) {
-        const lualibDir = `../dist/${luaTarget === LuaTarget.Lua50 ? "lualib-lua50" : "lualib"}`;
-        const lualibPath = path.resolve(__dirname, `${lualibDir}/lualib_bundle.lua`);
+        const lualibPath = path.join(resolveLuaLibDir(luaTarget), "lualib_bundle.lua");
         const result = emitHost.readFile(lualibPath);
         if (result !== undefined) {
             luaLibBundleContent = result;
diff --git a/test/util.ts b/test/util.ts
@@ -9,12 +9,12 @@ import * as ts from "typescript";
 import * as vm from "vm";
 import * as tstl from "../src";
 import { createEmitOutputCollector } from "../src/transpilation/output-collector";
-import { EmitHost, getEmitOutDir, LuaTarget, transpileProject } from "../src";
+import { EmitHost, getEmitOutDir, transpileProject } from "../src";
 import { formatPathToLuaPath, normalizeSlashes } from "../src/utils";
+import { resolveLuaLibDir } from "../src/LuaLib";
 
 function readLuaLib(target: tstl.LuaTarget) {
-    const luaLibDir = `../dist/${target === LuaTarget.Lua50 ? "lualib-lua50" : "lualib"}`;
-    return fs.readFileSync(path.resolve(__dirname, `${luaLibDir}/lualib_bundle.lua`), "utf8");
+    return fs.readFileSync(path.join(resolveLuaLibDir(target), "lualib_bundle.lua"), "utf8");
 }
 
 function jsonLib(target: tstl.LuaTarget): string {
