feat(unassertify): adjust sourcemap when preceding transform exists

twada · twada · commit c3c167776b33 · 2015-09-25T19:03:10.000+09:00
diff --git a/index.js b/index.js
@@ -36,7 +36,7 @@ function handleIncomingSourceMap (originalCode) {
 }
 
 function applyUnassertWithSourceMap (code, filepath, options) {
-    var ast = esprima.parse(code, { sourceType: 'module' });
+    var ast = esprima.parse(code, { sourceType: 'module', tolerant: true, loc: true });
     var inMap = handleIncomingSourceMap(code);
     var instrumented = escodegen.generate(unassert(ast), {
         sourceMap: filepath,
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
@@ -4,9 +4,11 @@ var unassertify = require('..');
 var fs = require('fs');
 var path = require('path');
 var Stream = require('stream');
-var assert = require('assert');
+var assert = require('power-assert');
 var browserify = require('browserify');
+var coffeeify = require('coffeeify');
 var es = require('event-stream');
+var convert = require('convert-source-map');
 
 
 describe('unassertify', function () {
@@ -22,6 +24,68 @@ describe('unassertify', function () {
             done();
         }));
     });
+    it('produces sourcemap when debug: true', function (done) {
+        var b = browserify({debug: true});
+        var testFilepath = path.normalize(path.join(__dirname, 'fixtures', 'func', 'fixture.js'));
+        b.add(testFilepath);
+        b.transform(unassertify);
+        b.bundle().pipe(es.wait(function(err, data) {
+            assert(!err);
+            var code = data.toString('utf-8');
+            // console.log(code);
+            assert(! /assert/.test(code));
+            var inlineMap = convert.fromSource(code);
+            assert(inlineMap);
+            var sourceMap = inlineMap.toObject();
+            assert(sourceMap);
+            // console.log(JSON.stringify(sourceMap, null, 2));
+            assert(sourceMap.sources.some(function (fpath) { return fpath === testFilepath; }));
+            done();
+        }));
+    });
+});
+
+
+describe('with preceding transform', function () {
+    it('just remove assertions and dependencies when debug: false', function (done) {
+        var b = browserify();
+        b.add(path.normalize(path.join(__dirname, 'fixtures', 'coffee', 'fixture.coffee')));
+        b.transform(coffeeify);
+        b.transform(unassertify);
+        b.bundle().pipe(es.wait(function(err, data) {
+            assert(!err);
+            var code = data.toString('utf-8');
+            // console.log(code);
+            var inlineMap = convert.fromSource(code);
+            assert(!inlineMap);
+            assert(! /require\('assert'\)/.test(code));
+            done();
+        }));
+    });
+    it('adjust sourcemap if debug: true', function (done) {
+        var b = browserify({debug: true});
+        var testFilepath = path.normalize(path.join(__dirname, 'fixtures', 'coffee', 'fixture.coffee'));
+        b.add(testFilepath);
+        b.transform(coffeeify);
+        b.transform(unassertify);
+        b.bundle().pipe(es.wait(function(err, data) {
+            assert(!err);
+            var code = data.toString('utf-8');
+            // console.log(code);
+            assert(! /require\('assert'\)/.test(code));
+            var inlineMap = convert.fromSource(code);
+            assert(inlineMap);
+            var sourceMap = inlineMap.toObject();
+            assert(sourceMap);
+            // console.log(JSON.stringify(sourceMap, null, 2));
+            assert(sourceMap.sources.some(function (fpath) { return fpath === testFilepath; }));
+            var originalCode = fs.readFileSync(testFilepath, 'utf-8');
+            assert(sourceMap.sourcesContent.some(function (eachCode) {
+                return eachCode === originalCode;
+            }));
+            done();
+        }));
+    });
 });
 
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ function handleIncomingSourceMap (originalCode) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function applyUnassertWithSourceMap (code, filepath, options) {`
`39`		`- var ast = esprima.parse(code, { sourceType: 'module' });`
	`39`	`+ var ast = esprima.parse(code, { sourceType: 'module', tolerant: true, loc: true });`
`40`	`40`	`var inMap = handleIncomingSourceMap(code);`
`41`	`41`	`var instrumented = escodegen.generate(unassert(ast), {`
`42`	`42`	`sourceMap: filepath,`