@openrewrite/rewrite 8.63.0 → 8.63.2

package/dist/javascript/rpc.js

@@ -27,12 +27,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const visitor_1 = require("./visitor");
 const rpc_1 = require("../rpc");
 const tree_1 = require("./tree");
-const immer_1 = require("immer");
 const rpc_2 = require("../java/rpc");
+const util_1 = require("../util");
 class JavaScriptSender extends visitor_1.JavaScriptVisitor {
     constructor() {
         super();
-        this.javaSender = new JavaScriptSenderDelegate(this);
+        this.delegate = new JavaScriptDelegateSender(this);
     }
     visit(tree, p, parent) {
         const _super = Object.create(null, {
@@ -42,7 +42,7 @@ class JavaScriptSender extends visitor_1.JavaScriptVisitor {
             if ((0, tree_1.isJavaScript)(tree)) {
                 return _super.visit.call(this, tree, p, parent);
             }
-            return this.javaSender.visit(tree, p, parent);
+            return this.delegate.visit(tree, p, parent);
         });
     }
     preVisit(j, q) {
@@ -580,31 +580,31 @@ class JavaScriptSender extends visitor_1.JavaScriptVisitor {
     }
     visitRightPadded(right, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaSender.visitRightPadded(right, q);
+            return this.delegate.visitRightPadded(right, q);
         });
     }
     visitLeftPadded(left, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaSender.visitLeftPadded(left, q);
+            return this.delegate.visitLeftPadded(left, q);
         });
     }
     visitContainer(container, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaSender.visitContainer(container, q);
+            return this.delegate.visitContainer(container, q);
         });
     }
     visitSpace(space, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaSender.visitSpace(space, q);
+            return this.delegate.visitSpace(space, q);
         });
     }
     visitType(javaType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaSender.visitType(javaType, q);
+            return this.delegate.visitType(javaType, q);
         });
     }
 }
