@openrewrite/rewrite 0.18.9 → 0.20.3

package/dist/src/javascript/parser.js

@@ -228,18 +228,24 @@ class JavaScriptParserVisitor {
         ]), node.getFullText()));
     }
     mapModifiers(node) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         if (ts.isVariableStatement(node)) {
             return [new J.Modifier((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, (_a = node.declarationList.getFirstToken()) === null || _a === void 0 ? void 0 : _a.getText(), J.Modifier.Type.LanguageExtension, [])];
         }
         else if (ts.isClassDeclaration(node)) {
             return node.modifiers ? (_b = node.modifiers) === null || _b === void 0 ? void 0 : _b.filter(ts.isModifier).map(this.mapModifier) : [];
         }
+        else if (ts.isEnumDeclaration(node) || ts.isInterfaceDeclaration(node)) {
+            return node.modifiers ? (_c = node.modifiers) === null || _c === void 0 ? void 0 : _c.filter(ts.isModifier).map(this.mapModifier) : [];
+        }
         else if (ts.isPropertyDeclaration(node)) {
-            return [];
+            return node.modifiers ? (_d = node.modifiers) === null || _d === void 0 ? void 0 : _d.filter(ts.isModifier).map(this.mapModifier) : [];
         }
-        else if (ts.isFunctionDeclaration(node) || ts.isParameter(node)) {
-            return node.modifiers ? (_c = node.modifiers) === null || _c === void 0 ? void 0 : _c.filter(ts.isModifier).map(this.mapModifier) : [];
+        else if (ts.isPropertySignature(node)) {
+            return node.modifiers ? (_e = node.modifiers) === null || _e === void 0 ? void 0 : _e.filter(ts.isModifier).map(this.mapModifier) : [];
+        }
+        else if (ts.isFunctionDeclaration(node) || ts.isParameter(node) || ts.isMethodDeclaration(node)) {
+            return node.modifiers ? (_f = node.modifiers) === null || _f === void 0 ? void 0 : _f.filter(ts.isModifier).map(this.mapModifier) : [];
         }
         else if (ts.isVariableDeclarationList(node)) {
             let modifier;
@@ -285,7 +291,10 @@ class JavaScriptParserVisitor {
         if (node.typeParameters) {
             return this.visitUnknown(node);
         }
-        return new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), new J.ClassDeclaration.Kind((0, core_1.randomId)(), node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node), core_1.Markers.EMPTY, [], J.ClassDeclaration.Kind.Type.Class), node.name ? this.convert(node.name) : this.mapIdentifier(node, ""), this.mapTypeParameters(node), null, this.mapExtends(node), this.mapImplements(node), null, this.convertBlock(node.getChildren(this.sourceFile).slice(-3)), this.mapType(node));
+        return new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), new J.ClassDeclaration.Kind((0, core_1.randomId)(), node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node), core_1.Markers.EMPTY, [], J.ClassDeclaration.Kind.Type.Class), node.name ? this.convert(node.name) : this.mapIdentifier(node, ""), this.mapTypeParameters(node), null, this.mapExtends(node), this.mapImplements(node), null, new J.Block((0, core_1.randomId)(), this.prefix(node.getChildren().find(v => v.kind === ts.SyntaxKind.OpenBraceToken)), core_1.Markers.EMPTY, new java_1.JRightPadded(false, java_1.Space.EMPTY, core_1.Markers.EMPTY), node.members.map((ce) => {
+            var _a, _b;
+            return new java_1.JRightPadded(this.convert(ce), ((_a = ce.getLastToken()) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.SemicolonToken ? this.prefix(ce.getLastToken()) : java_1.Space.EMPTY, ((_b = ce.getLastToken()) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.SemicolonToken ? core_1.Markers.build([new java_1.Semicolon((0, core_1.randomId)())]) : core_1.Markers.EMPTY);
+        }), this.prefix(node.getLastToken())), this.mapType(node));
     }
     mapExtends(node) {
         if (node.heritageClauses == undefined || node.heritageClauses.length == 0) {
@@ -298,6 +307,21 @@ class JavaScriptParserVisitor {
         }
         return null;
     }
+    mapInterfaceExtends(node) {
+        if (node.heritageClauses == undefined || node.heritageClauses.length == 0) {
+            return null;
+        }
+        for (let heritageClause of node.heritageClauses) {
+            if ((heritageClause.token == ts.SyntaxKind.ExtendsKeyword)) {
+                const _extends = [];
+                for (let type of heritageClause.types) {
+                    _extends.push(this.rightPadded(this.visit(type), this.suffix(type)));
+                }
+                return _extends.length > 0 ? new java_1.JContainer(this.prefix(heritageClause.getFirstToken()), _extends, core_1.Markers.EMPTY) : null;
+            }
+        }
+        return null;
+    }
     mapImplements(node) {
         if (node.heritageClauses == undefined || node.heritageClauses.length == 0) {
             return null;
@@ -331,6 +355,15 @@ class JavaScriptParserVisitor {
     visitUndefinedKeyword(node) {
         return this.mapIdentifier(node, 'undefined');
     }
+    visitAnyKeyword(node) {
+        return this.mapIdentifier(node, 'any');
+    }
+    visitUnknownKeyword(node) {
+        return this.mapIdentifier(node, 'unknown');
+    }
+    visitVoidKeyword(node) {
+        return this.mapIdentifier(node, 'void');
+    }
     visitFalseKeyword(node) {
         return this.mapLiteral(node, false);
     }
@@ -381,16 +414,26 @@ class JavaScriptParserVisitor {
         return this.mapIdentifier(node, node.text);
     }
     visitQualifiedName(node) {
-        return this.visitUnknown(node);
+        const fieldAccess = new J.FieldAccess((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.left), new java_1.JLeftPadded(this.suffix(node.left), this.convert(node.right), core_1.Markers.EMPTY), this.mapType(node));
+        const parent = node.parent;
+        if (parent.typeArguments) {
+            return new J.ParameterizedType((0, core_1.randomId)(), this.prefix(parent), core_1.Markers.EMPTY, fieldAccess, this.mapTypeArguments(parent.typeArguments), this.mapType(parent));
+        }
+        else {
+            return fieldAccess;
+        }
     }
     visitComputedPropertyName(node) {
         return new J.NewArray((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, null, [], new java_1.JContainer(java_1.Space.EMPTY, [this.rightPadded(this.convert(node.expression), this.suffix(node.expression))], core_1.Markers.EMPTY), this.mapType(node));
     }
     visitTypeParameter(node) {
-        return this.visitUnknown(node);
+        if (node.constraint || (node.modifiers && node.modifiers.length) || node.default) {
+            return this.visitUnknown(node);
+        }
+        return new J.TypeParameter((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.visit(node.name), null);
     }
     visitParameter(node) {
-        return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), node.type ? this.visit(node.type) : null, null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.visit(node.name), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildCount(this.sourceFile) - 2)), this.visit(node.initializer)) : null, this.mapVariableType(node)), this.suffix(node.name))]);
+        return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.visit(node.name), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildCount(this.sourceFile) - 2)), this.visit(node.initializer)) : null, this.mapVariableType(node)), this.suffix(node.name))]);
     }
     visitDecorator(node) {
         let annotationType;
@@ -413,16 +456,23 @@ class JavaScriptParserVisitor {
         return new J.Annotation((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, annotationType, _arguments);
     }
     visitPropertySignature(node) {
-        return this.visitUnknown(node);
+        return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.visit(node.name), [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
     }
     visitPropertyDeclaration(node) {
-        return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), node.type ? this.visit(node.type) : null, null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.name), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildCount(this.sourceFile) - 2)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+        return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.visit(node.name), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
     }
     visitMethodSignature(node) {
-        return this.visitUnknown(node);
+        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], node.typeParameters
+            ? new J.TypeParameters((0, core_1.randomId)(), this.suffix(node.name), core_1.Markers.EMPTY, [], node.typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp))))
+            : null, this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(node.name ? this.visit(node.name) : this.mapIdentifier(node, ""), []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
     }
     visitMethodDeclaration(node) {
-        return this.visitUnknown(node);
+        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), node.typeParameters
+            ? new J.TypeParameters((0, core_1.randomId)(), this.suffix(node.name), core_1.Markers.EMPTY, [], node.typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp))))
+            : null, this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(node.name ? this.visit(node.name) : this.mapIdentifier(node, ""), []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
+    }
+    mapTypeInfo(node) {
+        return node.type ? new JS.TypeInfo((0, core_1.randomId)(), this.prefix(node.getChildAt(node.getChildren().indexOf(node.type) - 1)), core_1.Markers.EMPTY, this.visit(node.type)) : null;
     }
     visitClassStaticBlockDeclaration(node) {
         return this.visitUnknown(node);
@@ -437,7 +487,9 @@ class JavaScriptParserVisitor {
         return this.visitUnknown(node);
     }
     visitCallSignature(node) {
-        return this.visitUnknown(node);
+        return new JS.ArrowFunction((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], new java_1.Lambda.Parameters((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, true, node.parameters.length > 0 ?
+            node.parameters.map(p => this.rightPadded(this.convert(p), this.suffix(p))) :
+            [this.rightPadded(this.newJEmpty(), this.prefix(node.getChildren().find(n => n.kind === ts.SyntaxKind.CloseParenToken)))]), this.mapTypeInfo(node), java_1.Space.EMPTY, this.newJEmpty(), null);
     }
     visitConstructSignature(node) {
         return this.visitUnknown(node);
@@ -450,12 +502,15 @@ class JavaScriptParserVisitor {
     }
     visitTypeReference(node) {
         if (node.typeArguments) {
+            if (ts.isQualifiedName(node.typeName)) {
+                return this.visit(node.typeName);
+            }
             return this.visitUnknown(node);
         }
         return this.visit(node.typeName);
     }
     visitFunctionType(node) {
-        return this.visitUnknown(node);
+        return new JS.FunctionType((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new java_1.JContainer(this.prefix(node), node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p))), core_1.Markers.EMPTY), this.prefix(node.getChildren().find(v => v.kind === ts.SyntaxKind.EqualsGreaterThanToken)), this.convert(node.type), null);
     }
     visitConstructorType(node) {
     }
@@ -576,7 +631,9 @@ class JavaScriptParserVisitor {
         return this.visitUnknown(node);
     }
     visitArrowFunction(node) {
-        return this.visitUnknown(node);
+        return new JS.ArrowFunction((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], new java_1.Lambda.Parameters((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, true, node.parameters.length > 0 ?
+            node.parameters.map(p => this.rightPadded(this.convert(p), this.suffix(p))) :
+            [this.rightPadded(this.newJEmpty(), this.prefix(node.getChildren().find(n => n.kind === ts.SyntaxKind.CloseParenToken)))]), this.mapTypeInfo(node), this.prefix(node.equalsGreaterThanToken), node.body ? this.convert(node.body) : this.newJEmpty(), null);
     }
     visitDeleteExpression(node) {
         return new JS.Delete((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.convert(node.expression), this.mapType(node));
@@ -748,7 +805,7 @@ class JavaScriptParserVisitor {
         return new J.Block((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.rightPadded(false, java_1.Space.EMPTY), this.semicolonPaddedStatementList(node.statements), this.prefix(node.getLastToken()));
     }
     visitEmptyStatement(node) {
-        return new J.Empty((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY);
+        return this.newJEmpty(this.prefix(node));
     }
     visitVariableStatement(node) {
         return this.visitVariableDeclarationList(node.declarationList);
@@ -778,9 +835,9 @@ class JavaScriptParserVisitor {
         return new J.ForLoop((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ForLoop.Control((0, core_1.randomId)(), this.prefix(node.getChildAt(1)), core_1.Markers.EMPTY, [node.initializer ?
                 (ts.isVariableDeclarationList(node.initializer) ? this.rightPadded(this.visit(node.initializer), java_1.Space.EMPTY) :
                     this.rightPadded(this.convert(node.initializer), this.suffix(node.initializer.getLastToken()))) :
-                this.rightPadded(new J.Empty((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY), java_1.Space.EMPTY)], node.condition ? this.rightPadded(this.convert(node.condition), this.suffix(node.condition.getLastToken())) :
-            this.rightPadded(new J.Empty((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY), java_1.Space.EMPTY), [node.incrementor ? this.rightPadded(this.convert(node.incrementor), this.suffix(node.incrementor.getLastToken())) :
-                this.rightPadded(new J.Empty((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY), java_1.Space.EMPTY)]), this.rightPadded(this.convert(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getLastToken()) === null || _a === void 0 ? void 0 : _a.kind) == ts.SyntaxKind.SemicolonToken ? core_1.Markers.build([new java_1.Semicolon((0, core_1.randomId)())]) : core_1.Markers.EMPTY));
+                this.rightPadded(this.newJEmpty(), java_1.Space.EMPTY)], node.condition ? this.rightPadded(this.convert(node.condition), this.suffix(node.condition.getLastToken())) :
+            this.rightPadded(this.newJEmpty(), java_1.Space.EMPTY), [node.incrementor ? this.rightPadded(this.convert(node.incrementor), this.suffix(node.incrementor.getLastToken())) :
+                this.rightPadded(this.newJEmpty(), java_1.Space.EMPTY)]), this.rightPadded(this.convert(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getLastToken()) === null || _a === void 0 ? void 0 : _a.kind) == ts.SyntaxKind.SemicolonToken ? core_1.Markers.build([new java_1.Semicolon((0, core_1.randomId)())]) : core_1.Markers.EMPTY));
     }
     visitForInStatement(node) {
         return this.visitUnknown(node);
@@ -807,22 +864,25 @@ class JavaScriptParserVisitor {
         return this.visitUnknown(node);
     }
     visitThrowStatement(node) {
-        return this.visitUnknown(node);
+        return new J.Throw((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.expression));
     }
     visitTryStatement(node) {
-        return this.visitUnknown(node);
+        var _a;
+        return new J.Try((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, null, this.visit(node.tryBlock), node.catchClause ?
+            [new J.Try.Catch((0, core_1.randomId)(), this.prefix(node.catchClause.getFirstToken()), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.suffix(node.catchClause.getFirstToken()), core_1.Markers.EMPTY, this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node.catchClause.variableDeclaration), core_1.Markers.EMPTY, [], [], this.mapTypeInfo(node.catchClause.variableDeclaration), null, [], [this.rightPadded(this.visit(node.catchClause.variableDeclaration), java_1.Space.EMPTY)]), this.suffix(node.catchClause.variableDeclaration))), this.visit((_a = node.catchClause) === null || _a === void 0 ? void 0 : _a.block))] : [], node.finallyBlock ? this.leftPadded(this.prefix(node.getChildren().find(n => n.kind === ts.SyntaxKind.FinallyKeyword)), this.visit(node.finallyBlock))
+            : null);
     }
     visitDebuggerStatement(node) {
         return this.visitUnknown(node);
     }
     visitVariableDeclaration(node) {
-        return new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.name).withPrefix(node.type ? this.suffix(node.name) : java_1.Space.EMPTY), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildCount(this.sourceFile) - 2)), this.visit(node.initializer)) : null, this.mapVariableType(node));
+        return new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.name), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildCount(this.sourceFile) - 2)), this.visit(node.initializer)) : null, this.mapVariableType(node));
     }
     visitVariableDeclarationList(node) {
         const kind = node.getFirstToken(this.sourceFile);
         return new JS.ScopedVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, (kind === null || kind === void 0 ? void 0 : kind.kind) === ts.SyntaxKind.LetKeyword ? JS.ScopedVariableDeclarations.Scope.Let :
             (kind === null || kind === void 0 ? void 0 : kind.kind) === ts.SyntaxKind.ConstKeyword ? JS.ScopedVariableDeclarations.Scope.Const : JS.ScopedVariableDeclarations.Scope.Var, node.declarations.map(declaration => {
-            return this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(declaration), core_1.Markers.EMPTY, [], [], declaration.type ? this.visit(declaration.type) : null, null, [], [this.rightPadded(this.visit(declaration), java_1.Space.EMPTY)]), this.suffix(declaration));
+            return this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(declaration), core_1.Markers.EMPTY, [], [], this.mapTypeInfo(declaration), null, [], [this.rightPadded(this.visit(declaration), java_1.Space.EMPTY)]), this.suffix(declaration));
         }));
     }
     visitFunctionDeclaration(node) {
@@ -841,13 +901,35 @@ class JavaScriptParserVisitor {
         return [];
     }
     visitInterfaceDeclaration(node) {
-        return this.visitUnknown(node);
+        if (node.typeParameters) {
+            return this.visitUnknown(node);
+        }
+        return new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), new J.ClassDeclaration.Kind((0, core_1.randomId)(), node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node), core_1.Markers.EMPTY, [], J.ClassDeclaration.Kind.Type.Interface), node.name ? this.convert(node.name) : this.mapIdentifier(node, ""), this.mapTypeParameters(node), null, null, this.mapInterfaceExtends(node), null, new J.Block((0, core_1.randomId)(), this.prefix(node.getChildren().find(v => v.kind === ts.SyntaxKind.OpenBraceToken)), core_1.Markers.EMPTY, new java_1.JRightPadded(false, java_1.Space.EMPTY, core_1.Markers.EMPTY), node.members.map(te => {
+            var _a, _b, _c, _d;
+            return new java_1.JRightPadded(this.convert(te), (((_a = te.getLastToken()) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.SemicolonToken) || (((_b = te.getLastToken()) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.CommaToken) ? this.prefix(te.getLastToken()) : java_1.Space.EMPTY, (((_c = te.getLastToken()) === null || _c === void 0 ? void 0 : _c.kind) === ts.SyntaxKind.SemicolonToken) || (((_d = te.getLastToken()) === null || _d === void 0 ? void 0 : _d.kind) === ts.SyntaxKind.CommaToken) ? core_1.Markers.build([this.convertToken(te.getLastToken())]) : core_1.Markers.EMPTY);
+        }), this.prefix(node.getLastToken())), this.mapType(node));
     }
     visitTypeAliasDeclaration(node) {
         return this.visitUnknown(node);
     }
     visitEnumDeclaration(node) {
-        return this.visitUnknown(node);
+        return new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), new J.ClassDeclaration.Kind((0, core_1.randomId)(), node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node), core_1.Markers.EMPTY, [], J.ClassDeclaration.Kind.Type.Enum), node.name ? this.convert(node.name) : this.mapIdentifier(node, ""), null, null, null, null, null, new J.Block((0, core_1.randomId)(), this.prefix(node.getChildren().find(v => v.kind === ts.SyntaxKind.OpenBraceToken)), core_1.Markers.EMPTY, new java_1.JRightPadded(false, java_1.Space.EMPTY, core_1.Markers.EMPTY), this.convertEnumBlock(node), this.prefix(node.getLastToken())), this.mapType(node));
+    }
+    convertEnumBlock(enumDeclaration) {
+        if (enumDeclaration.members.length == 0) {
+            return [];
+        }
+        const node = enumDeclaration.getChildren()[enumDeclaration.getChildCount() - 2];
+        const children = node.getChildren();
+        const childCount = children.length;
+        const enumMembers = [];
+        for (let i = 0; i < childCount; i++) {
+            if (children[i].kind === ts.SyntaxKind.EnumMember) {
+                const rp = new java_1.JRightPadded(this.convert(children[i]), i + 1 < childCount ? this.prefix(children[i + 1]) : java_1.Space.EMPTY, i + 1 < childCount ? core_1.Markers.build([new java_1.TrailingComma((0, core_1.randomId)(), java_1.Space.EMPTY)]) : core_1.Markers.EMPTY);
+                enumMembers.push(rp);
+            }
+        }
+        return enumMembers;
     }
     visitModuleDeclaration(node) {
         return this.visitUnknown(node);
@@ -975,7 +1057,7 @@ class JavaScriptParserVisitor {
         return this.visitUnknown(node);
     }
     visitEnumMember(node) {
-        return this.visitUnknown(node);
+        return new J.EnumValue((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], node.name ? this.convert(node.name) : this.mapIdentifier(node, ""), node.initializer ? new J.NewClass((0, core_1.randomId)(), this.suffix(node.name), core_1.Markers.EMPTY, null, java_1.Space.EMPTY, null, new java_1.JContainer(java_1.Space.EMPTY, [this.rightPadded(this.visit(node.initializer), java_1.Space.EMPTY)], core_1.Markers.EMPTY), null, this.mapMethodType(node)) : null);
     }
     visitBundle(node) {
         return this.visitUnknown(node);
@@ -1159,6 +1241,13 @@ class JavaScriptParserVisitor {
     mapCommaSeparatedList(nodes) {
         return this.mapToContainer(nodes, this.trailingComma(nodes));
     }
+    mapTypeArguments(nodes) {
+        if (nodes.length === 0) {
+            return java_1.JContainer.empty();
+        }
+        const args = nodes.map(node => this.rightPadded(this.visit(node), this.suffix(node), core_1.Markers.EMPTY));
+        return new java_1.JContainer(this.prefix(nodes[0]), args, core_1.Markers.EMPTY);
+    }
     mapToContainer(nodes, markers) {
         if (nodes.length === 0) {
             return java_1.JContainer.empty();
@@ -1172,7 +1261,7 @@ class JavaScriptParserVisitor {
         let childCount = elementList.length;
         const args = [];
         if (childCount === 0) {
-            args.push(this.rightPadded(new J.Empty((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY), lastAfter, core_1.Markers.EMPTY));
+            args.push(this.rightPadded(this.newJEmpty(), lastAfter, core_1.Markers.EMPTY));
         }
         else {
             for (let i = 0; i < childCount - 1; i += 2) {
@@ -1192,12 +1281,6 @@ class JavaScriptParserVisitor {
     mapTypeParameters(node) {
         return null;
     }
-    convertBlock(nodes) {
-        const prefix = this.prefix(nodes[0]);
-        let statementList = nodes[1];
-        const statements = this.rightPaddedSeparatedList([...statementList.getChildren(this.sourceFile)], ts.SyntaxKind.SemicolonToken, (nodes, i) => { var _a; return ((_a = nodes[i].getLastToken()) === null || _a === void 0 ? void 0 : _a.kind) == ts.SyntaxKind.SemicolonToken ? core_1.Markers.build([new java_1.Semicolon((0, core_1.randomId)())]) : core_1.Markers.EMPTY; });
-        return new J.Block((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.rightPadded(false, java_1.Space.EMPTY), statements, this.prefix(nodes[nodes.length - 1]));
-    }
     findChildNode(node, kind) {
         for (let i = 0; i < node.getChildCount(this.sourceFile); i++) {
             if (node.getChildAt(i, this.sourceFile).kind == kind) {
@@ -1206,6 +1289,16 @@ class JavaScriptParserVisitor {
         }
         return undefined;
     }
+    convertToken(token) {
+        if ((token === null || token === void 0 ? void 0 : token.kind) === ts.SyntaxKind.CommaToken)
+            return new java_1.TrailingComma((0, core_1.randomId)(), java_1.Space.EMPTY);
+        if ((token === null || token === void 0 ? void 0 : token.kind) === ts.SyntaxKind.SemicolonToken)
+            return new java_1.Semicolon((0, core_1.randomId)());
+        return null;
+    }
+    newJEmpty(prefix = java_1.Space.EMPTY) {
+        return new J.Empty((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY);
+    }
 }
 exports.JavaScriptParserVisitor = JavaScriptParserVisitor;
 function prefixFromNode(node, sourceFile) {