preExisting still rewrite urls but do not add extra newline

Author: nmccready

.jshintrc

@@ -1,6 +1,6 @@
 {
 	"node": true,
 	"strict": true,
-	"unused": true,
+	"unused": "vars",
   "undef": true
 }

src/init/index.js

@@ -36,13 +36,13 @@ function init(options) {
     });
 
     var fileContent = file.contents.toString();
-    var sourceMap;
-    var preExisting = utils.getPreExisting(fileContent);
+    var sourceMap, preExistingComment;
 
     if (options.loadMaps) {
       var result = loadMaps({file:file, fileContent:fileContent}, options);
       sourceMap = result.map;
       fileContent = result.content;
+      preExistingComment = result.preExistingComment;
     }
 
     if (!sourceMap && options.identityMap) {
@@ -124,8 +124,8 @@ function init(options) {
         sourcesContent: [fileContent]
       };
     }
-    else if(preExisting !== null && typeof preExisting !== 'undefined')
-      sourceMap.preExisting = preExisting;
+    else if(preExistingComment !== null && typeof preExistingComment !== 'undefined')
+      sourceMap.preExistingComment = preExistingComment;
 
     sourceMap.file = unixStylePath(file.relative);
     file.sourceMap = sourceMap;

src/init/loadMaps.js

