Regenerate Yaml and polish

openrewrite/src/core/tree.ts

@@ -314,7 +314,7 @@ export class FileAttributes {
 const SourceFileSymbol = Symbol('SourceFile');
 
 // This allows using `SourceFile` like a class in certain situations (e.g. `Cursor.firstEnclosing()`)
-export const SourceFile = SourceFileSymbol;
+const SourceFile = SourceFileSymbol;
 
 export function isSourceFile(tree: any & Tree): tree is SourceFile {
     // return 'sourcePath' in tree && 'printer' in tree;

openrewrite/src/java/extensions.ts

@@ -1,12 +1,13 @@
 import {JavaVisitor} from "./visitor";
 import {
+    isJava,
+    J,
     JavaType,
     JContainer,
     JLeftPadded,
     JRightPadded,
     Space,
 } from "./support_types";
-import {J} from "./tree";
 import {Cursor, ListUtils} from "../core";
 
 export function getJavaType<T extends J>(expr: T): JavaType | null {
@@ -67,7 +68,7 @@ export function visitLeftPadded<P, T>(v: JavaVisitor<P>, left: JLeftPadded<T> |
 
     let before = v.visitSpace(left.before, JLeftPadded.Location.beforeLocation(loc), p)!;
     let t = left.element;
-    if (left.element instanceof J)
+    if (isJava(left.element))
         t = v.visit(t as J, p) as T;
     v.cursor = v.cursor.parent!;
 
@@ -84,7 +85,7 @@ export function visitRightPadded<P, T>(v: JavaVisitor<P>, right: JRightPadded<T>
         return null;
 
     let t = right.element;
-    if (t instanceof J) {
+    if (isJava(t)) {
         v.cursor = new Cursor(v.cursor, right);
         t = v.visit(t as J, p) as T;
         v.cursor = v.cursor.parent!;

openrewrite/src/java/support_types.ts

@@ -3,7 +3,6 @@ import {JavaType} from "./types";
 import {JavaVisitor} from "./visitor";
 
 export {JavaType} from "./types";
-export * as J from './tree'
 
 export interface J extends Tree {
     get prefix(): Space;
@@ -65,6 +64,8 @@ export function JMixin<TBase extends Constructor<Object>>(Base: TBase) {
     return JMixed;
 }
 
+export * as J from './tree';
+
 export interface JavaSourceFile extends SourceFile {
 }
 

openrewrite/src/javascript/extensions.ts

@@ -1,8 +1,8 @@
-import {J, JavaType, JavaVisitor, JContainer, JLeftPadded, JRightPadded, Space} from "../java";
+import {J, JavaType, JContainer, JLeftPadded, JRightPadded, Space} from "../java";
 import * as java_extensions from "../java/extensions";
 import {JavaScriptVisitor} from "./visitor";
 import {JsContainer, JsLeftPadded, JsRightPadded, JsSpace} from "./support_types";
-import {JS} from "./tree";
+import {JS} from "./support_types";
 
 export function getJavaType<T extends J>(expr: T): JavaType | null {
     if (expr instanceof JS.Alias) {

openrewrite/src/javascript/index.ts

@@ -1,4 +1,3 @@
 export * from './markers';
 export * from './support_types';
-export * from './tree';
 export * from './visitor';

openrewrite/src/javascript/support_types.ts

@@ -2,8 +2,6 @@ import {J, JavaVisitor, Space} from "../java";
 import {Markers, Tree, TreeVisitor, UUID} from "../core";
 import {JavaScriptVisitor} from "./visitor";
 
-export * as JS from './tree'
-
 export interface JS extends J {
     get id(): UUID;
 
@@ -64,6 +62,7 @@ export function JSMixin<TBase extends Constructor<Object>>(Base: TBase) {
     return JSMixed;
 }
 
+export * as JS from './tree';
 
 export namespace JsSpace {
     export enum Location {

openrewrite/src/javascript/tree.ts

@@ -138,7 +138,7 @@ export class CompilationUnit extends SourceFileMixin(JSMixin(Object)) implements
     }
 
     public acceptJavaScript<P>(v: JavaScriptVisitor<P>, p: P): J | null {
-        return v.visitCompilationUnit(this, p);
+        return v.visitJsCompilationUnit(this, p);
     }
 
     get padding() {
@@ -2026,7 +2026,7 @@ export class Unary extends JSMixin(Object) implements Statement, Expression, Typ
         }
 
     public acceptJavaScript<P>(v: JavaScriptVisitor<P>, p: P): J | null {
-        return v.visitUnary(this, p);
+        return v.visitJsUnary(this, p);
     }
 
     get padding() {

openrewrite/src/javascript/visitor.ts

@@ -8,7 +8,7 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
         return isJavaScript(sourceFile);
     }
 
-    public visitCompilationUnit(compilationUnit: JS.CompilationUnit, p: P): J | null {
+    public visitJsCompilationUnit(compilationUnit: JS.CompilationUnit, p: P): J | null {
         compilationUnit = compilationUnit.withPrefix(this.visitSpace(compilationUnit.prefix, Space.Location.COMPILATION_UNIT_PREFIX, p)!);
         compilationUnit = compilationUnit.withMarkers(this.visitMarkers(compilationUnit.markers, p));
         compilationUnit = compilationUnit.padding.withImports(ListUtils.map(compilationUnit.padding.imports, el => this.visitRightPadded(el, JRightPadded.Location.IMPORT, p)));
@@ -282,7 +282,7 @@ export class JavaScriptVisitor<P> extends JavaVisitor<P> {
         return typeOperator;
     }
 
-    public visitUnary(unary: JS.Unary, p: P): J | null {
+    public visitJsUnary(unary: JS.Unary, p: P): J | null {
         unary = unary.withPrefix(this.visitSpace(unary.prefix, JsSpace.Location.UNARY_PREFIX, p)!);
         let tempStatement = this.visitStatement(unary, p) as Statement & J;
         if (!(tempStatement instanceof JS.Unary))

openrewrite/src/yaml/index.ts

@@ -1,4 +1,3 @@
 export * from './markers';
 export * from './support_types';
-export * from './tree';
 export * from './visitor';

openrewrite/src/yaml/support_types.ts

@@ -1,7 +1,62 @@
-import {Tree} from "../core";
+import {Markers, Tree, TreeVisitor, UUID} from "../core";
+import {YamlVisitor} from "./visitor";
+
+export interface Yaml extends Tree {
+    get id(): UUID;
+
+    withId(id: UUID): Yaml;
+
+    get markers(): Markers;
+
+    withMarkers(markers: Markers): Yaml;
+
+    isAcceptable<P>(v: TreeVisitor<Tree, P>, p: P): boolean;
+
+    accept<R extends Tree, P>(v: TreeVisitor<R, P>, p: P): R | null;
+
+    acceptYaml<P>(v: YamlVisitor<P>, p: P): Yaml | null;
+}
+
+type Constructor<T = {}> = new (...args: any[]) => T;
+
+const YamlSymbol = Symbol('Yaml');
+
+export function isYaml(tree: any & Tree): tree is Yaml {
+    return tree && tree[YamlSymbol] === true;
+}
+
+export function YamlMixin<TBase extends Constructor<Object>>(Base: TBase) {
+    abstract class YamlMixed extends Base implements Yaml {
+        [YamlSymbol]: true = true;
+
+        abstract get id(): UUID;
+
+        abstract withId(id: UUID): Yaml;
+
+        abstract get markers(): Markers;
+
+        abstract withMarkers(markers: Markers): Yaml;
+
+        public isAcceptable<P>(v: TreeVisitor<Tree, P>, p: P): boolean {
+            return v.isAdaptableTo(YamlVisitor);
+        }
+
+        public accept<R extends Tree, P>(v: TreeVisitor<R, P>, p: P): R | null {
+            return this.acceptYaml(v.adapt(YamlVisitor), p) as R | null;
+        }
+
+        public acceptYaml<P>(v: YamlVisitor<P>, p: P): Yaml | null {
+            return v.defaultValue(this, p) as Yaml | null;
+        }
+    }
+
+    return YamlMixed;
+}
+
+export * as Yaml from './tree';
 
 export interface YamlKey extends Tree {
     // get value(): string;
 
     withPrefix(prefix: string): YamlKey;
-}
+}