move util.generate to File::generate

This commit is contained in:
Sebastian McKenzie
2014-10-14 11:46:24 +11:00
parent c9f56b838f
commit 7fb023c2b0
2 changed files with 8 additions and 11 deletions

View File

@@ -3,6 +3,7 @@ module.exports = File;
var SHEBANG_REGEX = /^\#\!.*/;
var transform = require("./transform");
var recast = require("recast");
var util = require("./util");
var b = require("recast").types.builders;
var _ = require("lodash");
@@ -94,7 +95,12 @@ File.prototype.generate = function () {
var opts = this.opts;
var ast = this.ast;
var result = util.generate(ast, opts);
var printOpts = {};
if (opts.sourceMap) {
printOpts.sourceMapName = opts.sourceMapName;
}
var result = recast.print(ast, printOpts);
var code = result.code;
if (this.shebang) {
@@ -103,7 +109,7 @@ File.prototype.generate = function () {
}
if (opts.sourceMap === "inline") {
code += "\n" + util.sourceMapToComment(map);
code += "\n" + util.sourceMapToComment(result.map);
}
return {

View File

@@ -222,15 +222,6 @@ exports.repeat = function (width, cha) {
return new Array(width + 1).join(cha);
};
exports.generate = function (ast, opts) {
var printOpts = {};
if (opts.sourceMap) {
printOpts.sourceMapName = opts.sourceMapName;
}
return recast.print(ast, printOpts);
};
exports.parse = function (opts, code, callback) {
try {
var recastOpts = {};