@openrewrite/rewrite 8.92.15 → 8.92.17

package/dist/javascript/parser.js

@@ -602,24 +602,11 @@ class JavaScriptParserVisitor {
         };
     }
     mapModifiers(node) {
-        var _a, _b, _c, _d;
-        if (typescript_1.default.isPropertyAssignment(node) || typescript_1.default.isShorthandPropertyAssignment(node)) {
-            const modifiers = node.modifiers;
-            return modifiers ? modifiers.filter(typescript_1.default.isModifier).map(this.mapModifier) : [];
-        }
-        if (typescript_1.default.isVariableStatement(node) || typescript_1.default.isModuleDeclaration(node) || typescript_1.default.isClassDeclaration(node) || typescript_1.default.isEnumDeclaration(node)
-            || typescript_1.default.isInterfaceDeclaration(node) || typescript_1.default.isPropertyDeclaration(node) || typescript_1.default.isPropertySignature(node) || typescript_1.default.isParameter(node)
+        if (typescript_1.default.isVariableStatement(node) || typescript_1.default.isClassDeclaration(node) || typescript_1.default.isEnumDeclaration(node)
+            || typescript_1.default.isInterfaceDeclaration(node) || typescript_1.default.isPropertyDeclaration(node) || typescript_1.default.isPropertySignature(node) || typescript_1.default.isMethodSignature(node) || typescript_1.default.isParameter(node)
             || typescript_1.default.isMethodDeclaration(node) || typescript_1.default.isConstructorDeclaration(node) || typescript_1.default.isArrowFunction(node)
-            || typescript_1.default.isIndexSignatureDeclaration(node) || typescript_1.default.isTypeAliasDeclaration(node) || typescript_1.default.isExportDeclaration(node)
-            || typescript_1.default.isFunctionDeclaration(node) || typescript_1.default.isFunctionExpression(node) || typescript_1.default.isConstructorTypeNode(node) || typescript_1.default.isTypeParameterDeclaration(node) || typescript_1.default.isImportDeclaration(node) || typescript_1.default.isImportEqualsDeclaration(node)) {
-            return node.modifiers ? (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.filter(typescript_1.default.isModifier).map(this.mapModifier) : [];
-        }
-        else if (typescript_1.default.isExportAssignment(node)) {
-            const defaultModifier = this.findChildNode(node, typescript_1.default.SyntaxKind.DefaultKeyword);
-            return [
-                ...node.modifiers ? (_b = node.modifiers) === null || _b === void 0 ? void 0 : _b.filter(typescript_1.default.isModifier).map(this.mapModifier) : [],
-                ...defaultModifier && typescript_1.default.isModifier(defaultModifier) ? [this.mapModifier(defaultModifier)] : []
-            ];
+            || typescript_1.default.isFunctionDeclaration(node) || typescript_1.default.isFunctionExpression(node) || typescript_1.default.isConstructorTypeNode(node) || typescript_1.default.isTypeParameterDeclaration(node)) {
+            return this.mapKeywordModifiers(node.modifiers);
         }
         else if (typescript_1.default.isVariableDeclarationList(node)) {
             let modifier;
@@ -643,29 +630,71 @@ class JavaScriptParserVisitor {
                 }] : [];
         }
         else if (typescript_1.default.isGetAccessorDeclaration(node)) {
-            return (node.modifiers ? (_c = node.modifiers) === null || _c === void 0 ? void 0 : _c.filter(typescript_1.default.isModifier).map(this.mapModifier) : []).concat({
+            return this.mapKeywordModifiers(node.modifiers).concat({
                 kind: java_1.J.Kind.Modifier,
                 id: (0, uuid_1.randomId)(),
                 prefix: this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.GetKeyword)),
                 markers: markers_1.emptyMarkers,
                 keyword: 'get',
                 type: java_1.J.ModifierType.LanguageExtension,
-                annotations: []
+                annotations: this.mapTrailingDecorators(node)
             });
         }
         else if (typescript_1.default.isSetAccessorDeclaration(node)) {
-            return (node.modifiers ? (_d = node.modifiers) === null || _d === void 0 ? void 0 : _d.filter(typescript_1.default.isModifier).map(this.mapModifier) : []).concat({
+            return this.mapKeywordModifiers(node.modifiers).concat({
                 kind: java_1.J.Kind.Modifier,
                 id: (0, uuid_1.randomId)(),
                 prefix: this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.SetKeyword)),
                 markers: markers_1.emptyMarkers,
                 keyword: 'set',
                 type: java_1.J.ModifierType.LanguageExtension,
-                annotations: []
+                annotations: this.mapTrailingDecorators(node)
             });
         }
         throw new Error(`Cannot get modifiers from ${node}`);
     }
+    // A decorator written after a modifier is an annotation of the modifier that follows it.
+    mapKeywordModifiers(modifiers) {
+        const mapped = [];
+        let decorators = [];
+        for (const modifier of modifiers !== null && modifiers !== void 0 ? modifiers : []) {
+            if (typescript_1.default.isDecorator(modifier)) {
+                decorators.push(modifier);
+            }
+            else {
+                const annotations = mapped.length > 0 ? decorators.map((this.convert)) : [];
+                mapped.push(Object.assign(Object.assign({}, this.mapModifier(modifier)), { annotations }));
+                decorators = [];
+            }
+        }
+        return mapped;
+    }
+    // For a tree with no annotations of its own: a decorator is an annotation of the modifier written after it.
+    mapDecoratedModifiers(modifiers) {
+        const mapped = [];
+        let decorators = [];
+        for (const modifier of modifiers !== null && modifiers !== void 0 ? modifiers : []) {
+            if (typescript_1.default.isDecorator(modifier)) {
+                decorators.push(modifier);
+            }
+            else {
+                const annotations = decorators.map((this.convert));
+                mapped.push(Object.assign(Object.assign({}, this.mapModifier(modifier)), { annotations }));
+                decorators = [];
+            }
+        }
+        this.reject(decorators);
+        return mapped;
+    }
+    // What the model has no place for is refused in the compiler's words, never left out of the tree.
+    reject(modifiers) {
+        if (!modifiers || modifiers.length === 0) {
+            return;
+        }
+        const { line, character } = this.sourceFile.getLineAndCharacterOfPosition(modifiers[0].getStart(this.sourceFile));
+        const message = typescript_1.default.isDecorator(modifiers[0]) ? "Decorators are not valid here." : "Modifiers cannot appear here.";
+        throw new SyntaxError(`(${line + 1},${character + 1}): ${message}`);
+    }
     rightPadded(t, trailing, markers) {
         return {
             kind: java_1.J.Kind.RightPadded,
@@ -712,7 +741,7 @@ class JavaScriptParserVisitor {
                 id: (0, uuid_1.randomId)(),
                 prefix: node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node),
                 markers: markers_1.emptyMarkers,
-                annotations: [],
+                annotations: this.mapTrailingDecorators(node),
                 type: java_1.J.ClassDeclaration.Kind.Type.Class
             },
             name: node.name ? this.convert(node.name) : this.mapIdentifier(node, ""),
@@ -1032,6 +1061,7 @@ class JavaScriptParserVisitor {
             };
             name = spread;
         }
+        name = this.annotateName(name, this.trailingDecorators(node));
         return {
             kind: java_1.J.Kind.VariableDeclarations,
             id: (0, uuid_1.randomId)(),
@@ -1052,6 +1082,23 @@ class JavaScriptParserVisitor {
                 }, this.suffix(node.name))]
         };
     }