-class JavaScriptSenderDelegate extends rpc_2.JavaSender {
+class JavaScriptDelegateSender extends rpc_2.JavaSender {
     constructor(javascriptSender) {
         super();
         this.javascriptSender = javascriptSender;
@@ -626,7 +626,7 @@ class JavaScriptSenderDelegate extends rpc_2.JavaSender {
 class JavaScriptReceiver extends visitor_1.JavaScriptVisitor {
     constructor() {
         super();
-        this.javaReceiverDelegate = new JavaScriptReceiverDelegate(this);
+        this.delegate = new JavaScriptDelegateReceiver(this);
     }
     visit(tree, p, parent) {
         const _super = Object.create(null, {
@@ -636,636 +636,716 @@ class JavaScriptReceiver extends visitor_1.JavaScriptVisitor {
             if ((0, tree_1.isJavaScript)(tree)) {
                 return _super.visit.call(this, tree, p, parent);
             }
-            return this.javaReceiverDelegate.visit(tree, p, parent);
+            return this.delegate.visit(tree, p, parent);
         });
     }
     preVisit(j, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(j);
-            draft.id = yield q.receive(j.id);
-            draft.prefix = yield q.receive(j.prefix, space => this.visitSpace(space, q));
-            draft.markers = yield q.receive(j.markers);
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                id: yield q.receive(j.id),
+                prefix: yield q.receive(j.prefix, space => this.visitSpace(space, q)),
+                markers: yield q.receive(j.markers)
+            };
+            return (0, util_1.updateIfChanged)(j, updates);
         });
     }
     visitJsCompilationUnit(cu, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(cu);
-            draft.sourcePath = yield q.receive(cu.sourcePath);
-            draft.charsetName = yield q.receive(cu.charsetName);
-            draft.charsetBomMarked = yield q.receive(cu.charsetBomMarked);
-            draft.checksum = yield q.receive(cu.checksum);
-            draft.fileAttributes = yield q.receive(cu.fileAttributes);
-            draft.statements = yield q.receiveListDefined(cu.statements, stmt => this.visitRightPadded(stmt, q));
-            draft.eof = yield q.receive(cu.eof, space => this.visitSpace(space, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                sourcePath: yield q.receive(cu.sourcePath),
+                charsetName: yield q.receive(cu.charsetName),
+                charsetBomMarked: yield q.receive(cu.charsetBomMarked),
+                checksum: yield q.receive(cu.checksum),
+                fileAttributes: yield q.receive(cu.fileAttributes),
+                statements: yield q.receiveListDefined(cu.statements, stmt => this.visitRightPadded(stmt, q)),
+                eof: yield q.receive(cu.eof, space => this.visitSpace(space, q))
+            };
+            return (0, util_1.updateIfChanged)(cu, updates);
         });
     }
     visitAlias(alias, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(alias);
-            draft.propertyName = yield q.receive(draft.propertyName, el => this.visitRightPadded(el, q));
-            draft.alias = yield q.receive(draft.alias, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                propertyName: yield q.receive(alias.propertyName, el => this.visitRightPadded(el, q)),
+                alias: yield q.receive(alias.alias, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(alias, updates);
         });
     }
     visitArrowFunction(arrowFunction, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(arrowFunction);
-            draft.leadingAnnotations = yield q.receiveListDefined(draft.leadingAnnotations, el => this.visitDefined(el, q));
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.typeParameters = yield q.receive(draft.typeParameters, el => this.visitDefined(el, q));
-            draft.lambda = yield q.receive(draft.lambda, el => this.visitDefined(el, q));
-            draft.returnTypeExpression = yield q.receive(draft.returnTypeExpression, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                leadingAnnotations: yield q.receiveListDefined(arrowFunction.leadingAnnotations, el => this.visitDefined(el, q)),
+                modifiers: yield q.receiveListDefined(arrowFunction.modifiers, el => this.visitDefined(el, q)),
+                typeParameters: yield q.receive(arrowFunction.typeParameters, el => this.visitDefined(el, q)),
+                lambda: yield q.receive(arrowFunction.lambda, el => this.visitDefined(el, q)),
+                returnTypeExpression: yield q.receive(arrowFunction.returnTypeExpression, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(arrowFunction, updates);
         });
     }
-    visitAwait(await_, q) {
+    visitAwait(anAwait, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(await_);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(anAwait.expression, el => this.visitDefined(el, q)),
+                type: yield q.receive(anAwait.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(anAwait, updates);
         });
     }
     visitConditionalType(conditionalType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(conditionalType);
-            draft.checkType = yield q.receive(draft.checkType, el => this.visitDefined(el, q));
-            draft.condition = yield q.receive(draft.condition, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                checkType: yield q.receive(conditionalType.checkType, el => this.visitDefined(el, q)),
+                condition: yield q.receive(conditionalType.condition, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(conditionalType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(conditionalType, updates);
         });
     }
     visitDelete(delete_, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(delete_);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(delete_.expression, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(delete_, updates);
         });
     }
     visitExpressionStatement(expressionStatement, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(expressionStatement);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(expressionStatement.expression, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(expressionStatement, updates);
         });
     }
     visitExpressionWithTypeArguments(expressionWithTypeArguments, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(expressionWithTypeArguments);
-            draft.clazz = yield q.receive(draft.clazz, el => this.visitDefined(el, q));
-            draft.typeArguments = yield q.receive(draft.typeArguments, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                clazz: yield q.receive(expressionWithTypeArguments.clazz, el => this.visitDefined(el, q)),
+                typeArguments: yield q.receive(expressionWithTypeArguments.typeArguments, el => this.visitContainer(el, q)),
+                type: yield q.receive(expressionWithTypeArguments.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(expressionWithTypeArguments, updates);
         });
     }
     visitFunctionCall(functionCall, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(functionCall);
-            draft.function = yield q.receive(functionCall.function, select => this.visitRightPadded(select, q));
-            draft.typeParameters = yield q.receive(functionCall.typeParameters, typeParams => this.visitContainer(typeParams, q));
-            draft.arguments = yield q.receive(functionCall.arguments, args => this.visitContainer(args, q));
-            draft.methodType = yield q.receive(functionCall.methodType, type => this.visitType(type, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                function: yield q.receive(functionCall.function, select => this.visitRightPadded(select, q)),
+                typeParameters: yield q.receive(functionCall.typeParameters, typeParams => this.visitContainer(typeParams, q)),
+                arguments: yield q.receive(functionCall.arguments, args => this.visitContainer(args, q)),
+                methodType: yield q.receive(functionCall.methodType, type => this.visitType(type, q))
+            };
+            return (0, util_1.updateIfChanged)(functionCall, updates);
         });
     }
     visitFunctionType(functionType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(functionType);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.constructorType = yield q.receive(draft.constructorType, el => this.visitLeftPadded(el, q));
-            draft.typeParameters = yield q.receive(draft.typeParameters, el => this.visitDefined(el, q));
-            draft.parameters = yield q.receive(draft.parameters, el => this.visitContainer(el, q));
-            draft.returnType = yield q.receive(draft.returnType, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(functionType.modifiers, el => this.visitDefined(el, q)),
+                constructorType: yield q.receive(functionType.constructorType, el => this.visitLeftPadded(el, q)),
+                typeParameters: yield q.receive(functionType.typeParameters, el => this.visitDefined(el, q)),
+                parameters: yield q.receive(functionType.parameters, el => this.visitContainer(el, q)),
+                returnType: yield q.receive(functionType.returnType, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(functionType, updates);
         });
     }
     visitInferType(inferType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(inferType);
-            draft.typeParameter = yield q.receive(draft.typeParameter, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeParameter: yield q.receive(inferType.typeParameter, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(inferType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(inferType, updates);
         });
     }
     visitImportType(importType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(importType);
-            draft.hasTypeof = yield q.receive(draft.hasTypeof, el => this.visitRightPadded(el, q));
-            draft.argumentAndAttributes = yield q.receive(draft.argumentAndAttributes, el => this.visitContainer(el, q));
-            draft.qualifier = yield q.receive(draft.qualifier, el => this.visitLeftPadded(el, q));
-            draft.typeArguments = yield q.receive(draft.typeArguments, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                hasTypeof: yield q.receive(importType.hasTypeof, el => this.visitRightPadded(el, q)),
+                argumentAndAttributes: yield q.receive(importType.argumentAndAttributes, el => this.visitContainer(el, q)),
+                qualifier: yield q.receive(importType.qualifier, el => this.visitLeftPadded(el, q)),
+                typeArguments: yield q.receive(importType.typeArguments, el => this.visitContainer(el, q)),
+                type: yield q.receive(importType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(importType, updates);
         });
     }
     visitImportDeclaration(jsImport, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(jsImport);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.importClause = yield q.receive(draft.importClause, el => this.visitDefined(el, q));
-            draft.moduleSpecifier = yield q.receive(draft.moduleSpecifier, el => this.visitLeftPadded(el, q));
-            draft.attributes = yield q.receive(draft.attributes, el => this.visitDefined(el, q));
-            draft.initializer = yield q.receive(draft.initializer, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(jsImport.modifiers, el => this.visitDefined(el, q)),
+                importClause: yield q.receive(jsImport.importClause, el => this.visitDefined(el, q)),
+                moduleSpecifier: yield q.receive(jsImport.moduleSpecifier, el => this.visitLeftPadded(el, q)),
+                attributes: yield q.receive(jsImport.attributes, el => this.visitDefined(el, q)),
+                initializer: yield q.receive(jsImport.initializer, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(jsImport, updates);
         });
     }
     visitImportClause(jsImportClause, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(jsImportClause);
-            draft.typeOnly = yield q.receive(draft.typeOnly);
-            draft.name = yield q.receive(draft.name, el => this.visitRightPadded(el, q));
-            draft.namedBindings = yield q.receive(draft.namedBindings, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeOnly: yield q.receive(jsImportClause.typeOnly),
+                name: yield q.receive(jsImportClause.name, el => this.visitRightPadded(el, q)),
+                namedBindings: yield q.receive(jsImportClause.namedBindings, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(jsImportClause, updates);
         });
     }
     visitNamedImports(namedImports, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(namedImports);
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                elements: yield q.receive(namedImports.elements, el => this.visitContainer(el, q)),
+                type: yield q.receive(namedImports.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(namedImports, updates);
         });
     }
     visitImportSpecifier(jsImportSpecifier, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(jsImportSpecifier);
-            draft.importType = yield q.receive(draft.importType, el => this.visitLeftPadded(el, q));
-            draft.specifier = yield q.receive(draft.specifier, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                importType: yield q.receive(jsImportSpecifier.importType, el => this.visitLeftPadded(el, q)),
+                specifier: yield q.receive(jsImportSpecifier.specifier, el => this.visitDefined(el, q)),
+                type: yield q.receive(jsImportSpecifier.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(jsImportSpecifier, updates);
         });
     }
     visitImportAttributes(importAttributes, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(importAttributes);
-            draft.token = yield q.receive(draft.token);
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                token: yield q.receive(importAttributes.token),
+                elements: yield q.receive(importAttributes.elements, el => this.visitContainer(el, q))
+            };
+            return (0, util_1.updateIfChanged)(importAttributes, updates);
         });
     }
     visitImportTypeAttributes(importTypeAttributes, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(importTypeAttributes);
-            draft.token = yield q.receive(draft.token, el => this.visitRightPadded(el, q));
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            draft.end = yield q.receive(draft.end, el => this.visitSpace(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                token: yield q.receive(importTypeAttributes.token, el => this.visitRightPadded(el, q)),
+                elements: yield q.receive(importTypeAttributes.elements, el => this.visitContainer(el, q)),
+                end: yield q.receive(importTypeAttributes.end, el => this.visitSpace(el, q))
+            };
+            return (0, util_1.updateIfChanged)(importTypeAttributes, updates);
         });
     }
     visitImportAttribute(importAttribute, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(importAttribute);
-            draft.name = yield q.receive(draft.name, el => this.visitDefined(el, q));
-            draft.value = yield q.receive(draft.value, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                name: yield q.receive(importAttribute.name, el => this.visitDefined(el, q)),
+                value: yield q.receive(importAttribute.value, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(importAttribute, updates);
         });
     }
     visitBinaryExtensions(binary, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(binary);
-            draft.left = yield q.receive(draft.left, el => this.visitDefined(el, q));
-            draft.operator = yield q.receive(draft.operator, el => this.visitLeftPadded(el, q));
-            draft.right = yield q.receive(draft.right, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                left: yield q.receive(binary.left, el => this.visitDefined(el, q)),
+                operator: yield q.receive(binary.operator, el => this.visitLeftPadded(el, q)),
+                right: yield q.receive(binary.right, el => this.visitDefined(el, q)),
+                type: yield q.receive(binary.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(binary, updates);
         });
     }
     visitLiteralType(literalType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(literalType);
-            draft.literal = yield q.receive(draft.literal, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                literal: yield q.receive(literalType.literal, el => this.visitDefined(el, q)),
+                type: yield q.receive(literalType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(literalType, updates);
         });
     }
     visitMappedType(mappedType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(mappedType);
-            draft.prefixToken = yield q.receive(draft.prefixToken, el => this.visitLeftPadded(el, q));
-            draft.hasReadonly = yield q.receive(draft.hasReadonly, el => this.visitLeftPadded(el, q));
-            draft.keysRemapping = yield q.receive(draft.keysRemapping, el => this.visitDefined(el, q));
-            draft.suffixToken = yield q.receive(draft.suffixToken, el => this.visitLeftPadded(el, q));
-            draft.hasQuestionToken = yield q.receive(draft.hasQuestionToken, el => this.visitLeftPadded(el, q));
-            draft.valueType = yield q.receive(draft.valueType, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                prefixToken: yield q.receive(mappedType.prefixToken, el => this.visitLeftPadded(el, q)),
+                hasReadonly: yield q.receive(mappedType.hasReadonly, el => this.visitLeftPadded(el, q)),
+                keysRemapping: yield q.receive(mappedType.keysRemapping, el => this.visitDefined(el, q)),
+                suffixToken: yield q.receive(mappedType.suffixToken, el => this.visitLeftPadded(el, q)),
+                hasQuestionToken: yield q.receive(mappedType.hasQuestionToken, el => this.visitLeftPadded(el, q)),
+                valueType: yield q.receive(mappedType.valueType, el => this.visitContainer(el, q)),
+                type: yield q.receive(mappedType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(mappedType, updates);
         });
     }
     visitMappedTypeKeysRemapping(keysRemapping, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(keysRemapping);
-            draft.typeParameter = yield q.receive(draft.typeParameter, el => this.visitRightPadded(el, q));
-            draft.nameType = yield q.receive(draft.nameType, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeParameter: yield q.receive(keysRemapping.typeParameter, el => this.visitRightPadded(el, q)),
+                nameType: yield q.receive(keysRemapping.nameType, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(keysRemapping, updates);
         });
     }
     visitMappedTypeParameter(mappedTypeParameter, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(mappedTypeParameter);
-            draft.name = yield q.receive(draft.name, el => this.visitDefined(el, q));
-            draft.iterateType = yield q.receive(draft.iterateType, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                name: yield q.receive(mappedTypeParameter.name, el => this.visitDefined(el, q)),
+                iterateType: yield q.receive(mappedTypeParameter.iterateType, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(mappedTypeParameter, updates);
         });
     }
     visitObjectBindingPattern(objectBindingPattern, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(objectBindingPattern);
-            draft.leadingAnnotations = yield q.receiveListDefined(draft.leadingAnnotations, el => this.visitDefined(el, q));
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.typeExpression = yield q.receive(draft.typeExpression, el => this.visitDefined(el, q));
-            draft.bindings = yield q.receive(draft.bindings, el => this.visitContainer(el, q));
-            draft.initializer = yield q.receive(draft.initializer, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                leadingAnnotations: yield q.receiveListDefined(objectBindingPattern.leadingAnnotations, el => this.visitDefined(el, q)),
+                modifiers: yield q.receiveListDefined(objectBindingPattern.modifiers, el => this.visitDefined(el, q)),
+                typeExpression: yield q.receive(objectBindingPattern.typeExpression, el => this.visitDefined(el, q)),
+                bindings: yield q.receive(objectBindingPattern.bindings, el => this.visitContainer(el, q)),
+                initializer: yield q.receive(objectBindingPattern.initializer, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(objectBindingPattern, updates);
         });
     }
     visitPropertyAssignment(propertyAssignment, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(propertyAssignment);
-            draft.name = yield q.receive(draft.name, el => this.visitRightPadded(el, q));
-            draft.assigmentToken = yield q.receive(draft.assigmentToken);
-            draft.initializer = yield q.receive(draft.initializer, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                name: yield q.receive(propertyAssignment.name, el => this.visitRightPadded(el, q)),
+                assigmentToken: yield q.receive(propertyAssignment.assigmentToken),
+                initializer: yield q.receive(propertyAssignment.initializer, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(propertyAssignment, updates);
         });
     }
     visitSatisfiesExpression(satisfiesExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(satisfiesExpression);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            draft.satisfiesType = yield q.receive(draft.satisfiesType, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(satisfiesExpression.expression, el => this.visitDefined(el, q)),
+                satisfiesType: yield q.receive(satisfiesExpression.satisfiesType, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(satisfiesExpression.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(satisfiesExpression, updates);
         });
     }
     visitScopedVariableDeclarations(scopedVariableDeclarations, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(scopedVariableDeclarations);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.variables = yield q.receiveListDefined(draft.variables, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(scopedVariableDeclarations.modifiers, el => this.visitDefined(el, q)),
+                variables: yield q.receiveListDefined(scopedVariableDeclarations.variables, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(scopedVariableDeclarations, updates);
         });
     }
     visitStatementExpression(statementExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(statementExpression);
-            draft.statement = yield q.receive(draft.statement, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                statement: yield q.receive(statementExpression.statement, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(statementExpression, updates);
         });
     }
     visitTaggedTemplateExpression(taggedTemplateExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(taggedTemplateExpression);
-            draft.tag = yield q.receive(draft.tag, el => this.visitRightPadded(el, q));
-            draft.typeArguments = yield q.receive(draft.typeArguments, el => this.visitContainer(el, q));
-            draft.templateExpression = yield q.receive(draft.templateExpression, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                tag: yield q.receive(taggedTemplateExpression.tag, el => this.visitRightPadded(el, q)),
+                typeArguments: yield q.receive(taggedTemplateExpression.typeArguments, el => this.visitContainer(el, q)),
+                templateExpression: yield q.receive(taggedTemplateExpression.templateExpression, el => this.visitDefined(el, q)),
+                type: yield q.receive(taggedTemplateExpression.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(taggedTemplateExpression, updates);
         });
     }
     visitTemplateExpression(templateExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(templateExpression);
-            draft.head = yield q.receive(draft.head, el => this.visitDefined(el, q));
-            draft.spans = yield q.receiveListDefined(draft.spans, el => this.visitRightPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                head: yield q.receive(templateExpression.head, el => this.visitDefined(el, q)),
+                spans: yield q.receiveListDefined(templateExpression.spans, el => this.visitRightPadded(el, q)),
+                type: yield q.receive(templateExpression.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(templateExpression, updates);
         });
     }
     visitTemplateExpressionSpan(span, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(span);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            draft.tail = yield q.receive(draft.tail, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(span.expression, el => this.visitDefined(el, q)),
+                tail: yield q.receive(span.tail, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(span, updates);
         });
     }
     visitTuple(tuple, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(tuple);
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                elements: yield q.receive(tuple.elements, el => this.visitContainer(el, q)),
+                type: yield q.receive(tuple.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(tuple, updates);
         });
     }
     visitTypeDeclaration(typeDeclaration, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeDeclaration);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.name = yield q.receive(draft.name, el => this.visitLeftPadded(el, q));
