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.

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

Jump to bottom

Wiring up existing source maps of transpiled codes #692

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Wiring up existing source maps of transpiled codes #692

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
3c3fbfa
Wiring up existing source maps of transpiled codes
netj Jun 14, 2014
25489bc
Ran ./copydist.js
netj Jun 14, 2014
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
76 changes: 59 additions & 17 deletions build/jslib/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ define(function (require) {
env = require('env'),
commonJs = require('commonJs'),
SourceMapGenerator = require('source-map/source-map-generator'),
SourceMapConsumer = require('source-map/source-map-consumer'),
sourceMappingURL = require('source-map-url'),
hasProp = lang.hasProp,
getOwn = lang.getOwn,
falseProp = lang.falseProp,
Expand Down Expand Up @@ -1910,27 +1912,67 @@ define(function (require) {
}
}

//See if the file already has a source map
var sourceMapConsumer = null;
try {
var existingSourceMapURL = sourceMappingURL.get(singleContents);
if (existingSourceMapURL) {
//Load referenced source map
var sourceMapContents = file.readFile(build.makeAbsPath(existingSourceMapURL, file.parent(path)));
var existingSourceMap = JSON.parse(String(sourceMapContents));
sourceMapConsumer = existingSourceMap ? new SourceMapConsumer.SourceMapConsumer(existingSourceMap) : null;
}
} catch (e) {
sourceMapConsumer = null;
}
//Remove the sourceMappingURL comment, so it doesn't
//interfere with the new one to be generated.
singleContents = sourceMappingURL.remove(singleContents);

sourceMapLineNumber = fileContents.split('\n').length - 1;
lineCount = singleContents.split('\n').length;
for (var i = 1; i <= lineCount; i += 1) {
sourceMapGenerator.addMapping({
generated: {
line: sourceMapLineNumber + i,
column: 0
},
original: {
line: i,
column: 0
},
source: sourceMapPath
if (sourceMapConsumer) {
sourceMapConsumer.eachMapping(function(m) {
if (m.generatedLine > lineCount)
return;
//Translate the line numbers in the existing source map
sourceMapGenerator.addMapping({
generated: {
line: m.generatedLine + sourceMapLineNumber,
column: m.generatedColumn
},
original: {
line: m.originalLine,
column: m.originalColumn
},
source: m.source,
name: m.name
});
});
}

//Store the content of the original in the source
//map since other transforms later like minification
//can mess up translating back to the original
//source.
sourceMapGenerator.setSourceContent(sourceMapPath, singleContents);
// TODO Preserve sourcesContent of existing source map
// TODO by calling sourceMapGenerator.setSourceContent() for each non-null item in sourceMapConsumer.sourcesContent
} else {
for (var i = 1; i <= lineCount; i += 1) {
sourceMapGenerator.addMapping({
generated: {
line: sourceMapLineNumber + i,
column: 0
},
original: {
line: i,
column: 0
},
source: sourceMapPath
});
}

//Store the content of the original in the source
//map since other transforms later like minification
//can mess up translating back to the original
//source.
sourceMapGenerator.setSourceContent(sourceMapPath, singleContents);
}
}

//Add the file to the final contents
Expand Down
78 changes: 78 additions & 0 deletions build/jslib/source-map-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// Copyright 2014 Simon Lydell

void (function(root, factory) {
if (typeof define === "function" && define.amd) {
define(factory)
} else if (typeof exports === "object") {
module.exports = factory()
} else {
root.sourceMappingURL = factory()
}
}(this, function(undefined) {

var innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/
var newlineRegex = /\r\n?|\n/

var regex = RegExp(
"(^|(?:" + newlineRegex.source + "))" +
"(?:" +
"/\\*" +
"(?:\\s*(?:" + newlineRegex.source + ")(?://)?)?" +
"(?:" + innerRegex.source + ")" +
"\\s*" +
"\\*/" +
"|" +
"//(?:" + innerRegex.source + ")" +
")" +
"\\s*(?:$|(?:" + newlineRegex.source + "))"
)

function SourceMappingURL(commentSyntax) {
this._commentSyntax = commentSyntax
}

SourceMappingURL.prototype.regex = regex
SourceMappingURL.prototype._innerRegex = innerRegex
SourceMappingURL.prototype._newlineRegex = newlineRegex

SourceMappingURL.prototype.get = function(code) {
var match = code.match(this.regex)
if (!match) {
return null
}
return match[2] || match[3] || ""
}

SourceMappingURL.prototype.set = function(code, url, commentSyntax) {
if (!commentSyntax) {
commentSyntax = this._commentSyntax
}
// Use a newline present in the code, or fall back to '\n'.
var newline = String(code.match(this._newlineRegex) || "\n")
var open = commentSyntax[0], close = commentSyntax[1] || ""
code = this.remove(code)
return code + newline + open + "# sourceMappingURL=" + url + close
}

SourceMappingURL.prototype.remove = function(code) {
return code.replace(this.regex, "")
}

SourceMappingURL.prototype.insertBefore = function(code, string) {
var match = code.match(this.regex)
if (match) {
var hasNewline = Boolean(match[1])
return code.slice(0, match.index) +
string +
(hasNewline ? "" : "\n") +
code.slice(match.index)
} else {
return code + string
}
}

SourceMappingURL.prototype.SourceMappingURL = SourceMappingURL

return new SourceMappingURL(["/*", " */"])

}));
1 change: 1 addition & 0 deletions dist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ var fs = require('fs'),
'build/jslib/source-map/source-node.js',
'build/jslib/source-map/util.js',
'build/jslib/source-map.js',
'build/jslib/source-map-url.js',
'build/jslib/uglifyjs2.js',
'build/jslib/parse.js',
'build/jslib/transform.js',
Expand Down
158 changes: 139 additions & 19 deletions dist/r.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* @license r.js 2.1.14 Sat, 14 Jun 2014 06:59:17 GMT Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
Expand All @@ -20,7 +20,7 @@ var requirejs, require, define, xpcUtil;
(function (console, args, readFileFunc) {
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
version = '2.1.14',
version = '2.1.14 Sat, 14 Jun 2014 06:59:17 GMT',
jsSuffixRegExp = /\.js$/,
commandOption = '',
useLibLoaded = {},
Expand Down Expand Up @@ -15033,6 +15033,84 @@ exports.SourceNode = require('./source-map/source-node').SourceNode;

});

// Copyright 2014 Simon Lydell

void (function(root, factory) {
if (typeof define === "function" && define.amd) {
define('source-map-url', factory)
} else if (typeof exports === "object") {
module.exports = factory()
} else {
root.sourceMappingURL = factory()
}
}(this, function(undefined) {

var innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/
var newlineRegex = /\r\n?|\n/

var regex = RegExp(
"(^|(?:" + newlineRegex.source + "))" +
"(?:" +
"/\\*" +
"(?:\\s*(?:" + newlineRegex.source + ")(?://)?)?" +
"(?:" + innerRegex.source + ")" +
"\\s*" +
"\\*/" +
"|" +
"//(?:" + innerRegex.source + ")" +
")" +
"\\s*(?:$|(?:" + newlineRegex.source + "))"
)

function SourceMappingURL(commentSyntax) {
this._commentSyntax = commentSyntax
}

SourceMappingURL.prototype.regex = regex
SourceMappingURL.prototype._innerRegex = innerRegex
SourceMappingURL.prototype._newlineRegex = newlineRegex

SourceMappingURL.prototype.get = function(code) {
var match = code.match(this.regex)
if (!match) {
return null
}
return match[2] || match[3] || ""
}

SourceMappingURL.prototype.set = function(code, url, commentSyntax) {
if (!commentSyntax) {
commentSyntax = this._commentSyntax
}
// Use a newline present in the code, or fall back to '\n'.
var newline = String(code.match(this._newlineRegex) || "\n")
var open = commentSyntax[0], close = commentSyntax[1] || ""
code = this.remove(code)
return code + newline + open + "# sourceMappingURL=" + url + close
}

SourceMappingURL.prototype.remove = function(code) {
return code.replace(this.regex, "")
}

SourceMappingURL.prototype.insertBefore = function(code, string) {
var match = code.match(this.regex)
if (match) {
var hasNewline = Boolean(match[1])
return code.slice(0, match.index) +
string +
(hasNewline ? "" : "\n") +
code.slice(match.index)
} else {
return code + string
}
}

SourceMappingURL.prototype.SourceMappingURL = SourceMappingURL

return new SourceMappingURL(["/*", " */"])

}));
//Distributed under the BSD license:
//Copyright 2012 (c) Mihai Bazon <[email protected]>
define('uglifyjs2', ['exports', 'source-map', 'logger', 'env!env/file'], function (exports, MOZ_SourceMap, logger, rjsFile) {
Expand Down Expand Up @@ -25794,6 +25872,8 @@ define('build', function (require) {
env = require('env'),
commonJs = require('commonJs'),
SourceMapGenerator = require('source-map/source-map-generator'),
SourceMapConsumer = require('source-map/source-map-consumer'),
sourceMappingURL = require('source-map-url'),
hasProp = lang.hasProp,
getOwn = lang.getOwn,
falseProp = lang.falseProp,
Expand Down Expand Up @@ -27680,27 +27760,67 @@ define('build', function (require) {
}
}

//See if the file already has a source map
var sourceMapConsumer = null;
try {
var existingSourceMapURL = sourceMappingURL.get(singleContents);
if (existingSourceMapURL) {
//Load referenced source map
var sourceMapContents = file.readFile(build.makeAbsPath(existingSourceMapURL, file.parent(path)));
var existingSourceMap = JSON.parse(String(sourceMapContents));
sourceMapConsumer = existingSourceMap ? new SourceMapConsumer.SourceMapConsumer(existingSourceMap) : null;
}
} catch (e) {
sourceMapConsumer = null;
}
//Remove the sourceMappingURL comment, so it doesn't
//interfere with the new one to be generated.
singleContents = sourceMappingURL.remove(singleContents);

sourceMapLineNumber = fileContents.split('\n').length - 1;
lineCount = singleContents.split('\n').length;
for (var i = 1; i <= lineCount; i += 1) {
sourceMapGenerator.addMapping({
generated: {
line: sourceMapLineNumber + i,
column: 0
},
original: {
line: i,
column: 0
},
source: sourceMapPath
if (sourceMapConsumer) {
sourceMapConsumer.eachMapping(function(m) {
if (m.generatedLine > lineCount)
return;
//Translate the line numbers in the existing source map
sourceMapGenerator.addMapping({
generated: {
line: m.generatedLine + sourceMapLineNumber,
column: m.generatedColumn
},
original: {
line: m.originalLine,
column: m.originalColumn
},
source: m.source,
name: m.name
});
});
}

//Store the content of the original in the source
//map since other transforms later like minification
//can mess up translating back to the original
//source.
sourceMapGenerator.setSourceContent(sourceMapPath, singleContents);
// TODO Preserve sourcesContent of existing source map
// TODO by calling sourceMapGenerator.setSourceContent() for each non-null item in sourceMapConsumer.sourcesContent
} else {
for (var i = 1; i <= lineCount; i += 1) {
sourceMapGenerator.addMapping({
generated: {
line: sourceMapLineNumber + i,
column: 0
},
original: {
line: i,
column: 0
},
source: sourceMapPath
});
}

//Store the content of the original in the source
//map since other transforms later like minification
//can mess up translating back to the original
//source.
sourceMapGenerator.setSourceContent(sourceMapPath, singleContents);
}
}

//Add the file to the final contents
Expand Down