@openrewrite/rewrite 8.63.0 → 8.63.2

package/dist/javascript/visitor.js

@@ -84,10 +84,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             alias = expression;
-            return this.produceJavaScript(alias, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.propertyName = yield this.visitRightPadded(alias.propertyName, p);
-                draft.alias = yield this.visitDefined(alias.alias, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(alias.prefix, p),
+                markers: yield this.visitMarkers(alias.markers, p),
+                propertyName: yield this.visitRightPadded(alias.propertyName, p),
+                alias: yield this.visitDefined(alias.alias, p)
+            };
+            return (0, util_1.updateIfChanged)(alias, updates);
         });
     }
     visitArrowFunction(arrowFunction, p) {
@@ -102,22 +105,28 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             arrowFunction = statement;
-            return this.produceJavaScript(arrowFunction, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.leadingAnnotations = yield (0, util_1.mapAsync)(arrowFunction.leadingAnnotations, item => this.visitDefined(item, p));
-                draft.modifiers = yield (0, util_1.mapAsync)(arrowFunction.modifiers, item => this.visitDefined(item, p));
-                draft.typeParameters = arrowFunction.typeParameters && (yield this.visitDefined(arrowFunction.typeParameters, p));
-                draft.lambda = yield this.visitDefined(arrowFunction.lambda, p);
-                draft.returnTypeExpression = arrowFunction.returnTypeExpression && (yield this.visitDefined(arrowFunction.returnTypeExpression, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(arrowFunction.prefix, p),
+                markers: yield this.visitMarkers(arrowFunction.markers, p),
+                leadingAnnotations: yield (0, util_1.mapAsync)(arrowFunction.leadingAnnotations, item => this.visitDefined(item, p)),
+                modifiers: yield (0, util_1.mapAsync)(arrowFunction.modifiers, item => this.visitDefined(item, p)),
+                typeParameters: arrowFunction.typeParameters && (yield this.visitDefined(arrowFunction.typeParameters, p)),
+                lambda: yield this.visitDefined(arrowFunction.lambda, p),
+                returnTypeExpression: arrowFunction.returnTypeExpression && (yield this.visitDefined(arrowFunction.returnTypeExpression, p))
+            };
+            return (0, util_1.updateIfChanged)(arrowFunction, updates);
         });
     }
     visitAs(as_, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(as_, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.left = yield this.visitRightPadded(as_.left, p);
-                draft.right = yield this.visitDefined(as_.right, p);
-                draft.type = as_.type && (yield this.visitType(as_.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(as_.prefix, p),
+                markers: yield this.visitMarkers(as_.markers, p),
+                left: yield this.visitRightPadded(as_.left, p),
+                right: yield this.visitDefined(as_.right, p),
+                type: as_.type && (yield this.visitType(as_.type, p))
+            };
+            return (0, util_1.updateIfChanged)(as_, updates);
         });
     }
     visitAwait(await_, p) {
@@ -127,63 +136,84 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             await_ = expression;
-            return this.produceJavaScript(await_, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(await_.expression, p);
-                draft.type = await_.type && (yield this.visitType(await_.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(await_.prefix, p),
+                markers: yield this.visitMarkers(await_.markers, p),
+                expression: yield this.visitDefined(await_.expression, p),
+                type: await_.type && (yield this.visitType(await_.type, p))
+            };
+            return (0, util_1.updateIfChanged)(await_, updates);
         });
     }
     visitJsxTag(element, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(element, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.openName = yield this.visitLeftPadded(element.openName, p);
-                draft.typeArguments = element.typeArguments && (yield this.visitContainer(element.typeArguments, p));
-                draft.afterName = yield this.visitSpace(element.afterName, p);
-                draft.attributes = yield (0, util_1.mapAsync)(element.attributes, attr => this.visitRightPadded(attr, p));
-                draft.selfClosing = element.selfClosing && (yield this.visitSpace(element.selfClosing, p));
-                draft.children = element.children && (yield (0, util_1.mapAsync)(element.children, child => this.visit(child, p)));
-                draft.closingName = element.closingName && (yield this.visitLeftPadded(element.closingName, p));
-                draft.afterClosingName = element.afterClosingName && (yield this.visitSpace(element.afterClosingName, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(element.prefix, p),
+                markers: yield this.visitMarkers(element.markers, p),
+                openName: yield this.visitLeftPadded(element.openName, p),
+                typeArguments: element.typeArguments && (yield this.visitContainer(element.typeArguments, p)),
+                afterName: yield this.visitSpace(element.afterName, p),
+                attributes: yield (0, util_1.mapAsync)(element.attributes, attr => this.visitRightPadded(attr, p)),
+                selfClosing: element.selfClosing && (yield this.visitSpace(element.selfClosing, p)),
+                children: element.children && (yield (0, util_1.mapAsync)(element.children, child => this.visit(child, p))),
+                closingName: element.closingName && (yield this.visitLeftPadded(element.closingName, p)),
+                afterClosingName: element.afterClosingName && (yield this.visitSpace(element.afterClosingName, p))
+            };
+            return (0, util_1.updateIfChanged)(element, updates);
         });
     }
     visitJsxAttribute(attribute, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(attribute, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.key = yield this.visitDefined(attribute.key, p);
-                draft.value = attribute.value && (yield this.visitLeftPadded(attribute.value, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(attribute.prefix, p),
+                markers: yield this.visitMarkers(attribute.markers, p),
+                key: yield this.visitDefined(attribute.key, p),
+                value: attribute.value && (yield this.visitLeftPadded(attribute.value, p))
+            };
+            return (0, util_1.updateIfChanged)(attribute, updates);
         });
     }
     visitJsxSpreadAttribute(spread, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(spread, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.dots = yield this.visitSpace(spread.dots, p);
-                draft.expression = yield this.visitRightPadded(spread.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(spread.prefix, p),
+                markers: yield this.visitMarkers(spread.markers, p),
+                dots: yield this.visitSpace(spread.dots, p),
+                expression: yield this.visitRightPadded(spread.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(spread, updates);
         });
     }
     visitJsxEmbeddedExpression(expr, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(expr, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitRightPadded(expr.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(expr.prefix, p),
+                markers: yield this.visitMarkers(expr.markers, p),
+                expression: yield this.visitRightPadded(expr.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(expr, updates);
         });
     }
     visitJsxNamespacedName(ns, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(ns, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.namespace = yield this.visitDefined(ns.namespace, p);
-                draft.name = yield this.visitLeftPadded(ns.name, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(ns.prefix, p),
+                markers: yield this.visitMarkers(ns.markers, p),
+                namespace: yield this.visitDefined(ns.namespace, p),
+                name: yield this.visitLeftPadded(ns.name, p)
+            };
+            return (0, util_1.updateIfChanged)(ns, updates);
         });
     }
     visitJsCompilationUnit(compilationUnit, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(compilationUnit, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.statements = yield (0, util_1.mapAsync)(compilationUnit.statements, stmt => this.visitRightPadded(stmt, p));
-                draft.eof = yield this.visitSpace(compilationUnit.eof, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(compilationUnit.prefix, p),
+                markers: yield this.visitMarkers(compilationUnit.markers, p),
+                statements: yield (0, util_1.mapAsync)(compilationUnit.statements, stmt => this.visitRightPadded(stmt, p)),
+                eof: yield this.visitSpace(compilationUnit.eof, p)
+            };
+            return (0, util_1.updateIfChanged)(compilationUnit, updates);
         });
     }
     visitConditionalType(conditionalType, p) {
@@ -193,11 +223,14 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             conditionalType = expression;
-            return this.produceJavaScript(conditionalType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.checkType = yield this.visitDefined(conditionalType.checkType, p);
-                draft.condition = yield this.visitLeftPadded(conditionalType.condition, p);
-                draft.type = conditionalType.type && (yield this.visitType(conditionalType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(conditionalType.prefix, p),
+                markers: yield this.visitMarkers(conditionalType.markers, p),
+                checkType: yield this.visitDefined(conditionalType.checkType, p),
+                condition: yield this.visitLeftPadded(conditionalType.condition, p),
+                type: conditionalType.type && (yield this.visitType(conditionalType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(conditionalType, updates);
         });
     }
     visitDelete(delete_, p) {
@@ -212,9 +245,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             delete_ = statement;
-            return this.produceJavaScript(delete_, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(delete_.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(delete_.prefix, p),
+                markers: yield this.visitMarkers(delete_.markers, p),
+                expression: yield this.visitDefined(delete_.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(delete_, updates);
         });
     }
     visitExpressionStatement(expressionStatement, p) {
@@ -229,9 +265,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             expressionStatement = statement;
-            return this.produceJavaScript(expressionStatement, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(expressionStatement.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(expressionStatement.prefix, p),
+                markers: yield this.visitMarkers(expressionStatement.markers, p),
+                expression: yield this.visitDefined(expressionStatement.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(expressionStatement, updates);
         });
     }
     visitExpressionWithTypeArguments(expressionWithTypeArguments, p) {
@@ -241,11 +280,14 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             expressionWithTypeArguments = expression;
-            return this.produceJavaScript(expressionWithTypeArguments, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.clazz = yield this.visitDefined(expressionWithTypeArguments.clazz, p);
-                draft.typeArguments = expressionWithTypeArguments.typeArguments && (yield this.visitContainer(expressionWithTypeArguments.typeArguments, p));
-                draft.type = expressionWithTypeArguments.type && (yield this.visitType(expressionWithTypeArguments.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(expressionWithTypeArguments.prefix, p),
+                markers: yield this.visitMarkers(expressionWithTypeArguments.markers, p),
+                clazz: yield this.visitDefined(expressionWithTypeArguments.clazz, p),
+                typeArguments: expressionWithTypeArguments.typeArguments && (yield this.visitContainer(expressionWithTypeArguments.typeArguments, p)),
+                type: expressionWithTypeArguments.type && (yield this.visitType(expressionWithTypeArguments.type, p))
+            };
+            return (0, util_1.updateIfChanged)(expressionWithTypeArguments, updates);
         });
     }
     visitFunctionCall(functionCall, p) {
@@ -275,12 +317,15 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             functionType = expression;
-            return this.produceJavaScript(functionType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.constructorType = yield this.visitLeftPadded(functionType.constructorType, p);
-                draft.typeParameters = functionType.typeParameters && (yield this.visitDefined(functionType.typeParameters, p));
-                draft.parameters = yield this.visitContainer(functionType.parameters, p);
-                draft.returnType = yield this.visitLeftPadded(functionType.returnType, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(functionType.prefix, p),
+                markers: yield this.visitMarkers(functionType.markers, p),
+                constructorType: yield this.visitLeftPadded(functionType.constructorType, p),
+                typeParameters: functionType.typeParameters && (yield this.visitDefined(functionType.typeParameters, p)),
+                parameters: yield this.visitContainer(functionType.parameters, p),
+                returnType: yield this.visitLeftPadded(functionType.returnType, p)
+            };
+            return (0, util_1.updateIfChanged)(functionType, updates);
         });
     }
     visitInferType(inferType, p) {
@@ -290,10 +335,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             inferType = expression;
-            return this.produceJavaScript(inferType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.typeParameter = yield this.visitLeftPadded(inferType.typeParameter, p);
-                draft.type = inferType.type && (yield this.visitType(inferType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(inferType.prefix, p),
+                markers: yield this.visitMarkers(inferType.markers, p),
+                typeParameter: yield this.visitLeftPadded(inferType.typeParameter, p),
+                type: inferType.type && (yield this.visitType(inferType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(inferType, updates);
         });
     }
     visitImportType(importType, p) {
@@ -303,13 +351,16 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             importType = expression;
-            return this.produceJavaScript(importType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.hasTypeof = yield this.visitRightPadded(importType.hasTypeof, p);
-                draft.argumentAndAttributes = yield this.visitContainer(importType.argumentAndAttributes, p);
-                draft.qualifier = importType.qualifier && (yield this.visitLeftPadded(importType.qualifier, p));
-                draft.typeArguments = importType.typeArguments && (yield this.visitContainer(importType.typeArguments, p));
-                draft.type = importType.type && (yield this.visitType(importType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importType.prefix, p),
+                markers: yield this.visitMarkers(importType.markers, p),
+                hasTypeof: yield this.visitRightPadded(importType.hasTypeof, p),
+                argumentAndAttributes: yield this.visitContainer(importType.argumentAndAttributes, p),
+                qualifier: importType.qualifier && (yield this.visitLeftPadded(importType.qualifier, p)),
+                typeArguments: importType.typeArguments && (yield this.visitContainer(importType.typeArguments, p)),
+                type: importType.type && (yield this.visitType(importType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(importType, updates);
         });
     }
     visitImportDeclaration(jsImport, p) {
@@ -319,21 +370,27 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             jsImport = statement;
-            return this.produceJavaScript(jsImport, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(jsImport.modifiers, item => this.visitDefined(item, p));
-                draft.importClause = jsImport.importClause && (yield this.visitDefined(jsImport.importClause, p));
-                draft.moduleSpecifier = jsImport.moduleSpecifier && (yield this.visitLeftPadded(jsImport.moduleSpecifier, p));
-                draft.attributes = jsImport.attributes && (yield this.visitDefined(jsImport.attributes, p));
-                draft.initializer = jsImport.initializer && (yield this.visitLeftPadded(jsImport.initializer, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(jsImport.prefix, p),
+                markers: yield this.visitMarkers(jsImport.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(jsImport.modifiers, item => this.visitDefined(item, p)),
+                importClause: jsImport.importClause && (yield this.visitDefined(jsImport.importClause, p)),
+                moduleSpecifier: jsImport.moduleSpecifier && (yield this.visitLeftPadded(jsImport.moduleSpecifier, p)),
+                attributes: jsImport.attributes && (yield this.visitDefined(jsImport.attributes, p)),
+                initializer: jsImport.initializer && (yield this.visitLeftPadded(jsImport.initializer, p))
+            };
+            return (0, util_1.updateIfChanged)(jsImport, updates);
         });
     }
     visitImportClause(importClause, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(importClause, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.name = importClause.name && (yield this.visitRightPadded(importClause.name, p));
-                draft.namedBindings = importClause.namedBindings && (yield this.visitDefined(importClause.namedBindings, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importClause.prefix, p),
+                markers: yield this.visitMarkers(importClause.markers, p),
+                name: importClause.name && (yield this.visitRightPadded(importClause.name, p)),
+                namedBindings: importClause.namedBindings && (yield this.visitDefined(importClause.namedBindings, p))
+            };
+            return (0, util_1.updateIfChanged)(importClause, updates);
         });
     }
     visitNamedImports(namedImports, p) {
@@ -343,10 +400,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             namedImports = expression;
-            return this.produceJavaScript(namedImports, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.elements = yield this.visitContainer(namedImports.elements, p);
-                draft.type = namedImports.type && (yield this.visitType(namedImports.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(namedImports.prefix, p),
+                markers: yield this.visitMarkers(namedImports.markers, p),
+                elements: yield this.visitContainer(namedImports.elements, p),
+                type: namedImports.type && (yield this.visitType(namedImports.type, p))
+            };
+            return (0, util_1.updateIfChanged)(namedImports, updates);
         });
     }
     visitImportSpecifier(importSpecifier, p) {
@@ -356,27 +416,36 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             importSpecifier = expression;
-            return this.produceJavaScript(importSpecifier, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.importType = yield this.visitLeftPadded(importSpecifier.importType, p);
-                draft.specifier = yield this.visitDefined(importSpecifier.specifier, p);
-                draft.type = importSpecifier.type && (yield this.visitType(importSpecifier.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importSpecifier.prefix, p),
+                markers: yield this.visitMarkers(importSpecifier.markers, p),
+                importType: yield this.visitLeftPadded(importSpecifier.importType, p),
+                specifier: yield this.visitDefined(importSpecifier.specifier, p),
+                type: importSpecifier.type && (yield this.visitType(importSpecifier.type, p))
+            };
+            return (0, util_1.updateIfChanged)(importSpecifier, updates);
         });
     }
     visitImportAttributes(importAttributes, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(importAttributes, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.elements = yield this.visitContainer(importAttributes.elements, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importAttributes.prefix, p),
+                markers: yield this.visitMarkers(importAttributes.markers, p),
+                elements: yield this.visitContainer(importAttributes.elements, p)
+            };
+            return (0, util_1.updateIfChanged)(importAttributes, updates);
         });
     }
     visitImportTypeAttributes(importTypeAttributes, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(importTypeAttributes, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.token = yield this.visitRightPadded(importTypeAttributes.token, p);
-                draft.elements = yield this.visitContainer(importTypeAttributes.elements, p);
-                draft.end = yield this.visitSpace(importTypeAttributes.end, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importTypeAttributes.prefix, p),
+                markers: yield this.visitMarkers(importTypeAttributes.markers, p),
+                token: yield this.visitRightPadded(importTypeAttributes.token, p),
+                elements: yield this.visitContainer(importTypeAttributes.elements, p),
+                end: yield this.visitSpace(importTypeAttributes.end, p)
+            };
+            return (0, util_1.updateIfChanged)(importTypeAttributes, updates);
         });
     }
     visitImportAttribute(importAttribute, p) {
@@ -386,20 +455,26 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             importAttribute = statement;
-            return this.produceJavaScript(importAttribute, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.name = yield this.visitDefined(importAttribute.name, p);
-                draft.value = yield this.visitLeftPadded(importAttribute.value, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(importAttribute.prefix, p),
+                markers: yield this.visitMarkers(importAttribute.markers, p),
+                name: yield this.visitDefined(importAttribute.name, p),
+                value: yield this.visitLeftPadded(importAttribute.value, p)
+            };
+            return (0, util_1.updateIfChanged)(importAttribute, updates);
         });
     }
     visitBinaryExtensions(jsBinary, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(jsBinary, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.left = yield this.visitDefined(jsBinary.left, p);
-                draft.operator = yield this.visitLeftPadded(jsBinary.operator, p);
-                draft.right = yield this.visitDefined(jsBinary.right, p);
-                draft.type = jsBinary.type && (yield this.visitType(jsBinary.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(jsBinary.prefix, p),
+                markers: yield this.visitMarkers(jsBinary.markers, p),
+                left: yield this.visitDefined(jsBinary.left, p),
+                operator: yield this.visitLeftPadded(jsBinary.operator, p),
+                right: yield this.visitDefined(jsBinary.right, p),
+                type: jsBinary.type && (yield this.visitType(jsBinary.type, p))
+            };
+            return (0, util_1.updateIfChanged)(jsBinary, updates);
         });
     }
     visitLiteralType(literalType, p) {
@@ -409,10 +484,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             literalType = expression;
-            return this.produceJavaScript(literalType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.literal = yield this.visitDefined(literalType.literal, p);
-                draft.type = (yield this.visitType(literalType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(literalType.prefix, p),
+                markers: yield this.visitMarkers(literalType.markers, p),
+                literal: yield this.visitDefined(literalType.literal, p),
+                type: (yield this.visitType(literalType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(literalType, updates);
         });
     }
     visitMappedType(mappedType, p) {
@@ -422,31 +500,40 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             mappedType = expression;
-            return this.produceJavaScript(mappedType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.prefixToken = mappedType.prefixToken && (yield this.visitLeftPadded(mappedType.prefixToken, p));
-                draft.hasReadonly = yield this.visitLeftPadded(mappedType.hasReadonly, p);
-                draft.keysRemapping = yield this.visitDefined(mappedType.keysRemapping, p);
-                draft.suffixToken = mappedType.suffixToken && (yield this.visitLeftPadded(mappedType.suffixToken, p));
-                draft.hasQuestionToken = yield this.visitLeftPadded(mappedType.hasQuestionToken, p);
-                draft.valueType = yield this.visitContainer(mappedType.valueType, p);
-                draft.type = mappedType.type && (yield this.visitType(mappedType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(mappedType.prefix, p),
+                markers: yield this.visitMarkers(mappedType.markers, p),
+                prefixToken: mappedType.prefixToken && (yield this.visitLeftPadded(mappedType.prefixToken, p)),
+                hasReadonly: yield this.visitLeftPadded(mappedType.hasReadonly, p),
+                keysRemapping: yield this.visitDefined(mappedType.keysRemapping, p),
+                suffixToken: mappedType.suffixToken && (yield this.visitLeftPadded(mappedType.suffixToken, p)),
+                hasQuestionToken: yield this.visitLeftPadded(mappedType.hasQuestionToken, p),
+                valueType: yield this.visitContainer(mappedType.valueType, p),
+                type: mappedType.type && (yield this.visitType(mappedType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(mappedType, updates);
         });
     }
     visitMappedTypeKeysRemapping(keysRemapping, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(keysRemapping, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.typeParameter = yield this.visitRightPadded(keysRemapping.typeParameter, p);
-                draft.nameType = keysRemapping.nameType && (yield this.visitRightPadded(keysRemapping.nameType, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(keysRemapping.prefix, p),
+                markers: yield this.visitMarkers(keysRemapping.markers, p),
+                typeParameter: yield this.visitRightPadded(keysRemapping.typeParameter, p),
+                nameType: keysRemapping.nameType && (yield this.visitRightPadded(keysRemapping.nameType, p))
+            };
+            return (0, util_1.updateIfChanged)(keysRemapping, updates);
         });
     }
     visitMappedTypeParameter(mappedTypeParameter, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(mappedTypeParameter, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.name = yield this.visitDefined(mappedTypeParameter.name, p);
-                draft.iterateType = yield this.visitLeftPadded(mappedTypeParameter.iterateType, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(mappedTypeParameter.prefix, p),
+                markers: yield this.visitMarkers(mappedTypeParameter.markers, p),
+                name: yield this.visitDefined(mappedTypeParameter.name, p),
+                iterateType: yield this.visitLeftPadded(mappedTypeParameter.iterateType, p)
+            };
+            return (0, util_1.updateIfChanged)(mappedTypeParameter, updates);
         });
     }
     visitObjectBindingPattern(objectBindingPattern, p) {
@@ -456,13 +543,16 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             objectBindingPattern = expression;
-            return this.produceJavaScript(objectBindingPattern, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.leadingAnnotations = yield (0, util_1.mapAsync)(objectBindingPattern.leadingAnnotations, item => this.visitDefined(item, p));
-                draft.modifiers = yield (0, util_1.mapAsync)(objectBindingPattern.modifiers, item => this.visitDefined(item, p));
-                draft.typeExpression = objectBindingPattern.typeExpression && (yield this.visitDefined(objectBindingPattern.typeExpression, p));
-                draft.bindings = yield this.visitContainer(objectBindingPattern.bindings, p);
-                draft.initializer = objectBindingPattern.initializer && (yield this.visitLeftPadded(objectBindingPattern.initializer, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(objectBindingPattern.prefix, p),
+                markers: yield this.visitMarkers(objectBindingPattern.markers, p),
+                leadingAnnotations: yield (0, util_1.mapAsync)(objectBindingPattern.leadingAnnotations, item => this.visitDefined(item, p)),
+                modifiers: yield (0, util_1.mapAsync)(objectBindingPattern.modifiers, item => this.visitDefined(item, p)),
+                typeExpression: objectBindingPattern.typeExpression && (yield this.visitDefined(objectBindingPattern.typeExpression, p)),
+                bindings: yield this.visitContainer(objectBindingPattern.bindings, p),
+                initializer: objectBindingPattern.initializer && (yield this.visitLeftPadded(objectBindingPattern.initializer, p))
+            };
+            return (0, util_1.updateIfChanged)(objectBindingPattern, updates);
         });
     }
     visitPropertyAssignment(propertyAssignment, p) {
@@ -472,10 +562,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             propertyAssignment = statement;
-            return this.produceJavaScript(propertyAssignment, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.name = yield this.visitRightPadded(propertyAssignment.name, p);
-                draft.initializer = propertyAssignment.initializer && (yield this.visitDefined(propertyAssignment.initializer, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(propertyAssignment.prefix, p),
+                markers: yield this.visitMarkers(propertyAssignment.markers, p),
+                name: yield this.visitRightPadded(propertyAssignment.name, p),
+                initializer: propertyAssignment.initializer && (yield this.visitDefined(propertyAssignment.initializer, p))
+            };
+            return (0, util_1.updateIfChanged)(propertyAssignment, updates);
         });
     }
     visitSatisfiesExpression(satisfiesExpression, p) {
@@ -485,11 +578,14 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             satisfiesExpression = expression;
-            return this.produceJavaScript(satisfiesExpression, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(satisfiesExpression.expression, p);
-                draft.satisfiesType = yield this.visitLeftPadded(satisfiesExpression.satisfiesType, p);
-                draft.type = satisfiesExpression.type && (yield this.visitType(satisfiesExpression.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(satisfiesExpression.prefix, p),
+                markers: yield this.visitMarkers(satisfiesExpression.markers, p),
+                expression: yield this.visitDefined(satisfiesExpression.expression, p),
+                satisfiesType: yield this.visitLeftPadded(satisfiesExpression.satisfiesType, p),
+                type: satisfiesExpression.type && (yield this.visitType(satisfiesExpression.type, p))
+            };
+            return (0, util_1.updateIfChanged)(satisfiesExpression, updates);
         });
     }
     visitScopedVariableDeclarations(scopedVariableDeclarations, p) {
@@ -499,10 +595,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             scopedVariableDeclarations = statement;
-            return this.produceJavaScript(scopedVariableDeclarations, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(scopedVariableDeclarations.modifiers, item => this.visitDefined(item, p));
-                draft.variables = yield (0, util_1.mapAsync)(scopedVariableDeclarations.variables, item => this.visitRightPadded(item, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(scopedVariableDeclarations.prefix, p),
+                markers: yield this.visitMarkers(scopedVariableDeclarations.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(scopedVariableDeclarations.modifiers, item => this.visitDefined(item, p)),
+                variables: yield (0, util_1.mapAsync)(scopedVariableDeclarations.variables, item => this.visitRightPadded(item, p))
+            };
+            return (0, util_1.updateIfChanged)(scopedVariableDeclarations, updates);
         });
     }
     visitStatementExpression(statementExpression, p) {
@@ -517,9 +616,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             statementExpression = statement;
-            return this.produceJavaScript(statementExpression, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.statement = yield this.visitDefined(statementExpression.statement, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(statementExpression.prefix, p),
+                markers: yield this.visitMarkers(statementExpression.markers, p),
+                statement: yield this.visitDefined(statementExpression.statement, p)
+            };
+            return (0, util_1.updateIfChanged)(statementExpression, updates);
         });
     }
     visitTaggedTemplateExpression(taggedTemplateExpression, p) {
@@ -534,12 +636,15 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             taggedTemplateExpression = statement;
-            return this.produceJavaScript(taggedTemplateExpression, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.tag = taggedTemplateExpression.tag && (yield this.visitRightPadded(taggedTemplateExpression.tag, p));
-                draft.typeArguments = taggedTemplateExpression.typeArguments && (yield this.visitContainer(taggedTemplateExpression.typeArguments, p));
-                draft.templateExpression = yield this.visitDefined(taggedTemplateExpression.templateExpression, p);
-                draft.type = taggedTemplateExpression.type && (yield this.visitType(taggedTemplateExpression.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(taggedTemplateExpression.prefix, p),
+                markers: yield this.visitMarkers(taggedTemplateExpression.markers, p),
+                tag: taggedTemplateExpression.tag && (yield this.visitRightPadded(taggedTemplateExpression.tag, p)),
+                typeArguments: taggedTemplateExpression.typeArguments && (yield this.visitContainer(taggedTemplateExpression.typeArguments, p)),
+                templateExpression: yield this.visitDefined(taggedTemplateExpression.templateExpression, p),
+                type: taggedTemplateExpression.type && (yield this.visitType(taggedTemplateExpression.type, p))
+            };
+            return (0, util_1.updateIfChanged)(taggedTemplateExpression, updates);
         });
     }
     visitTemplateExpression(templateExpression, p) {
@@ -554,19 +659,25 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             templateExpression = statement;
-            return this.produceJavaScript(templateExpression, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.head = yield this.visitDefined(templateExpression.head, p);
-                draft.spans = yield (0, util_1.mapAsync)(templateExpression.spans, item => this.visitRightPadded(item, p));
-                draft.type = templateExpression.type && (yield this.visitType(templateExpression.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(templateExpression.prefix, p),
+                markers: yield this.visitMarkers(templateExpression.markers, p),
+                head: yield this.visitDefined(templateExpression.head, p),
+                spans: yield (0, util_1.mapAsync)(templateExpression.spans, item => this.visitRightPadded(item, p)),
+                type: templateExpression.type && (yield this.visitType(templateExpression.type, p))
+            };
+            return (0, util_1.updateIfChanged)(templateExpression, updates);
         });
     }
     visitTemplateExpressionSpan(span, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(span, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(span.expression, p);
-                draft.tail = yield this.visitDefined(span.tail, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(span.prefix, p),
+                markers: yield this.visitMarkers(span.markers, p),
+                expression: yield this.visitDefined(span.expression, p),
+                tail: yield this.visitDefined(span.tail, p)
+            };
+            return (0, util_1.updateIfChanged)(span, updates);
         });
     }
     visitTuple(tuple, p) {
@@ -576,10 +687,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             tuple = expression;
-            return this.produceJavaScript(tuple, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.elements = yield this.visitContainer(tuple.elements, p);
-                draft.type = tuple.type && (yield this.visitType(tuple.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(tuple.prefix, p),
+                markers: yield this.visitMarkers(tuple.markers, p),
+                elements: yield this.visitContainer(tuple.elements, p),
+                type: tuple.type && (yield this.visitType(tuple.type, p))
+            };
+            return (0, util_1.updateIfChanged)(tuple, updates);
         });
     }
     visitTypeDeclaration(typeDeclaration, p) {
@@ -589,13 +703,16 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             typeDeclaration = statement;
-            return this.produceJavaScript(typeDeclaration, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(typeDeclaration.modifiers, item => this.visitDefined(item, p));
-                draft.name = yield this.visitLeftPadded(typeDeclaration.name, p);
-                draft.typeParameters = typeDeclaration.typeParameters && (yield this.visitDefined(typeDeclaration.typeParameters, p));
-                draft.initializer = yield this.visitLeftPadded(typeDeclaration.initializer, p);
-                draft.type = typeDeclaration.type && (yield this.visitType(typeDeclaration.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeDeclaration.prefix, p),
+                markers: yield this.visitMarkers(typeDeclaration.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(typeDeclaration.modifiers, item => this.visitDefined(item, p)),
+                name: yield this.visitLeftPadded(typeDeclaration.name, p),
+                typeParameters: typeDeclaration.typeParameters && (yield this.visitDefined(typeDeclaration.typeParameters, p)),
+                initializer: yield this.visitLeftPadded(typeDeclaration.initializer, p),
+                type: typeDeclaration.type && (yield this.visitType(typeDeclaration.type, p))
+            };
+            return (0, util_1.updateIfChanged)(typeDeclaration, updates);
         });
     }
     visitTypeOf(typeOf, p) {
@@ -605,10 +722,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typeOf = expression;
-            return this.produceJavaScript(typeOf, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(typeOf.expression, p);
-                draft.type = typeOf.type && (yield this.visitType(typeOf.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeOf.prefix, p),
+                markers: yield this.visitMarkers(typeOf.markers, p),
+                expression: yield this.visitDefined(typeOf.expression, p),
+                type: typeOf.type && (yield this.visitType(typeOf.type, p))
+            };
+            return (0, util_1.updateIfChanged)(typeOf, updates);
         });
     }
     visitTypeTreeExpression(typeTreeExpression, p) {
@@ -618,19 +738,25 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typeTreeExpression = expression;
-            return this.produceJavaScript(typeTreeExpression, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(typeTreeExpression.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeTreeExpression.prefix, p),
+                markers: yield this.visitMarkers(typeTreeExpression.markers, p),
+                expression: yield this.visitDefined(typeTreeExpression.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(typeTreeExpression, updates);
         });
     }
     visitAssignmentOperationExtensions(assignmentOperation, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(assignmentOperation, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.variable = yield this.visitDefined(assignmentOperation.variable, p);
-                draft.operator = yield this.visitLeftPadded(assignmentOperation.operator, p);
-                draft.assignment = yield this.visitDefined(assignmentOperation.assignment, p);
-                draft.type = assignmentOperation.type && (yield this.visitType(assignmentOperation.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(assignmentOperation.prefix, p),
+                markers: yield this.visitMarkers(assignmentOperation.markers, p),
+                variable: yield this.visitDefined(assignmentOperation.variable, p),
+                operator: yield this.visitLeftPadded(assignmentOperation.operator, p),
+                assignment: yield this.visitDefined(assignmentOperation.assignment, p),
+                type: assignmentOperation.type && (yield this.visitType(assignmentOperation.type, p))
+            };
+            return (0, util_1.updateIfChanged)(assignmentOperation, updates);
         });
     }
     visitIndexedAccessType(indexedAccessType, p) {
@@ -640,19 +766,25 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             indexedAccessType = expression;
-            return this.produceJavaScript(indexedAccessType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.objectType = yield this.visitDefined(indexedAccessType.objectType, p);
-                draft.indexType = yield this.visitDefined(indexedAccessType.indexType, p);
-                draft.type = indexedAccessType.type && (yield this.visitType(indexedAccessType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(indexedAccessType.prefix, p),
+                markers: yield this.visitMarkers(indexedAccessType.markers, p),
+                objectType: yield this.visitDefined(indexedAccessType.objectType, p),
+                indexType: yield this.visitDefined(indexedAccessType.indexType, p),
+                type: indexedAccessType.type && (yield this.visitType(indexedAccessType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(indexedAccessType, updates);
         });
     }
     visitIndexedAccessTypeIndexType(indexType, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(indexType, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.element = yield this.visitRightPadded(indexType.element, p);
-                draft.type = indexType.type && (yield this.visitType(indexType.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(indexType.prefix, p),
+                markers: yield this.visitMarkers(indexType.markers, p),
+                element: yield this.visitRightPadded(indexType.element, p),
+                type: indexType.type && (yield this.visitType(indexType.type, p))
+            };
+            return (0, util_1.updateIfChanged)(indexType, updates);
         });
     }
     visitTypeQuery(typeQuery, p) {
@@ -662,11 +794,14 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typeQuery = expression;
-            return this.produceJavaScript(typeQuery, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.typeExpression = yield this.visitDefined(typeQuery.typeExpression, p);
-                draft.typeArguments = typeQuery.typeArguments && (yield this.visitContainer(typeQuery.typeArguments, p));
-                draft.type = typeQuery.type && (yield this.visitType(typeQuery.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeQuery.prefix, p),
+                markers: yield this.visitMarkers(typeQuery.markers, p),
+                typeExpression: yield this.visitDefined(typeQuery.typeExpression, p),
+                typeArguments: typeQuery.typeArguments && (yield this.visitContainer(typeQuery.typeArguments, p)),
+                type: typeQuery.type && (yield this.visitType(typeQuery.type, p))
+            };
+            return (0, util_1.updateIfChanged)(typeQuery, updates);
         });
     }
     visitTypeInfo(typeInfo, p) {
@@ -676,9 +811,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typeInfo = expression;
-            return this.produceJavaScript(typeInfo, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.typeIdentifier = yield this.visitDefined(typeInfo.typeIdentifier, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeInfo.prefix, p),
+                markers: yield this.visitMarkers(typeInfo.markers, p),
+                typeIdentifier: yield this.visitDefined(typeInfo.typeIdentifier, p)
+            };
+            return (0, util_1.updateIfChanged)(typeInfo, updates);
         });
     }
     visitComputedPropertyName(computedPropertyName, p) {
@@ -688,9 +826,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             computedPropertyName = expression;
-            return this.produceJavaScript(computedPropertyName, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitRightPadded(computedPropertyName.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(computedPropertyName.prefix, p),
+                markers: yield this.visitMarkers(computedPropertyName.markers, p),
+                expression: yield this.visitRightPadded(computedPropertyName.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(computedPropertyName, updates);
         });
     }
     visitTypeOperator(typeOperator, p) {
@@ -700,9 +841,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typeOperator = expression;
-            return this.produceJavaScript(typeOperator, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitLeftPadded(typeOperator.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeOperator.prefix, p),
+                markers: yield this.visitMarkers(typeOperator.markers, p),
+                expression: yield this.visitLeftPadded(typeOperator.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(typeOperator, updates);
         });
     }
     visitTypePredicate(typePredicate, p) {
@@ -712,12 +856,15 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             typePredicate = expression;
-            return this.produceJavaScript(typePredicate, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.asserts = yield this.visitLeftPadded(typePredicate.asserts, p);
-                draft.parameterName = yield this.visitDefined(typePredicate.parameterName, p);
-                draft.expression = typePredicate.expression && (yield this.visitLeftPadded(typePredicate.expression, p));
-                draft.type = typePredicate.type && (yield this.visitType(typePredicate.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typePredicate.prefix, p),
+                markers: yield this.visitMarkers(typePredicate.markers, p),
+                asserts: yield this.visitLeftPadded(typePredicate.asserts, p),
+                parameterName: yield this.visitDefined(typePredicate.parameterName, p),
+                expression: typePredicate.expression && (yield this.visitLeftPadded(typePredicate.expression, p)),
+                type: typePredicate.type && (yield this.visitType(typePredicate.type, p))
+            };
+            return (0, util_1.updateIfChanged)(typePredicate, updates);
         });
     }
     visitUnion(union, p) {
@@ -727,10 +874,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             union = expression;
-            return this.produceJavaScript(union, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.types = yield (0, util_1.mapAsync)(union.types, item => this.visitRightPadded(item, p));
-                draft.type = union.type && (yield this.visitType(union.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(union.prefix, p),
+                markers: yield this.visitMarkers(union.markers, p),
+                types: yield (0, util_1.mapAsync)(union.types, item => this.visitRightPadded(item, p)),
+                type: union.type && (yield this.visitType(union.type, p))
+            };
+            return (0, util_1.updateIfChanged)(union, updates);
         });
     }
     visitIntersection(intersection, p) {
@@ -740,10 +890,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             intersection = expression;
-            return this.produceJavaScript(intersection, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.types = yield (0, util_1.mapAsync)(intersection.types, item => this.visitRightPadded(item, p));
-                draft.type = intersection.type && (yield this.visitType(intersection.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(intersection.prefix, p),
+                markers: yield this.visitMarkers(intersection.markers, p),
+                types: yield (0, util_1.mapAsync)(intersection.types, item => this.visitRightPadded(item, p)),
+                type: intersection.type && (yield this.visitType(intersection.type, p))
+            };
+            return (0, util_1.updateIfChanged)(intersection, updates);
         });
     }
     visitVoid(void_, p) {
@@ -753,9 +906,12 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return expression;
             }
             void_ = expression;
-            return this.produceJavaScript(void_, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(void_.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(void_.prefix, p),
+                markers: yield this.visitMarkers(void_.markers, p),
+                expression: yield this.visitDefined(void_.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(void_, updates);
         });
     }
     visitWithStatement(withStatement, p) {
@@ -765,10 +921,13 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             withStatement = statement;
-            return this.produceJavaScript(withStatement, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitDefined(withStatement.expression, p);
-                draft.body = yield this.visitRightPadded(withStatement.body, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(withStatement.prefix, p),
+                markers: yield this.visitMarkers(withStatement.markers, p),
+                expression: yield this.visitDefined(withStatement.expression, p),
+                body: yield this.visitRightPadded(withStatement.body, p)
+            };
+            return (0, util_1.updateIfChanged)(withStatement, updates);
         });
     }
     visitIndexSignatureDeclaration(indexSignatureDeclaration, p) {
@@ -778,12 +937,15 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             indexSignatureDeclaration = statement;
-            return this.produceJavaScript(indexSignatureDeclaration, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(indexSignatureDeclaration.modifiers, item => this.visitDefined(item, p));
-                draft.parameters = yield this.visitContainer(indexSignatureDeclaration.parameters, p);
-                draft.typeExpression = yield this.visitLeftPadded(indexSignatureDeclaration.typeExpression, p);
-                draft.type = indexSignatureDeclaration.type && (yield this.visitType(indexSignatureDeclaration.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(indexSignatureDeclaration.prefix, p),
+                markers: yield this.visitMarkers(indexSignatureDeclaration.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(indexSignatureDeclaration.modifiers, item => this.visitDefined(item, p)),
+                parameters: yield this.visitContainer(indexSignatureDeclaration.parameters, p),
+                typeExpression: yield this.visitLeftPadded(indexSignatureDeclaration.typeExpression, p),
+                type: indexSignatureDeclaration.type && (yield this.visitType(indexSignatureDeclaration.type, p))
+            };
+            return (0, util_1.updateIfChanged)(indexSignatureDeclaration, updates);
         });
     }
     visitComputedPropertyMethodDeclaration(computedPropMethod, p) {
@@ -793,31 +955,40 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             computedPropMethod = statement;
-            return this.produceJavaScript(computedPropMethod, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.leadingAnnotations = yield (0, util_1.mapAsync)(computedPropMethod.leadingAnnotations, item => this.visitDefined(item, p));
-                draft.modifiers = yield (0, util_1.mapAsync)(computedPropMethod.modifiers, item => this.visitDefined(item, p));
-                draft.typeParameters = computedPropMethod.typeParameters && (yield this.visitDefined(computedPropMethod.typeParameters, p));
-                draft.returnTypeExpression = computedPropMethod.returnTypeExpression && (yield this.visitDefined(computedPropMethod.returnTypeExpression, p));
-                draft.name = yield this.visitDefined(computedPropMethod.name, p);
-                draft.parameters = yield this.visitContainer(computedPropMethod.parameters, p);
-                draft.body = computedPropMethod.body && (yield this.visitDefined(computedPropMethod.body, p));
-                draft.methodType = computedPropMethod.methodType && (yield this.visitType(computedPropMethod.methodType, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(computedPropMethod.prefix, p),
+                markers: yield this.visitMarkers(computedPropMethod.markers, p),
+                leadingAnnotations: yield (0, util_1.mapAsync)(computedPropMethod.leadingAnnotations, item => this.visitDefined(item, p)),
+                modifiers: yield (0, util_1.mapAsync)(computedPropMethod.modifiers, item => this.visitDefined(item, p)),
+                typeParameters: computedPropMethod.typeParameters && (yield this.visitDefined(computedPropMethod.typeParameters, p)),
+                returnTypeExpression: computedPropMethod.returnTypeExpression && (yield this.visitDefined(computedPropMethod.returnTypeExpression, p)),
+                name: yield this.visitDefined(computedPropMethod.name, p),
+                parameters: yield this.visitContainer(computedPropMethod.parameters, p),
+                body: computedPropMethod.body && (yield this.visitDefined(computedPropMethod.body, p)),
+                methodType: computedPropMethod.methodType && (yield this.visitType(computedPropMethod.methodType, p))
+            };
+            return (0, util_1.updateIfChanged)(computedPropMethod, updates);
         });
     }
     visitForOfLoop(forOfLoop, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(forOfLoop, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.loop = yield this.visitDefined(forOfLoop.loop, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(forOfLoop.prefix, p),
+                markers: yield this.visitMarkers(forOfLoop.markers, p),
+                loop: yield this.visitDefined(forOfLoop.loop, p)
+            };
+            return (0, util_1.updateIfChanged)(forOfLoop, updates);
         });
     }
     visitForInLoop(forInLoop, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(forInLoop, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.control = yield this.visitDefined(forInLoop.control, p);
-                draft.body = yield this.visitRightPadded(forInLoop.body, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(forInLoop.prefix, p),
+                markers: yield this.visitMarkers(forInLoop.markers, p),
+                control: yield this.visitDefined(forInLoop.control, p),
+                body: yield this.visitRightPadded(forInLoop.body, p)
+            };
+            return (0, util_1.updateIfChanged)(forInLoop, updates);
         });
     }
     visitNamespaceDeclaration(namespaceDeclaration, p) {
@@ -827,28 +998,37 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             namespaceDeclaration = statement;
-            return this.produceJavaScript(namespaceDeclaration, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(namespaceDeclaration.modifiers, item => this.visitDefined(item, p));
-                draft.keywordType = yield this.visitLeftPadded(namespaceDeclaration.keywordType, p);
-                draft.name = yield this.visitRightPadded(namespaceDeclaration.name, p);
-                draft.body = namespaceDeclaration.body && (yield this.visitDefined(namespaceDeclaration.body, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(namespaceDeclaration.prefix, p),
+                markers: yield this.visitMarkers(namespaceDeclaration.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(namespaceDeclaration.modifiers, item => this.visitDefined(item, p)),
+                keywordType: yield this.visitLeftPadded(namespaceDeclaration.keywordType, p),
+                name: yield this.visitRightPadded(namespaceDeclaration.name, p),
+                body: namespaceDeclaration.body && (yield this.visitDefined(namespaceDeclaration.body, p))
+            };
+            return (0, util_1.updateIfChanged)(namespaceDeclaration, updates);
         });
     }
     visitTypeLiteral(typeLiteral, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(typeLiteral, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.members = yield this.visitDefined(typeLiteral.members, p);
-                draft.type = typeLiteral.type && (yield this.visitType(typeLiteral.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(typeLiteral.prefix, p),
+                markers: yield this.visitMarkers(typeLiteral.markers, p),
+                members: yield this.visitDefined(typeLiteral.members, p),
+                type: typeLiteral.type && (yield this.visitType(typeLiteral.type, p))
+            };
+            return (0, util_1.updateIfChanged)(typeLiteral, updates);
         });
     }
     visitArrayBindingPattern(arrayBindingPattern, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(arrayBindingPattern, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.elements = yield this.visitContainer(arrayBindingPattern.elements, p);
-                draft.type = arrayBindingPattern.type && (yield this.visitType(arrayBindingPattern.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(arrayBindingPattern.prefix, p),
+                markers: yield this.visitMarkers(arrayBindingPattern.markers, p),
+                elements: yield this.visitContainer(arrayBindingPattern.elements, p),
+                type: arrayBindingPattern.type && (yield this.visitType(arrayBindingPattern.type, p))
+            };
+            return (0, util_1.updateIfChanged)(arrayBindingPattern, updates);
         });
     }
     visitBindingElement(bindingElement, p) {
@@ -858,12 +1038,15 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             bindingElement = statement;
-            return this.produceJavaScript(bindingElement, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.propertyName = bindingElement.propertyName && (yield this.visitRightPadded(bindingElement.propertyName, p));
-                draft.name = yield this.visitDefined(bindingElement.name, p);
-                draft.initializer = bindingElement.initializer && (yield this.visitLeftPadded(bindingElement.initializer, p));
-                draft.variableType = bindingElement.variableType && (yield this.visitType(bindingElement.variableType, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(bindingElement.prefix, p),
+                markers: yield this.visitMarkers(bindingElement.markers, p),
+                propertyName: bindingElement.propertyName && (yield this.visitRightPadded(bindingElement.propertyName, p)),
+                name: yield this.visitDefined(bindingElement.name, p),
+                initializer: bindingElement.initializer && (yield this.visitLeftPadded(bindingElement.initializer, p)),
+                variableType: bindingElement.variableType && (yield this.visitType(bindingElement.variableType, p))
+            };
+            return (0, util_1.updateIfChanged)(bindingElement, updates);
         });
     }
     visitExportDeclaration(exportDeclaration, p) {
@@ -873,13 +1056,16 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             exportDeclaration = statement;
-            return this.produceJavaScript(exportDeclaration, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.modifiers = yield (0, util_1.mapAsync)(exportDeclaration.modifiers, item => this.visitDefined(item, p));
-                draft.typeOnly = yield this.visitLeftPadded(exportDeclaration.typeOnly, p);
-                draft.exportClause = exportDeclaration.exportClause && (yield this.visitDefined(exportDeclaration.exportClause, p));
-                draft.moduleSpecifier = exportDeclaration.moduleSpecifier && (yield this.visitLeftPadded(exportDeclaration.moduleSpecifier, p));
-                draft.attributes = exportDeclaration.attributes && (yield this.visitDefined(exportDeclaration.attributes, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(exportDeclaration.prefix, p),
+                markers: yield this.visitMarkers(exportDeclaration.markers, p),
+                modifiers: yield (0, util_1.mapAsync)(exportDeclaration.modifiers, item => this.visitDefined(item, p)),
+                typeOnly: yield this.visitLeftPadded(exportDeclaration.typeOnly, p),
+                exportClause: exportDeclaration.exportClause && (yield this.visitDefined(exportDeclaration.exportClause, p)),
+                moduleSpecifier: exportDeclaration.moduleSpecifier && (yield this.visitLeftPadded(exportDeclaration.moduleSpecifier, p)),
+                attributes: exportDeclaration.attributes && (yield this.visitDefined(exportDeclaration.attributes, p))
+            };
+            return (0, util_1.updateIfChanged)(exportDeclaration, updates);
         });
     }
     visitExportAssignment(exportAssignment, p) {
@@ -889,26 +1075,35 @@ class JavaScriptVisitor extends java_1.JavaVisitor {
                 return statement;
             }
             exportAssignment = statement;
-            return this.produceJavaScript(exportAssignment, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.expression = yield this.visitLeftPadded(exportAssignment.expression, p);
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(exportAssignment.prefix, p),
+                markers: yield this.visitMarkers(exportAssignment.markers, p),
+                expression: yield this.visitLeftPadded(exportAssignment.expression, p)
+            };
+            return (0, util_1.updateIfChanged)(exportAssignment, updates);
         });
     }
     visitNamedExports(namedExports, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(namedExports, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.elements = yield this.visitContainer(namedExports.elements, p);
-                draft.type = namedExports.type && (yield this.visitType(namedExports.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(namedExports.prefix, p),
+                markers: yield this.visitMarkers(namedExports.markers, p),
+                elements: yield this.visitContainer(namedExports.elements, p),
+                type: namedExports.type && (yield this.visitType(namedExports.type, p))
+            };
+            return (0, util_1.updateIfChanged)(namedExports, updates);
         });
     }
     visitExportSpecifier(exportSpecifier, p) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.produceJavaScript(exportSpecifier, p, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.typeOnly = yield this.visitLeftPadded(exportSpecifier.typeOnly, p);
-                draft.specifier = yield this.visitDefined(exportSpecifier.specifier, p);
-                draft.type = exportSpecifier.type && (yield this.visitType(exportSpecifier.type, p));
-            }));
+            const updates = {
+                prefix: yield this.visitSpace(exportSpecifier.prefix, p),
+                markers: yield this.visitMarkers(exportSpecifier.markers, p),
+                typeOnly: yield this.visitLeftPadded(exportSpecifier.typeOnly, p),
+                specifier: yield this.visitDefined(exportSpecifier.specifier, p),
+                type: exportSpecifier.type && (yield this.visitType(exportSpecifier.type, p))
+            };
+            return (0, util_1.updateIfChanged)(exportSpecifier, updates);
         });
     }
     accept(j, p) {