+    // A decorator written after the last modifier of a parameter is an annotation of the name it is written before.
+    annotateName(name, decorators) {
+        if (decorators.length === 0) {
+            return name;
+        }
+        if (name.kind === java_1.J.Kind.Identifier) {
+            const annotations = decorators.map((this.convert));
+            return Object.assign(Object.assign({}, name), { annotations });
+        }
+        if (name.kind === _1.JS.Kind.ObjectBindingPattern) {
+            // a pattern prints its annotations after its prefix, so the space before its brace moves behind them
+            const pattern = name;
+            return Object.assign(Object.assign({}, pattern), { prefix: java_1.emptySpace, leadingAnnotations: decorators.map((this.convert)), bindings: Object.assign(Object.assign({}, pattern.bindings), { before: pattern.prefix }) });
+        }
+        this.reject(decorators);
+        return name;
+    }
     visitDecorator(node) {
         let annotationType;
         let _arguments = undefined;
@@ -1065,7 +1112,7 @@ class JavaScriptParserVisitor {
                 prefix: java_1.emptySpace,
                 markers: markers_1.emptyMarkers,
                 clazz: this.convert(node.expression.expression),
-                typeArguments: this.mapTypeArguments(this.suffix(node.expression.expression), node.expression.typeArguments)
+                typeArguments: this.mapTypeArguments(this.typeArgumentsPrefix(node.expression, node.expression.typeArguments), node.expression.typeArguments)
             };
             _arguments = this.mapCommaSeparatedList(node.expression.getChildren(this.sourceFile).slice(-3));
         }
