@openrewrite/rewrite 8.96.4 → 8.96.5

package/dist/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../src/tree.ts"],"names":[],"mappings":"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"}

package/dist/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}

package/dist/visitor.js

@@ -22,6 +22,7 @@ const markers_1 = require("./markers");
 const tree_1 = require("./tree");
 const mutative_1 = require("mutative");
 const util_1 = require("./util");
+const heavyweight_1 = require("./heavyweight");
 async function produceAsync(before, recipe) {
     const b = await before;
     // Mutative's create(base, recipe) supports async recipes and rawReturn(undefined)
@@ -140,6 +141,7 @@ class TreeVisitor {
     }
 }
 exports.TreeVisitor = TreeVisitor;
+(0, heavyweight_1.registerHeavyweight)(TreeVisitor);
 function noopVisitor() {
     return new class extends TreeVisitor {
         async visit(tree) {

package/dist/visitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../src/visitor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@openrewrite/rewrite",
-  "version" : "8.96.4",
+  "version" : "8.96.5",
   "license" : "Moderne Source Available License",
   "description" : "OpenRewrite JavaScript.",
   "repository" : {

package/src/execution.ts

@@ -14,11 +14,15 @@
  * limitations under the License.
  */
 import {RpcCodec, RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "./rpc";
+import {registerHeavyweight} from "./heavyweight";
 
 export class ExecutionContext {
     /** Mirrors `org.openrewrite.ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT`. */
     static readonly REQUIRE_PRINT_EQUALS_INPUT = "org.openrewrite.requirePrintEqualsInput";
 
+    /** Mirrors `org.openrewrite.ExecutionContext.SCANNING_MUTATION_VALIDATION`, which the test harness sets. */
+    static readonly SCANNING_MUTATION_VALIDATION = "org.openrewrite.test.scanningMutationValidation";
+
     readonly kind: string = "org.openrewrite.InMemoryExecutionContext"
 
     constructor(public readonly messages: { [key: string | symbol]: any } = {}) {
@@ -45,6 +49,8 @@ export class ExecutionContext {
     }
 }
 
+registerHeavyweight(ExecutionContext);
+
 const executionContextCodec: RpcCodec<ExecutionContext> = {
     rpcNew(): ExecutionContext {
         return new ExecutionContext();

package/src/heavyweight.ts

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {MarkersKind} from "./markers";
+
+const heavyweightClasses: Function[] = [];
+const heavyweightKinds = new Set<string>();
+
+/**
+ * Registers a class, or the kind of a plain object such as a marker, as a type too expensive to keep in memory for a
+ * whole run, as in a ScanningRecipe's accumulator.
+ */
+export function registerHeavyweight(type: string | (abstract new (...args: any[]) => unknown)): void {
+    if (typeof type === "string") {
+        heavyweightKinds.add(type);
+    } else if (!heavyweightClasses.includes(type)) {
+        heavyweightClasses.push(type);
+    }
+}
+
+/** The registered kind or class that `value` is of, or the kind of a tree, which is always heavyweight. */
+export function heavyweightType(value: object): string | Function | undefined {
+    const kind = (value as { kind?: unknown }).kind;
+    // a tree has an id and markers, and so do the Markers that hold its markers
+    if (typeof kind === "string" && (heavyweightKinds.has(kind) ||
+        "id" in value && "markers" in value && kind !== MarkersKind.Markers)) {
+        return kind;
+    }
+    return heavyweightClasses.find(type => value instanceof type);
+}

package/src/index.ts

@@ -33,6 +33,7 @@ export * from "./util";
 export * from "./recipe";
 export * from "./run";
 export * from "./marketplace";
+export {registerHeavyweight} from "./heavyweight";
 
 // Install all recipes in this package
 export async function activate(marketplace: RecipeMarketplace): Promise<void> {

package/src/java/visitor.ts

@@ -221,6 +221,12 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
         if (!expression?.kind || expression.kind !== J.Kind.Binary) {
             return expression;
         }
+        const given = this.cursor;
+        if (expression !== binary && given.value === binary) {
+            // the operands are visited under the binary that holds them, where a template reads their slots
+            this.cursor = new Cursor(expression, given.parent);
+            given.messages.forEach((value, key) => this.cursor.messages.set(key, value));
+        }
         binary = expression as J.Binary;
 
         const updates = {
@@ -231,6 +237,11 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
             right: await this.visitDefined(binary.right, p) as Expression,
             type: await this.visitType(binary.type, p)
         };
+        if (this.cursor !== given) {
+            // what follows reads the cursor of the binary it was given, as for every other tree
+            this.cursor.messages.forEach((value, key) => given.messages.set(key, value));
+            this.cursor = given;
+        }
         return updateIfChanged(binary, updates);
     }
 
@@ -1241,9 +1252,12 @@ export class JavaVisitor<P> extends TreeVisitor<J, P> {
 
         const updates: any = {
             prefix: await this.visitSpace(aYield.prefix, p),
-            markers: await this.visitMarkers(aYield.markers, p),
-            value: await this.visitDefined(aYield.value, p) as Expression
+            markers: await this.visitMarkers(aYield.markers, p)
         };
+        // a bare `yield` has no value
+        if (aYield.value) {
+            updates.value = await this.visitDefined(aYield.value, p) as Expression;
+        }
         return updateIfChanged(aYield, updates);
     }
 

package/src/javascript/add-import.ts

@@ -12,6 +12,7 @@ import {bindingNames, compilationUnitOf, cursorOf, declarationsOf, deconflict, i
 import {create as produce, Draft} from "mutative";
 import {autoFormat} from "./format";
 import {getPrettierStyle} from "./format/prettier-format";
+import ts from "typescript";
 
 export type QuoteChar = "'" | '"';
 
@@ -562,7 +563,8 @@ function claimedName(v: unknown): string | undefined {
 /**
  * The parser lifts surrogate pairs out of `valueSource` into `unicodeEscapes` and, when it does,
  * sets `value` to the quoted source (`parser.ts` `mapLiteral`), so neither field alone is the
- * module name. Reuniting them and stripping the quotes yields it for either shape of literal.
+ * module name. Reuniting them and reading the quoted text as the language does yields it for
+ * either shape of literal.
  */
 export function moduleNameOf(module: string | J.Literal): string {
     if (typeof module === 'string') {
@@ -579,6 +581,13 @@ export function moduleNameOf(module: string | J.Literal): string {
         cut = escape.valueSourceIndex;
     }
     restored += source.slice(cut);
+    // an escape such as `\u00dc` names the character it spells
+    const scanner = ts.createScanner(ts.ScriptTarget.Latest, false, ts.LanguageVariant.Standard, restored);
+    const token = scanner.scan();
+    if ((token === ts.SyntaxKind.StringLiteral || token === ts.SyntaxKind.NoSubstitutionTemplateLiteral) &&
+        scanner.getTokenEnd() === restored.length) {
+        return scanner.getTokenValue();
+    }
     const quote = restored.charAt(0);
     return (quote === "'" || quote === '"' || quote === '`') && restored.endsWith(quote) && restored.length > 1
         ? restored.slice(1, -1)
@@ -1583,7 +1592,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             value: this.module,
             valueSource,
             unicodeEscapes: this.moduleUnicodeEscapes,
-            type: undefined
+            type: Type.Primitive.String
         };
     }
 

package/src/javascript/amd.ts

@@ -25,7 +25,8 @@ import {
     rightPadded,
     space,
     Statement,
-    TrailingComma
+    TrailingComma,
+    Type
 } from "../java";
 import {JS} from "./tree";
 import {moduleNameOf} from "./add-import";
@@ -428,7 +429,8 @@ function dependencyLiteral(module: string, quote: string): J.Literal {
         prefix: emptySpace,
         markers: emptyMarkers,
         value: module,
-        valueSource: `${quote}${module}${quote}`
+        valueSource: `${quote}${module}${quote}`,
+        type: Type.Primitive.String
     };
 }
 

package/src/javascript/cleanup/add-parse-int-radix.ts

@@ -18,7 +18,7 @@ import {Recipe} from "../../recipe";
 import {TreeVisitor} from "../../visitor";
 import {ExecutionContext} from "../../execution";
 import {JavaScriptVisitor} from "../visitor";
-import {J, singleSpace} from "../../java";
+import {J, singleSpace, Type} from "../../java";
 import {emptyMarkers} from "../../markers";
 import {randomId} from "../../uuid";
 
@@ -73,7 +73,7 @@ export class AddParseIntRadix extends Recipe {
                     value: 10,
                     valueSource: '10',
                     unicodeEscapes: undefined,
-                    type: undefined
+                    type: Type.Primitive.Double
                 };
 
                 return {

package/src/javascript/format/format.ts

@@ -26,6 +26,7 @@ import {TabsAndIndentsVisitor} from "./tabs-and-indents-visitor";
 import {NormalizeWhitespaceVisitor} from "./normalize-whitespace-visitor";
 import {MinimumViableSpacingVisitor} from "./minimum-viable-spacing-visitor";
 import {applyPrettierFormatting, getPrettierStyle} from "./prettier-format";
+import {AsyncLocalStorage} from "node:async_hooks";
 
 export {TabsAndIndentsVisitor} from "./tabs-and-indents-visitor";
 export {NormalizeWhitespaceVisitor} from "./normalize-whitespace-visitor";
@@ -56,6 +57,22 @@ export const autoIndent = async <J2 extends J, P>(j: J2, p: P, parent?: Cursor):
     return await new TabsAndIndentsVisitor(style).visit(j, p, parent) as J2;
 }
 
+/**
+ * Hears about each request to auto-format a tree made while it listens, so that a test harness can check that a
+ * recipe formats only what it changed.
+ */
+export interface FormattingListener {
+    /** AutoformatVisitor calls this before it formats `tree`, stopping after `stopAfter` when it is given. */
+    onFormat(tree: Tree, stopAfter: Tree | undefined, cursor: Cursor | undefined): void;
+}
+
+const formattingListener = new AsyncLocalStorage<FormattingListener>();
+
+/** Runs `run`, telling `listener` about the formatting it requests. */
+export function listenToFormatting<T>(listener: FormattingListener, run: () => Promise<T>): Promise<T> {
+    return formattingListener.run(listener, run);
+}
+
 /**
  * Formats JavaScript/TypeScript code using a comprehensive set of formatting rules.
  *
@@ -77,6 +94,7 @@ export class AutoformatVisitor<P> extends JavaScriptVisitor<P> {
     }
 
     async visit<R extends J>(tree: Tree, p: P, cursor?: Cursor): Promise<R | undefined> {
+        formattingListener.getStore()?.onFormat(tree, this.stopAfter, cursor);
         const prettierStyle = getPrettierStyle(tree, cursor, this.styles);
         if (prettierStyle) {
             const formatted = await applyPrettierFormatting(tree as R, prettierStyle, p, cursor, this.stopAfter);

package/src/javascript/format/tabs-and-indents-visitor.ts

@@ -408,6 +408,10 @@ export class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
             return literal;
         }
         return produce(literal, draft => {
+            // JSX text is its own value, as the parser makes it
+            if (draft.value === draft.valueSource) {
+                draft.value = normalizedValueSource;
+            }
             draft.valueSource = normalizedValueSource;
         });
     }

package/src/javascript/format/whitespace-reconciler.ts

@@ -416,6 +416,10 @@ export class WhitespaceReconciler {
         original: J.Identifier | J.Literal,
         formatted: J.Identifier | J.Literal
     ): J.Identifier | J.Literal {
+        // A literal's type follows from how it is written, so an identifier's is not the literal's
+        if (isLiteral(formatted)) {
+            return formatted;
+        }
         const result: Record<string, unknown> = { ...formatted };
 
         // Preserve type attribution - both Identifier and Literal have `type`

package/src/javascript/node-resolution-result.ts

@@ -19,6 +19,7 @@ import {asRef} from "../reference";
 import {RpcCodecs, RpcReceiveQueue, RpcSendQueue} from "../rpc";
 import {castDraft} from "mutative";
 import {updateIfChanged} from "../util";
+import {registerHeavyweight} from "../heavyweight";
 import * as semver from "semver";
 import * as fsp from "fs/promises";
 import * as path from "path";
@@ -259,6 +260,8 @@ export interface NodeResolutionResult extends Marker {
     readonly npmrcConfigs?: Npmrc[];
 }
 
+registerHeavyweight(NodeResolutionResultKind);
+
 /**
  * Creates a NodeResolutionResult marker from a package.json file.
  * Should be called during parsing to attach to JS.CompilationUnit.

package/src/javascript/parser-utils.ts

@@ -17,7 +17,8 @@ import * as ts from "typescript";
 import {Expression, J, Statement} from "../java";
 import {JS} from "./tree";
 
-const is_statements = new Set<string>([
+// Built on first use, since ./tree imports the visitor, which imports this module
+const statementKinds = (): string[] => [
     J.Kind.Assert,
     J.Kind.Assignment,
     J.Kind.AssignmentOperation,
@@ -78,9 +79,9 @@ const is_statements = new Set<string>([
     JS.Kind.WithStatement,
     JS.Kind.ExpressionStatement,
     JS.Kind.StatementExpression
-])
+];
 
-const is_expressions = new Set<string>([
+const expressionKinds = (): string[] => [
     J.Kind.AnnotatedType,
     J.Kind.Annotation,
     J.Kind.ArrayAccess,
@@ -157,14 +158,17 @@ const is_expressions = new Set<string>([
     JS.Kind.Void,
     JS.Kind.ExpressionStatement,
     JS.Kind.StatementExpression
-])
+];
+
+let is_statements: Set<string> | undefined;
+let is_expressions: Set<string> | undefined;
 
 export function isStatement(statement: J):  statement is Statement {
-    return is_statements.has(statement.kind);
+    return (is_statements ??= new Set(statementKinds())).has(statement.kind);
 }
 
 export function isExpression(expression: J):  expression is Expression {
-    return is_expressions.has(expression.kind);
+    return (is_expressions ??= new Set(expressionKinds())).has(expression.kind);
 }
 
 export function getNextSibling(node: ts.Node): ts.Node | undefined {

package/src/javascript/templating/engine.ts

@@ -756,14 +756,18 @@ class MarkerAttachmentVisitor extends JavaScriptVisitor<undefined> {
 }
 
 // FIXME: This is a heuristic to determine if the parent expects a statement child
-function expectsStatement(parentTree: J): boolean {
+function expectsStatement(parentTree: J, childId: string): boolean {
+    if (parentTree.kind === J.Kind.Case) {
+        // the labels of a case are expressions
+        return !(parentTree as J.Case).caseLabels.elements.some(label => label.element.id === childId);
+    }
     return parentTree.kind === J.Kind.Block ||
-        parentTree.kind === J.Kind.Case ||
         parentTree.kind === J.Kind.DoWhileLoop ||
         parentTree.kind === J.Kind.ForEachLoop ||
         parentTree.kind === J.Kind.ForLoop ||
         parentTree.kind === J.Kind.If ||
         parentTree.kind === J.Kind.IfElse ||
+        parentTree.kind === J.Kind.Label ||
         parentTree.kind === J.Kind.WhileLoop ||
         parentTree.kind === JS.Kind.CompilationUnit ||
         parentTree.kind === JS.Kind.ForInLoop;
@@ -782,7 +786,7 @@ export function replacedByObjectLiteral(tree: J, cursor: Cursor): boolean {
         return true;
     }
     const parentTree = cursor.parentTree()?.value;
-    return parentTree !== undefined && !expectsStatement(parentTree);
+    return parentTree !== undefined && !expectsStatement(parentTree, tree.id);
 }
 
 /**
@@ -915,7 +919,7 @@ export class TemplateApplier {
 
         // Only apply wrapping logic if we have parent context
         if (parentTree) {
-            const parentExpectsStatement = expectsStatement(parentTree);
+            const parentExpectsStatement = expectsStatement(parentTree, originalTree.id);
             const originalIsStatement = isStatement(originalTree);
 
             const resultIsStatement = isStatement(resultToUse);
@@ -935,8 +939,9 @@ export class TemplateApplier {
                         expression: { ...expression, prefix: emptySpace }
                     } as JS.ExpressionStatement;
                 }
-            } else if (!parentExpectsStatement) {
-                // Expression context: wrap in StatementExpression if result is statement-only
+            } else if (!parentExpectsStatement && isExpression(originalTree)) {
+                // Expression context: wrap in StatementExpression if result is statement-only. A slot that held
+                // a statement-only node, such as an arrow function's block body, takes one unwrapped.
                 if (resultIsStatement && !resultIsExpression) {
                     const stmt = resultToUse as Statement;
                     resultToUse = {

package/src/javascript/templating/pattern.ts

@@ -756,6 +756,16 @@ class Matcher {
                 opensWithBrace(this.pattern.templateParts) && this.ast.kind !== J.Kind.Block);
         }
 
+        // A visit reaches what parentheses hold right after them, so seeing through them here would match it twice
+        if ((this.ast.kind === J.Kind.Parentheses || this.ast.kind === J.Kind.ControlParentheses) &&
+            this.patternAst.kind !== this.ast.kind) {
+            if (this.debugOptions.enabled) {
+                this.setExplanation('kind-mismatch', 'An expression without parentheses',
+                    `Parentheses (${this.ast.kind.split('.').pop()})`,
+                    'The expression the parentheses hold is matched on its own');
+            }
+            return false;
+        }
         return this.matchNode(this.patternAst, this.ast);
     }
 

package/src/javascript/templating/placeholder-replacement.ts

@@ -41,6 +41,18 @@ export class SubstitutedValue implements Marker {
 /** Chooses a substituted value's prefix, and says whether it is the source's own. */
 type MergePrefix = (sourcePrefix: J.Space, templatePrefix: J.Space) => [J.Space, boolean];
 
+/** Whether `value` is a property, method or spread of an object literal. */
+function isObjectMember(value: unknown): value is J {
+    switch (isTree(value) && value.kind) {
+        case JS.Kind.PropertyAssignment:
+        case JS.Kind.Spread:
+        case J.Kind.MethodDeclaration:
+        case JS.Kind.ComputedPropertyMethodDeclaration:
+            return true;
+    }
+    return false;
+}
+
 /**
  * Visitor that replaces placeholder nodes with actual parameter values.
  */
@@ -331,6 +343,10 @@ export class PlaceholderReplacementVisitor extends JavaScriptVisitor<any> {
                         else if (Array.isArray(param.value)) {
                             arrayToExpand = param.value as J[];
                         }
+                        // One member of an object literal fills the slot of a member, not the name of a property
+                        else if (element.kind === JS.Kind.PropertyAssignment && isObjectMember(param.value)) {
+                            arrayToExpand = [param.value];
+                        }
                         // Check if it's a CaptureValue
                         else if (param.value instanceof CaptureValue) {
                             const resolved = param.value.resolve(this.values);

package/src/javascript/visitor.ts

@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 import {mapAsync, updateIfChanged} from "../util";
+import {Markers} from "../markers";
 import {SourceFile} from "../tree";
 import {ValidRecipeReturnType} from "../visitor";
 import {Expression, J, JavaVisitor, NameTree, Statement, Type, TypedTree} from "../java";
 import {create, Draft} from "mutative";
 import {isJavaScript, JS, JSX} from "./tree";
+import {isStatement} from "./parser-utils";
 
 export class JavaScriptVisitor<P> extends JavaVisitor<P> {
 
@@ -276,6 +278,16 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
             markers: await this.visitMarkers(expressionStatement.markers, p),
             expression: await this.visitDefined<Expression>(expressionStatement.expression, p)
         };
+        // Outside a `for` head the parser makes a statement the statement itself, so a visit that makes one does too
+        const visited: J | undefined = updates.expression;
+        if (visited && visited !== expressionStatement.expression && isStatement(visited) &&
+            this.cursor.parentTree()?.value.kind !== J.Kind.ForLoopControl) {
+            return {
+                ...visited,
+                prefix: concatenated(updates.prefix, visited.prefix),
+                markers: withOuterMarkers(updates.markers, visited.markers)
+            };
+        }
         return updateIfChanged(expressionStatement, updates);
     }
 
@@ -1293,3 +1305,21 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
         return super.accept(j, p);
     }
 }
+
+/** The prefix that prints as `outer` and then `inner`. */
+function concatenated(outer: J.Space, inner: J.Space): J.Space {
+    if (outer.comments.length === 0) {
+        return {...inner, whitespace: outer.whitespace + inner.whitespace};
+    }
+    const last = outer.comments[outer.comments.length - 1];
+    return {
+        ...outer,
+        comments: [...outer.comments.slice(0, -1), {...last, suffix: last.suffix + inner.whitespace}, ...inner.comments]
+    };
+}
+
+/** `inner`, led by each marker of `outer` it does not already hold, so they print as they did around it. */
+function withOuterMarkers(outer: Markers, inner: Markers): Markers {
+    const added = outer.markers.filter(marker => !inner.markers.some(own => own.id === marker.id));
+    return added.length === 0 ? inner : {...inner, markers: [...added, ...inner.markers]};
+}

package/src/recipe.ts

@@ -175,6 +175,11 @@ export interface OptionDescriptor {
     readonly type?: string
 }
 
+/**
+ * @typeParam P The type of the accumulator where scanning data is held until the editing phase. It stays in memory
+ * until the cycle ends, so it should hold values such as coordinates, paths and ids, not trees or other objects of a
+ * type given to registerHeavyweight.
+ */
 export abstract class ScanningRecipe<P> extends Recipe {
     private readonly recipeAccMessage = Symbol("org.openrewrite.recipe.acc");
 

package/src/run.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import {ExecutionContext} from "./execution";
-import {rootCursor, SourceFile} from "./tree";
+import {Cursor, rootCursor, SourceFile} from "./tree";
 import {createTwoFilesPatch} from "diff";
 import {TreePrinters} from "./print";
 import {Recipe, ScanningRecipe} from "./recipe";
@@ -83,6 +83,25 @@ async function recursiveOnComplete(recipe: Recipe, ctx: ExecutionContext, recipe
     }
 }
 
+/**
+ * Under this key a test harness puts an {@link AccumulatorListener} on the execution context, which the scheduler
+ * calls with the accumulator of each scanning recipe after the scanning phase and again after the editing phase.
+ */
+export const ACCUMULATOR_LISTENER = "org.openrewrite.test.accumulatorListener";
+
+export type AccumulatorListener =
+    (accumulators: Map<ScanningRecipe<any>, any>, phase: "after scanning" | "after editing") => void;
+
+async function accumulators(recipe: Recipe, recipeLists: RecipeLists, cursor: Cursor,
+                            ctx: ExecutionContext): Promise<Map<ScanningRecipe<any>, any>> {
+    return (await recurseRecipeList(recipe, new Map<ScanningRecipe<any>, any>(), recipeLists, async (r, found) => {
+        if (r instanceof ScanningRecipe && !found.has(r)) {
+            found.set(r, r.accumulator(cursor, ctx));
+        }
+        return found;
+    }))!;
+}
+
 export async function scheduleRun(recipe: Recipe, before: SourceFile[], ctx: ExecutionContext): Promise<RecipeRun> {
     const changeset: Result[] = [];
     for await (const result of scheduleRunStreaming(recipe, before, ctx)) {
@@ -135,13 +154,21 @@ export async function* scheduleRunStreaming(
             // of the recipe list, leaving nested scanners unrun.
             await recurseRecipeList(recipe, b, recipeLists, async (recipe, b2) => {
                 if (recipe instanceof ScanningRecipe) {
-                    await (await recipe.scanner(recipe.accumulator(cursor, ctx))).visit(b2, ctx, cursor);
+                    const scanned = await (await recipe.scanner(recipe.accumulator(cursor, ctx))).visit(b2, ctx, cursor);
+                    if (scanned !== b2 && ctx.getBoolean(ExecutionContext.SCANNING_MUTATION_VALIDATION, false)) {
+                        throw new Error("Record what the scanner finds in the accumulator, and make the edits in " +
+                            `editorWithData(acc). ${recipe.name}'s scanner ${scanned ? "changed" : "deleted"} ` +
+                            `${b2.sourcePath}, and the scanning phase discards edits. A scanner that reuses an ` +
+                            "editing visitor opts out with spec.checkNoEditsInScanningPhase = false.");
+                    }
                 }
                 return b2;
             });
         }
 
         const totalFiles = files.length;
+        const listener: AccumulatorListener | undefined = ctx.messages[ACCUMULATOR_LISTENER];
+        listener?.(await accumulators(recipe, recipeLists, cursor, ctx), "after scanning");
 
         // Phase 2: Collect generated files
         const generated = (await recurseRecipeList(recipe, [] as SourceFile[], recipeLists, async (recipe, generated) => {
@@ -169,6 +196,7 @@ export async function* scheduleRunStreaming(
                 yield new Result(undefined, editedG);
             }
         }
+        listener?.(await accumulators(recipe, recipeLists, cursor, ctx), "after editing");
     } else {
         // For non-scanning recipes, process files immediately as they come in
         let processCount = 0;