Skip to content

fixed commenting of inline sourcemaps #519

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 2 commits into from
Apr 12, 2019
+29 −2
Merged

fixed commenting of inline sourcemaps #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8279677
fixed commenting of inline sourcemaps and added test
tomblind Apr 12, 2019
b2f7fbd
forgot to run prettier
tomblind Apr 12, 2019
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
2 changes: 1 addition & 1 deletion src/LuaPrinter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export class LuaPrinter {
const map = sourceMap.toString();
const base64Map = Buffer.from(map).toString('base64');

return `//# sourceMappingURL=data:application/json;base64,${base64Map}\n`;
return `--# sourceMappingURL=data:application/json;base64,${base64Map}\n`;
}

private printStackTraceOverride(rootNode: SourceNode): string {
Expand Down
29 changes: 28 additions & 1 deletion test/unit/sourcemaps.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as util from "../util";
import { LuaLibImportKind } from "../../src/CompilerOptions";
import { LuaLibImportKind, CompilerOptions } from "../../src/CompilerOptions";
import { SourceMapConsumer, Position } from "source-map";

test.each([
Expand Down Expand Up @@ -109,6 +109,33 @@ test("sourceMapTraceback saves sourcemap in _G", () => {
}
});

test("Inline sourcemaps", () => {
const typeScriptSource = `
function abc() {
return def();
}
function def() {
return "foo";
}
return abc();`;

const compilerOptions: CompilerOptions = {
inlineSourceMap: true,
};

const { lua, sourceMap } = util.transpileStringResult(typeScriptSource, compilerOptions);

const inlineSourceMapMatch = lua.match(
/--# sourceMappingURL=data:application\/json;base64,([A-Za-z0-9+/=]+)/,
);
expect(inlineSourceMapMatch !== null && inlineSourceMapMatch !== undefined).toBe(true);

const inlineSourceMap = Buffer.from(inlineSourceMapMatch[1], "base64").toString();
expect(sourceMap).toBe(inlineSourceMap);

expect(util.executeLua(lua)).toBe("foo");
});

// Helper functions

function lineAndColumnOf(text: string, pattern: string): Position {
Expand Down