cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up common-interop module formatter

Browse Source
This commit is contained in:
Sebastian McKenzie
2014-11-19 12:40:10 +11:00
parent d9d84c60b5
commit 34599a21cb
27 changed files with 218 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/6to5/templates/interop-require.js Normal file
View File

@@ -0,0 +1,3 @@
(function (obj) {
return obj && (obj["default"] || obj);
})

29
lib/6to5/transformation/modules/common-interop.js Normal file
View File

@@ -0,0 +1,29 @@
module.exports = CommonJSInteropFormatter;
var CommonJSFormatter = require("./common");
var util = require("../../util");
var t = require("../../types");
function CommonJSInteropFormatter(file) {
this.file = file;
}
util.inherits(CommonJSInteropFormatter, CommonJSFormatter);
CommonJSInteropFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var variableName = t.getSpecifierName(specifier);
// import foo from "foo";
if (specifier.default) {
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(variableName,
t.callExpression(this.file.addDeclaration("interop-require"), [util.template("require", {
MODULE_NAME: node.source.raw
})])
)
]));
return;
}
CommonJSFormatter.prototype.importSpecifier.apply(this, arguments);
};

157
lib/6to5/transformation/modules/common_interop.js
View File

@@ -1,157 +0,0 @@
module.exports = CommonJSInteropFormatter;
var util = require("../../util");
var t = require("../../types");
function CommonJSInteropFormatter(file) {
this.file = file;
}
CommonJSInteropFormatter.prototype.import = function (node, nodes) {
// import "foo";
nodes.push(util.template("require", {
//inherits: node,
MODULE_NAME: node.source.raw
}, true));
};
CommonJSInteropFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var variableName = t.getSpecifierName(specifier);
//console.log("HI")
// import foo from "foo";
if (specifier.default) {
// var m_foo = require("foo"), foo = m_foo && (m_foo["default"] || m_foo);
var tmpId = util.getUid(t.identifier(variableName), this.file);
nodes.push(
t.variableDeclaration('var', [
t.variableDeclarator(tmpId,
t.callExpression(t.identifier("require"), [node.source])
),
t.variableDeclarator(variableName,
t.binaryExpression(
"&&",
tmpId,
t.binaryExpression(
"||",
t.memberExpression(
tmpId,
t.identifier("default"),
true
),
tmpId
)
)
)
])
);
return;
}
var templateName = "require-assign";
// import * as bar from "foo";
if (specifier.type !== "ImportBatchSpecifier") templateName += "-key";
nodes.push(util.template(templateName, {
//inherits: node.specifiers.length === 1 && node,
VARIABLE_NAME: variableName,
MODULE_NAME: node.source.raw,
KEY: specifier.id
}));
};
CommonJSInteropFormatter.prototype.export = function (node, nodes) {
var declar = node.declaration;
if (node.default) {
var ref = declar;
if (t.isClass(ref) || t.isFunction(ref)) {
if (ref.id) {
nodes.push(t.toStatement(ref));
ref = ref.id;
}
}
nodes.push(util.template("exports-default", {
//inherits: node,
VALUE: ref
}, true));
} else {
var assign;
if (t.isVariableDeclaration(declar)) {
var decl = declar.declarations[0];
if (decl.init) {
decl.init = util.template("exports-assign", {
//inherits: node,
VALUE: decl.init,
KEY: decl.id
});
}
nodes.push(declar);
} else {
assign = util.template("exports-assign", {
//inherits: node,
VALUE: declar.id,
KEY: declar.id
}, true);
nodes.push(t.toStatement(declar));
nodes.push(assign);
if (t.isFunctionDeclaration(declar)) {
assign._blockHoist = true;
}
}
}
};
CommonJSInteropFormatter.prototype._exportSpecifier = function (getRef, specifier, node, nodes) {
var variableName = t.getSpecifierName(specifier);
var inherits = false;
if (node.specifiers.length === 1) inherits = node;
if (node.source) {
if (t.isExportBatchSpecifier(specifier)) {
// export * from "foo";
nodes.push(util.template("exports-wildcard", {
//inherits: inherits,
OBJECT: getRef()
}, true));
} else {
// export { foo } from "test";
nodes.push(util.template("exports-assign-key", {
//inherits: inherits,
VARIABLE_NAME: variableName.name,
OBJECT: getRef(),
KEY: specifier.id
}, true));
}
} else {
// export { foo };
nodes.push(util.template("exports-assign", {
//inherits: inherits,
VALUE: specifier.id,
KEY: variableName
}, true));
}
};
CommonJSInteropFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
return this._exportSpecifier(function () {
return t.callExpression(t.identifier("require"), [node.source]);
}, specifier, node, nodes);
};

