diff options
Diffstat (limited to 'node_modules/babel-generator/lib')
6 files changed, 29 insertions, 16 deletions
diff --git a/node_modules/babel-generator/lib/generators/classes.js b/node_modules/babel-generator/lib/generators/classes.js index 9ac56dfd7..73f9cc3c5 100644 --- a/node_modules/babel-generator/lib/generators/classes.js +++ b/node_modules/babel-generator/lib/generators/classes.js @@ -66,6 +66,7 @@ function ClassProperty(node) { this.print(node.key, node); this.token("]"); } else { + this._variance(node); this.print(node.key, node); } this.print(node.typeAnnotation, node); diff --git a/node_modules/babel-generator/lib/generators/flow.js b/node_modules/babel-generator/lib/generators/flow.js index bb769acb1..cc52ffe83 100644 --- a/node_modules/babel-generator/lib/generators/flow.js +++ b/node_modules/babel-generator/lib/generators/flow.js @@ -18,9 +18,11 @@ exports.FunctionTypeAnnotation = FunctionTypeAnnotation; exports.FunctionTypeParam = FunctionTypeParam; exports.InterfaceExtends = InterfaceExtends; exports._interfaceish = _interfaceish; +exports._variance = _variance; exports.InterfaceDeclaration = InterfaceDeclaration; exports.IntersectionTypeAnnotation = IntersectionTypeAnnotation; exports.MixedTypeAnnotation = MixedTypeAnnotation; +exports.EmptyTypeAnnotation = EmptyTypeAnnotation; exports.NullableTypeAnnotation = NullableTypeAnnotation; var _types = require("./types"); @@ -65,7 +67,7 @@ function ArrayTypeAnnotation(node) { } function BooleanTypeAnnotation() { - this.word("bool"); + this.word("boolean"); } function BooleanLiteralTypeAnnotation(node) { @@ -200,6 +202,14 @@ function _interfaceish(node) { this.print(node.body, node); } +function _variance(node) { + if (node.variance === "plus") { + this.token("+"); + } else if (node.variance === "minus") { + this.token("-"); + } +} + function InterfaceDeclaration(node) { this.word("interface"); this.space(); @@ -220,6 +230,10 @@ function MixedTypeAnnotation() { this.word("mixed"); } +function EmptyTypeAnnotation() { + this.word("empty"); +} + function NullableTypeAnnotation(node) { this.token("?"); this.print(node.typeAnnotation, node); @@ -269,11 +283,7 @@ function TypeAnnotation(node) { } function TypeParameter(node) { - if (node.variance === "plus") { - this.token("+"); - } else if (node.variance === "minus") { - this.token("-"); - } + this._variance(node); this.word(node.name); @@ -344,6 +354,7 @@ function ObjectTypeIndexer(node) { this.word("static"); this.space(); } + this._variance(node); this.token("["); this.print(node.id, node); this.token(":"); @@ -360,6 +371,7 @@ function ObjectTypeProperty(node) { this.word("static"); this.space(); } + this._variance(node); this.print(node.key, node); if (node.optional) this.token("?"); this.token(":"); diff --git a/node_modules/babel-generator/lib/generators/statements.js b/node_modules/babel-generator/lib/generators/statements.js index 0e6f1dcd5..1866fe00f 100644 --- a/node_modules/babel-generator/lib/generators/statements.js +++ b/node_modules/babel-generator/lib/generators/statements.js @@ -147,7 +147,7 @@ function DoWhileStatement(node) { } function buildLabelStatement(prefix) { - var key = arguments.length <= 1 || arguments[1] === undefined ? "label" : arguments[1]; + var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "label"; return function (node) { this.word(prefix); diff --git a/node_modules/babel-generator/lib/node/parentheses.js b/node_modules/babel-generator/lib/node/parentheses.js index a6405be83..10eba8e2c 100644 --- a/node_modules/babel-generator/lib/node/parentheses.js +++ b/node_modules/babel-generator/lib/node/parentheses.js @@ -214,7 +214,7 @@ function AssignmentExpression(node) { } function isFirstInStatement(printStack) { - var _ref = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; var _ref$considerArrow = _ref.considerArrow; var considerArrow = _ref$considerArrow === undefined ? false : _ref$considerArrow; diff --git a/node_modules/babel-generator/lib/node/whitespace.js b/node_modules/babel-generator/lib/node/whitespace.js index 6a27c55cb..d3690a84a 100644 --- a/node_modules/babel-generator/lib/node/whitespace.js +++ b/node_modules/babel-generator/lib/node/whitespace.js @@ -21,7 +21,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function crawl(node) { - var state = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; if (t.isMemberExpression(node)) { crawl(node.object, state); diff --git a/node_modules/babel-generator/lib/printer.js b/node_modules/babel-generator/lib/printer.js index b98b0a5a4..058ad72b7 100644 --- a/node_modules/babel-generator/lib/printer.js +++ b/node_modules/babel-generator/lib/printer.js @@ -101,7 +101,7 @@ var Printer = function () { }; Printer.prototype.semicolon = function semicolon() { - var force = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0]; + var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; this._maybeAddAuxComment(); this._append(";", !force); @@ -115,7 +115,7 @@ var Printer = function () { }; Printer.prototype.space = function space() { - var force = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0]; + var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; if (this.format.compact) return; @@ -198,7 +198,7 @@ var Printer = function () { }; Printer.prototype._append = function _append(str) { - var queue = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1]; + var queue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; this._maybeAddParen(str); this._maybeIndent(str); @@ -349,7 +349,7 @@ var Printer = function () { }; Printer.prototype.printJoin = function printJoin(nodes, parent) { - var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; + var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}; if (!nodes || !nodes.length) return; @@ -407,7 +407,7 @@ var Printer = function () { }; Printer.prototype.printInnerComments = function printInnerComments(node) { - var indent = arguments.length <= 1 || arguments[1] === undefined ? true : arguments[1]; + var indent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; if (!node.innerComments) return; if (indent) this.indent(); @@ -416,14 +416,14 @@ var Printer = function () { }; Printer.prototype.printSequence = function printSequence(nodes, parent) { - var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; + var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}; opts.statement = true; return this.printJoin(nodes, parent, opts); }; Printer.prototype.printList = function printList(items, parent) { - var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; + var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {}; if (opts.separator == null) { opts.separator = commaSeparator; |