-            draft.typeParameters = yield q.receive(draft.typeParameters, el => this.visitDefined(el, q));
-            draft.initializer = yield q.receive(draft.initializer, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(typeDeclaration.modifiers, el => this.visitDefined(el, q)),
+                name: yield q.receive(typeDeclaration.name, el => this.visitLeftPadded(el, q)),
+                typeParameters: yield q.receive(typeDeclaration.typeParameters, el => this.visitDefined(el, q)),
+                initializer: yield q.receive(typeDeclaration.initializer, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(typeDeclaration.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeDeclaration, updates);
         });
     }
     visitTypeOf(typeOf, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeOf);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(typeOf.expression, el => this.visitDefined(el, q)),
+                type: yield q.receive(typeOf.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeOf, updates);
         });
     }
     visitTypeTreeExpression(typeTreeExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeTreeExpression);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(typeTreeExpression.expression, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeTreeExpression, updates);
         });
     }
     visitAs(as_, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(as_);
-            draft.left = yield q.receive(draft.left, el => this.visitRightPadded(el, q));
-            draft.right = yield q.receive(draft.right, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                left: yield q.receive(as_.left, el => this.visitRightPadded(el, q)),
+                right: yield q.receive(as_.right, el => this.visitDefined(el, q)),
+                type: yield q.receive(as_.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(as_, updates);
         });
     }
     visitAssignmentOperationExtensions(assignmentOperation, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(assignmentOperation);
-            draft.variable = yield q.receive(draft.variable, el => this.visitDefined(el, q));
-            draft.operator = yield q.receive(draft.operator, el => this.visitLeftPadded(el, q));
-            draft.assignment = yield q.receive(draft.assignment, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                variable: yield q.receive(assignmentOperation.variable, el => this.visitDefined(el, q)),
+                operator: yield q.receive(assignmentOperation.operator, el => this.visitLeftPadded(el, q)),
+                assignment: yield q.receive(assignmentOperation.assignment, el => this.visitDefined(el, q)),
+                type: yield q.receive(assignmentOperation.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(assignmentOperation, updates);
         });
     }
     visitIndexedAccessType(indexedAccessType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(indexedAccessType);
-            draft.objectType = yield q.receive(draft.objectType, el => this.visitDefined(el, q));
-            draft.indexType = yield q.receive(draft.indexType, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                objectType: yield q.receive(indexedAccessType.objectType, el => this.visitDefined(el, q)),
+                indexType: yield q.receive(indexedAccessType.indexType, el => this.visitDefined(el, q)),
+                type: yield q.receive(indexedAccessType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(indexedAccessType, updates);
         });
     }
     visitIndexedAccessTypeIndexType(indexType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(indexType);
-            draft.element = yield q.receive(draft.element, el => this.visitRightPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                element: yield q.receive(indexType.element, el => this.visitRightPadded(el, q)),
+                type: yield q.receive(indexType.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(indexType, updates);
         });
     }
     visitTypeQuery(typeQuery, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeQuery);