2
lib/6to5/transformation/transform.js
View File

@@ -21,7 +21,7 @@ transform.transformers = {};
transform.moduleFormatters = {
common: require("./modules/common"),
commoninterop: require("./modules/common_interop"),
commonInterop: require("./modules/common-interop"),
ignore: require("./modules/ignore"),
amd: require("./modules/amd"),
umd: require("./modules/umd")

8
test/fixtures/transformation/modules-common-interop/exports-default/actual.js vendored Normal file
View File

@@ -0,0 +1,8 @@
export default 42;
export default {};
export default [];
export default foo;
export default function () {}
export default class {}
export default function foo () {}
export default class Foo {}

13
test/fixtures/transformation/modules-common-interop/exports-default/expected.js vendored Normal file
View File

@@ -0,0 +1,13 @@
"use strict";
exports["default"] = 42;
exports["default"] = {};
exports["default"] = [];
exports["default"] = foo;
exports["default"] = function () {};
exports["default"] = function () {};
function foo() {}
exports["default"] = foo;
var Foo = function Foo() {};
exports["default"] = Foo;

6
test/fixtures/transformation/modules-common-interop/exports-from/actual.js vendored Normal file
View File

@@ -0,0 +1,6 @@
export * from "foo";
export {foo} from "foo";
export {foo, bar} from "foo";
export {foo as bar} from "foo";
export {foo as default} from "foo";
export {foo as default, bar} from "foo";

15
test/fixtures/transformation/modules-common-interop/exports-from/expected.js vendored Normal file
View File

@@ -0,0 +1,15 @@
"use strict";
(function (obj) {
for (var i in obj) {
exports[i] = obj[i];
}
})(require("foo"));
exports.foo = require("foo").foo;
exports.foo = require("foo").foo;
exports.bar = require("foo").bar;
exports.bar = require("foo").foo;
exports["default"] = require("foo").foo;
exports["default"] = require("foo").foo;
exports.bar = require("foo").bar;

5
test/fixtures/transformation/modules-common-interop/exports-named/actual.js vendored Normal file
View File

@@ -0,0 +1,5 @@
export {foo};
export {foo, bar};
export {foo as bar};
export {foo as default};
export {foo as default, bar};

9
test/fixtures/transformation/modules-common-interop/exports-named/expected.js vendored Normal file
View File

@@ -0,0 +1,9 @@
"use strict";
exports.foo = foo;
exports.foo = foo;
exports.bar = bar;
exports.bar = foo;
exports["default"] = foo;
exports["default"] = foo;
exports.bar = bar;

8
test/fixtures/transformation/modules-common-interop/exports-variable/actual.js vendored Normal file
View File

@@ -0,0 +1,8 @@
export var foo = 1;
export var foo2 = function () {};
export var foo3;
export let foo4 = 2;
export let foo5;
export const foo6 = 3;
export function foo7 () {}
export class foo8 {}

13
test/fixtures/transformation/modules-common-interop/exports-variable/expected.js vendored Normal file
View File

@@ -0,0 +1,13 @@
"use strict";
exports.foo7 = foo7;
var foo = exports.foo = 1;
var foo2 = exports.foo2 = function () {};
var foo3;
var foo4 = exports.foo4 = 2;
var foo5;
var foo6 = exports.foo6 = 3;
function foo7() {}
var foo8 = function foo8() {};
exports.foo8 = foo8;

11
test/fixtures/transformation/modules-common-interop/hoist-function-exports/actual.js vendored Normal file
View File

@@ -0,0 +1,11 @@
import { isEven } from "./evens";
export function nextOdd(n) {
return isEven(n) ? n + 1 : n + 2;
}
export var isOdd = (function (isEven) {
return function (n) {
return !isEven(n);
};
})(isEven);

13
test/fixtures/transformation/modules-common-interop/hoist-function-exports/expected.js vendored Normal file
View File

@@ -0,0 +1,13 @@
"use strict";
exports.nextOdd = nextOdd;
var isEven = require("./evens").isEven;
function nextOdd(n) {
return isEven(n) ? n + 1 : n + 2;
}
var isOdd = exports.isOdd = (function (isEven) {
return function (n) {
return !isEven(n);
};
})(isEven);

2
test/fixtures/transformation/modules-common-interop/imports-default/actual.js vendored Normal file
View File

@@ -0,0 +1,2 @@
import foo from "foo";
import {default as foo} from "foo";

9
test/fixtures/transformation/modules-common-interop/imports-default/expected.js vendored Normal file
View File

@@ -0,0 +1,9 @@
"use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
var foo = _interopRequire(require("foo"));
var foo = require("foo")["default"];

1
test/fixtures/transformation/modules-common-interop/imports-glob/actual.js vendored Normal file
View File

@@ -0,0 +1 @@
import * as foo from "foo";

3
test/fixtures/transformation/modules-common-interop/imports-glob/expected.js vendored Normal file
View File

@@ -0,0 +1,3 @@
"use strict";
var foo = require("foo");

1
test/fixtures/transformation/modules-common-interop/imports-mixing/actual.js vendored Normal file
View File

@@ -0,0 +1 @@
import foo, {baz as xyz} from "foo";

9
test/fixtures/transformation/modules-common-interop/imports-mixing/expected.js vendored Normal file
View File

@@ -0,0 +1,9 @@
"use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
var foo = _interopRequire(require("foo"));
var xyz = require("foo").baz;

4
test/fixtures/transformation/modules-common-interop/imports-named/actual.js vendored Normal file
View File

@@ -0,0 +1,4 @@
import {bar} from "foo";
import {bar, baz} from "foo";
import {bar as baz} from "foo";
import {bar as baz, xyz} from "foo";

8
test/fixtures/transformation/modules-common-interop/imports-named/expected.js vendored Normal file
View File

@@ -0,0 +1,8 @@
"use strict";
var bar = require("foo").bar;
var bar = require("foo").bar;
var baz = require("foo").baz;
var baz = require("foo").bar;
var baz = require("foo").bar;
var xyz = require("foo").xyz;

3
test/fixtures/transformation/modules-common-interop/imports/actual.js vendored Normal file
View File

@@ -0,0 +1,3 @@
import "foo";
import "foo-bar";
import "./directory/foo-bar";

7
test/fixtures/transformation/modules-common-interop/imports/expected.js vendored Normal file
View File

@@ -0,0 +1,7 @@
"use strict";
require("foo");
require("foo-bar");
require("./directory/foo-bar");

3
test/fixtures/transformation/modules-common-interop/options.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"modules": "commonInterop"
}

12
test/fixtures/transformation/modules-common-interop/overview/actual.js vendored Normal file
View File

@@ -0,0 +1,12 @@
import "foo";
import "foo-bar";
import "./directory/foo-bar";
import foo from "foo";
import * as foo from "foo";
import {bar} from "foo";
import {foo as bar} from "foo";
export {test};
export var test = 5;
export default test;

22
test/fixtures/transformation/modules-common-interop/overview/expected.js vendored Normal file
View File

@@ -0,0 +1,22 @@
"use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
require("foo");
require("foo-bar");
require("./directory/foo-bar");
var foo = _interopRequire(require("foo"));
var foo = require("foo");
var bar = require("foo").bar;
var bar = require("foo").foo;
exports.test = test;
var test = exports.test = 5;
exports["default"] = test;