update

node_modules/@babel/generator/lib/generators/base.js

@@ -3,14 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.File = File;
-exports.Program = Program;
 exports.BlockStatement = BlockStatement;
-exports.Noop = Noop;
 exports.Directive = Directive;
 exports.DirectiveLiteral = DirectiveLiteral;
+exports.File = File;
 exports.InterpreterDirective = InterpreterDirective;
 exports.Placeholder = Placeholder;
+exports.Program = Program;
 
 function File(node) {
   if (node.program) {
@@ -45,7 +44,7 @@ function BlockStatement(node) {
     });
     this.removeTrailingNewline();
     this.source("end", node.loc);
-    if (!this.endsWith("\n")) this.newline();
+    if (!this.endsWith(10)) this.newline();
     this.rightBrace();
   } else {
     this.source("end", node.loc);
@@ -53,8 +52,6 @@ function BlockStatement(node) {
   }
 }
 
-function Noop() {}
-
 function Directive(node) {
   this.print(node.value, node);
   this.semicolon();
@@ -66,7 +63,7 @@ const unescapedDoubleQuoteRE = /(?:^|[^\\])(?:\\\\)*"/;
 function DirectiveLiteral(node) {
   const raw = this.getPossibleRaw(node);
 
-  if (raw != null) {
+  if (!this.format.minified && raw !== undefined) {
     this.token(raw);
     return;
   }

node_modules/@babel/generator/lib/generators/classes.js

@@ -3,23 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ClassExpression = exports.ClassDeclaration = ClassDeclaration;
+exports.ClassAccessorProperty = ClassAccessorProperty;
 exports.ClassBody = ClassBody;
-exports.ClassProperty = ClassProperty;
-exports.ClassPrivateProperty = ClassPrivateProperty;
+exports.ClassExpression = exports.ClassDeclaration = ClassDeclaration;
 exports.ClassMethod = ClassMethod;
 exports.ClassPrivateMethod = ClassPrivateMethod;
+exports.ClassPrivateProperty = ClassPrivateProperty;
+exports.ClassProperty = ClassProperty;
+exports.StaticBlock = StaticBlock;
 exports._classMethodHead = _classMethodHead;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isExportDefaultDeclaration,
+  isExportNamedDeclaration
+} = _t;
 
 function ClassDeclaration(node, parent) {
-  if (!this.format.decoratorsBeforeExport || !t.isExportDefaultDeclaration(parent) && !t.isExportNamedDeclaration(parent)) {
-    this.printJoin(node.decorators, node);
+  {
+    if (!this.format.decoratorsBeforeExport || !isExportDefaultDeclaration(parent) && !isExportNamedDeclaration(parent)) {
+      this.printJoin(node.decorators, node);
+    }
   }
 
   if (node.declare) {
@@ -33,6 +38,7 @@ function ClassDeclaration(node, parent) {
   }
 
   this.word("class");
+  this.printInnerComments(node);
 
   if (node.id) {
     this.space();
@@ -71,14 +77,53 @@ function ClassBody(node) {
     this.indent();
     this.printSequence(node.body, node);
     this.dedent();
-    if (!this.endsWith("\n")) this.newline();
+    if (!this.endsWith(10)) this.newline();
     this.rightBrace();
   }
 }
 
 function ClassProperty(node) {
   this.printJoin(node.decorators, node);
-  this.tsPrintClassMemberModifiers(node, true);
+  this.source("end", node.key.loc);
+  this.tsPrintClassMemberModifiers(node);
+
+  if (node.computed) {
+    this.token("[");
+    this.print(node.key, node);
+    this.token("]");
+  } else {
+    this._variance(node);
+
+    this.print(node.key, node);
+  }
+
+  if (node.optional) {
+    this.token("?");
+  }
+
+  if (node.definite) {
+    this.token("!");
+  }
+
+  this.print(node.typeAnnotation, node);
+
+  if (node.value) {
+    this.space();
+    this.token("=");
+    this.space();
+    this.print(node.value, node);
+  }
+
+  this.semicolon();
+}
+
+function ClassAccessorProperty(node) {
+  this.printJoin(node.decorators, node);
+  this.source("end", node.key.loc);
+  this.tsPrintClassMemberModifiers(node);
+  this.word("accessor");
+  this.printInnerComments(node);
+  this.space();
 
   if (node.computed) {
     this.token("[");
@@ -111,6 +156,8 @@ function ClassProperty(node) {
 }
 
 function ClassPrivateProperty(node) {
+  this.printJoin(node.decorators, node);
+
   if (node.static) {
     this.word("static");
     this.space();
@@ -145,7 +192,24 @@ function ClassPrivateMethod(node) {
 
 function _classMethodHead(node) {
   this.printJoin(node.decorators, node);
-  this.tsPrintClassMemberModifiers(node, false);
+  this.source("end", node.key.loc);
+  this.tsPrintClassMemberModifiers(node);
 
   this._methodHead(node);
+}
+
+function StaticBlock(node) {
+  this.word("static");
+  this.space();
+  this.token("{");
+
+  if (node.body.length === 0) {
+    this.token("}");
+  } else {
+    this.newline();
+    this.printSequence(node.body, node, {
+      indent: true
+    });
+    this.rightBrace();
+  }
 }

node_modules/@babel/generator/lib/generators/expressions.js

@@ -3,38 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnaryExpression = UnaryExpression;
-exports.DoExpression = DoExpression;
-exports.ParenthesizedExpression = ParenthesizedExpression;
-exports.UpdateExpression = UpdateExpression;
-exports.ConditionalExpression = ConditionalExpression;
-exports.NewExpression = NewExpression;
-exports.SequenceExpression = SequenceExpression;
-exports.ThisExpression = ThisExpression;
-exports.Super = Super;
-exports.Decorator = Decorator;
-exports.OptionalMemberExpression = OptionalMemberExpression;
-exports.OptionalCallExpression = OptionalCallExpression;
+exports.LogicalExpression = exports.BinaryExpression = exports.AssignmentExpression = AssignmentExpression;
+exports.AssignmentPattern = AssignmentPattern;
+exports.AwaitExpression = AwaitExpression;
+exports.BindExpression = BindExpression;
 exports.CallExpression = CallExpression;
-exports.Import = Import;
+exports.ConditionalExpression = ConditionalExpression;
+exports.Decorator = Decorator;
+exports.DoExpression = DoExpression;
 exports.EmptyStatement = EmptyStatement;
 exports.ExpressionStatement = ExpressionStatement;
-exports.AssignmentPattern = AssignmentPattern;
-exports.LogicalExpression = exports.BinaryExpression = exports.AssignmentExpression = AssignmentExpression;
-exports.BindExpression = BindExpression;
+exports.Import = Import;
 exports.MemberExpression = MemberExpression;
 exports.MetaProperty = MetaProperty;
+exports.ModuleExpression = ModuleExpression;
+exports.NewExpression = NewExpression;
+exports.OptionalCallExpression = OptionalCallExpression;
+exports.OptionalMemberExpression = OptionalMemberExpression;
+exports.ParenthesizedExpression = ParenthesizedExpression;
 exports.PrivateName = PrivateName;
+exports.SequenceExpression = SequenceExpression;
+exports.Super = Super;
+exports.ThisExpression = ThisExpression;
+exports.UnaryExpression = UnaryExpression;
+exports.UpdateExpression = UpdateExpression;
 exports.V8IntrinsicIdentifier = V8IntrinsicIdentifier;
-exports.AwaitExpression = exports.YieldExpression = void 0;
+exports.YieldExpression = YieldExpression;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-var n = _interopRequireWildcard(require("../node"));
+var n = require("../node");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isCallExpression,
+  isLiteral,
+  isMemberExpression,
+  isNewExpression
+} = _t;
 
 function UnaryExpression(node) {
   if (node.operator === "void" || node.operator === "delete" || node.operator === "typeof" || node.operator === "throw") {
@@ -48,6 +53,11 @@ function UnaryExpression(node) {
 }
 
 function DoExpression(node) {
+  if (node.async) {
+    this.word("async");
+    this.space();
+  }
+
   this.word("do");
   this.space();
   this.print(node.body, node);
@@ -64,9 +74,7 @@ function UpdateExpression(node) {
     this.token(node.operator);
     this.print(node.argument, node);
   } else {
-    this.startTerminatorless(true);
-    this.print(node.argument, node);
-    this.endTerminatorless();
+    this.printTerminatorless(node.argument, node, true);
     this.token(node.operator);
   }
 }
@@ -88,9 +96,9 @@ function NewExpression(node, parent) {
   this.space();
   this.print(node.callee, node);
 
-  if (this.format.minified && node.arguments.length === 0 && !node.optional && !t.isCallExpression(parent, {
+  if (this.format.minified && node.arguments.length === 0 && !node.optional && !isCallExpression(parent, {
     callee: node
-  }) && !t.isMemberExpression(parent) && !t.isNewExpression(parent)) {
+  }) && !isMemberExpression(parent) && !isNewExpression(parent)) {
     return;
   }
 
@@ -118,22 +126,58 @@ function Super() {
   this.word("super");
 }
 
+function isDecoratorMemberExpression(node) {
+  switch (node.type) {
+    case "Identifier":
+      return true;
+
+    case "MemberExpression":
+      return !node.computed && node.property.type === "Identifier" && isDecoratorMemberExpression(node.object);
+
+    default:
+      return false;
+  }
+}
+
+function shouldParenthesizeDecoratorExpression(node) {
+  if (node.type === "CallExpression") {
+    node = node.callee;
+  }
+
+  if (node.type === "ParenthesizedExpression") {
+    return false;
+  }
+
+  return !isDecoratorMemberExpression(node);
+}
+
 function Decorator(node) {
   this.token("@");
-  this.print(node.expression, node);
+  const {
+    expression
+  } = node;
+
+  if (shouldParenthesizeDecoratorExpression(expression)) {
+    this.token("(");
+    this.print(expression, node);
+    this.token(")");
+  } else {
+    this.print(expression, node);
+  }
+
   this.newline();
 }
 
 function OptionalMemberExpression(node) {
   this.print(node.object, node);
 
-  if (!node.computed && t.isMemberExpression(node.property)) {
+  if (!node.computed && isMemberExpression(node.property)) {
     throw new TypeError("Got a MemberExpression for MemberExpression property");
   }
 
   let computed = node.computed;
 
-  if (t.isLiteral(node.property) && typeof node.property.value === "number") {
+  if (isLiteral(node.property) && typeof node.property.value === "number") {
     computed = true;
   }
 
@@ -181,27 +225,27 @@ function Import() {
   this.word("import");
 }
 
-function buildYieldAwait(keyword) {
-  return function (node) {
-    this.word(keyword);
+function AwaitExpression(node) {
+  this.word("await");
 
-    if (node.delegate) {
-      this.token("*");
-    }
-
-    if (node.argument) {
-      this.space();
-      const terminatorState = this.startTerminatorless();
-      this.print(node.argument, node);
-      this.endTerminatorless(terminatorState);
-    }
-  };
+  if (node.argument) {
+    this.space();
+    this.printTerminatorless(node.argument, node, false);
+  }
 }
 
-const YieldExpression = buildYieldAwait("yield");
-exports.YieldExpression = YieldExpression;
-const AwaitExpression = buildYieldAwait("await");
-exports.AwaitExpression = AwaitExpression;
+function YieldExpression(node) {
+  this.word("yield");
+
+  if (node.delegate) {
+    this.token("*");
+  }
+
+  if (node.argument) {
+    this.space();
+    this.printTerminatorless(node.argument, node, false);
+  }
+}
 
 function EmptyStatement() {
   this.semicolon(true);
@@ -255,13 +299,13 @@ function BindExpression(node) {
 function MemberExpression(node) {
   this.print(node.object, node);
 
-  if (!node.computed && t.isMemberExpression(node.property)) {
+  if (!node.computed && isMemberExpression(node.property)) {
     throw new TypeError("Got a MemberExpression for MemberExpression property");
   }
 
   let computed = node.computed;
 
-  if (t.isLiteral(node.property) && typeof node.property.value === "number") {
+  if (isLiteral(node.property) && typeof node.property.value === "number") {
     computed = true;
   }
 
@@ -289,4 +333,20 @@ function PrivateName(node) {
 function V8IntrinsicIdentifier(node) {
   this.token("%");
   this.word(node.name);
+}
+
+function ModuleExpression(node) {
+  this.word("module");
+  this.space();
+  this.token("{");
+
+  if (node.body.body.length === 0) {
+    this.token("}");
+  } else {
+    this.newline();
+    this.printSequence(node.body.body, node, {
+      indent: true
+    });
+    this.rightBrace();
+  }
 }

node_modules/@babel/generator/lib/generators/flow.js

@@ -5,86 +5,89 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AnyTypeAnnotation = AnyTypeAnnotation;
 exports.ArrayTypeAnnotation = ArrayTypeAnnotation;
-exports.BooleanTypeAnnotation = BooleanTypeAnnotation;
 exports.BooleanLiteralTypeAnnotation = BooleanLiteralTypeAnnotation;
-exports.NullLiteralTypeAnnotation = NullLiteralTypeAnnotation;
+exports.BooleanTypeAnnotation = BooleanTypeAnnotation;
 exports.DeclareClass = DeclareClass;
+exports.DeclareExportAllDeclaration = DeclareExportAllDeclaration;
+exports.DeclareExportDeclaration = DeclareExportDeclaration;
 exports.DeclareFunction = DeclareFunction;
-exports.InferredPredicate = InferredPredicate;
-exports.DeclaredPredicate = DeclaredPredicate;
 exports.DeclareInterface = DeclareInterface;
 exports.DeclareModule = DeclareModule;
 exports.DeclareModuleExports = DeclareModuleExports;
-exports.DeclareTypeAlias = DeclareTypeAlias;
 exports.DeclareOpaqueType = DeclareOpaqueType;
+exports.DeclareTypeAlias = DeclareTypeAlias;
 exports.DeclareVariable = DeclareVariable;
-exports.DeclareExportDeclaration = DeclareExportDeclaration;
-exports.DeclareExportAllDeclaration = DeclareExportAllDeclaration;
-exports.EnumDeclaration = EnumDeclaration;
+exports.DeclaredPredicate = DeclaredPredicate;
+exports.EmptyTypeAnnotation = EmptyTypeAnnotation;
 exports.EnumBooleanBody = EnumBooleanBody;
-exports.EnumNumberBody = EnumNumberBody;
-exports.EnumStringBody = EnumStringBody;
-exports.EnumSymbolBody = EnumSymbolBody;
-exports.EnumDefaultedMember = EnumDefaultedMember;
 exports.EnumBooleanMember = EnumBooleanMember;
+exports.EnumDeclaration = EnumDeclaration;
+exports.EnumDefaultedMember = EnumDefaultedMember;
+exports.EnumNumberBody = EnumNumberBody;
 exports.EnumNumberMember = EnumNumberMember;
+exports.EnumStringBody = EnumStringBody;
 exports.EnumStringMember = EnumStringMember;
+exports.EnumSymbolBody = EnumSymbolBody;
 exports.ExistsTypeAnnotation = ExistsTypeAnnotation;
 exports.FunctionTypeAnnotation = FunctionTypeAnnotation;
 exports.FunctionTypeParam = FunctionTypeParam;
-exports.GenericTypeAnnotation = exports.ClassImplements = exports.InterfaceExtends = InterfaceExtends;
-exports._interfaceish = _interfaceish;
-exports._variance = _variance;
+exports.IndexedAccessType = IndexedAccessType;
+exports.InferredPredicate = InferredPredicate;
 exports.InterfaceDeclaration = InterfaceDeclaration;
+exports.GenericTypeAnnotation = exports.ClassImplements = exports.InterfaceExtends = InterfaceExtends;
 exports.InterfaceTypeAnnotation = InterfaceTypeAnnotation;
 exports.IntersectionTypeAnnotation = IntersectionTypeAnnotation;
 exports.MixedTypeAnnotation = MixedTypeAnnotation;
-exports.EmptyTypeAnnotation = EmptyTypeAnnotation;
+exports.NullLiteralTypeAnnotation = NullLiteralTypeAnnotation;
 exports.NullableTypeAnnotation = NullableTypeAnnotation;
-exports.NumberTypeAnnotation = NumberTypeAnnotation;
-exports.StringTypeAnnotation = StringTypeAnnotation;
-exports.ThisTypeAnnotation = ThisTypeAnnotation;
-exports.TupleTypeAnnotation = TupleTypeAnnotation;
-exports.TypeofTypeAnnotation = TypeofTypeAnnotation;
-exports.TypeAlias = TypeAlias;
-exports.TypeAnnotation = TypeAnnotation;
-exports.TypeParameterDeclaration = exports.TypeParameterInstantiation = TypeParameterInstantiation;
-exports.TypeParameter = TypeParameter;
-exports.OpaqueType = OpaqueType;
-exports.ObjectTypeAnnotation = ObjectTypeAnnotation;
-exports.ObjectTypeInternalSlot = ObjectTypeInternalSlot;
-exports.ObjectTypeCallProperty = ObjectTypeCallProperty;
-exports.ObjectTypeIndexer = ObjectTypeIndexer;
-exports.ObjectTypeProperty = ObjectTypeProperty;
-exports.ObjectTypeSpreadProperty = ObjectTypeSpreadProperty;
-exports.QualifiedTypeIdentifier = QualifiedTypeIdentifier;
-exports.SymbolTypeAnnotation = SymbolTypeAnnotation;
-exports.UnionTypeAnnotation = UnionTypeAnnotation;
-exports.TypeCastExpression = TypeCastExpression;
-exports.Variance = Variance;
-exports.VoidTypeAnnotation = VoidTypeAnnotation;
 Object.defineProperty(exports, "NumberLiteralTypeAnnotation", {
   enumerable: true,
   get: function () {
     return _types2.NumericLiteral;
   }
 });
+exports.NumberTypeAnnotation = NumberTypeAnnotation;
+exports.ObjectTypeAnnotation = ObjectTypeAnnotation;
+exports.ObjectTypeCallProperty = ObjectTypeCallProperty;
+exports.ObjectTypeIndexer = ObjectTypeIndexer;
+exports.ObjectTypeInternalSlot = ObjectTypeInternalSlot;
+exports.ObjectTypeProperty = ObjectTypeProperty;
+exports.ObjectTypeSpreadProperty = ObjectTypeSpreadProperty;
+exports.OpaqueType = OpaqueType;
+exports.OptionalIndexedAccessType = OptionalIndexedAccessType;
+exports.QualifiedTypeIdentifier = QualifiedTypeIdentifier;
 Object.defineProperty(exports, "StringLiteralTypeAnnotation", {
   enumerable: true,
   get: function () {
     return _types2.StringLiteral;
   }
 });
+exports.StringTypeAnnotation = StringTypeAnnotation;
+exports.SymbolTypeAnnotation = SymbolTypeAnnotation;
+exports.ThisTypeAnnotation = ThisTypeAnnotation;
+exports.TupleTypeAnnotation = TupleTypeAnnotation;
+exports.TypeAlias = TypeAlias;
+exports.TypeAnnotation = TypeAnnotation;
+exports.TypeCastExpression = TypeCastExpression;
+exports.TypeParameter = TypeParameter;
+exports.TypeParameterDeclaration = exports.TypeParameterInstantiation = TypeParameterInstantiation;
+exports.TypeofTypeAnnotation = TypeofTypeAnnotation;
+exports.UnionTypeAnnotation = UnionTypeAnnotation;
+exports.Variance = Variance;
+exports.VoidTypeAnnotation = VoidTypeAnnotation;
+exports._interfaceish = _interfaceish;
+exports._variance = _variance;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
 var _modules = require("./modules");
 
 var _types2 = require("./types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isDeclareExportDeclaration,
+  isStatement
+} = _t;
 
 function AnyTypeAnnotation() {
   this.word("any");
@@ -109,7 +112,7 @@ function NullLiteralTypeAnnotation() {
 }
 
 function DeclareClass(node, parent) {
-  if (!t.isDeclareExportDeclaration(parent)) {
+  if (!isDeclareExportDeclaration(parent)) {
     this.word("declare");
     this.space();
   }
@@ -121,7 +124,7 @@ function DeclareClass(node, parent) {
 }
 
 function DeclareFunction(node, parent) {
-  if (!t.isDeclareExportDeclaration(parent)) {
+  if (!isDeclareExportDeclaration(parent)) {
     this.word("declare");
     this.space();
   }
@@ -184,7 +187,7 @@ function DeclareTypeAlias(node) {
 }
 
 function DeclareOpaqueType(node, parent) {
-  if (!t.isDeclareExportDeclaration(parent)) {
+  if (!isDeclareExportDeclaration(parent)) {
     this.word("declare");
     this.space();
   }
@@ -193,7 +196,7 @@ function DeclareOpaqueType(node, parent) {
 }
 
 function DeclareVariable(node, parent) {
-  if (!t.isDeclareExportDeclaration(parent)) {
+  if (!isDeclareExportDeclaration(parent)) {
     this.word("declare");
     this.space();
   }
@@ -216,14 +219,14 @@ function DeclareExportDeclaration(node) {
     this.space();
   }
 
-  FlowExportDeclaration.apply(this, arguments);
+  FlowExportDeclaration.call(this, node);
 }
 
-function DeclareExportAllDeclaration() {
+function DeclareExportAllDeclaration(node) {
   this.word("declare");
   this.space();
 
-  _modules.ExportAllDeclaration.apply(this, arguments);
+  _modules.ExportAllDeclaration.call(this, node);
 }
 
 function EnumDeclaration(node) {
@@ -261,6 +264,11 @@ function enumBody(context, node) {
     context.newline();
   }
 
+  if (node.hasUnknownMembers) {
+    context.token("...");
+    context.newline();
+  }
+
   context.dedent();
   context.token("}");
 }
@@ -331,7 +339,7 @@ function FlowExportDeclaration(node) {
   if (node.declaration) {
     const declar = node.declaration;
     this.print(declar, node);
-    if (!t.isStatement(declar)) this.semicolon();
+    if (!isStatement(declar)) this.semicolon();
   } else {
     this.token("{");
 
@@ -361,6 +369,19 @@ function ExistsTypeAnnotation() {
 function FunctionTypeAnnotation(node, parent) {
   this.print(node.typeParameters, node);
   this.token("(");
+
+  if (node.this) {
+    this.word("this");
+    this.token(":");
+    this.space();
+    this.print(node.this.typeAnnotation, node);
+
+    if (node.params.length || node.rest) {
+      this.token(",");
+      this.space();
+    }
+  }
+
   this.printList(node.params, node);
 
   if (node.rest) {
@@ -375,7 +396,7 @@ function FunctionTypeAnnotation(node, parent) {
 
   this.token(")");
 
-  if (parent.type === "ObjectTypeCallProperty" || parent.type === "DeclareFunction" || parent.type === "ObjectTypeProperty" && parent.method) {
+  if (parent && (parent.type === "ObjectTypeCallProperty" || parent.type === "DeclareFunction" || parent.type === "ObjectTypeProperty" && parent.method)) {
     this.token(":");
   } else {
     this.space();
@@ -404,10 +425,12 @@ function InterfaceExtends(node) {
 }
 
 function _interfaceish(node) {
+  var _node$extends;
+
   this.print(node.id, node);
   this.print(node.typeParameters, node);
 
-  if (node.extends.length) {
+  if ((_node$extends = node.extends) != null && _node$extends.length) {
     this.space();
     this.word("extends");
     this.space();
@@ -585,7 +608,7 @@ function ObjectTypeAnnotation(node) {
     this.token("{");
   }
 
-  const props = node.properties.concat(node.callProperties || [], node.indexers || [], node.internalSlots || []);
+  const props = [...node.properties, ...(node.callProperties || []), ...(node.indexers || []), ...(node.internalSlots || [])];
 
   if (props.length) {
     this.space();
@@ -750,4 +773,23 @@ function Variance(node) {
 
 function VoidTypeAnnotation() {
   this.word("void");
+}
+
+function IndexedAccessType(node) {
+  this.print(node.objectType, node);
+  this.token("[");
+  this.print(node.indexType, node);
+  this.token("]");
+}
+
+function OptionalIndexedAccessType(node) {
+  this.print(node.objectType, node);
+
+  if (node.optional) {
+    this.token("?.");
+  }
+
+  this.token("[");
+  this.print(node.indexType, node);
+  this.token("]");
 }

node_modules/@babel/generator/lib/generators/index.js

@@ -8,6 +8,7 @@ var _templateLiterals = require("./template-literals");
 
 Object.keys(_templateLiterals).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _templateLiterals[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -20,6 +21,7 @@ var _expressions = require("./expressions");
 
 Object.keys(_expressions).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _expressions[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -32,6 +34,7 @@ var _statements = require("./statements");
 
 Object.keys(_statements).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _statements[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -44,6 +47,7 @@ var _classes = require("./classes");
 
 Object.keys(_classes).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _classes[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -56,6 +60,7 @@ var _methods = require("./methods");
 
 Object.keys(_methods).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _methods[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -68,6 +73,7 @@ var _modules = require("./modules");
 
 Object.keys(_modules).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _modules[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -80,6 +86,7 @@ var _types = require("./types");
 
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -92,6 +99,7 @@ var _flow = require("./flow");
 
 Object.keys(_flow).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _flow[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -104,6 +112,7 @@ var _base = require("./base");
 
 Object.keys(_base).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _base[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -116,6 +125,7 @@ var _jsx = require("./jsx");
 
 Object.keys(_jsx).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _jsx[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
@@ -128,6 +138,7 @@ var _typescript = require("./typescript");
 
 Object.keys(_typescript).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _typescript[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {

node_modules/@babel/generator/lib/generators/jsx.js

@@ -4,20 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.JSXAttribute = JSXAttribute;
-exports.JSXIdentifier = JSXIdentifier;
-exports.JSXNamespacedName = JSXNamespacedName;
-exports.JSXMemberExpression = JSXMemberExpression;
-exports.JSXSpreadAttribute = JSXSpreadAttribute;
+exports.JSXClosingElement = JSXClosingElement;
+exports.JSXClosingFragment = JSXClosingFragment;
+exports.JSXElement = JSXElement;
+exports.JSXEmptyExpression = JSXEmptyExpression;
 exports.JSXExpressionContainer = JSXExpressionContainer;
+exports.JSXFragment = JSXFragment;
+exports.JSXIdentifier = JSXIdentifier;
+exports.JSXMemberExpression = JSXMemberExpression;
+exports.JSXNamespacedName = JSXNamespacedName;
+exports.JSXOpeningElement = JSXOpeningElement;
+exports.JSXOpeningFragment = JSXOpeningFragment;
+exports.JSXSpreadAttribute = JSXSpreadAttribute;
 exports.JSXSpreadChild = JSXSpreadChild;
 exports.JSXText = JSXText;
-exports.JSXElement = JSXElement;
-exports.JSXOpeningElement = JSXOpeningElement;
-exports.JSXClosingElement = JSXClosingElement;
-exports.JSXEmptyExpression = JSXEmptyExpression;
-exports.JSXFragment = JSXFragment;
-exports.JSXOpeningFragment = JSXOpeningFragment;
-exports.JSXClosingFragment = JSXClosingFragment;
 
 function JSXAttribute(node) {
   this.print(node.name, node);
@@ -67,7 +67,7 @@ function JSXSpreadChild(node) {
 function JSXText(node) {
   const raw = this.getPossibleRaw(node);
 
-  if (raw != null) {
+  if (raw !== undefined) {
     this.token(raw);
   } else {
     this.token(node.value);

node_modules/@babel/generator/lib/generators/methods.js

@@ -3,20 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._params = _params;
-exports._parameters = _parameters;
-exports._param = _param;
-exports._methodHead = _methodHead;
-exports._predicate = _predicate;
-exports._functionHead = _functionHead;
-exports.FunctionDeclaration = exports.FunctionExpression = FunctionExpression;
 exports.ArrowFunctionExpression = ArrowFunctionExpression;
+exports.FunctionDeclaration = exports.FunctionExpression = FunctionExpression;
+exports._functionHead = _functionHead;
+exports._methodHead = _methodHead;
+exports._param = _param;
+exports._parameters = _parameters;
+exports._params = _params;
+exports._predicate = _predicate;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isIdentifier
+} = _t;
 
 function _params(node) {
   this.print(node.typeParameters, node);
@@ -42,7 +42,11 @@ function _parameters(parameters, parent) {
 function _param(parameter, parent) {
   this.printJoin(parameter.decorators, parameter);
   this.print(parameter, parent);
-  if (parameter.optional) this.token("?");
+
+  if (parameter.optional) {
+    this.token("?");
+  }
+
   this.print(parameter.typeAnnotation, parameter);
 }
 
@@ -56,6 +60,8 @@ function _methodHead(node) {
   }
 
   if (node.async) {
+    this._catchUp("start", key.loc);
+
     this.word("async");
     this.space();
   }
@@ -100,6 +106,7 @@ function _functionHead(node) {
 
   this.word("function");
   if (node.generator) this.token("*");
+  this.printInnerComments(node);
   this.space();
 
   if (node.id) {
@@ -108,7 +115,9 @@ function _functionHead(node) {
 
   this._params(node);
 
-  this._predicate(node);
+  if (node.type !== "TSDeclareFunction") {
+    this._predicate(node);
+  }
 }
 
 function FunctionExpression(node) {
@@ -126,24 +135,8 @@ function ArrowFunctionExpression(node) {
 
   const firstParam = node.params[0];
 
-  if (node.params.length === 1 && t.isIdentifier(firstParam) && !hasTypes(node, firstParam)) {
-    if (this.format.retainLines && node.loc && node.body.loc && node.loc.start.line < node.body.loc.start.line) {
-      this.token("(");
-
-      if (firstParam.loc && firstParam.loc.start.line > node.loc.start.line) {
-        this.indent();
-        this.print(firstParam, node);
-        this.dedent();
-
-        this._catchUp("start", node.body.loc);
-      } else {
-        this.print(firstParam, node);
-      }
-
-      this.token(")");
-    } else {
-      this.print(firstParam, node);
-    }
+  if (!this.format.retainLines && !this.format.auxiliaryCommentBefore && !this.format.auxiliaryCommentAfter && node.params.length === 1 && isIdentifier(firstParam) && !hasTypesOrComments(node, firstParam)) {
+    this.print(firstParam, node);
   } else {
     this._params(node);
   }
@@ -156,6 +149,8 @@ function ArrowFunctionExpression(node) {
   this.print(node.body, node);
 }
 
-function hasTypes(node, param) {
-  return node.typeParameters || node.returnType || param.typeAnnotation || param.optional || param.trailingComments;
+function hasTypesOrComments(node, param) {
+  var _param$leadingComment, _param$trailingCommen;
+
+  return !!(node.typeParameters || node.returnType || node.predicate || param.typeAnnotation || param.optional || (_param$leadingComment = param.leadingComments) != null && _param$leadingComment.length || (_param$trailingCommen = param.trailingComments) != null && _param$trailingCommen.length);
 }

node_modules/@babel/generator/lib/generators/modules.js

@@ -3,23 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ImportSpecifier = ImportSpecifier;
-exports.ImportDefaultSpecifier = ImportDefaultSpecifier;
-exports.ExportDefaultSpecifier = ExportDefaultSpecifier;
-exports.ExportSpecifier = ExportSpecifier;
-exports.ExportNamespaceSpecifier = ExportNamespaceSpecifier;
 exports.ExportAllDeclaration = ExportAllDeclaration;
-exports.ExportNamedDeclaration = ExportNamedDeclaration;
 exports.ExportDefaultDeclaration = ExportDefaultDeclaration;
-exports.ImportDeclaration = ImportDeclaration;
+exports.ExportDefaultSpecifier = ExportDefaultSpecifier;
+exports.ExportNamedDeclaration = ExportNamedDeclaration;
+exports.ExportNamespaceSpecifier = ExportNamespaceSpecifier;
+exports.ExportSpecifier = ExportSpecifier;
 exports.ImportAttribute = ImportAttribute;
+exports.ImportDeclaration = ImportDeclaration;
+exports.ImportDefaultSpecifier = ImportDefaultSpecifier;
 exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier;
+exports.ImportSpecifier = ImportSpecifier;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isClassDeclaration,
+  isExportDefaultSpecifier,
+  isExportNamespaceSpecifier,
+  isImportDefaultSpecifier,
+  isImportNamespaceSpecifier,
+  isStatement
+} = _t;
 
 function ImportSpecifier(node) {
   if (node.importKind === "type" || node.importKind === "typeof") {
@@ -46,6 +51,11 @@ function ExportDefaultSpecifier(node) {
 }
 
 function ExportSpecifier(node) {
+  if (node.exportKind === "type") {
+    this.word("type");
+    this.space();
+  }
+
   this.print(node.local, node);
 
   if (node.exported && node.local.name !== node.exported.name) {
@@ -78,36 +88,23 @@ function ExportAllDeclaration(node) {
   this.word("from");
   this.space();
   this.print(node.source, node);
+  this.printAssertions(node);
   this.semicolon();
 }
 
 function ExportNamedDeclaration(node) {
-  if (this.format.decoratorsBeforeExport && t.isClassDeclaration(node.declaration)) {
-    this.printJoin(node.declaration.decorators, node);
+  {
+    if (this.format.decoratorsBeforeExport && isClassDeclaration(node.declaration)) {
+      this.printJoin(node.declaration.decorators, node);
+    }
   }
-
   this.word("export");
   this.space();
-  ExportDeclaration.apply(this, arguments);
-}
 
-function ExportDefaultDeclaration(node) {
-  if (this.format.decoratorsBeforeExport && t.isClassDeclaration(node.declaration)) {
-    this.printJoin(node.declaration.decorators, node);
-  }
-
-  this.word("export");
-  this.space();
-  this.word("default");
-  this.space();
-  ExportDeclaration.apply(this, arguments);
-}
-
-function ExportDeclaration(node) {
   if (node.declaration) {
     const declar = node.declaration;
     this.print(declar, node);
-    if (!t.isStatement(declar)) this.semicolon();
+    if (!isStatement(declar)) this.semicolon();
   } else {
     if (node.exportKind === "type") {
       this.word("type");
@@ -120,7 +117,7 @@ function ExportDeclaration(node) {
     for (;;) {
       const first = specifiers[0];
 
-      if (t.isExportDefaultSpecifier(first) || t.isExportNamespaceSpecifier(first)) {
+      if (isExportDefaultSpecifier(first) || isExportNamespaceSpecifier(first)) {
         hasSpecial = true;
         this.print(specifiers.shift(), node);
 
@@ -150,63 +147,85 @@ function ExportDeclaration(node) {
       this.word("from");
       this.space();
       this.print(node.source, node);
+      this.printAssertions(node);
     }
 
     this.semicolon();
   }
 }
 
-function ImportDeclaration(node) {
-  var _node$attributes;
+function ExportDefaultDeclaration(node) {
+  {
+    if (this.format.decoratorsBeforeExport && isClassDeclaration(node.declaration)) {
+      this.printJoin(node.declaration.decorators, node);
+    }
+  }
+  this.word("export");
+  this.space();
+  this.word("default");
+  this.space();
+  const declar = node.declaration;
+  this.print(declar, node);
+  if (!isStatement(declar)) this.semicolon();
+}
 
+function ImportDeclaration(node) {
   this.word("import");
   this.space();
+  const isTypeKind = node.importKind === "type" || node.importKind === "typeof";
 
-  if (node.importKind === "type" || node.importKind === "typeof") {
+  if (isTypeKind) {
     this.word(node.importKind);
     this.space();
   }
 
   const specifiers = node.specifiers.slice(0);
+  const hasSpecifiers = !!specifiers.length;
 
-  if (specifiers == null ? void 0 : specifiers.length) {
-    for (;;) {
-      const first = specifiers[0];
+  while (hasSpecifiers) {
+    const first = specifiers[0];
 
-      if (t.isImportDefaultSpecifier(first) || t.isImportNamespaceSpecifier(first)) {
-        this.print(specifiers.shift(), node);
+    if (isImportDefaultSpecifier(first) || isImportNamespaceSpecifier(first)) {
+      this.print(specifiers.shift(), node);
 
-        if (specifiers.length) {
-          this.token(",");
-          this.space();
-        }
-      } else {
-        break;
+      if (specifiers.length) {
+        this.token(",");
+        this.space();
       }
+    } else {
+      break;
     }
+  }
 
-    if (specifiers.length) {
-      this.token("{");
-      this.space();
-      this.printList(specifiers, node);
-      this.space();
-      this.token("}");
-    }
+  if (specifiers.length) {
+    this.token("{");
+    this.space();
+    this.printList(specifiers, node);
+    this.space();
+    this.token("}");
+  } else if (isTypeKind && !hasSpecifiers) {
+    this.token("{");
+    this.token("}");
+  }
 
+  if (hasSpecifiers || isTypeKind) {
     this.space();
     this.word("from");
     this.space();
   }
 
   this.print(node.source, node);
+  this.printAssertions(node);
+  {
+    var _node$attributes;
 
-  if ((_node$attributes = node.attributes) == null ? void 0 : _node$attributes.length) {
-    this.space();
-    this.word("with");
-    this.space();
-    this.printList(node.attributes, node);
+    if ((_node$attributes = node.attributes) != null && _node$attributes.length) {
+      this.space();
+      this.word("with");
+      this.space();
+      this.printList(node.attributes, node);
+    }
   }
-
   this.semicolon();
 }
 

node_modules/@babel/generator/lib/generators/statements.js

@@ -3,26 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WithStatement = WithStatement;
-exports.IfStatement = IfStatement;
-exports.ForStatement = ForStatement;
-exports.WhileStatement = WhileStatement;
-exports.DoWhileStatement = DoWhileStatement;
-exports.LabeledStatement = LabeledStatement;
-exports.TryStatement = TryStatement;
+exports.BreakStatement = BreakStatement;
 exports.CatchClause = CatchClause;
-exports.SwitchStatement = SwitchStatement;
-exports.SwitchCase = SwitchCase;
+exports.ContinueStatement = ContinueStatement;
 exports.DebuggerStatement = DebuggerStatement;
+exports.DoWhileStatement = DoWhileStatement;
+exports.ForOfStatement = exports.ForInStatement = void 0;
+exports.ForStatement = ForStatement;
+exports.IfStatement = IfStatement;
+exports.LabeledStatement = LabeledStatement;
+exports.ReturnStatement = ReturnStatement;
+exports.SwitchCase = SwitchCase;
+exports.SwitchStatement = SwitchStatement;
+exports.ThrowStatement = ThrowStatement;
+exports.TryStatement = TryStatement;
 exports.VariableDeclaration = VariableDeclaration;
 exports.VariableDeclarator = VariableDeclarator;
-exports.ThrowStatement = exports.BreakStatement = exports.ReturnStatement = exports.ContinueStatement = exports.ForOfStatement = exports.ForInStatement = void 0;
+exports.WhileStatement = WhileStatement;
+exports.WithStatement = WithStatement;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isFor,
+  isForStatement,
+  isIfStatement,
+  isStatement
+} = _t;
 
 function WithStatement(node) {
   this.word("with");
@@ -40,7 +47,7 @@ function IfStatement(node) {
   this.print(node.test, node);
   this.token(")");
   this.space();
-  const needsBlock = node.alternate && t.isIfStatement(getLastStatement(node.consequent));
+  const needsBlock = node.alternate && isIfStatement(getLastStatement(node.consequent));
 
   if (needsBlock) {
     this.token("{");
@@ -57,7 +64,7 @@ function IfStatement(node) {
   }
 
   if (node.alternate) {
-    if (this.endsWith("}")) this.space();
+    if (this.endsWith(125)) this.space();
     this.word("else");
     this.space();
     this.printAndIndentOnComments(node.alternate, node);
@@ -65,8 +72,15 @@ function IfStatement(node) {
 }
 
 function getLastStatement(statement) {
-  if (!t.isStatement(statement.body)) return statement;
-  return getLastStatement(statement.body);
+  const {
+    body
+  } = statement;
+
+  if (isStatement(body) === false) {
+    return statement;
+  }
+
+  return getLastStatement(body);
 }
 
 function ForStatement(node) {
@@ -103,30 +117,29 @@ function WhileStatement(node) {
   this.printBlock(node);
 }
 
-const buildForXStatement = function (op) {
-  return function (node) {
-    this.word("for");
-    this.space();
+function ForXStatement(node) {
+  this.word("for");
+  this.space();
+  const isForOf = node.type === "ForOfStatement";
 
-    if (op === "of" && node.await) {
-      this.word("await");
-      this.space();
-    }
-
-    this.token("(");
-    this.print(node.left, node);
+  if (isForOf && node.await) {
+    this.word("await");
     this.space();
-    this.word(op);
-    this.space();
-    this.print(node.right, node);
-    this.token(")");
-    this.printBlock(node);
-  };
-};
+  }
 
-const ForInStatement = buildForXStatement("in");
+  this.token("(");
+  this.print(node.left, node);
+  this.space();
+  this.word(isForOf ? "of" : "in");
+  this.space();
+  this.print(node.right, node);
+  this.token(")");
+  this.printBlock(node);
+}
+
+const ForInStatement = ForXStatement;
 exports.ForInStatement = ForInStatement;
-const ForOfStatement = buildForXStatement("of");
+const ForOfStatement = ForXStatement;
 exports.ForOfStatement = ForOfStatement;
 
 function DoWhileStatement(node) {
@@ -142,31 +155,34 @@ function DoWhileStatement(node) {
   this.semicolon();
 }
 
-function buildLabelStatement(prefix, key = "label") {
-  return function (node) {
-    this.word(prefix);
-    const label = node[key];
+function printStatementAfterKeyword(printer, node, parent, isLabel) {
+  if (node) {
+    printer.space();
+    printer.printTerminatorless(node, parent, isLabel);
+  }
 
-    if (label) {
-      this.space();
-      const isLabel = key == "label";
-      const terminatorState = this.startTerminatorless(isLabel);
-      this.print(label, node);
-      this.endTerminatorless(terminatorState);
-    }
-
-    this.semicolon();
-  };
+  printer.semicolon();
 }
 
-const ContinueStatement = buildLabelStatement("continue");
-exports.ContinueStatement = ContinueStatement;
-const ReturnStatement = buildLabelStatement("return", "argument");
-exports.ReturnStatement = ReturnStatement;
-const BreakStatement = buildLabelStatement("break");
-exports.BreakStatement = BreakStatement;
-const ThrowStatement = buildLabelStatement("throw", "argument");
-exports.ThrowStatement = ThrowStatement;
+function BreakStatement(node) {
+  this.word("break");
+  printStatementAfterKeyword(this, node.label, node, true);
+}
+
+function ContinueStatement(node) {
+  this.word("continue");
+  printStatementAfterKeyword(this, node.label, node, true);
+}
+
+function ReturnStatement(node) {
+  this.word("return");
+  printStatementAfterKeyword(this, node.argument, node, false);
+}
+
+function ThrowStatement(node) {
+  this.word("throw");
+  printStatementAfterKeyword(this, node.argument, node, false);
+}
 
 function LabeledStatement(node) {
   this.print(node.label, node);
@@ -202,6 +218,7 @@ function CatchClause(node) {
   if (node.param) {
     this.token("(");
     this.print(node.param, node);
+    this.print(node.param.typeAnnotation, node);
     this.token(")");
     this.space();
   }
@@ -255,13 +272,19 @@ function DebuggerStatement() {
 function variableDeclarationIndent() {
   this.token(",");
   this.newline();
-  if (this.endsWith("\n")) for (let i = 0; i < 4; i++) this.space(true);
+
+  if (this.endsWith(10)) {
+    for (let i = 0; i < 4; i++) this.space(true);
+  }
 }
 
 function constDeclarationIndent() {
   this.token(",");
   this.newline();
-  if (this.endsWith("\n")) for (let i = 0; i < 6; i++) this.space(true);
+
+  if (this.endsWith(10)) {
+    for (let i = 0; i < 6; i++) this.space(true);
+  }
 }
 
 function VariableDeclaration(node, parent) {
@@ -274,7 +297,7 @@ function VariableDeclaration(node, parent) {
   this.space();
   let hasInits = false;
 
-  if (!t.isFor(parent)) {
+  if (!isFor(parent)) {
     for (const declar of node.declarations) {
       if (declar.init) {
         hasInits = true;
@@ -292,8 +315,12 @@ function VariableDeclaration(node, parent) {
     separator
   });
 
-  if (t.isFor(parent)) {
-    if (parent.left === node || parent.init === node) return;
+  if (isFor(parent)) {
+    if (isForStatement(parent)) {
+      if (parent.init === node) return;
+    } else {
+      if (parent.left === node) return;
+    }
   }
 
   this.semicolon();

node_modules/@babel/generator/lib/generators/types.js

@@ -3,34 +3,35 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Identifier = Identifier;
 exports.ArgumentPlaceholder = ArgumentPlaceholder;
-exports.SpreadElement = exports.RestElement = RestElement;
+exports.ArrayPattern = exports.ArrayExpression = ArrayExpression;
+exports.BigIntLiteral = BigIntLiteral;
+exports.BooleanLiteral = BooleanLiteral;
+exports.DecimalLiteral = DecimalLiteral;
+exports.Identifier = Identifier;
+exports.NullLiteral = NullLiteral;
+exports.NumericLiteral = NumericLiteral;
 exports.ObjectPattern = exports.ObjectExpression = ObjectExpression;
 exports.ObjectMethod = ObjectMethod;
 exports.ObjectProperty = ObjectProperty;
-exports.ArrayPattern = exports.ArrayExpression = ArrayExpression;
-exports.RecordExpression = RecordExpression;
-exports.TupleExpression = TupleExpression;
-exports.RegExpLiteral = RegExpLiteral;
-exports.BooleanLiteral = BooleanLiteral;
-exports.NullLiteral = NullLiteral;
-exports.NumericLiteral = NumericLiteral;
-exports.StringLiteral = StringLiteral;
-exports.BigIntLiteral = BigIntLiteral;
-exports.PipelineTopicExpression = PipelineTopicExpression;
 exports.PipelineBareFunction = PipelineBareFunction;
 exports.PipelinePrimaryTopicReference = PipelinePrimaryTopicReference;
+exports.PipelineTopicExpression = PipelineTopicExpression;
+exports.RecordExpression = RecordExpression;
+exports.RegExpLiteral = RegExpLiteral;
+exports.SpreadElement = exports.RestElement = RestElement;
+exports.StringLiteral = StringLiteral;
+exports.TopicReference = TopicReference;
+exports.TupleExpression = TupleExpression;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-var _jsesc = _interopRequireDefault(require("jsesc"));
+var _jsesc = require("jsesc");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  isAssignmentPattern,
+  isIdentifier
+} = _t;
 
 function Identifier(node) {
   this.exactSource(node.loc, () => {
@@ -81,14 +82,14 @@ function ObjectProperty(node) {
     this.print(node.key, node);
     this.token("]");
   } else {
-    if (t.isAssignmentPattern(node.value) && t.isIdentifier(node.key) && node.key.name === node.value.left.name) {
+    if (isAssignmentPattern(node.value) && isIdentifier(node.key) && node.key.name === node.value.left.name) {
       this.print(node.value, node);
       return;
     }
 
     this.print(node.key, node);
 
-    if (node.shorthand && t.isIdentifier(node.key) && t.isIdentifier(node.value) && node.key.name === node.value.name) {
+    if (node.shorthand && isIdentifier(node.key) && isIdentifier(node.value) && node.key.name === node.value.name) {
       return;
     }
   }
@@ -199,7 +200,7 @@ function NumericLiteral(node) {
   const value = node.value + "";
 
   if (opts.numbers) {
-    this.number((0, _jsesc.default)(node.value, opts));
+    this.number(_jsesc(node.value, opts));
   } else if (raw == null) {
     this.number(value);
   } else if (this.format.minified) {
@@ -212,30 +213,54 @@ function NumericLiteral(node) {
 function StringLiteral(node) {
   const raw = this.getPossibleRaw(node);
 
-  if (!this.format.minified && raw != null) {
+  if (!this.format.minified && raw !== undefined) {
     this.token(raw);
     return;
   }
 
-  const opts = this.format.jsescOption;
+  const val = _jsesc(node.value, Object.assign(this.format.jsescOption, this.format.jsonCompatibleStrings && {
+    json: true
+  }));
 
-  if (this.format.jsonCompatibleStrings) {
-    opts.json = true;
-  }
-
-  const val = (0, _jsesc.default)(node.value, opts);
   return this.token(val);
 }
 
 function BigIntLiteral(node) {
   const raw = this.getPossibleRaw(node);
 
-  if (!this.format.minified && raw != null) {
-    this.token(raw);
+  if (!this.format.minified && raw !== undefined) {
+    this.word(raw);
     return;
   }
 
-  this.token(node.value + "n");
+  this.word(node.value + "n");
+}
+
+function DecimalLiteral(node) {
+  const raw = this.getPossibleRaw(node);
+
+  if (!this.format.minified && raw !== undefined) {
+    this.word(raw);
+    return;
+  }
+
+  this.word(node.value + "m");
+}
+
+const validTopicTokenSet = new Set(["^^", "@@", "^", "%", "#"]);
+
+function TopicReference() {
+  const {
+    topicToken
+  } = this.format;
+
+  if (validTopicTokenSet.has(topicToken)) {
+    this.token(topicToken);
+  } else {
+    const givenTopicTokenJSON = JSON.stringify(topicToken);
+    const validTopics = Array.from(validTopicTokenSet, v => JSON.stringify(v));
+    throw new Error(`The "topicToken" generator option must be one of ` + `${validTopics.join(", ")} (${givenTopicTokenJSON} received instead).`);
+  }
 }
 
 function PipelineTopicExpression(node) {

node_modules/@babel/generator/lib/generators/typescript.js

@@ -3,73 +3,74 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TSTypeAnnotation = TSTypeAnnotation;
-exports.TSTypeParameterDeclaration = exports.TSTypeParameterInstantiation = TSTypeParameterInstantiation;
-exports.TSTypeParameter = TSTypeParameter;
-exports.TSParameterProperty = TSParameterProperty;
+exports.TSAnyKeyword = TSAnyKeyword;
+exports.TSArrayType = TSArrayType;
+exports.TSAsExpression = TSAsExpression;
+exports.TSBigIntKeyword = TSBigIntKeyword;
+exports.TSBooleanKeyword = TSBooleanKeyword;
+exports.TSCallSignatureDeclaration = TSCallSignatureDeclaration;
+exports.TSConditionalType = TSConditionalType;
+exports.TSConstructSignatureDeclaration = TSConstructSignatureDeclaration;
+exports.TSConstructorType = TSConstructorType;
 exports.TSDeclareFunction = TSDeclareFunction;
 exports.TSDeclareMethod = TSDeclareMethod;
-exports.TSQualifiedName = TSQualifiedName;
-exports.TSCallSignatureDeclaration = TSCallSignatureDeclaration;
-exports.TSConstructSignatureDeclaration = TSConstructSignatureDeclaration;
-exports.TSPropertySignature = TSPropertySignature;
-exports.tsPrintPropertyOrMethodName = tsPrintPropertyOrMethodName;
-exports.TSMethodSignature = TSMethodSignature;
-exports.TSIndexSignature = TSIndexSignature;
-exports.TSAnyKeyword = TSAnyKeyword;
-exports.TSBigIntKeyword = TSBigIntKeyword;
-exports.TSUnknownKeyword = TSUnknownKeyword;
-exports.TSNumberKeyword = TSNumberKeyword;
-exports.TSObjectKeyword = TSObjectKeyword;
-exports.TSBooleanKeyword = TSBooleanKeyword;
-exports.TSStringKeyword = TSStringKeyword;
-exports.TSSymbolKeyword = TSSymbolKeyword;
-exports.TSVoidKeyword = TSVoidKeyword;
-exports.TSUndefinedKeyword = TSUndefinedKeyword;
-exports.TSNullKeyword = TSNullKeyword;
-exports.TSNeverKeyword = TSNeverKeyword;
-exports.TSThisType = TSThisType;
-exports.TSFunctionType = TSFunctionType;
-exports.TSConstructorType = TSConstructorType;
-exports.tsPrintFunctionOrConstructorType = tsPrintFunctionOrConstructorType;
-exports.TSTypeReference = TSTypeReference;
-exports.TSTypePredicate = TSTypePredicate;
-exports.TSTypeQuery = TSTypeQuery;
-exports.TSTypeLiteral = TSTypeLiteral;
-exports.tsPrintTypeLiteralOrInterfaceBody = tsPrintTypeLiteralOrInterfaceBody;
-exports.tsPrintBraced = tsPrintBraced;
-exports.TSArrayType = TSArrayType;
-exports.TSTupleType = TSTupleType;
-exports.TSOptionalType = TSOptionalType;
-exports.TSRestType = TSRestType;
-exports.TSUnionType = TSUnionType;
-exports.TSIntersectionType = TSIntersectionType;
-exports.tsPrintUnionOrIntersectionType = tsPrintUnionOrIntersectionType;
-exports.TSConditionalType = TSConditionalType;
-exports.TSInferType = TSInferType;
-exports.TSParenthesizedType = TSParenthesizedType;
-exports.TSTypeOperator = TSTypeOperator;
-exports.TSIndexedAccessType = TSIndexedAccessType;
-exports.TSMappedType = TSMappedType;
-exports.TSLiteralType = TSLiteralType;
-exports.TSExpressionWithTypeArguments = TSExpressionWithTypeArguments;
-exports.TSInterfaceDeclaration = TSInterfaceDeclaration;
-exports.TSInterfaceBody = TSInterfaceBody;
-exports.TSTypeAliasDeclaration = TSTypeAliasDeclaration;
-exports.TSAsExpression = TSAsExpression;
-exports.TSTypeAssertion = TSTypeAssertion;
 exports.TSEnumDeclaration = TSEnumDeclaration;
 exports.TSEnumMember = TSEnumMember;
-exports.TSModuleDeclaration = TSModuleDeclaration;
-exports.TSModuleBlock = TSModuleBlock;
-exports.TSImportType = TSImportType;
-exports.TSImportEqualsDeclaration = TSImportEqualsDeclaration;
-exports.TSExternalModuleReference = TSExternalModuleReference;
-exports.TSNonNullExpression = TSNonNullExpression;
 exports.TSExportAssignment = TSExportAssignment;
+exports.TSExpressionWithTypeArguments = TSExpressionWithTypeArguments;
+exports.TSExternalModuleReference = TSExternalModuleReference;
+exports.TSFunctionType = TSFunctionType;
+exports.TSImportEqualsDeclaration = TSImportEqualsDeclaration;
+exports.TSImportType = TSImportType;
+exports.TSIndexSignature = TSIndexSignature;
+exports.TSIndexedAccessType = TSIndexedAccessType;
+exports.TSInferType = TSInferType;
+exports.TSInstantiationExpression = TSInstantiationExpression;
+exports.TSInterfaceBody = TSInterfaceBody;
+exports.TSInterfaceDeclaration = TSInterfaceDeclaration;
+exports.TSIntersectionType = TSIntersectionType;
+exports.TSIntrinsicKeyword = TSIntrinsicKeyword;
+exports.TSLiteralType = TSLiteralType;
+exports.TSMappedType = TSMappedType;
+exports.TSMethodSignature = TSMethodSignature;
+exports.TSModuleBlock = TSModuleBlock;
+exports.TSModuleDeclaration = TSModuleDeclaration;
+exports.TSNamedTupleMember = TSNamedTupleMember;
 exports.TSNamespaceExportDeclaration = TSNamespaceExportDeclaration;
-exports.tsPrintSignatureDeclarationBase = tsPrintSignatureDeclarationBase;
+exports.TSNeverKeyword = TSNeverKeyword;
+exports.TSNonNullExpression = TSNonNullExpression;
+exports.TSNullKeyword = TSNullKeyword;
+exports.TSNumberKeyword = TSNumberKeyword;
+exports.TSObjectKeyword = TSObjectKeyword;
+exports.TSOptionalType = TSOptionalType;
+exports.TSParameterProperty = TSParameterProperty;
+exports.TSParenthesizedType = TSParenthesizedType;
+exports.TSPropertySignature = TSPropertySignature;
+exports.TSQualifiedName = TSQualifiedName;
+exports.TSRestType = TSRestType;
+exports.TSStringKeyword = TSStringKeyword;
+exports.TSSymbolKeyword = TSSymbolKeyword;
+exports.TSThisType = TSThisType;
+exports.TSTupleType = TSTupleType;
+exports.TSTypeAliasDeclaration = TSTypeAliasDeclaration;
+exports.TSTypeAnnotation = TSTypeAnnotation;
+exports.TSTypeAssertion = TSTypeAssertion;
+exports.TSTypeLiteral = TSTypeLiteral;
+exports.TSTypeOperator = TSTypeOperator;
+exports.TSTypeParameter = TSTypeParameter;
+exports.TSTypeParameterDeclaration = exports.TSTypeParameterInstantiation = TSTypeParameterInstantiation;
+exports.TSTypePredicate = TSTypePredicate;
+exports.TSTypeQuery = TSTypeQuery;
+exports.TSTypeReference = TSTypeReference;
+exports.TSUndefinedKeyword = TSUndefinedKeyword;
+exports.TSUnionType = TSUnionType;
+exports.TSUnknownKeyword = TSUnknownKeyword;
+exports.TSVoidKeyword = TSVoidKeyword;
 exports.tsPrintClassMemberModifiers = tsPrintClassMemberModifiers;
+exports.tsPrintFunctionOrConstructorType = tsPrintFunctionOrConstructorType;
+exports.tsPrintPropertyOrMethodName = tsPrintPropertyOrMethodName;
+exports.tsPrintSignatureDeclarationBase = tsPrintSignatureDeclarationBase;
+exports.tsPrintTypeLiteralOrInterfaceBody = tsPrintTypeLiteralOrInterfaceBody;
 
 function TSTypeAnnotation(node) {
   this.token(":");
@@ -78,13 +79,28 @@ function TSTypeAnnotation(node) {
   this.print(node.typeAnnotation, node);
 }
 
-function TSTypeParameterInstantiation(node) {
+function TSTypeParameterInstantiation(node, parent) {
   this.token("<");
   this.printList(node.params, node, {});
+
+  if (parent.type === "ArrowFunctionExpression" && node.params.length === 1) {
+    this.token(",");
+  }
+
   this.token(">");
 }
 
 function TSTypeParameter(node) {
+  if (node.in) {
+    this.word("in");
+    this.space();
+  }
+
+  if (node.out) {
+    this.word("out");
+    this.space();
+  }
+
   this.word(node.name);
 
   if (node.constraint) {
@@ -192,6 +208,15 @@ function tsPrintPropertyOrMethodName(node) {
 }
 
 function TSMethodSignature(node) {
+  const {
+    kind
+  } = node;
+
+  if (kind === "set" || kind === "get") {
+    this.word(kind);
+    this.space();
+  }
+
   this.tsPrintPropertyOrMethodName(node);
   this.tsPrintSignatureDeclarationBase(node);
   this.token(";");
@@ -199,9 +224,15 @@ function TSMethodSignature(node) {
 
 function TSIndexSignature(node) {
   const {
-    readonly
+    readonly,
+    static: isStatic
   } = node;
 
+  if (isStatic) {
+    this.word("static");
+    this.space();
+  }
+
   if (readonly) {
     this.word("readonly");
     this.space();
@@ -264,6 +295,10 @@ function TSNeverKeyword() {
   this.word("never");
 }
 
+function TSIntrinsicKeyword() {
+  this.word("intrinsic");
+}
+
 function TSThisType() {
   this.word("this");
 }
@@ -273,6 +308,11 @@ function TSFunctionType(node) {
 }
 
 function TSConstructorType(node) {
+  if (node.abstract) {
+    this.word("abstract");
+    this.space();
+  }
+
   this.word("new");
   this.space();
   this.tsPrintFunctionOrConstructorType(node);
@@ -280,9 +320,9 @@ function TSConstructorType(node) {
 
 function tsPrintFunctionOrConstructorType(node) {
   const {
-    typeParameters,
-    parameters
+    typeParameters
   } = node;
+  const parameters = node.parameters;
   this.print(typeParameters, node);
   this.token("(");
 
@@ -292,7 +332,8 @@ function tsPrintFunctionOrConstructorType(node) {
   this.space();
   this.token("=>");
   this.space();
-  this.print(node.typeAnnotation.typeAnnotation, node);
+  const returnType = node.typeAnnotation;
+  this.print(returnType.typeAnnotation, node);
 }
 
 function TSTypeReference(node) {
@@ -320,6 +361,10 @@ function TSTypeQuery(node) {
   this.word("typeof");
   this.space();
   this.print(node.exprName);
+
+  if (node.typeParameters) {
+    this.print(node.typeParameters, node);
+  }
 }
 
 function TSTypeLiteral(node) {
@@ -327,25 +372,25 @@ function TSTypeLiteral(node) {
 }
 
 function tsPrintTypeLiteralOrInterfaceBody(members, node) {
-  this.tsPrintBraced(members, node);
+  tsPrintBraced(this, members, node);
 }
 
-function tsPrintBraced(members, node) {
-  this.token("{");
+function tsPrintBraced(printer, members, node) {
+  printer.token("{");
 
   if (members.length) {
-    this.indent();
-    this.newline();
+    printer.indent();
+    printer.newline();
 
     for (const member of members) {
-      this.print(member, node);
-      this.newline();
+      printer.print(member, node);
+      printer.newline();
     }
 
-    this.dedent();
-    this.rightBrace();
+    printer.dedent();
+    printer.rightBrace();
   } else {
-    this.token("}");
+    printer.token("}");
   }
 }
 
@@ -370,16 +415,24 @@ function TSRestType(node) {
   this.print(node.typeAnnotation, node);
 }
 
+function TSNamedTupleMember(node) {
+  this.print(node.label, node);
+  if (node.optional) this.token("?");
+  this.token(":");
+  this.space();
+  this.print(node.elementType, node);
+}
+
 function TSUnionType(node) {
-  this.tsPrintUnionOrIntersectionType(node, "|");
+  tsPrintUnionOrIntersectionType(this, node, "|");
 }
 
 function TSIntersectionType(node) {
-  this.tsPrintUnionOrIntersectionType(node, "&");
+  tsPrintUnionOrIntersectionType(this, node, "&");
 }
 
-function tsPrintUnionOrIntersectionType(node, sep) {
-  this.printJoin(node.types, node, {
+function tsPrintUnionOrIntersectionType(printer, node, sep) {
+  printer.printJoin(node.types, node, {
     separator() {
       this.space();
       this.token(sep);
@@ -418,7 +471,7 @@ function TSParenthesizedType(node) {
 }
 
 function TSTypeOperator(node) {
-  this.token(node.operator);
+  this.word(node.operator);
   this.space();
   this.print(node.typeAnnotation, node);
 }
@@ -432,9 +485,10 @@ function TSIndexedAccessType(node) {
 
 function TSMappedType(node) {
   const {
+    nameType,
+    optional,
     readonly,
-    typeParameter,
-    optional
+    typeParameter
   } = node;
   this.token("{");
   this.space();
@@ -451,6 +505,14 @@ function TSMappedType(node) {
   this.word("in");
   this.space();
   this.print(typeParameter.constraint, typeParameter);
+
+  if (nameType) {
+    this.space();
+    this.word("as");
+    this.space();
+    this.print(nameType, node);
+  }
+
   this.token("]");
 
   if (optional) {
@@ -499,7 +561,7 @@ function TSInterfaceDeclaration(node) {
   this.print(id, node);
   this.print(typeParameters, node);
 
-  if (extendz) {
+  if (extendz != null && extendz.length) {
     this.space();
     this.word("extends");
     this.space();
@@ -562,6 +624,11 @@ function TSTypeAssertion(node) {
   this.print(expression, node);
 }
 
+function TSInstantiationExpression(node) {
+  this.print(node.expression, node);
+  this.print(node.typeParameters, node);
+}
+
 function TSEnumDeclaration(node) {
   const {
     declare,
@@ -584,7 +651,7 @@ function TSEnumDeclaration(node) {
   this.space();
   this.print(id, node);
   this.space();
-  this.tsPrintBraced(members, node);
+  tsPrintBraced(this, members, node);
 }
 
 function TSEnumMember(node) {
@@ -640,7 +707,7 @@ function TSModuleDeclaration(node) {
 }
 
 function TSModuleBlock(node) {
-  this.tsPrintBraced(node.body, node);
+  tsPrintBraced(this, node.body, node);
 }
 
 function TSImportType(node) {
@@ -718,19 +785,22 @@ function TSNamespaceExportDeclaration(node) {
 
 function tsPrintSignatureDeclarationBase(node) {
   const {
-    typeParameters,
-    parameters
+    typeParameters
   } = node;
+  const parameters = node.parameters;
   this.print(typeParameters, node);
   this.token("(");
 
   this._parameters(parameters, node);
 
   this.token(")");
-  this.print(node.typeAnnotation, node);
+  const returnType = node.typeAnnotation;
+  this.print(returnType, node);
 }
 
-function tsPrintClassMemberModifiers(node, isField) {
+function tsPrintClassMemberModifiers(node) {
+  const isField = node.type === "ClassAccessorProperty" || node.type === "ClassProperty";
+
   if (isField && node.declare) {
     this.word("declare");
     this.space();
@@ -746,6 +816,11 @@ function tsPrintClassMemberModifiers(node, isField) {
     this.space();
   }
 
+  if (node.override) {
+    this.word("override");
+    this.space();
+  }
+
   if (node.abstract) {
     this.word("abstract");
     this.space();