Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 4 commits into from
Apr 24, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b67e3ba
fix: debug.traceback of loadstring get unknown file #1259
pilaoda Apr 17, 2022
5ffcf67
fix the linter errors
pilaoda Apr 18, 2022
1065c6b
add a test: loadstring sourceMapTraceback gives traceback
pilaoda Apr 22, 2022
f05d509
better test for loadstring sourceMapTraceback gives traceback
pilaoda Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/lualib/SourceMapTraceBack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
22 changes: 22 additions & 0 deletions test/unit/printer/sourcemaps.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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");
});