@@ -1170,7 +1217,7 @@ class JavaScriptParserVisitor {
                 prefix: prefix,
                 markers: markers_1.emptyMarkers,
                 leadingAnnotations: [], // no decorators allowed
-                modifiers: [], // no modifiers allowed
+                modifiers: this.mapModifiers(node),
                 typeParameters: this.mapTypeParametersAsObject(node),
                 returnTypeExpression: this.mapTypeInfo(node),
                 name: (0, mutative_1.create)(this.convert(node.name), draft => {
@@ -1190,7 +1237,7 @@ class JavaScriptParserVisitor {
             prefix: prefix,
             markers: markers_1.emptyMarkers,
             leadingAnnotations: [], // no decorators allowed
-            modifiers: [], // no modifiers allowed
+            modifiers: this.mapModifiers(node),
             typeParameters: this.mapTypeParametersAsObject(node),
             returnTypeExpression: this.mapTypeInfo(node),
             nameAnnotations: [],
@@ -1217,6 +1264,7 @@ class JavaScriptParserVisitor {
             draft.markers = this.maybeAddOptionalMarker(draft, node);
         });
         if (typescript_1.default.isComputedPropertyName(node.name)) {
+            this.reject(this.trailingDecorators(node));
             return {
                 kind: _1.JS.Kind.ComputedPropertyMethodDeclaration,
                 id: (0, uuid_1.randomId)(),
@@ -1241,7 +1289,7 @@ class JavaScriptParserVisitor {
             modifiers: this.mapModifiers(node),
             typeParameters: this.mapTypeParametersAsObject(node),
             returnTypeExpression: this.mapTypeInfo(node),
-            nameAnnotations: [],
+            nameAnnotations: this.mapTrailingDecorators(node),
             name: name,
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
             dimensionsAfterName: [],
@@ -1282,6 +1330,7 @@ class JavaScriptParserVisitor {
         };
     }
     visitClassStaticBlockDeclaration(node) {
+        this.reject(node.modifiers);
         return {
             kind: java_1.J.Kind.Block,
             id: (0, uuid_1.randomId)(),
@@ -1449,7 +1498,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            modifiers: this.mapModifiers(node),
+            modifiers: this.mapDecoratedModifiers(node.modifiers),
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node, typescript_1.default.SyntaxKind.OpenBracketToken)),
             typeExpression: this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.type) - 1)), this.convert(node.type)),
             type: this.mapType(node)
@@ -1475,7 +1524,7 @@ class JavaScriptParserVisitor {
                 prefix: this.prefix(node),
                 markers: markers_1.emptyMarkers,
                 class: this.visit(node.typeName),
-                typeParameters: this.mapTypeArguments(this.suffix(node.typeName), node.typeArguments),
+                typeParameters: this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments),
                 type: this.mapType(node)
             };
         }