-            draft.typeExpression = yield q.receive(draft.typeExpression, el => this.visitDefined(el, q));
-            draft.typeArguments = yield q.receive(draft.typeArguments, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeExpression: yield q.receive(typeQuery.typeExpression, el => this.visitDefined(el, q)),
+                typeArguments: yield q.receive(typeQuery.typeArguments, el => this.visitContainer(el, q)),
+                type: yield q.receive(typeQuery.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeQuery, updates);
         });
     }
     visitTypeInfo(typeInfo, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeInfo);
-            draft.typeIdentifier = yield q.receive(draft.typeIdentifier, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeIdentifier: yield q.receive(typeInfo.typeIdentifier, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeInfo, updates);
         });
     }
     visitComputedPropertyName(computedPropertyName, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(computedPropertyName);
-            draft.expression = yield q.receive(draft.expression, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(computedPropertyName.expression, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(computedPropertyName, updates);
         });
     }
     visitTypeOperator(typeOperator, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeOperator);
-            draft.operator = yield q.receive(draft.operator);
-            draft.expression = yield q.receive(draft.expression, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                operator: yield q.receive(typeOperator.operator),
+                expression: yield q.receive(typeOperator.expression, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeOperator, updates);
         });
     }
     visitTypePredicate(typePredicate, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typePredicate);
