Refactoring

Author: alessiostalla

src/interop/ecore.ts

@@ -40,7 +40,7 @@ import {
 } from "./starlasu-v2-metamodel";
 import {KOLASU_URI_V1, THE_NODE_ECLASS as THE_NODE_ECLASS_V1} from "./kolasu-v1-metamodel";
 import {EBigDecimal, EBigInteger} from "./ecore-patching";
-import {ExternalNode} from "../trace/trace-node";
+import {NodeAdapter} from "../trace/trace-node";
 
 export * as starlasu_v2 from "./starlasu-v2-metamodel";
 export * as kolasu_v1 from "./kolasu-v1-metamodel";
@@ -815,7 +815,7 @@ export interface EcoreMetamodelSupport {
     generateMetamodel(resource: ECore.Resource, includingKolasuMetamodel: boolean): void;
 }
 
-export class ECoreNode extends ExternalNode {
+export class ECoreNode extends NodeAdapter {
 
     parent?: ECoreNode;
 
@@ -835,7 +835,7 @@ export class ECoreNode extends ExternalNode {
         };
     }
 
-    get(...path: string[]): ExternalNode | undefined {
+    get(...path: string[]): NodeAdapter | undefined {
         let eo: ECore.EObject = this.eo;
         for (const component of path) {
             eo = eo?.get(component);
@@ -860,7 +860,7 @@ export class ECoreNode extends ExternalNode {
         return result;
     }
 
-    getChildren(role?: string): ExternalNode[] {
+    getChildren(role?: string): NodeAdapter[] {
         return this.getChildrenEObjects(role).map(c => new ECoreNode(c));
     }
 
@@ -925,7 +925,7 @@ export class ECoreNode extends ExternalNode {
         return this.eo.isKindOf(THE_STATEMENT_INTERFACE);
     }
 
-    equals(other: ExternalNode): boolean {
+    equals(other: NodeAdapter): boolean {
         return super.equals(other) || (other instanceof ECoreNode && other.eo == this.eo);
     }
 }

src/interop/lionweb.ts

@@ -13,7 +13,7 @@ import {
     Language,
     Node as LionwebNodeInterface
 } from "@lionweb/core";
-import {ExternalNode, Issue, Node, NodeDefinition, Position, PropertyDefinition} from "..";
+import {NodeAdapter, Issue, Node, NodeDefinition, Position, PropertyDefinition} from "..";
 import {STARLASU_LANGUAGE} from "./lionweb-starlasu-language";
 
 export class TylasuNodeWrapper implements LionwebNodeInterface {
@@ -121,7 +121,7 @@ function allFeatures(classifier: Classifier) {
     return features;
 }
 
-export class LionwebNode extends ExternalNode {
+export class LionwebNode extends NodeAdapter {
 
     parent: LionwebNode;
     public readonly nodeDefinition: NodeDefinition;
@@ -143,7 +143,7 @@ export class LionwebNode extends ExternalNode {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    get(...path: string[]): ExternalNode | undefined {
+    get(...path: string[]): NodeAdapter | undefined {
         return undefined; // TODO
     }
 

src/interop/strumenta-playground.ts

@@ -19,7 +19,7 @@ import {
 } from "./transpilation-package";
 import {TRANSPILATION_EPACKAGE_V1} from "./transpilation-package-v1";
 import {ensureEcoreContainsAllDataTypes} from "./ecore-patching";
-import {ExternalNode, TraceNode} from "../trace/trace-node";
+import {NodeAdapter, TraceNode} from "../trace/trace-node";
 
 export function saveForStrumentaPlayground<R extends Node>(
     result: ParsingResult<R>, name: string,
@@ -162,7 +162,7 @@ abstract class AbstractTranspilationTrace {
     protected sourceToTarget = new Map<string, TargetNode[]>();
     public issues: Issue[] = [];
 
-    protected constructor(protected wrappedNode: ExternalNode) {}
+    protected constructor(protected wrappedNode: NodeAdapter) {}
 
     getDestinationNodes(sourceNode: SourceNode): TargetNode[] {
         return this.sourceToTarget.get(sourceNode.wrappedNode.getId()) || [];
@@ -239,7 +239,7 @@ export class WorkspaceTranspilationTrace extends AbstractTranspilationTrace {
 }
 
 abstract class AbstractWorkspaceFile<N> {
-    protected constructor(protected wrappedNode: ExternalNode, protected trace: AbstractTranspilationTrace) {}
+    protected constructor(protected wrappedNode: NodeAdapter, protected trace: AbstractTranspilationTrace) {}
 
     get path(): string {
         return this.wrappedNode.getAttribute("path");
@@ -257,7 +257,7 @@ abstract class AbstractWorkspaceFile<N> {
 }
 
 export class SourceWorkspaceFile extends AbstractWorkspaceFile<SourceNode> {
-    constructor(wrapped: ExternalNode, trace: AbstractTranspilationTrace) {
+    constructor(wrapped: NodeAdapter, trace: AbstractTranspilationTrace) {
         super(wrapped, trace);
     }
 
@@ -269,7 +269,7 @@ export class SourceWorkspaceFile extends AbstractWorkspaceFile<SourceNode> {
 export class TargetWorkspaceFile extends AbstractWorkspaceFile<TargetNode> {
     node: TargetNode;
 
-    constructor(wrapped: ExternalNode, trace: AbstractTranspilationTrace) {
+    constructor(wrapped: NodeAdapter, trace: AbstractTranspilationTrace) {
         super(wrapped, trace);
     }
 }
@@ -278,7 +278,7 @@ export class SourceNode extends TraceNode {
     parent?: SourceNode;
     protected _destinations?: TargetNode[];
 
-    constructor(wrappedNode: ExternalNode, protected trace: AbstractTranspilationTrace,
+    constructor(wrappedNode: NodeAdapter, protected trace: AbstractTranspilationTrace,
                 public readonly file?: SourceWorkspaceFile) {
         super(wrappedNode);
         if (wrappedNode.parent) {
@@ -305,7 +305,7 @@ export class SourceNode extends TraceNode {
 export class TargetNode extends TraceNode {
     parent?: TargetNode;
 
-    constructor(wrapped: ExternalNode, protected trace: AbstractTranspilationTrace, public file?: TargetWorkspaceFile) {
+    constructor(wrapped: NodeAdapter, protected trace: AbstractTranspilationTrace, public file?: TargetWorkspaceFile) {
         super(wrapped);
         if (wrapped.parent) {
             this.parent = new TargetNode(wrapped.parent, this.trace, this.file);

src/trace/trace-node.ts

@@ -2,16 +2,16 @@ import {Node, NodeDefinition} from "../model/model";
 import {Position} from "../model/position";
 import {Issue} from "../validation";
 
-export abstract class ExternalNode extends Node {
-    abstract parent?: ExternalNode;
+export abstract class NodeAdapter extends Node {
+    abstract parent?: NodeAdapter;
     abstract get nodeDefinition(): NodeDefinition;
 
-    abstract get(...path: string[]): ExternalNode | undefined;
+    abstract get(...path: string[]): NodeAdapter | undefined;
 
     abstract getAttributes(): { [name: string]: any };
 
-    getChildren(name?: string | symbol): ExternalNode[] {
-        return super.getChildren(name).map(c => c as ExternalNode);
+    getChildren(name?: string | symbol): NodeAdapter[] {
+        return super.getChildren(name).map(c => c as NodeAdapter);
     }
 
     abstract getId(): string;
@@ -28,12 +28,12 @@ export abstract class ExternalNode extends Node {
 
     abstract isStatement(): boolean;
 
-    equals(other: ExternalNode) {
+    equals(other: NodeAdapter) {
         return other == this;
     }
 }
 
-export class AugmentedNode extends ExternalNode {
+export class AugmentedNode extends NodeAdapter {
     constructor(protected node: Node) {
         super();
     }
@@ -64,7 +64,7 @@ export class AugmentedNode extends ExternalNode {
         return this.node.getAttribute(name);
     }
 
-    get(): ExternalNode | undefined {
+    get(): NodeAdapter | undefined {
         return undefined;
     }
 
@@ -105,7 +105,7 @@ export abstract class TraceNode extends Node {
 
     abstract parent?: TraceNode;
 
-    protected constructor(public wrappedNode: ExternalNode) {
+    protected constructor(public wrappedNode: NodeAdapter) {
         super();
     }