@@ -1522,7 +1571,7 @@ class JavaScriptParserVisitor {
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
             typeExpression: this.convert(node.exprName),
-            typeArguments: node.typeArguments && this.mapTypeArguments(this.suffix(node.exprName), node.typeArguments),
+            typeArguments: node.typeArguments && this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments),
             type: this.mapType(node)
         };
     }
@@ -1892,7 +1941,7 @@ class JavaScriptParserVisitor {
                 markers: markers_1.emptyMarkers
             },
             qualifier: node.qualifier && this.leftPadded(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.DotToken)), this.visit(node.qualifier)),
-            typeArguments: node.typeArguments && this.mapTypeArguments(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.LessThanToken)), node.typeArguments),
+            typeArguments: node.typeArguments && this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments),
             type: this.mapType(node)
         };
     }
@@ -2033,9 +2082,8 @@ class JavaScriptParserVisitor {
     }
     visitCallExpression(node) {
         const prefix = this.prefix(node);
-        const ltToken = this.findChildNode(node, typescript_1.default.SyntaxKind.LessThanToken);
-        const typeArguments = node.typeArguments && ltToken
-            ? this.mapTypeArguments(this.prefix(ltToken), node.typeArguments)
+        const typeArguments = node.typeArguments
+            ? this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments)
             : undefined;
         let select;
         let name = {
@@ -2128,7 +2176,7 @@ class JavaScriptParserVisitor {
                     }
                     return typeTree;
                 })(),
-                typeParameters: this.mapTypeArguments(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.LessThanToken)), node.typeArguments),
+                typeParameters: this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments),
                 type: undefined
             } : this.mapTypeTree(node.expression),
             arguments: node.arguments ?
@@ -2145,7 +2193,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            tag: this.rightPadded(this.visit(node.tag), this.suffix(node.tag)),
+            tag: this.rightPadded(this.visit(node.tag), node.typeArguments ? this.typeArgumentsPrefix(node, node.typeArguments) : this.suffix(node.tag)),
             typeArguments: node.typeArguments && this.mapTypeArguments(java_1.emptySpace, node.typeArguments),
             templateExpression: this.convert(node.template),
             type: this.mapType(node)
@@ -2580,13 +2628,13 @@ class JavaScriptParserVisitor {
                 prefix: java_1.emptySpace,
                 markers: markers_1.emptyMarkers,
                 leadingAnnotations: this.mapDecorators(node),
-                modifiers: [],
+                modifiers: this.mapKeywordModifiers(node.modifiers),
                 classKind: {
                     kind: java_1.J.Kind.ClassDeclarationKind,
                     id: (0, uuid_1.randomId)(),
                     prefix: node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node),
                     markers: markers_1.emptyMarkers,
-                    annotations: [],
+                    annotations: this.mapTrailingDecorators(node),
                     type: java_1.J.ClassDeclaration.Kind.Type.Class
                 },
                 name: node.name ? this.convert(node.name) : this.mapIdentifier(node, ""),
@@ -2628,7 +2676,7 @@ class JavaScriptParserVisitor {
                 prefix: this.prefix(node),
                 markers: markers_1.emptyMarkers,
                 clazz: this.visit(node.expression),
-                typeArguments: this.mapTypeArguments(this.suffix(node.expression), node.typeArguments),
+                typeArguments: this.mapTypeArguments(this.typeArgumentsPrefix(node, node.typeArguments), node.typeArguments),
                 type: this.mapType(node)
             };
         }
@@ -2709,11 +2757,35 @@ class JavaScriptParserVisitor {
     }
     visitVariableStatement(node) {
         const prefix = this.prefix(node);
+        const leading = this.mapDecorators(node);
+        const modifiers = this.mapModifiers(node);
+        const trailing = this.mapTrailingDecorators(node);
         return (0, mutative_1.create)(this.visitVariableDeclarationList(node.declarationList), draft => {
             draft.prefix = prefix;
-            draft.modifiers = this.mapModifiers(node).concat(draft.modifiers);
+            // `const`, `let` or `var` is the modifier that follows them
+            draft.modifiers[0].annotations = (0, mutative_1.castDraft)(trailing);
+            draft.modifiers = (0, mutative_1.castDraft)(modifiers).concat(draft.modifiers);
+            if (draft.kind === java_1.J.Kind.VariableDeclarations) {
+                draft.leadingAnnotations = (0, mutative_1.castDraft)(leading);
+            }
+            else if (leading.length > 0) {
+                draft.modifiers[0].annotations = (0, mutative_1.castDraft)(leading);
+            }
         });
     }
