Skip to content
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.

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

Fix compressed source-maps have non-terminated segments #1106

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/sourcemap.js
Expand Up @@ -82,12 +82,20 @@ async function SourceMap(options) {
}

function add(source, gen_line, gen_col, orig_line, orig_col, name) {
let generatedPos = { line: gen_line, column: gen_col };

if (orig_map) {
var info = orig_map.originalPositionFor({
line: orig_line,
column: orig_col
});
if (info.source === null) {
generator.addMapping({
generated: generatedPos,
original: null,
source: null,
name: null
});
return;
}
source = info.source;
Expand All @@ -96,7 +104,7 @@ async function SourceMap(options) {
name = info.name || name;
}
generator.addMapping({
generated : { line: gen_line, column: gen_col },
generated : generatedPos,
original : { line: orig_line, column: orig_col },
source : source,
name : name
Expand Down
4 changes: 2 additions & 2 deletions test/input/source-maps/expect.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 17 additions & 11 deletions test/input/source-maps/input.js
@@ -1,11 +1,17 @@
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }

var _require = require("bar"),
foo = _require.foo;

var _require2 = require("world"),
hello = _require2.hello;

foo.x.apply(foo, _toConsumableArray(foo.y(hello.z)));

//# sourceMappingURL=input.js.map
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
function somePromiseFn() {
return __awaiter(this, void 0, void 0, function* () {
let value = 'promise-value';
return value;
});
}
somePromiseFn().then(d => console.info(d));
14 changes: 13 additions & 1 deletion test/input/source-maps/input.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 49 additions & 1 deletion test/mocha/input-sourcemaps.js
Expand Up @@ -2,7 +2,7 @@ import assert from "assert";
import { minify } from "../../main.js";
import source_map from "source-map"

const { SourceMapConsumer } = source_map
const { SourceMapConsumer, SourceMapGenerator } = source_map

describe("input sourcemaps", function() {
var transpilemap, map;
Expand Down Expand Up @@ -65,4 +65,52 @@ describe("input sourcemaps", function() {
assert.ok(pos.line <= 2, msg);
})
});

it("Should preserve unmapped segments in output source map", async function() {
var generator = new SourceMapGenerator();

generator.addMapping({
source: "source.ts",
generated: {line: 1, column: 0},
original: {line: 1, column: 0},
});
generator.addMapping({
source: null,
generated: {line: 1, column: 37},
original: null,
});

generator.addMapping({
source: "source.ts",
generated: {line: 1, column: 50},
original: {line: 2, column: 0},
});

generator.setSourceContent("source.ts",
`function say(msg) {console.log(msg)};say('hello');\nprocess.exit(1);`)

// Everything except the "say('hello');" part is mapped to "source.ts". The "say"
// function call is not mapped to any original source location. e.g. this can
// happen when a code transformer inserts generated code in between existing code.
var inputFile = "function say(msg) {console.log(msg)};say('hello');process.exit(1);";
var result = await minify(inputFile, {
sourceMap: {
content: JSON.parse(generator.toString()),
url: 'inline'
}
});

var transformedMap = await new SourceMapConsumer(result.map);
var hasMappedSource = true;

for (let i = 0; i < result.code.length; i++) {
var info = transformedMap.originalPositionFor({line: 1, column: i});
hasMappedSource = hasMappedSource && !!info.source;
}

assert.equal(hasMappedSource, false, "Expected transformed source map to preserve the " +
"mapping without original source location");

assert.doesNotThrow(() => SourceMapGenerator.fromSourceMap(transformedMap));
});
});