@openrewrite/rewrite 0.26.0 → 0.28.0

package/dist/src/javascript/parser.js

@@ -221,8 +221,31 @@ class JavaScriptParserVisitor {
         };
         this.typeMapping = new typeMapping_1.JavaScriptTypeMapping(typeChecker);
     }
+    detectBOMAndTextEncoding(content) {
+        const BOM_UTF8 = "\uFEFF";
+        const BOM_UTF16_LE = [0xFF, 0xFE];
+        const hasUtf8Bom = content.startsWith(BOM_UTF8);
+        const hasUtf16LeBom = content.charCodeAt(0) === BOM_UTF16_LE[0] && content.charCodeAt(1) === BOM_UTF16_LE[1];
+        if (hasUtf8Bom) {
+            return { hasBom: true, encoding: 'utf8' };
+        }
+        else if (hasUtf16LeBom) {
+            return { hasBom: true, encoding: 'utf16le' };
+        }
+        return { hasBom: false, encoding: null };
+    }
     visitSourceFile(node) {
-        return new JS.CompilationUnit((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.sourceFile.fileName, null, null, false, null, [], this.semicolonPaddedStatementList(node.statements), this.prefix(node.endOfFileToken));
+        let bomAndTextEncoding = this.detectBOMAndTextEncoding(node.getFullText());
+        let prefix = this.prefix(node);
+        if (bomAndTextEncoding.hasBom) {
+            if (bomAndTextEncoding.encoding === 'utf8') {
+                prefix = prefix.withWhitespace(prefix.whitespace.slice(1));
+            }
+            else if (bomAndTextEncoding.encoding === 'utf16le') {
+                prefix = prefix.withWhitespace(prefix.whitespace.slice(2));
+            }
+        }
+        return new JS.CompilationUnit((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.sourceFile.fileName, null, bomAndTextEncoding.encoding, bomAndTextEncoding.hasBom, null, [], this.semicolonPaddedStatementList(node.statements), this.prefix(node.endOfFileToken));
     }
     semicolonPaddedStatementList(statements) {
         return [...statements].map(n => {
@@ -248,7 +271,7 @@ class JavaScriptParserVisitor {
             || ts.isInterfaceDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isPropertySignature(node) || ts.isParameter(node)
             || ts.isMethodDeclaration(node) || ts.isConstructorDeclaration(node) || ts.isArrowFunction(node)
             || ts.isIndexSignatureDeclaration(node) || ts.isTypeAliasDeclaration(node) || ts.isExportDeclaration(node)
-            || ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) || ts.isConstructorTypeNode(node) || ts.isTypeParameterDeclaration(node)) {
+            || ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) || ts.isConstructorTypeNode(node) || ts.isTypeParameterDeclaration(node) || ts.isImportDeclaration(node) || ts.isImportEqualsDeclaration(node)) {
             return node.modifiers ? (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.filter(ts.isModifier).map(this.mapModifier) : [];
         }
         else if (ts.isExportAssignment(node)) {
@@ -373,6 +396,9 @@ class JavaScriptParserVisitor {
     visitAnyKeyword(node) {
         return this.mapIdentifier(node, 'any');
     }
+    visitIntrinsicKeyword(node) {
+        return this.mapIdentifier(node, 'intrinsic');
+    }
     visitObjectKeyword(node) {
         return this.mapIdentifier(node, 'object');
     }
@@ -476,6 +502,9 @@ class JavaScriptParserVisitor {
         else if (ts.isPropertyAccessExpression(node.expression)) {
             annotationType = this.convert(node.expression);
         }
+        else if (ts.isParenthesizedExpression(node.expression)) {
+            annotationType = new JS.TypeTreeExpression((0, core_1.randomId)(), this.prefix(node.expression), core_1.Markers.EMPTY, this.convert(node.expression));
+        }
         else {
             return this.visitUnknown(node);
         }
@@ -513,7 +542,12 @@ class JavaScriptParserVisitor {
         if (ts.isComputedPropertyName(node.name)) {
             return new JS.JSMethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), this.convert(node.name), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
         }
-        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), 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));
+        const name = !node.name
+            ? this.mapIdentifier(node, "")
+            : ts.isStringLiteral(node.name)
+                ? this.mapIdentifier(node.name, node.name.getText())
+                : this.visit(node.name);
+        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(name, []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
     }
     visitMethodDeclaration(node) {
         if (node.questionToken || node.asteriskToken) {
@@ -574,11 +608,16 @@ class JavaScriptParserVisitor {
         return this.visit(node.typeName);
     }
     visitFunctionType(node) {
-        return new JS.FunctionType((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.leftPadded(java_1.Space.EMPTY, false), this.mapTypeParametersAsObject(node), new java_1.JContainer(this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)), node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
-            .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken))) : []), core_1.Markers.EMPTY), this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)), this.convert(node.type), null);
+        return new JS.FunctionType((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.leftPadded(java_1.Space.EMPTY, false), this.mapTypeParametersAsObject(node), new java_1.JContainer(this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)), node.parameters.length == 0 ?
+            [this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)))]
+            : node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
+                .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken))) : []), core_1.Markers.EMPTY), this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)), this.convert(node.type), null);
     }
     visitConstructorType(node) {
-        return new JS.FunctionType((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapModifiers(node), this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.NewKeyword)), true), this.mapTypeParametersAsObject(node), new java_1.JContainer(this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)), node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p))), core_1.Markers.EMPTY), this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)), this.convert(node.type), null);
+        return new JS.FunctionType((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapModifiers(node), this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.NewKeyword)), true), this.mapTypeParametersAsObject(node), new java_1.JContainer(this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === node.parameters.pos) - 1)), node.parameters.length == 0 ?
+            [this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken)))]
+            : node.parameters.map(p => this.rightPadded(this.visit(p), this.suffix(p)))
+                .concat(node.parameters.hasTrailingComma ? this.rightPadded(this.newJEmpty(), this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken))) : []), core_1.Markers.EMPTY), this.prefix(this.findChildNode(node, ts.SyntaxKind.EqualsGreaterThanToken)), this.convert(node.type), null);
     }
     visitTypeQuery(node) {
         return new JS.TypeQuery((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.convert(node.exprName), node.typeArguments ? this.mapTypeArguments(this.suffix(node.exprName), node.typeArguments) : null, this.mapType(node));
@@ -804,7 +843,7 @@ class JavaScriptParserVisitor {
         if (unaryOperator === undefined) {
             return this.visitUnknown(node);
         }
-        return new J.Unary((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.leftPadded(this.prefix(node.getFirstToken()), unaryOperator), this.convert(node.operand), this.mapType(node));
+        return new J.Unary((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.leftPadded(this.suffix(node.operand), unaryOperator), this.convert(node.operand), this.mapType(node));
     }
     visitBinaryExpression(node) {
         if (node.operatorToken.kind == ts.SyntaxKind.EqualsToken) {
@@ -850,6 +889,9 @@ class JavaScriptParserVisitor {
                 case ts.SyntaxKind.AsteriskAsteriskToken:
                     assignmentOperation = JS.JsAssignmentOperation.Type.Power;
                     break;
+                case ts.SyntaxKind.AsteriskAsteriskEqualsToken:
+                    assignmentOperation = JS.JsAssignmentOperation.Type.Exp;
+                    break;
             }
             if (assignmentOperation !== undefined) {
                 return new JS.JsAssignmentOperation((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.convert(node.left), this.leftPadded(this.prefix(node.operatorToken), assignmentOperation), this.convert(node.right), this.mapType(node));
@@ -945,7 +987,7 @@ class JavaScriptParserVisitor {
         return new JS.Unary((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.leftPadded(java_1.Space.EMPTY, JS.Unary.Type.Spread), this.convert(node.expression), this.mapType(node));
     }
     visitClassExpression(node) {
-        return new JS.StatementExpression((0, core_1.randomId)(), new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], 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.mapTypeParametersAsJContainer(node), null, this.mapExtends(node), this.mapImplements(node), null, new J.Block((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenBraceToken)), core_1.Markers.EMPTY, this.rightPadded(false, java_1.Space.EMPTY), node.members.map(ce => {
+        return new JS.StatementExpression((0, core_1.randomId)(), new J.ClassDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(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.mapTypeParametersAsJContainer(node), null, this.mapExtends(node), this.mapImplements(node), null, new J.Block((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenBraceToken)), core_1.Markers.EMPTY, this.rightPadded(false, java_1.Space.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)));
@@ -987,7 +1029,8 @@ class JavaScriptParserVisitor {
         return this.newJEmpty(this.prefix(node));
     }
     visitVariableStatement(node) {
-        return this.visitVariableDeclarationList(node.declarationList).withModifiers(this.mapModifiers(node)).withPrefix(this.prefix(node));
+        const declaration = this.visitVariableDeclarationList(node.declarationList);
+        return declaration.withModifiers(this.mapModifiers(node).concat(declaration.modifiers)).withPrefix(this.prefix(node));
     }
     visitExpressionStatement(node) {
         const expression = this.visit(node.expression);
@@ -1009,7 +1052,7 @@ class JavaScriptParserVisitor {
     }
     visitWhileStatement(node) {
         var _a;
-        return new J.WhileLoop((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(this.visit(node.expression), this.suffix(node.expression))), 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));
+        return new J.WhileLoop((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(this.visit(node.expression), this.suffix(node.expression))), this.rightPadded(this.convert(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getChildAt(node.statement.getChildCount() - 1)) === 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));
     }
     visitForStatement(node) {
         var _a;
@@ -1038,7 +1081,8 @@ class JavaScriptParserVisitor {
         return new J.Return((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, node.expression ? this.convert(node.expression) : null);
     }
     visitWithStatement(node) {
-        return this.visitUnknown(node);
+        var _a;
+        return new JS.WithStatement((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(this.visit(node.expression), this.suffix(node.expression))), this.rightPadded(this.convert(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getChildAt(node.statement.getChildCount() - 1)) === 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));
     }
     visitSwitchStatement(node) {
         return new J.Switch((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(this.visit(node.expression), this.suffix(node.expression))), this.visit(node.caseBlock));
@@ -1051,6 +1095,10 @@ class JavaScriptParserVisitor {
         return new J.Throw((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.expression));
     }
     visitTryStatement(node) {
+        var _a, _b, _c, _d;
+        if (((_b = (_a = node.catchClause) === null || _a === void 0 ? void 0 : _a.variableDeclaration) === null || _b === void 0 ? void 0 : _b.name) && !ts.isIdentifier((_d = (_c = node.catchClause) === null || _c === void 0 ? void 0 : _c.variableDeclaration) === null || _d === void 0 ? void 0 : _d.name)) {
+            return new JS.JSTry((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.tryBlock), this.visit(node.catchClause), node.finallyBlock ? this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.FinallyKeyword)), this.visit(node.finallyBlock)) : null);
+        }
         return new J.Try((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, null, this.visit(node.tryBlock), node.catchClause ? [this.visit(node.catchClause)] : [], node.finallyBlock ? this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.FinallyKeyword)), this.visit(node.finallyBlock)) : null);
     }
     visitDebuggerStatement(node) {
@@ -1064,12 +1112,19 @@ class JavaScriptParserVisitor {
         return new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, node.exclamationToken ? new JS.Unary((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.leftPadded(this.suffix(node.name), JS.Unary.Type.Exclamation), nameExpression, this.mapType(node)) : nameExpression, [], 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)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], this.leftPadded(this.prefix(node), (kind === null || kind === void 0 ? void 0 : kind.kind) === ts.SyntaxKind.LetKeyword
+        let kind = node.getFirstToken();
+        let modifier;
+        if ((kind === null || kind === void 0 ? void 0 : kind.kind) === ts.SyntaxKind.AwaitKeyword) {
+            modifier = new J.Modifier((0, core_1.randomId)(), this.prefix(kind), core_1.Markers.EMPTY, 'await', J.Modifier.Type.LanguageExtension, []);
+            kind = node.getChildAt(1);
+        }
+        return new JS.ScopedVariableDeclarations((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, modifier ? [modifier] : [], this.leftPadded(kind ? this.prefix(kind) : this.prefix(node), (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) => {
+                : (kind === null || kind === void 0 ? void 0 : kind.kind) === ts.SyntaxKind.UsingKeyword
+                    ? JS.ScopedVariableDeclarations.Scope.Using
+                    : JS.ScopedVariableDeclarations.Scope.Var), node.declarations.map((declaration) => {
             const declarationExpression = this.visit(declaration);
             return this.rightPadded(JS.isJavaScript(declarationExpression)
                 ? new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(declaration), core_1.Markers.EMPTY, [], [], this.mapTypeInfo(declaration), null, [this.rightPadded(declarationExpression, java_1.Space.EMPTY)])
@@ -1142,30 +1197,25 @@ class JavaScriptParserVisitor {
         ], this.leftPadded(this.prefix(this.findChildNode(node, ts.SyntaxKind.NamespaceKeyword)), JS.NamespaceDeclaration.KeywordType.Namespace), this.rightPadded(this.convert(node.name), this.suffix(node.name)), null);
     }
     visitImportEqualsDeclaration(node) {
-        return this.visitUnknown(node);
+        const kind = this.findChildNode(node, ts.SyntaxKind.ImportKeyword);
+        return new JS.ScopedVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapModifiers(node), this.leftPadded(this.prefix(kind), JS.ScopedVariableDeclarations.Scope.Import), [
+            this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], node.isTypeOnly ? [new J.Modifier((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.TypeKeyword)), core_1.Markers.EMPTY, "type", J.Modifier.Type.LanguageExtension, [])] : [], null, null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.visit(node.name), [], this.leftPadded(this.suffix(node.name), this.visit(node.moduleReference)), this.mapVariableType(node)), java_1.Space.EMPTY)]), java_1.Space.EMPTY)
+        ]);
     }
     visitImportKeyword(node) {
         return this.mapIdentifier(node, 'import');
     }
     visitImportDeclaration(node) {
-        var _a, _b, _c, _d;
-        const children = node.getChildren(this.sourceFile);
-        const _default = !!((_a = node.importClause) === null || _a === void 0 ? void 0 : _a.name);
-        const onlyDefault = _default && node.importClause.namedBindings == undefined;
-        return new JS.JsImport((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, _default ? this.rightPadded(this.visit((_b = node.importClause) === null || _b === void 0 ? void 0 : _b.name), this.suffix((_c = node.importClause) === null || _c === void 0 ? void 0 : _c.name)) : null, ((_d = node.importClause) === null || _d === void 0 ? void 0 : _d.isTypeOnly) ? this.leftPadded(this.prefix(this.findChildNode(node.importClause, ts.SyntaxKind.TypeKeyword)), node.importClause.isTypeOnly) : this.leftPadded(java_1.Space.EMPTY, false), node.importClause && !onlyDefault ? this.visit(node.importClause) : null, children[children.indexOf(node.moduleSpecifier) - 1].kind == ts.SyntaxKind.FromKeyword ? this.prefix(children[children.indexOf(node.moduleSpecifier) - 1]) : null, this.convert(node.moduleSpecifier), null);
+        return new JS.JsImport((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapModifiers(node), node.importClause ? this.visit(node.importClause) : null, this.leftPadded(node.importClause ? this.prefix(this.findChildNode(node, ts.SyntaxKind.FromKeyword)) : java_1.Space.EMPTY, this.visit(node.moduleSpecifier)), node.attributes ? this.visit(node.attributes) : null);
     }
     visitImportClause(node) {
-        var _a;
-        if (node.namedBindings && ts.isNamespaceImport(node.namedBindings)) {
-            return new java_1.JContainer(this.prefix(node), [this.rightPadded(new JS.Alias((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.rightPadded(this.mapIdentifier(node.namedBindings, "*"), this.prefix(node.namedBindings.getChildAt(1, this.sourceFile))), this.convert(node.namedBindings.name)), java_1.Space.EMPTY)], core_1.Markers.EMPTY);
-        }
-        return this.mapCommaSeparatedList((_a = node.namedBindings) === null || _a === void 0 ? void 0 : _a.getChildren(this.sourceFile));
+        return new JS.JsImportClause((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, node.isTypeOnly, node.name ? this.rightPadded(this.visit(node.name), this.suffix(node.name)) : null, node.namedBindings ? this.visit(node.namedBindings) : null);
     }
     visitNamespaceImport(node) {
-        return this.visitUnknown(node);
+        return new JS.Alias((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.rightPadded(this.mapIdentifier(node, "*"), this.prefix(this.findChildNode(node, ts.SyntaxKind.AsKeyword))), this.visit(node.name));
     }
     visitNamedImports(node) {
-        return this.visitUnknown(node);
+        return new JS.NamedImports((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapCommaSeparatedList(node.getChildren(this.sourceFile)), null);
     }
     visitImportSpecifier(node) {
         return new JS.JsImportSpecifier((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.leftPadded(node.isTypeOnly ? this.prefix(this.findChildNode(node, ts.SyntaxKind.TypeKeyword)) : java_1.Space.EMPTY, node.isTypeOnly), node.propertyName
@@ -1241,15 +1291,21 @@ class JavaScriptParserVisitor {
         return this.convert(node.types[0]);
     }
     visitCatchClause(node) {
+        var _a, _b;
+        if (((_a = node.variableDeclaration) === null || _a === void 0 ? void 0 : _a.name) && !ts.isIdentifier((_b = node.variableDeclaration) === null || _b === void 0 ? void 0 : _b.name)) {
+            return new JS.JSTry.JSCatch((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node.variableDeclaration), core_1.Markers.EMPTY, [], [], this.mapTypeInfo(node.variableDeclaration), null, [this.rightPadded(this.visit(node.variableDeclaration), java_1.Space.EMPTY)]), this.suffix(node.variableDeclaration))), this.visit(node.block));
+        }
         return new J.Try.Catch((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, node.variableDeclaration ?
             new J.ControlParentheses((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node.variableDeclaration), core_1.Markers.EMPTY, [], [], this.mapTypeInfo(node.variableDeclaration), null, [], [this.rightPadded(this.visit(node.variableDeclaration), java_1.Space.EMPTY)]), this.suffix(node.variableDeclaration))) :
             new J.ControlParentheses((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.rightPadded(new J.VariableDeclarations((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], [], null, null, [], []), java_1.Space.EMPTY)), this.visit(node.block));
     }
     visitImportAttributes(node) {
-        return this.visitUnknown(node);
+        const openBraceIndex = node.getChildren().findIndex(n => n.kind === ts.SyntaxKind.OpenBraceToken);
+        const elements = this.mapCommaSeparatedList(node.getChildren(this.sourceFile).slice(openBraceIndex, openBraceIndex + 3));
+        return new JS.ImportAttributes((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, ts.SyntaxKind.WithKeyword === node.token ? JS.ImportAttributes.Token.With : JS.ImportAttributes.Token.Assert, elements);
     }
     visitImportAttribute(node) {
-        return this.visitUnknown(node);
+        return new JS.ImportAttribute((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.visit(node.name), this.leftPadded(this.suffix(node.name), this.visit(node.value)));
     }
     visitPropertyAssignment(node) {
         return new JS.PropertyAssignment((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.rightPadded(this.visit(node.name), this.suffix(node.name)), JS.PropertyAssignment.AssigmentToken.Colon, this.visit(node.initializer));
@@ -1484,7 +1540,7 @@ class JavaScriptParserVisitor {
     }
     mapTypeParametersAsJContainer(node) {
         return node.typeParameters
-            ? java_1.JContainer.build(this.suffix(this.findChildNode(node, ts.SyntaxKind.Identifier)), this.mapTypeParametersList(node.typeParameters)
+            ? java_1.JContainer.build(this.prefix(this.findChildNode(node, ts.SyntaxKind.LessThanToken)), this.mapTypeParametersList(node.typeParameters)
                 .concat(node.typeParameters.hasTrailingComma ? this.rightPadded(new J.TypeParameter((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], [], this.newJEmpty(), null), this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken))) : []), core_1.Markers.EMPTY)
             : null;
     }
@@ -1492,8 +1548,10 @@ class JavaScriptParserVisitor {
         const typeParameters = node.typeParameters;
         if (!typeParameters)
             return null;
-        return new J.TypeParameters((0, core_1.randomId)(), this.prefix(node.getChildAt(node.getChildren().findIndex(n => n.pos === typeParameters[0].pos) - 1)), core_1.Markers.EMPTY, [], typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)))
-            .concat(typeParameters.hasTrailingComma ? this.rightPadded(new J.TypeParameter((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], [], this.newJEmpty(), null), this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken))) : []));
+        return new J.TypeParameters((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.LessThanToken)), core_1.Markers.EMPTY, [], typeParameters.length == 0 ?
+            [this.rightPadded(new J.TypeParameter((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], [], this.newJEmpty(), null), this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken)))]
+            : typeParameters.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)))
+                .concat(typeParameters.hasTrailingComma ? this.rightPadded(new J.TypeParameter((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, [], [], this.newJEmpty(), null), this.prefix(this.findChildNode(node, ts.SyntaxKind.GreaterThanToken))) : []));
     }
     mapTypeParametersList(typeParamsNodeArray) {
         return typeParamsNodeArray.map(tp => this.rightPadded(this.visit(tp), this.suffix(tp)));