+    // A loop variable is a statement in the model, which a pattern or an access expression is not.
+    asStatement(tree) {
+        if ((0, parser_utils_1.isStatement)(tree)) {
+            return tree;
+        }
+        return {
+            kind: _1.JS.Kind.ExpressionStatement,
+            id: (0, uuid_1.randomId)(),
+            prefix: java_1.emptySpace,
+            markers: markers_1.emptyMarkers,
+            expression: tree
+        };
+    }
     visitExpressionStatement(node) {
         const expression = this.visit(node.expression);
         if ((0, parser_utils_1.isStatement)(expression)) {
@@ -2864,7 +2936,7 @@ class JavaScriptParserVisitor {
                         }, this.suffix(node.initializer));
                     }
                     else {
-                        return this.rightPadded(this.visit(node.initializer), this.suffix(node.initializer));
+                        return this.rightPadded(this.asStatement(this.visit(node.initializer)), this.suffix(node.initializer));
                     }
                 })(),
                 iterable: this.rightPadded(this.visit(node.expression), this.suffix(node.expression))
@@ -2925,7 +2997,7 @@ class JavaScriptParserVisitor {
                             }, this.suffix(node.initializer));
                         }
                         else if (typescript_1.default.isObjectLiteralExpression(node.initializer)) {
-                            return this.rightPadded({
+                            return this.rightPadded(this.asStatement({
                                 kind: _1.JS.Kind.ObjectBindingPattern,
                                 id: (0, uuid_1.randomId)(),
                                 leadingAnnotations: [],
@@ -2940,10 +3012,10 @@ class JavaScriptParserVisitor {
                                 },
                                 markers: markers_1.emptyMarkers,
                                 prefix: java_1.emptySpace
-                            }, this.suffix(node.initializer));
+                            }), this.suffix(node.initializer));
                         }
                         else {
-                            return this.rightPadded(this.visit(node.initializer), this.suffix(node.initializer));
+                            return this.rightPadded(this.asStatement(this.visit(node.initializer)), this.suffix(node.initializer));
                         }
                     })(),
                     iterable: this.rightPadded(this.visit(node.expression), this.suffix(node.expression))
@@ -3197,8 +3269,8 @@ class JavaScriptParserVisitor {
                     });
                 }
             }),
-            leadingAnnotations: [],
-            nameAnnotations: [],
+            leadingAnnotations: this.mapDecorators(node),
+            nameAnnotations: this.mapTrailingDecorators(node),
             modifiers: this.mapModifiers(node),
             name: this.mapMethodName(node, methodType),
             typeParameters: this.mapTypeParametersAsObject(node),
@@ -3224,14 +3296,14 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            leadingAnnotations: [],
+            leadingAnnotations: this.mapDecorators(node),
             modifiers: this.mapModifiers(node),
             classKind: {
                 kind: java_1.J.Kind.ClassDeclarationKind,
                 id: (0, uuid_1.randomId)(),
                 prefix: node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node),
                 markers: markers_1.emptyMarkers,
-                annotations: [],
+                annotations: this.mapTrailingDecorators(node),
                 type: java_1.J.ClassDeclaration.Kind.Type.Interface
             },
             name: node.name ? this.convert(node.name) : this.mapIdentifier(node, ""),
@@ -3263,7 +3335,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            modifiers: this.mapModifiers(node),
+            modifiers: this.mapDecoratedModifiers(node.modifiers),
             name: this.leftPadded(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.TypeKeyword)), this.visit(node.name)),
             typeParameters: node.typeParameters && this.mapTypeParametersAsObject(node),
             initializer: this.leftPadded(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.EqualsToken)), this.convert(node.type)),
