feat(espowerify): use espower-source directly since espower-source 0.9.0 is backported from espowerify

Author: twada

Diff for: index.js

@@ -10,73 +10,7 @@
 'use strict';
 
 var through = require('through'),
-    espower = require('espower'),
-    esprima = require('esprima'),
-    escodegen = require('escodegen'),
-    extend = require('xtend'),
-    convert = require('convert-source-map'),
-    transfer = require('multi-stage-sourcemap').transfer;
-
-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 handleUpstreamSourceMap (jsCode, options) {
-    var inMap;
-    if (options.sourceMap) {
-        inMap = options.sourceMap;
-    } else {
-        var commented = convert.fromSource(jsCode);
-        if (commented) {
-            inMap = commented.toObject();
-            options.sourceMap = inMap;
-        }
-    }
-    return inMap;
-}
-
-function instrument (jsCode, filepath, options) {
-    var jsAst = esprima.parse(jsCode, {tolerant: true, loc: true, source: filepath});
-    var modifiedAst = espower(jsAst, options);
-    // keep paths absolute by not using `file` and `sourceMapRoot`
-    // paths will be resolved by mold-source-map
-    return escodegen.generate(modifiedAst, {
-        sourceMap: true,
-        sourceMapWithCode: true
-    });
-}
-
-function mergeEspowerOptions (options, filepath) {
-    return extend(espower.defaultOptions(), options, {
-        destructive: true,
-        path: filepath
-    });
-}
-
-function transform (jsCode, filepath, options) {
-    var espowerOptions = mergeEspowerOptions(options, filepath);
-    var inMap = handleUpstreamSourceMap(jsCode, espowerOptions);
-    var instrumented = instrument(jsCode, filepath, espowerOptions);
-    var outMap = convert.fromJSON(instrumented.map.toString());
-    if (inMap) {
-        var mergedRawMap = mergeSourceMap(inMap, outMap.toObject());
-        var reMap = convert.fromObject(mergedRawMap);
-        reMap.setProperty('sources', inMap.sources);
-        reMap.setProperty('sourcesContent', inMap.sourcesContent);
-        return instrumented.code + '\n' + reMap.toComment() + '\n';
-    } else {
-        // Keeping paths absolute. Paths will be resolved by mold-source-map.
-        outMap.setProperty('sources', [filepath]);
-        outMap.setProperty('sourcesContent', [jsCode]);
-        return instrumented.code + '\n' + outMap.toComment() + '\n';
-    }
-}
+    espowerSource = require('espower-source');
 
 /**
  * Apply espower through the browserify transform chain.
@@ -95,7 +29,7 @@ function espowerify(filepath, options) {
     }
 
     function end() {
-        stream.queue(transform(data, filepath, options));
+        stream.queue(espowerSource(data, filepath, options));
         stream.queue(null);
     }
 

Diff for: package.json

@@ -42,14 +42,8 @@
     "test": "jshint index.js && mocha"
   },
   "dependencies": {
-    "convert-source-map": "~0.4.1",
-    "escodegen": "~1.3.3",
-    "espower": "~0.9.0",
-    "esprima": "~1.2.2",
-    "multi-stage-sourcemap": "~0.1.1",
-    "source-map": "~0.1.38",
-    "through": "~2.3.4",
-    "xtend": "~4.0.0"
+    "espower-source": "~0.9.0",
+    "through": "~2.3.4"
   },
   "devDependencies": {
     "jshint": "~2.5.2",