@openrewrite/rewrite 8.96.2 → 8.96.4

package/src/javascript/tree.ts

@@ -602,7 +602,7 @@ export namespace JS {
          * Represents the index type in an indexed access.
          * @example 'key'
          */
-        export interface IndexType extends JS {
+        export interface IndexType extends JS, Expression, TypeTree {
             readonly kind: typeof Kind.IndexedAccessTypeIndexType;
             readonly element: J.RightPadded<TypeTree>;
             readonly type?: Type;
@@ -633,7 +633,7 @@ export namespace JS {
      * Represents TypeScript computed property name.
      * @example { [key]: value }
      */
-    export interface ComputedPropertyName extends JS, Expression, TypedTree, VariableDeclarator {
+    export interface ComputedPropertyName extends JS, Expression, TypeTree, VariableDeclarator {
         readonly kind: typeof Kind.ComputedPropertyName;
         readonly expression: J.RightPadded<Expression>;
     }
@@ -695,7 +695,7 @@ export namespace JS {
      * @example data["key"](5, 0, 4)
      * @example (() => { return 3 + 5 })()
      */
-    export interface FunctionCall extends JS, MethodCall {
+    export interface FunctionCall extends JS, TypedTree, MethodCall {
         readonly kind: typeof Kind.FunctionCall;
         readonly function?: J.RightPadded<Expression>;
         readonly typeParameters?: J.Container<Expression>;
@@ -706,7 +706,7 @@ export namespace JS {
      * Represents the `void` operator.
      * @example void 0;
      */
-    export interface Void extends JS, Expression {
+    export interface Void extends JS, Expression, Statement {
         readonly kind: typeof Kind.Void;
         readonly expression: Expression;
     }
@@ -737,7 +737,7 @@ export namespace JS {
      * Represents a method declaration in classes or objects.
      * @example class A { [Symbol.asyncIterator]() { ... } }
      */
-    export interface ComputedPropertyMethodDeclaration extends JS, Statement {
+    export interface ComputedPropertyMethodDeclaration extends JS, Statement, TypedTree {
         readonly kind: typeof Kind.ComputedPropertyMethodDeclaration;
         readonly leadingAnnotations: J.Annotation[];
         readonly modifiers: J.Modifier[];
@@ -754,7 +754,7 @@ export namespace JS {
      * @example for (const x of arr) { }
      * @example for await (const x of arr) { }
      */
-    export interface ForOfLoop extends JS {
+    export interface ForOfLoop extends JS, Statement {
         readonly kind: typeof Kind.ForOfLoop;
         readonly await?: J.Space;
         readonly loop: J.ForEachLoop;
@@ -768,7 +768,7 @@ export namespace JS {
      * Represents a for-in loop.
      * @example for (let key in obj) { }
      */
-    export interface ForInLoop extends JS {
+    export interface ForInLoop extends JS, Statement {
         readonly kind: typeof Kind.ForInLoop;
         readonly control: ForInLoop.Control;
         readonly body: J.RightPadded<Statement>;
@@ -802,7 +802,7 @@ export namespace JS {
      * Represents a literal type object in TypeScript.
      * @example type T = { a: number };
      */
-    export interface TypeLiteral extends JS, TypeTree {
+    export interface TypeLiteral extends JS, Expression, TypeTree {
         readonly kind: typeof Kind.TypeLiteral;
         readonly members: J.Block;
         readonly type?: Type;
@@ -812,7 +812,7 @@ export namespace JS {
      * Represents an array destructuring pattern.
      * @example const [a, b] = arr;
      */
-    export interface ArrayBindingPattern extends JS, TypedTree, VariableDeclarator {
+    export interface ArrayBindingPattern extends JS, Expression, TypedTree, VariableDeclarator {
         readonly kind: typeof Kind.ArrayBindingPattern;
         readonly elements: J.Container<Expression>;
         readonly type?: Type;
@@ -822,7 +822,7 @@ export namespace JS {
      * Represents a named element in a binding pattern.
      * @example const { x: alias } = obj;
      */
-    export interface BindingElement extends JS, Statement, TypeTree {
+    export interface BindingElement extends JS, Statement, Expression, TypeTree {
         readonly kind: typeof Kind.BindingElement;
         readonly propertyName?: J.RightPadded<Expression>;
         readonly name: TypedTree;
@@ -858,7 +858,7 @@ export namespace JS {
      * Represents named exports in an export declaration.
      * @example export { a, b };
      */
-    export interface NamedExports extends JS {
+    export interface NamedExports extends JS, Expression {
         readonly kind: typeof Kind.NamedExports;
         readonly elements: J.Container<Expression>;
         readonly type?: Type;
@@ -868,7 +868,7 @@ export namespace JS {
      * Represents a specifier in a named export.
      * @example export { foo as bar };
      */
-    export interface ExportSpecifier extends JS {
+    export interface ExportSpecifier extends JS, Expression, TypedTree {
         readonly kind: typeof Kind.ExportSpecifier;
         readonly typeOnly: J.LeftPadded<boolean>;
         readonly specifier: Expression;

package/src/javascript/visitor.ts

@@ -111,6 +111,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitAs(as_: JS.As, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(as_, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.As) {
+            return expression;
+        }
+        as_ = expression as JS.As;
+
         const updates: any = {
             prefix: await this.visitSpace(as_.prefix, p),
             markers: await this.visitMarkers(as_.markers, p),
@@ -138,6 +144,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitJsxTag(element: JSX.Tag, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(element, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.JsxTag) {
+            return expression;
+        }
+        element = expression as JSX.Tag;
+
         const updates: any = {
             prefix: await this.visitSpace(element.prefix, p),
             markers: await this.visitMarkers(element.markers, p),
@@ -174,6 +186,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitJsxEmbeddedExpression(expr: JSX.EmbeddedExpression, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(expr, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.JsxEmbeddedExpression) {
+            return expression;
+        }
+        expr = expression as JSX.EmbeddedExpression;
+
         const updates: any = {
             prefix: await this.visitSpace(expr.prefix, p),
             markers: await this.visitMarkers(expr.markers, p),
@@ -455,6 +473,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitBinaryExtensions(jsBinary: JS.Binary, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(jsBinary, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.Binary) {
+            return expression;
+        }
+        jsBinary = expression as JS.Binary;
+
         const updates: any = {
             prefix: await this.visitSpace(jsBinary.prefix, p),
             markers: await this.visitMarkers(jsBinary.markers, p),
@@ -504,6 +528,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitMappedTypeKeysRemapping(keysRemapping: JS.MappedType.KeysRemapping, p: P): Promise<J | undefined> {
+        const statement = await this.visitStatement(keysRemapping, p);
+        if (!statement?.kind || statement.kind !== JS.Kind.MappedTypeKeysRemapping) {
+            return statement;
+        }
+        keysRemapping = statement as JS.MappedType.KeysRemapping;
+
         const updates: any = {
             prefix: await this.visitSpace(keysRemapping.prefix, p),
             markers: await this.visitMarkers(keysRemapping.markers, p),
@@ -514,6 +544,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitMappedTypeParameter(mappedTypeParameter: JS.MappedType.Parameter, p: P): Promise<J | undefined> {
+        const statement = await this.visitStatement(mappedTypeParameter, p);
+        if (!statement?.kind || statement.kind !== JS.Kind.MappedTypeParameter) {
+            return statement;
+        }
+        mappedTypeParameter = statement as JS.MappedType.Parameter;
+
         const updates: any = {
             prefix: await this.visitSpace(mappedTypeParameter.prefix, p),
             markers: await this.visitMarkers(mappedTypeParameter.markers, p),
@@ -767,6 +803,18 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitAssignmentOperationExtensions(assignmentOperation: JS.AssignmentOperation, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(assignmentOperation, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.AssignmentOperation) {
+            return expression;
+        }
+        assignmentOperation = expression as JS.AssignmentOperation;
+
+        const statement = await this.visitStatement(assignmentOperation, p);
+        if (!statement?.kind || statement.kind !== JS.Kind.AssignmentOperation) {
+            return statement;
+        }
+        assignmentOperation = statement as JS.AssignmentOperation;
+
         const updates: any = {
             prefix: await this.visitSpace(assignmentOperation.prefix, p),
             markers: await this.visitMarkers(assignmentOperation.markers, p),
@@ -796,6 +844,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitIndexedAccessTypeIndexType(indexType: JS.IndexedAccessType.IndexType, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(indexType, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.IndexedAccessTypeIndexType) {
+            return expression;
+        }
+        indexType = expression as JS.IndexedAccessType.IndexType;
+
         const updates: any = {
             prefix: await this.visitSpace(indexType.prefix, p),
             markers: await this.visitMarkers(indexType.markers, p),
@@ -989,6 +1043,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitForOfLoop(forOfLoop: JS.ForOfLoop, p: P): Promise<J | undefined> {
+        const statement = await this.visitStatement(forOfLoop, p);
+        if (!statement?.kind || statement.kind !== JS.Kind.ForOfLoop) {
+            return statement;
+        }
+        forOfLoop = statement as JS.ForOfLoop;
+
         const updates: any = {
             prefix: await this.visitSpace(forOfLoop.prefix, p),
             markers: await this.visitMarkers(forOfLoop.markers, p),
@@ -999,6 +1059,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitForInLoop(forInLoop: JS.ForInLoop, p: P): Promise<J | undefined> {
+        const statement = await this.visitStatement(forInLoop, p);
+        if (!statement?.kind || statement.kind !== JS.Kind.ForInLoop) {
+            return statement;
+        }
+        forInLoop = statement as JS.ForInLoop;
+
         const updates: any = {
             prefix: await this.visitSpace(forInLoop.prefix, p),
             markers: await this.visitMarkers(forInLoop.markers, p),
@@ -1027,6 +1093,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitTypeLiteral(typeLiteral: JS.TypeLiteral, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(typeLiteral, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.TypeLiteral) {
+            return expression;
+        }
+        typeLiteral = expression as JS.TypeLiteral;
+
         const updates: any = {
             prefix: await this.visitSpace(typeLiteral.prefix, p),
             markers: await this.visitMarkers(typeLiteral.markers, p),
@@ -1037,6 +1109,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitArrayBindingPattern(arrayBindingPattern: JS.ArrayBindingPattern, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(arrayBindingPattern, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.ArrayBindingPattern) {
+            return expression;
+        }
+        arrayBindingPattern = expression as JS.ArrayBindingPattern;
+
         const updates: any = {
             prefix: await this.visitSpace(arrayBindingPattern.prefix, p),
             markers: await this.visitMarkers(arrayBindingPattern.markers, p),
@@ -1099,6 +1177,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitNamedExports(namedExports: JS.NamedExports, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(namedExports, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.NamedExports) {
+            return expression;
+        }
+        namedExports = expression as JS.NamedExports;
+
         const updates: any = {
             prefix: await this.visitSpace(namedExports.prefix, p),
             markers: await this.visitMarkers(namedExports.markers, p),
@@ -1109,6 +1193,12 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
     }
 
     protected async visitExportSpecifier(exportSpecifier: JS.ExportSpecifier, p: P): Promise<J | undefined> {
+        const expression = await this.visitExpression(exportSpecifier, p);
+        if (!expression?.kind || expression.kind !== JS.Kind.ExportSpecifier) {
+            return expression;
+        }
+        exportSpecifier = expression as JS.ExportSpecifier;
+
         const updates: any = {
             prefix: await this.visitSpace(exportSpecifier.prefix, p),
             markers: await this.visitMarkers(exportSpecifier.markers, p),

package/src/test/rewrite-test.ts

@@ -222,6 +222,7 @@ export class RecipeSpec {
         const {changeset, unsettled} = await this.runCycles(allParsed.map(([_, sourceFile]) => sourceFile),
             cycles, expectedCycles);
 
+        this.expectNoUnexpectedGeneratedFiles(flattenedSpecs, changeset);
         this.checkReportingMarkersOnly && await this.expectNoAddedMarkers(flattenedSpecs, allParsed, changeset);
         await this.expectResultsToMatchAfter(flattenedSpecs, changeset, allParsed);
         await this.expectGeneratedFiles(flattenedSpecs, changeset);
@@ -511,9 +512,21 @@ export class RecipeSpec {
         }
     }
 
+    private expectNoUnexpectedGeneratedFiles(specs: SourceSpec<any>[], changeset: Result[]) {
+        const expectedPaths = new Set(specs.filter(spec => !spec.before).map(spec => spec.path));
+        const unexpected = changeset.filter(c => !c.before && c.after && !expectedPaths.has(c.after.sourcePath));
+        if (unexpected.length > 0) {
+            throw new Error([
+                "The recipe generated source files the test did not expect:",
+                ...unexpected.map(c => `  ${c.after!.sourcePath}`),
+                "Describe each with a spec that has a null before and the path of the file."
+            ].join("\n"));
+        }
+    }
+
     private async expectAfter(spec: SourceSpec<any>, after?: SourceFile, before?: SourceFile) {
         if (!after) {
-            throw new Error('Expected for recipe to have produced a change for file:\n' + trimIndent(spec.before))
+            throw new Error('Expected for recipe to have produced a change for file:\n' + (trimIndent(spec.before) || spec.path))
         }
         await new ValidateWhitespaceVisitor().visit(after, this.executionContext);
         const actualAfter = await TreePrinters.print(after);