@@ -3276,14 +3348,14 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            leadingAnnotations: [],
+            leadingAnnotations: this.mapDecorators(node),
             modifiers: this.mapModifiers(node),
             classKind: {
                 kind: java_1.J.Kind.ClassDeclarationKind,
                 id: (0, uuid_1.randomId)(),
                 prefix: node.modifiers ? this.suffix(node.modifiers[node.modifiers.length - 1]) : this.prefix(node),
                 markers: markers_1.emptyMarkers,
-                annotations: [],
+                annotations: this.mapTrailingDecorators(node),
                 type: java_1.J.ClassDeclaration.Kind.Type.Enum
             },
             name: node.name ? this.convert(node.name) : this.mapIdentifier(node, ""),
@@ -3334,7 +3406,7 @@ class JavaScriptParserVisitor {
                 id: (0, uuid_1.randomId)(),
                 prefix: java_1.emptySpace,
                 markers: markers_1.emptyMarkers,
-                modifiers: this.mapModifiers(node),
+                modifiers: this.mapDecoratedModifiers(node.modifiers),
                 keywordType: this.leftPadded(namespaceKeyword ? this.prefix(namespaceKeyword) : java_1.emptySpace, keywordType),
                 name: this.rightPadded((body.name.element.kind === java_1.J.Kind.FieldAccess)
                     ? this.remapFieldAccess(body.name.element, node.name)
@@ -3361,7 +3433,7 @@ class JavaScriptParserVisitor {
                 id: (0, uuid_1.randomId)(),
                 prefix: this.prefix(node),
                 markers: markers_1.emptyMarkers,
-                modifiers: this.mapModifiers(node),
+                modifiers: this.mapDecoratedModifiers(node.modifiers),
                 keywordType: this.leftPadded(namespaceKeyword ? this.prefix(namespaceKeyword) : java_1.emptySpace, keywordType),
                 name: this.rightPadded(this.convert(node.name), this.suffix(node.name)),
                 body
@@ -3423,21 +3495,16 @@ class JavaScriptParserVisitor {
         };
     }
     visitNamespaceExportDeclaration(node) {
+        var _a;
+        const prefix = this.prefix(node);
+        const written = (_a = node.modifiers) !== null && _a !== void 0 ? _a : [];
         return {
             kind: _1.JS.Kind.NamespaceDeclaration,
             id: (0, uuid_1.randomId)(),
-            prefix: this.prefix(node),
+            prefix,
             markers: markers_1.emptyMarkers,
             modifiers: [
-                {
-                    kind: java_1.J.Kind.Modifier,
-                    id: (0, uuid_1.randomId)(),
-                    prefix: java_1.emptySpace,
-                    markers: markers_1.emptyMarkers,
-                    keyword: 'export',
-                    type: java_1.J.ModifierType.LanguageExtension,
-                    annotations: []
-                },
+                ...this.mapDecoratedModifiers([...written, this.findChildNode(node, typescript_1.default.SyntaxKind.ExportKeyword)]),
                 {
                     kind: java_1.J.Kind.Modifier,
                     id: (0, uuid_1.randomId)(),
@@ -3453,25 +3520,14 @@ class JavaScriptParserVisitor {
         };
     }
     visitImportEqualsDeclaration(node) {
-        let exportModifierSuffix = undefined;
+        // mapped before the prefix, so that what is written first takes the leading whitespace
+        const modifiers = this.mapDecoratedModifiers(node.modifiers);
         return {
             kind: _1.JS.Kind.Import,
             id: (0, uuid_1.randomId)(),
-            modifiers: (() => {
-                var _a;
-                const exportModifier = (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.find(m => m.kind === typescript_1.default.SyntaxKind.ExportKeyword);
-                exportModifierSuffix = exportModifier && this.suffix(exportModifier);
-                return exportModifier ? [{
-                        kind: java_1.J.Kind.Modifier,
-                        id: (0, uuid_1.randomId)(),
-                        prefix: this.prefix(exportModifier),
-                        markers: markers_1.emptyMarkers,
-                        keyword: 'export',
-                        type: java_1.J.ModifierType.LanguageExtension,
-                        annotations: []
-                    }] : [];
-            })(),
-            prefix: exportModifierSuffix ? exportModifierSuffix : this.prefix(node),
+            prefix: this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.ImportKeyword)),
+            markers: markers_1.emptyMarkers,
+            modifiers,
             importClause: {
                 kind: _1.JS.Kind.ImportClause,
                 id: (0, uuid_1.randomId)(),
@@ -3489,7 +3545,6 @@ class JavaScriptParserVisitor {
                 name: node.name && this.rightPadded(this.visit(node.name), this.suffix(node.name)),
                 namedBindings: undefined
             },
-            markers: markers_1.emptyMarkers,
             moduleSpecifier: undefined,
             attributes: undefined,
             initializer: this.leftPadded(this.suffix(node.name), this.visit(node.moduleReference))
@@ -3500,12 +3555,13 @@ class JavaScriptParserVisitor {
         return this.mapIdentifier(node, 'import');
     }
     visitImportDeclaration(node) {
+        const modifiers = this.mapDecoratedModifiers(node.modifiers);
         return {
             kind: _1.JS.Kind.Import,
             id: (0, uuid_1.randomId)(),
-            prefix: this.prefix(node),
+            prefix: this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.ImportKeyword)),
             markers: markers_1.emptyMarkers,
-            modifiers: [],
+            modifiers,
             importClause: node.importClause && this.visit(node.importClause),
             moduleSpecifier: this.leftPadded(node.importClause ? this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.FromKeyword)) : java_1.emptySpace, this.visit(node.moduleSpecifier)),
             attributes: node.attributes && this.visit(node.attributes)
@@ -3586,6 +3642,7 @@ class JavaScriptParserVisitor {
         };
     }
     visitExportAssignment(node) {
+        this.reject(node.modifiers);
         return {
             kind: _1.JS.Kind.ExportAssignment,
             id: (0, uuid_1.randomId)(),
@@ -3596,12 +3653,13 @@ class JavaScriptParserVisitor {
         };
     }
     visitExportDeclaration(node) {
+        const modifiers = this.mapDecoratedModifiers(node.modifiers);
         return {
             kind: _1.JS.Kind.ExportDeclaration,
             id: (0, uuid_1.randomId)(),
-            prefix: this.prefix(node),
+            prefix: this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.ExportKeyword)),
             markers: markers_1.emptyMarkers,
-            modifiers: this.mapModifiers(node),
+            modifiers,
             typeOnly: this.leftPadded(node.isTypeOnly ? this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.TypeKeyword)) : java_1.emptySpace, node.isTypeOnly),
             exportClause: node.exportClause ? this.visit(node.exportClause) : this.mapIdentifier(this.findChildNode(node, typescript_1.default.SyntaxKind.AsteriskToken), "*"),
             moduleSpecifier: node.moduleSpecifier && this.leftPadded(this.prefix(this.findChildNode(node, typescript_1.default.SyntaxKind.FromKeyword)), this.visit(node.moduleSpecifier)),
@@ -3906,7 +3964,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            modifiers: this.mapModifiers(node),
+            modifiers: this.mapDecoratedModifiers(node.modifiers),
             name: this.rightPadded(this.visit(node.name), this.suffix(node.name)),
             assigmentToken: _1.JS.PropertyAssignment.Token.Colon,
             initializer: this.visit(node.initializer)
@@ -3918,7 +3976,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
-            modifiers: this.mapModifiers(node),
+            modifiers: this.mapDecoratedModifiers(node.modifiers),
             name: this.rightPadded(this.visit(node.name), this.suffix(node.name)),
             assigmentToken: _1.JS.PropertyAssignment.Token.Equals,
             initializer: node.objectAssignmentInitializer && this.visit(node.objectAssignmentInitializer)
@@ -3941,7 +3999,11 @@ class JavaScriptParserVisitor {
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
             annotations: [],
-            name: node.name ? typescript_1.default.isStringLiteral(node.name) ? this.mapIdentifier(node.name, node.name.getText()) : this.convert(node.name) : this.mapIdentifier(node, ""),
+            name: node.name ?
+                typescript_1.default.isStringLiteral(node.name) ? this.mapIdentifier(node.name, node.name.getText()) :
+                    typescript_1.default.isComputedPropertyName(node.name) ? this.mapComputedEnumMemberName(node.name) :
+                        this.convert(node.name) :
+                this.mapIdentifier(node, ""),
             initializer: node.initializer && {
                 kind: java_1.J.Kind.NewClass,
                 id: (0, uuid_1.randomId)(),
@@ -3958,6 +4020,14 @@ class JavaScriptParserVisitor {
             }
         };
     }
+    // An enum member is named by an identifier in the model, so the brackets go in a marker.
+    mapComputedEnumMemberName(node) {
+        return Object.assign(Object.assign({}, this.mapIdentifier(node.expression, node.expression.getText())), { markers: (0, markers_1.markers)({
+                kind: _1.JS.Markers.Computed,
+                id: (0, uuid_1.randomId)(),
+                suffix: this.suffix(node.expression)
+            }) });
+    }
     visitBundle(node) {
         return this.visitUnknown(node);
     }
@@ -4152,6 +4222,17 @@ class JavaScriptParserVisitor {
     mapCommaSeparatedList(nodes) {
         return this.mapToContainer(nodes, this.trailingComma(nodes));
     }
+    // `<<` is scanned as one token, so a list whose first type argument starts with `<` has no `<` among the children.
+    typeArgumentsPrefix(node, typeArguments) {
+        var _a;
+        const lessThan = this.findChildNode(node, typescript_1.default.SyntaxKind.LessThanToken);
+        if (lessThan) {
+            return this.prefix(lessThan);
+        }
+        const start = typeArguments.pos - 1;
+        const fullStart = (_a = node.getChildren(this.sourceFile).map(child => child.getEnd()).filter(end => end <= start).pop()) !== null && _a !== void 0 ? _a : start;
+        return this.prefix({ getFullStart: () => fullStart, getStart: () => start });
+    }
     mapTypeArguments(prefix, nodes) {
         if (nodes.length === 0) {
             return (0, java_1.emptyContainer)();
@@ -4224,8 +4305,24 @@ class JavaScriptParserVisitor {
         }
     }
     mapDecorators(node) {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = node.modifiers) === null || _a === void 0 ? void 0 : _a.filter(typescript_1.default.isDecorator)) === null || _b === void 0 ? void 0 : _b.map((this.convert))) !== null && _c !== void 0 ? _c : [];
+        var _a;
+        const modifiers = (_a = node.modifiers) !== null && _a !== void 0 ? _a : [];
+        const firstKeyword = modifiers.findIndex(typescript_1.default.isModifier);
+        return modifiers.slice(0, firstKeyword < 0 ? modifiers.length : firstKeyword)
+            .filter(typescript_1.default.isDecorator).map((this.convert));
+    }
+    // The decorators between the last modifier and the keyword of the declaration.
+    mapTrailingDecorators(node) {
+        return this.trailingDecorators(node).map((this.convert));
+    }
+    trailingDecorators(node) {
+        var _a;
+        const modifiers = (_a = node.modifiers) !== null && _a !== void 0 ? _a : [];
+        let afterKeywords = modifiers.length;
+        while (afterKeywords > 0 && typescript_1.default.isDecorator(modifiers[afterKeywords - 1])) {
+            afterKeywords--;
+        }
+        return afterKeywords === 0 ? [] : modifiers.slice(afterKeywords).filter(typescript_1.default.isDecorator);
     }
     mapTypeParametersAsContainer(node) {
         return node.typeParameters &&