move some util and traverse methods into types

This commit is contained in:
Sebastian McKenzie
2014-10-30 13:26:06 +11:00
parent 45cb755845
commit e797be518f
15 changed files with 109 additions and 107 deletions

View File

@@ -2,6 +2,7 @@ module.exports = AMDFormatter;
var CommonJSFormatter = require("./common");
var util = require("../util");
var t = require("../types");
var b = require("../builders");
var _ = require("lodash");
@@ -51,7 +52,7 @@ AMDFormatter.prototype.import = function (node) {
};
AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var key = util.getSpecifierName(specifier);
var key = t.getSpecifierName(specifier);
var id = specifier.id;
// import foo from "foo";

View File

@@ -1,6 +1,7 @@
module.exports = CommonJSFormatter;
var util = require("../util");
var t = require("../types");
var b = require("../builders");
function CommonJSFormatter(file) {
@@ -15,7 +16,7 @@ CommonJSFormatter.prototype.import = function (node, nodes) {
};
CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var variableName = util.getSpecifierName(specifier);
var variableName = t.getSpecifierName(specifier);
// import foo from "foo";
if (specifier.default) {
@@ -38,7 +39,7 @@ CommonJSFormatter.prototype.export = function (node, nodes) {
var declar = node.declaration;
if (node.default) {
util.ensureExpressionType(declar);
t.ensureExpressionType(declar);
nodes.push(util.template("exports-default", {
VALUE: declar
@@ -65,7 +66,7 @@ CommonJSFormatter.prototype.export = function (node, nodes) {
};
CommonJSFormatter.prototype._exportSpecifier = function (getRef, specifier, node, nodes) {
var variableName = util.getSpecifierName(specifier);
var variableName = t.getSpecifierName(specifier);
if (node.source) {
if (specifier.type === "ExportBatchSpecifier") {