-            draft.asserts = yield q.receive(draft.asserts, el => this.visitLeftPadded(el, q));
-            draft.parameterName = yield q.receive(draft.parameterName, el => this.visitDefined(el, q));
-            draft.expression = yield q.receive(draft.expression, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                asserts: yield q.receive(typePredicate.asserts, el => this.visitLeftPadded(el, q)),
+                parameterName: yield q.receive(typePredicate.parameterName, el => this.visitDefined(el, q)),
+                expression: yield q.receive(typePredicate.expression, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(typePredicate.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typePredicate, updates);
         });
     }
     visitUnion(union, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(union);
-            draft.types = yield q.receiveListDefined(draft.types, el => this.visitRightPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                types: yield q.receiveListDefined(union.types, el => this.visitRightPadded(el, q)),
+                type: yield q.receive(union.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(union, updates);
         });
     }
     visitIntersection(intersection, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(intersection);
-            draft.types = yield q.receiveListDefined(draft.types, el => this.visitRightPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                types: yield q.receiveListDefined(intersection.types, el => this.visitRightPadded(el, q)),
+                type: yield q.receive(intersection.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(intersection, updates);
         });
     }
     visitVoid(void_, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(void_);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(void_.expression, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(void_, updates);
         });
     }
     visitWithStatement(withStatement, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(withStatement);
-            draft.expression = yield q.receive(draft.expression, el => this.visitDefined(el, q));
-            draft.body = yield q.receive(draft.body, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(withStatement.expression, el => this.visitDefined(el, q)),
+                body: yield q.receive(withStatement.body, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(withStatement, updates);
         });
     }
     visitJsxTag(tag, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(tag);
-            draft.openName = yield q.receive(draft.openName, el => this.visitLeftPadded(el, q));
-            draft.typeArguments = yield q.receive(draft.typeArguments, el => this.visitContainer(el, q));
-            draft.afterName = yield q.receive(draft.afterName, space => this.visitSpace(space, q));
-            draft.attributes = yield q.receiveListDefined(draft.attributes, attr => this.visitRightPadded(attr, q));
-            draft.selfClosing = yield q.receive(draft.selfClosing, space => this.visitSpace(space, q));
-            draft.children = yield q.receiveListDefined(draft.children, child => this.visit(child, q));
-            draft.closingName = yield q.receive(draft.closingName, el => this.visitLeftPadded(el, q));
-            draft.afterClosingName = yield q.receive(draft.afterClosingName, el => this.visitSpace(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            if ('selfClosing' in tag) {
+                // Self-closing tag
+                const updates = {
+                    openName: yield q.receive(tag.openName, el => this.visitLeftPadded(el, q)),
+                    typeArguments: yield q.receive(tag.typeArguments, el => this.visitContainer(el, q)),
+                    afterName: yield q.receive(tag.afterName, space => this.visitSpace(space, q)),
+                    attributes: yield q.receiveListDefined(tag.attributes, attr => this.visitRightPadded(attr, q)),
+                    selfClosing: yield q.receive(tag.selfClosing, space => this.visitSpace(space, q))
+                };
+                return (0, util_1.updateIfChanged)(tag, updates);
+            }
+            else {
+                // Tag with children
+                const updates = {
+                    openName: yield q.receive(tag.openName, el => this.visitLeftPadded(el, q)),
+                    typeArguments: yield q.receive(tag.typeArguments, el => this.visitContainer(el, q)),
+                    afterName: yield q.receive(tag.afterName, space => this.visitSpace(space, q)),
+                    attributes: yield q.receiveListDefined(tag.attributes, attr => this.visitRightPadded(attr, q)),
+                    children: yield q.receiveListDefined(tag.children, child => this.visit(child, q)),
+                    closingName: yield q.receive(tag.closingName, el => this.visitLeftPadded(el, q)),
+                    afterClosingName: yield q.receive(tag.afterClosingName, el => this.visitSpace(el, q))
+                };
+                return (0, util_1.updateIfChanged)(tag, updates);
+            }
         });
     }
     visitJsxAttribute(attribute, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(attribute);
-            draft.key = yield q.receive(draft.key, el => this.visitDefined(el, q));
-            draft.value = yield q.receive(draft.value, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                key: yield q.receive(attribute.key, el => this.visitDefined(el, q)),
+                value: yield q.receive(attribute.value, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(attribute, updates);
         });
     }
     visitJsxSpreadAttribute(spreadAttribute, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(spreadAttribute);
-            draft.dots = yield q.receive(draft.dots, space => this.visitSpace(space, q));
-            draft.expression = yield q.receive(draft.expression, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                dots: yield q.receive(spreadAttribute.dots, space => this.visitSpace(space, q)),
+                expression: yield q.receive(spreadAttribute.expression, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(spreadAttribute, updates);
         });
     }
     visitJsxEmbeddedExpression(embeddedExpression, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(embeddedExpression);
-            draft.expression = yield q.receive(draft.expression, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                expression: yield q.receive(embeddedExpression.expression, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(embeddedExpression, updates);
         });
     }
     visitJsxNamespacedName(namespacedName, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(namespacedName);
-            draft.namespace = yield q.receive(draft.namespace, el => this.visitDefined(el, q));
-            draft.name = yield q.receive(draft.name, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                namespace: yield q.receive(namespacedName.namespace, el => this.visitDefined(el, q)),
+                name: yield q.receive(namespacedName.name, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(namespacedName, updates);
         });
     }
     visitIndexSignatureDeclaration(indexSignatureDeclaration, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(indexSignatureDeclaration);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.parameters = yield q.receive(draft.parameters, el => this.visitContainer(el, q));
-            draft.typeExpression = yield q.receive(draft.typeExpression, el => this.visitLeftPadded(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(indexSignatureDeclaration.modifiers, el => this.visitDefined(el, q)),
+                parameters: yield q.receive(indexSignatureDeclaration.parameters, el => this.visitContainer(el, q)),
+                typeExpression: yield q.receive(indexSignatureDeclaration.typeExpression, el => this.visitLeftPadded(el, q)),
+                type: yield q.receive(indexSignatureDeclaration.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(indexSignatureDeclaration, updates);
         });
     }
     visitComputedPropertyMethodDeclaration(computedPropMethod, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(computedPropMethod);
-            draft.leadingAnnotations = yield q.receiveListDefined(draft.leadingAnnotations, el => this.visitDefined(el, q));
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.typeParameters = yield q.receive(draft.typeParameters, el => this.visitDefined(el, q));
-            draft.returnTypeExpression = yield q.receive(draft.returnTypeExpression, el => this.visitDefined(el, q));
-            draft.name = yield q.receive(draft.name, el => this.visitDefined(el, q));
-            draft.parameters = yield q.receive(draft.parameters, el => this.visitContainer(el, q));
-            draft.body = yield q.receive(draft.body, el => this.visitDefined(el, q));
-            draft.methodType = yield q.receive(draft.methodType, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                leadingAnnotations: yield q.receiveListDefined(computedPropMethod.leadingAnnotations, el => this.visitDefined(el, q)),
+                modifiers: yield q.receiveListDefined(computedPropMethod.modifiers, el => this.visitDefined(el, q)),
+                typeParameters: yield q.receive(computedPropMethod.typeParameters, el => this.visitDefined(el, q)),
+                returnTypeExpression: yield q.receive(computedPropMethod.returnTypeExpression, el => this.visitDefined(el, q)),
+                name: yield q.receive(computedPropMethod.name, el => this.visitDefined(el, q)),
+                parameters: yield q.receive(computedPropMethod.parameters, el => this.visitContainer(el, q)),
+                body: yield q.receive(computedPropMethod.body, el => this.visitDefined(el, q)),
+                methodType: yield q.receive(computedPropMethod.methodType, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(computedPropMethod, updates);
         });
     }
     visitForOfLoop(forOfLoop, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(forOfLoop);
-            draft.await = yield q.receive(draft.await, space => this.visitSpace(space, q));
-            draft.loop = yield q.receive(draft.loop, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                await: yield q.receive(forOfLoop.await, space => this.visitSpace(space, q)),
+                loop: yield q.receive(forOfLoop.loop, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(forOfLoop, updates);
         });
     }
     visitForInLoop(forInLoop, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(forInLoop);
-            draft.control = yield q.receive(draft.control, el => this.visitDefined(el, q));
-            draft.body = yield q.receive(draft.body, el => this.visitRightPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                control: yield q.receive(forInLoop.control, el => this.visitDefined(el, q)),
+                body: yield q.receive(forInLoop.body, el => this.visitRightPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(forInLoop, updates);
         });
     }
     visitNamespaceDeclaration(namespaceDeclaration, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(namespaceDeclaration);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.keywordType = yield q.receive(draft.keywordType, el => this.visitLeftPadded(el, q));
-            draft.name = yield q.receive(draft.name, el => this.visitRightPadded(el, q));
-            draft.body = yield q.receive(draft.body, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(namespaceDeclaration.modifiers, el => this.visitDefined(el, q)),
+                keywordType: yield q.receive(namespaceDeclaration.keywordType, el => this.visitLeftPadded(el, q)),
+                name: yield q.receive(namespaceDeclaration.name, el => this.visitRightPadded(el, q)),
+                body: yield q.receive(namespaceDeclaration.body, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(namespaceDeclaration, updates);
         });
     }
     visitTypeLiteral(typeLiteral, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(typeLiteral);
-            draft.members = yield q.receive(draft.members, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                members: yield q.receive(typeLiteral.members, el => this.visitDefined(el, q)),
+                type: yield q.receive(typeLiteral.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(typeLiteral, updates);
         });
     }
     visitArrayBindingPattern(arrayBindingPattern, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(arrayBindingPattern);
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                elements: yield q.receive(arrayBindingPattern.elements, el => this.visitContainer(el, q)),
+                type: yield q.receive(arrayBindingPattern.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(arrayBindingPattern, updates);
         });
     }
     visitBindingElement(bindingElement, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(bindingElement);
-            draft.propertyName = yield q.receive(draft.propertyName, el => this.visitRightPadded(el, q));
-            draft.name = yield q.receive(draft.name, el => this.visitDefined(el, q));
-            draft.initializer = yield q.receive(draft.initializer, el => this.visitLeftPadded(el, q));
-            draft.variableType = yield q.receive(draft.variableType, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                propertyName: yield q.receive(bindingElement.propertyName, el => this.visitRightPadded(el, q)),
+                name: yield q.receive(bindingElement.name, el => this.visitDefined(el, q)),
+                initializer: yield q.receive(bindingElement.initializer, el => this.visitLeftPadded(el, q)),
+                variableType: yield q.receive(bindingElement.variableType, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(bindingElement, updates);
         });
     }
     visitExportDeclaration(exportDeclaration, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(exportDeclaration);
-            draft.modifiers = yield q.receiveListDefined(draft.modifiers, el => this.visitDefined(el, q));
-            draft.typeOnly = yield q.receive(draft.typeOnly, el => this.visitLeftPadded(el, q));
-            draft.exportClause = yield q.receive(draft.exportClause, el => this.visitDefined(el, q));
-            draft.moduleSpecifier = yield q.receive(draft.moduleSpecifier, el => this.visitLeftPadded(el, q));
-            draft.attributes = yield q.receive(draft.attributes, el => this.visitDefined(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                modifiers: yield q.receiveListDefined(exportDeclaration.modifiers, el => this.visitDefined(el, q)),
+                typeOnly: yield q.receive(exportDeclaration.typeOnly, el => this.visitLeftPadded(el, q)),
+                exportClause: yield q.receive(exportDeclaration.exportClause, el => this.visitDefined(el, q)),
+                moduleSpecifier: yield q.receive(exportDeclaration.moduleSpecifier, el => this.visitLeftPadded(el, q)),
+                attributes: yield q.receive(exportDeclaration.attributes, el => this.visitDefined(el, q))
+            };
+            return (0, util_1.updateIfChanged)(exportDeclaration, updates);
         });
     }
     visitExportAssignment(exportAssignment, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(exportAssignment);
-            draft.exportEquals = yield q.receive(draft.exportEquals);
-            draft.expression = yield q.receive(draft.expression, el => this.visitLeftPadded(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                exportEquals: yield q.receive(exportAssignment.exportEquals),
+                expression: yield q.receive(exportAssignment.expression, el => this.visitLeftPadded(el, q))
+            };
+            return (0, util_1.updateIfChanged)(exportAssignment, updates);
         });
     }
     visitNamedExports(namedExports, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(namedExports);
-            draft.elements = yield q.receive(draft.elements, el => this.visitContainer(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                elements: yield q.receive(namedExports.elements, el => this.visitContainer(el, q)),
+                type: yield q.receive(namedExports.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(namedExports, updates);
         });
     }
     visitExportSpecifier(exportSpecifier, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            const draft = (0, immer_1.createDraft)(exportSpecifier);
-            draft.typeOnly = yield q.receive(draft.typeOnly, el => this.visitLeftPadded(el, q));
-            draft.specifier = yield q.receive(draft.specifier, el => this.visitDefined(el, q));
-            draft.type = yield q.receive(draft.type, el => this.visitType(el, q));
-            return (0, immer_1.finishDraft)(draft);
+            const updates = {
+                typeOnly: yield q.receive(exportSpecifier.typeOnly, el => this.visitLeftPadded(el, q)),
+                specifier: yield q.receive(exportSpecifier.specifier, el => this.visitDefined(el, q)),
+                type: yield q.receive(exportSpecifier.type, el => this.visitType(el, q))
+            };
+            return (0, util_1.updateIfChanged)(exportSpecifier, updates);
         });
     }
     visitRightPadded(right, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaReceiverDelegate.visitRightPadded(right, q);
+            return this.delegate.visitRightPadded(right, q);
         });
     }
     visitLeftPadded(left, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaReceiverDelegate.visitLeftPadded(left, q);
+            return this.delegate.visitLeftPadded(left, q);
         });
     }
     visitContainer(container, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaReceiverDelegate.visitContainer(container, q);
+            return this.delegate.visitContainer(container, q);
         });
     }
     visitSpace(space, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaReceiverDelegate.visitSpace(space, q);
+            return this.delegate.visitSpace(space, q);
         });
     }
     visitType(javaType, q) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.javaReceiverDelegate.visitType(javaType, q);
+            return this.delegate.visitType(javaType, q);
         });
     }
 }
-class JavaScriptReceiverDelegate extends rpc_2.JavaReceiver {
+class JavaScriptDelegateReceiver extends rpc_2.JavaReceiver {
     constructor(javascriptReceiver) {
         super();
         this.javascriptReceiver = javascriptReceiver;