@openrewrite/rewrite 8.63.3 → 8.63.4

package/src/javascript/type-mapping.ts

@@ -196,7 +196,7 @@ export class JavaScriptTypeMapping {
     private wrapperType(declaringType: (Type.FullyQualified & Type.Primitive) | Type.FullyQualified) {
         if (declaringType == Type.Primitive.String && this.stringWrapperType) {
             return this.getType(this.stringWrapperType) as Type.FullyQualified;
-        } else if ((declaringType == Type.Primitive.Double || declaringType == Type.Primitive.Long) && this.numberWrapperType) {
+        } else if ((declaringType == Type.Primitive.Double || declaringType == Type.Primitive.BigInt) && this.numberWrapperType) {
             return this.getType(this.numberWrapperType) as Type.FullyQualified;
         } else if (declaringType == Type.Primitive.Boolean && this.booleanWrapperType) {
             return this.getType(this.booleanWrapperType) as Type.FullyQualified;
@@ -808,7 +808,7 @@ export class JavaScriptTypeMapping {
             type.flags === ts.TypeFlags.BigIntLiteral ||
             type.flags === ts.TypeFlags.BigIntLike
         ) {
-            return Type.Primitive.Long;
+            return Type.Primitive.BigInt;
         } else if (
             (type.symbol !== undefined && type.symbol === this.regExpSymbol) ||
             this.checker.typeToString(type) === "RegExp"

package/src/rpc/queue.ts

@@ -150,7 +150,8 @@ export class RpcSendQueue {
         return saveTrace(this.trace, async () => {
             if (before === after) {
                 this.put({state: RpcObjectState.NO_CHANGE});
-            } else if (before === undefined) {
+            } else if (before === undefined || (after !== undefined && this.typesAreDifferent(after, before))) {
+                // Treat as ADD when before is undefined OR types differ (it's a new object, not a change)
                 await this.add(after, onChange);
             } else if (after === undefined) {
                 this.put({state: RpcObjectState.DELETE});
@@ -182,6 +183,9 @@ export class RpcSendQueue {
                     const aBefore = before ? before[beforePos] : undefined;
                     if (aBefore === anAfter) {
                         this.put({state: RpcObjectState.NO_CHANGE});
+                    } else if (anAfter !== undefined && this.typesAreDifferent(anAfter, aBefore)) {
+                        // Type changed - treat as ADD
+                        await this.add(anAfter, onChangeRun);
                     } else {
                         this.put({state: RpcObjectState.CHANGE});
                         await this.doChange(anAfter, aBefore, onChangeRun, RpcCodecs.forInstance(anAfter, this.sourceFileType));
@@ -248,6 +252,12 @@ export class RpcSendQueue {
         }
     }
 
+    private typesAreDifferent(after: any, before: any): boolean {
+        const afterKind = after !== undefined && after !== null && typeof after === "object" ? after["kind"] : undefined;
+        const beforeKind = before !== undefined && before !== null && typeof before === "object" ? before["kind"] : undefined;
+        return afterKind !== undefined && beforeKind !== undefined && afterKind !== beforeKind;
+    }
+
     private getValueType(after?: any): string | undefined {
         if (after !== undefined && after !== null && typeof after === "object" && "kind" in after) {
             return after["kind"];

package/src/rpc/server.ts

@@ -19,6 +19,7 @@ import {RewriteRpc} from "./rewrite-rpc";
 import * as fs from "fs";
 import {Command} from 'commander';
 import {dir} from 'tmp-promise';
+import {DependencyWorkspace} from "../javascript/dependency-workspace";
 
 // Include all languages you want this server to support.
 import "../text";
@@ -66,6 +67,8 @@ async function main() {
             if (recipeCleanup) {
                 await recipeCleanup();
             }
+            // Clean up old dependency workspaces (older than 24 hours)
+            DependencyWorkspace.cleanupOldWorkspaces();
             process.exit(0);
         });
 
@@ -73,6 +76,8 @@ async function main() {
             if (recipeCleanup) {
                 await recipeCleanup();
             }
+            // Clean up old dependency workspaces (older than 24 hours)
+            DependencyWorkspace.cleanupOldWorkspaces();
             process.exit(0);
         });
 

package/src/test/rewrite-test.ts

@@ -61,13 +61,21 @@ export class RecipeSpec {
         this.dataTableAssertions[name] = allRows;
     }
 
-    async rewriteRun(...sourceSpecs: (SourceSpec<any> | Generator<SourceSpec<any>, void, unknown>)[]): Promise<void> {
+    async rewriteRun(...sourceSpecs: (SourceSpec<any> | Generator<SourceSpec<any>, void, unknown> | AsyncGenerator<SourceSpec<any>, void, unknown>)[]): Promise<void> {
         // Flatten generators into a list of sourceSpecs
         const flattenedSpecs: SourceSpec<any>[] = [];
         for (const specOrGenerator of sourceSpecs) {
             if (specOrGenerator && typeof (specOrGenerator as any).next === 'function') {
-                for (const spec of specOrGenerator as Generator<SourceSpec<any>, void, unknown>) {
-                    flattenedSpecs.push(spec);
+                // Check if it's an async generator
+                if (typeof (specOrGenerator as any)[Symbol.asyncIterator] === 'function') {
+                    for await (const spec of specOrGenerator as AsyncGenerator<SourceSpec<any>, void, unknown>) {
+                        flattenedSpecs.push(spec);
+                    }
+                } else {
+                    // Sync generator
+                    for (const spec of specOrGenerator as Generator<SourceSpec<any>, void, unknown>) {
+                        flattenedSpecs.push(spec);
+                    }
                 }
             } else {
                 flattenedSpecs.push(specOrGenerator as SourceSpec<any>);