Polish

openrewrite/src/core/markers.ts

@@ -1,28 +1,39 @@
 import {random_id, UUID} from "./tree";
 
 export interface Marker {
+    id(): UUID;
+
+    withId(id: UUID): Marker;
 }
 
 export class Markers {
     public static readonly EMPTY: Markers = new Markers(random_id(), []);
 
-    private readonly _id: string;
+    private readonly _id: UUID;
     private readonly _markers: Marker[] = [];
 
     constructor(id: UUID, markers: Marker[]) {
         this._id = id;
         this._markers = markers;
     }
 
-    public id(): string {
+    public id(): UUID {
         return this._id;
     }
 
+    public withId(id: UUID): Markers {
+        return this._id === id ? this : new Markers(id, this._markers);
+    }
+
     public markers(): Marker[] {
         return this._markers;
     }
 
-    public findFirst<T extends Marker>(markerType: new () => T): T | null {
-        return this._markers.find((marker) => marker instanceof markerType) as T || null;
+    public withMarkers(markers: Marker[]): Markers {
+        return this._markers === markers ? this : new Markers(this._id, markers);
+    }
+
+    public findFirst<T extends Marker>(markerType: new () => T): T | undefined {
+        return this._markers.find((marker) => marker instanceof markerType) as T || undefined;
     }
 }

openrewrite/src/core/tree.ts

@@ -28,4 +28,10 @@ export class Cursor {
     public fork(): Cursor {
         return new Cursor(this._parent === null ? null : this._parent.fork(), this.value);
     }
-}
+}
+
+export interface Tree {
+    id(): UUID;
+
+    withId(id: UUID): Tree;
+}