Skip to content

Commit 6d78e35

Browse files
committed
Use globalThis instead of _G
1 parent 31b5c47 commit 6d78e35

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/lualib/SourceMapTraceBack.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
// TODO: In the future, change this to __TS__RegisterFileInfo and provide tstl interface to
22
// get some metadata about transpilation.
33
function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap: { [line: number]: number }): void {
4-
_G.__TS__sourcemap = _G.__TS__sourcemap || {};
5-
_G.__TS__sourcemap[fileName] = sourceMap;
4+
globalThis.__TS__sourcemap = globalThis.__TS__sourcemap || {};
5+
globalThis.__TS__sourcemap[fileName] = sourceMap;
66

7-
if (_G.__TS__originalTraceback === undefined) {
8-
_G.__TS__originalTraceback = debug.traceback;
7+
if (globalThis.__TS__originalTraceback === undefined) {
8+
globalThis.__TS__originalTraceback = debug.traceback;
99
debug.traceback = (thread, message, level) => {
10-
const trace = _G.__TS__originalTraceback(thread, message, level);
10+
const trace = globalThis.__TS__originalTraceback(thread, message, level);
1111
const [result] = string.gsub(trace, "(%S+).lua:(%d+)", (file, line) => {
12-
if (_G.__TS__sourcemap[file + ".lua"] && _G.__TS__sourcemap[file + ".lua"][line]) {
13-
return `${file}.ts:${_G.__TS__sourcemap[file + ".lua"][line]}`;
12+
const fileSourceMap = globalThis.__TS__sourcemap[file + ".lua"];
13+
if (fileSourceMap && fileSourceMap[line]) {
14+
return `${file}.ts:${fileSourceMap[line]}`;
1415
}
1516
return `${file}.lua:${line}`;
1617
});

src/lualib/declarations/global.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/** @noSelfInFile */
22

3-
declare const _G: typeof globalThis;
4-
53
declare var __TS__sourcemap: Record<number, number> | undefined;
64
declare var __TS__originalTraceback:
75
| ((this: void, thread?: any, message?: string, level?: number) => string)

0 commit comments

Comments
 (0)