@@ -16,7 +16,7 @@ module.exports = function loadMaps (lOpts, options) {
   var fileContent = lOpts.fileContent;
   var file = lOpts.file;
 
-  var sources = { path: '', map: null , content: fileContent};
+  var sources = { path: '', map: null , content: fileContent, preExistingComment: null};
 
   _getInlineSources({sources:sources, file:file, options:options});
   if (!sources.map) // ahh not inline, so try file
@@ -82,6 +82,8 @@ function _getInlineSources(args) {
   var sources = args.sources,
   file = args.file,
   options = args.options;
+
+  sources.preExistingComment = utils.getInlinePreExisting(sources.content);
   // Try to read inline source map
   sources.map = convert.fromSource(sources.content, options.largeFile);
 
@@ -92,6 +94,7 @@ function _getInlineSources(args) {
   // sources in map are relative to the source file
   sources.path = path.dirname(file.path);
   if (!options.largeFile) {
+    debug('comment REMOVED');
     sources.content = convert.removeComments(sources.content);
   }
 }
@@ -104,7 +107,8 @@ function _getFileSources(args) {
 
   var mapFile;
   if (mapComment) {
-    mapFile = path.resolve(path.dirname(file.path), mapComment[1] || mapComment[2]);
+    sources.preExistingComment = mapComment[1] || mapComment[2];
+    mapFile = path.resolve(path.dirname(file.path), sources.preExistingComment);
     sources.content = convert.removeMapFileComments(sources.content);
     // if no comment try map file with same name as source file
   } else {

src/utils.js

@@ -18,7 +18,7 @@ See http://stackoverflow.com/questions/10229144/bug-with-regexp-in-javascript-wh
 
 So we either need to use a new instance of a regex everywhere.
 */
-var sourceMapUrlRegEx = function(){ return /\/\/\# sourceMappingURL\=.*/g;}
+var sourceMapUrlRegEx = function(){ return /\/\/\# sourceMappingURL\=.*/g;};
 
 
 var getCommentFormatter = function (file) {
@@ -29,12 +29,12 @@ var getCommentFormatter = function (file) {
       return '';
     };
 
-  if (file.sourceMap.preExisting){
-    debug('preExisting commentFormatter');
+  if (file.sourceMap.preExistingComment){
+    debug('preExistingComment commentFormatter');
     commentFormatter = function(url) {
-      return file.sourceMap.preExisting;
+      return "//# sourceMappingURL=" + url + newline;
     };
-    return commentFormatter
+    return commentFormatter;
   }
 
   switch (extension) {
@@ -51,24 +51,24 @@ var getCommentFormatter = function (file) {
       };
       break;
     default:
-      debug('unknown commentFormatter')
+      debug('unknown commentFormatter');
   }
 
   return commentFormatter;
-}
+};
 
-var getPreExisting = function(fileContent){
+var getInlinePreExisting = function(fileContent){
   if(sourceMapUrlRegEx().test(fileContent)){
     debug('has preExisting');
     return fileContent.match(sourceMapUrlRegEx())[0];
   }
-}
+};
 
 module.exports = {
   unixStylePath: unixStylePath,
   PLUGIN_NAME: PLUGIN_NAME,
   urlRegex: urlRegex,
   sourceMapUrlRegEx: sourceMapUrlRegEx,
   getCommentFormatter: getCommentFormatter,
-  getPreExisting: getPreExisting
+  getInlinePreExisting: getInlinePreExisting
 };

src/write.js

@@ -5,7 +5,6 @@ var utils = require('./utils'),
   through = require('through2'),
   fs = require('graceful-fs'),
   path = require('path'),
-  File = require('vinyl'),
   stripBom = require('strip-bom');
 
 /**
@@ -97,7 +96,7 @@ function write(destPath, options) {
     if (destPath === undefined || destPath === null) {
       // encode source map into comment
       var base64Map = new Buffer(JSON.stringify(sourceMap)).toString('base64');
-      debug("basic comment")
+      debug("basic comment");
       comment = commentFormatter('data:application/json;charset=' + options.charset + ';base64,' + base64Map);
     } else {
       var mapFile = path.join(destPath, file.relative) + '.map';
@@ -152,18 +151,17 @@ function write(destPath, options) {
         }
         sourceMapPathRelative = prefix + path.join('/', sourceMapPathRelative);
       }
-      debug("destPath comment")
+      debug("destPath comment");
       comment = commentFormatter(unixStylePath(sourceMapPathRelative));
 
       if (options.sourceMappingURL && typeof options.sourceMappingURL === 'function') {
-        debug("options.sourceMappingURL comment")
+        debug("options.sourceMappingURL comment");
         comment = commentFormatter(options.sourceMappingURL(file));
       }
     }
 
-    var preExisting = options.preExisting && utils.getPreExisting(String(file.contents));
     // append source map comment
-    if (options.addComment && !preExisting){
+    if (options.addComment){
       file.contents = Buffer.concat([file.contents, new Buffer(comment)]);
     }
 

test/integration.js

@@ -10,6 +10,10 @@ var fs = require('fs');
 var sourceContent = fs.readFileSync(join(__dirname, 'assets/helloworld.js')).toString();
 
 
+function base64JSON(object) {
+  return 'data:application/json;charset=utf8;base64,' + new Buffer(JSON.stringify(object)).toString('base64');
+}
+
 function moveHtml(dest, t){
   return gulp.src(join(__dirname, './assets/*.html'))
   .pipe(gulp.dest('tmp/' + dest))
@@ -18,7 +22,7 @@ function moveHtml(dest, t){
 
 debug('running');
 
-test('creates inline mapping', function(t) {
+test('combined: creates inline mapping', function(t) {
 
   gulp.src(join(__dirname, './assets/helloworld.js'))
   .pipe(sourcemaps.init())
@@ -42,17 +46,17 @@ test('creates inline mapping', function(t) {
   });
 });
 
-test('creates re-uses existing mapping', function(t) {
+test('combined: creates preExistingComment , no new previous line', function(t) {
   gulp.src(join(__dirname, './assets/helloworld.map.js'))
   .pipe(sourcemaps.init({loadMaps:true}))
   .pipe(sourcemaps.write())
   // .pipe(gulp.dest('tmp'))
   .on('data', function(data) {
     t.ok(data.sourceMap, 'should add a source map object');
-    t.ok(!!data.sourceMap.preExisting, 'should know the sourcemap pre-existed');
+    t.ok(!!data.sourceMap.preExistingComment, 'should know the sourcemap pre-existed');
     t.deepEqual(
       data.contents.toString(),
-      sourceContent + "\n//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlcyI6WyJoZWxsb3dvcmxkLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc3RyaWN0JztcblxuZnVuY3Rpb24gaGVsbG9Xb3JsZCgpIHtcbiAgICBjb25zb2xlLmxvZygnSGVsbG8gd29ybGQhJyk7XG59XG4iXSwiZmlsZSI6ImhlbGxvd29ybGQuanMifQ==",
+      sourceContent + '\n//# sourceMappingURL=' + base64JSON(data.sourceMap) + '\n',
       'file should be sourcemapped'
     );
     t.end();

test/write.js

@@ -10,6 +10,7 @@ var hookStd = require('hook-std');
 var debug = require('debug-fabulous')();
 var assign = require('object-assign');
 var utils = require('../src/utils');
+var convert =  require('convert-source-map');
 
 var sourceContent = fs.readFileSync(path.join(__dirname, 'assets/helloworld.js')).toString();
 var mappedContent = fs.readFileSync(path.join(__dirname, 'assets/helloworld.map.js')).toString();
@@ -52,7 +53,7 @@ function makeMappedFile() {
     path: path.join(__dirname, 'assets', 'helloworld.map.js'),
     contents: new Buffer(mappedContent)
   });
-  file.sourceMap = makeSourceMap({preExisting:utils.getPreExisting(mappedContent)});
+  file.sourceMap = makeSourceMap({preExistingComment:utils.getInlinePreExisting(mappedContent)});
   return file;
 }
 
@@ -169,17 +170,17 @@ test('write: should detect whether a file uses \\n or \\r\\n and follow the exis
   }).write(file);
 });
 
-test('write: preExisting', function(t) {
+test('write: preExistingComment', function(t) {
   var file = makeMappedFile();
-  file.contents = new Buffer(file.contents.toString());
+  file.contents = new Buffer(convert.removeComments(file.contents.toString()));
 
-  sourcemaps.write({preExisting:true})
+  sourcemaps.write({preExistingComment:true})
   .on('data', function(data) {
     t.ok(data, 'should pass something through');
-    t.ok(!!data.sourceMap.preExisting, 'should mark as preExisting');
+    t.ok(!!data.sourceMap.preExistingComment, 'should mark as preExistingComment');
     t.equal(
       String(data.contents),
-      mappedContent,'should add source map as comment');
+      sourceContent + '\n//# sourceMappingURL=' + base64JSON(data.sourceMap) + '\n' ,'should add source map as comment');
     t.end();
   })
   .on('error', function() {