feat(unassertify): remove assertions when debug:true as well

twada · twada · commit da63931f4160 · 2015-09-25T15:23:21.000+09:00
diff --git a/index.js b/index.js
@@ -13,22 +13,65 @@
 var through = require('through');
 var esprima = require('esprima');
 var escodegen = require('escodegen');
+var convert = require('convert-source-map');
+var transfer = require('multi-stage-sourcemap').transfer;
 var unassert = require('unassert');
 
-function isDebugMode (options) {
-    return (options && options._flags && options._flags.debug);
+function mergeSourceMap (incomingSourceMap, outgoingSourceMap) {
+    if (typeof outgoingSourceMap === 'string' || outgoingSourceMap instanceof String) {
+        outgoingSourceMap = JSON.parse(outgoingSourceMap);
+    }
+    if (!incomingSourceMap) {
+        return outgoingSourceMap;
+    }
+    return JSON.parse(transfer({fromSourceMap: outgoingSourceMap, toSourceMap: incomingSourceMap}));
 }
 
-function applyUnassert (code, options) {
+function handleIncomingSourceMap (originalCode) {
+    var commented = convert.fromSource(originalCode);
+    if (commented) {
+        return commented.toObject();
+    }
+    return null;
+}
+
+function applyUnassertWithSourceMap (code, filepath, options) {
+    var ast = esprima.parse(code, { sourceType: 'module' });
+    var inMap = handleIncomingSourceMap(code);
+    var instrumented = escodegen.generate(unassert(ast), {
+        sourceMap: filepath,
+        sourceContent: code,
+        sourceMapWithCode: true
+    });
+    var outMap = convert.fromJSON(instrumented.map.toString());
+    if (inMap) {
+        var mergedRawMap = mergeSourceMap(inMap, outMap.toObject());
+        var reMap = convert.fromObject(mergedRawMap);
+        if (inMap.sources) {
+            reMap.setProperty('sources', inMap.sources);
+        }
+        if (inMap.sourceRoot) {
+            reMap.setProperty('sourceRoot', inMap.sourceRoot);
+        }
+        if (inMap.sourcesContent) {
+            reMap.setProperty('sourcesContent', inMap.sourcesContent);
+        }
+        return instrumented.code + '\n' + reMap.toComment() + '\n';
+    } else {
+        return instrumented.code + '\n' + outMap.toComment() + '\n';
+    }
+}
+
+function applyUnassertWithoutSourceMap (code, filepath, options) {
     var ast = esprima.parse(code, { sourceType: 'module' });
     return escodegen.generate(unassert(ast));
 }
 
-module.exports = function unassertify (filepath, options) {
-    if (isDebugMode(options)) {
-        return through();
-    }
+function isDebugMode (options) {
+    return (options && options._flags && options._flags.debug);
+}
 
+module.exports = function unassertify (filepath, options) {
     var data = '',
         stream = through(write, end);
 
@@ -37,7 +80,11 @@ module.exports = function unassertify (filepath, options) {
     }
 
     function end() {
-        stream.queue(applyUnassert(data, options));
+        if (isDebugMode(options)) {
+            stream.queue(applyUnassertWithSourceMap(data, filepath, options));
+        } else {
+            stream.queue(applyUnassertWithoutSourceMap(data, filepath, options));
+        }        
         stream.queue(null);
     }
 
diff --git a/package.json b/package.json
@@ -9,8 +9,10 @@
   },
   "bugs": "https://github.com/twada/unassertify/issues",
   "dependencies": {
+    "convert-source-map": "^1.1.1",
     "escodegen": "^1.6.1",
     "esprima": "^2.2.0",
+    "multi-stage-sourcemap": "^0.2.1",
     "through": "^2.3.7",
     "unassert": "^1.1.0"
   },
diff --git a/test/fixtures/func/expected-with-sourcemap.js b/test/fixtures/func/expected-with-sourcemap.js
diff --git a/test/test.js b/test/test.js
@@ -25,7 +25,7 @@ describe('unassertify', function () {
 });
 
 
-describe('do nothing if debug: true', function() {
+describe('adjust sourcemap if debug: true', function() {
     var stream = unassertify(
         '/absolute/path/to/test/fixtures/func/fixture.js',
         {
@@ -47,7 +47,7 @@ describe('do nothing if debug: true', function() {
             output += buf;
         });
         stream.on('end', function() {
-            var expected = fs.readFileSync('test/fixtures/func/fixture.js', 'utf8');
+            var expected = fs.readFileSync('test/fixtures/func/expected-with-sourcemap.js', 'utf8');
             assert.equal(output, expected);
             done();
         });
@@ -57,7 +57,7 @@ describe('do nothing if debug: true', function() {
 });
 
 
-describe('remove assertions if debug: false', function() {
+describe('just remove assertions if debug: false', function() {
     var stream = unassertify(
         '/absolute/path/to/test/fixtures/func/fixture.js',
         {
