fix: debug.traceback of loadstring get unknown file #1259 (#1260)

pilaoda · web-flow · commit 080163ac742c · 2022-04-24T16:54:47.000+02:00
* fix: debug.traceback of loadstring get unknown file #1259 * fix the linter errors * add a test: loadstring sourceMapTraceback gives traceback * better test for loadstring sourceMapTraceback gives traceback
diff --git a/src/lualib/SourceMapTraceBack.ts b/src/lualib/SourceMapTraceBack.ts
@@ -43,9 +43,23 @@ export function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap
             let [result] = string.gsub(trace, "(%S+)%.lua:(%d+)", (file, line) =>
                 replacer(`${file}.lua`, `${file}.ts`, line)
             );
-            [result] = string.gsub(result, '(%[string "[^"]+"%]):(%d+)', (file, line) =>
-                replacer(file, "unknown", line)
-            );
+
+            const stringReplacer = (file: string, line: string) => {
+                const fileSourceMap: SourceMap = globalThis.__TS__sourcemap[file];
+                if (fileSourceMap && fileSourceMap[line]) {
+                    const chunkName = string.match(file, '%[string "([^"]+)"%]')[0];
+                    const [sourceName] = string.gsub(chunkName, ".lua$", ".ts");
+                    const data = fileSourceMap[line];
+                    if (typeof data === "number") {
+                        return `${sourceName}:${data}`;
+                    }
+
+                    return `${data.file}:${data.line}`;
+                }
+
+                return `${file}:${line}`;
+            };
+            [result] = string.gsub(result, '(%[string "[^"]+"%]):(%d+)', (file, line) => stringReplacer(file, line));
 
             return result;
         }) as typeof debug.traceback;
diff --git a/test/unit/printer/sourcemaps.spec.ts b/test/unit/printer/sourcemaps.spec.ts
@@ -1,5 +1,6 @@
 import { SourceMapConsumer } from "source-map";
 import * as tstl from "../../../src";
+import { LuaTarget, transpileString } from "../../../src";
 import { couldNotResolveRequire } from "../../../src/transpilation/diagnostics";
 import * as util from "../../util";
 import { lineAndColumnOf } from "./utils";
@@ -326,3 +327,24 @@ test("Inline sourcemaps", () => {
     const inlineSourceMap = Buffer.from(inlineSourceMapMatch, "base64").toString();
     expect(inlineSourceMap).toBe(file.luaSourceMap);
 });
+
+test("loadstring sourceMapTraceback gives traceback", () => {
+    const loadStrCode = transpileString(
+        `function bar() {
+            const trace = (debug.traceback as (this: void)=>string)();
+            return trace;
+        }
+        return bar();`,
+        { sourceMapTraceback: true, luaTarget: LuaTarget.Lua51 }
+    ).file?.lua;
+
+    const builder = util.testModule`
+        const luaCode = \`${loadStrCode}\`;
+        return loadstring(luaCode, "foo.lua")();
+    `
+        .setTsHeader("declare function loadstring(this: void, string: string, chunkname: string): () => unknown")
+        .setOptions({ sourceMapTraceback: true, luaTarget: LuaTarget.Lua51 });
+
+    const traceback = builder.getLuaExecutionResult();
+    expect(traceback).toContain("foo.ts");
+});
