ParserNode instances usable without ECore

Author: alessiostalla

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project from version 1.2.0 upwards are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.6.12] – 2024-03-07
+
+### Added
+- LionwebNode get method
+
+### Fixed
+- ECoreNode definition
+
 ## [1.6.11] – 2024-03-07
 
 ### Changed

package.json

@@ -3,7 +3,7 @@
 	"description": "AST building blocks for TypeScript/JavaScript, part of the *lasu family, with optional integrations with ANTLR4 and Ecore.",
 	"author": "Strumenta s.r.l.",
 	"publisher": "strumenta",
-	"version": "1.6.11",
+	"version": "1.6.12",
 	"license": "Apache-2.0",
 	"keywords": [
 		"antlr",

src/interop/ecore.ts

@@ -838,17 +838,17 @@ export class ECoreNode extends NodeAdapter {
         }
     }
 
-    private __nodeDefinition?: NodeDefinition;
+    private _nodeDefinition?: NodeDefinition;
 
     get nodeDefinition() {
-        if (!this.__nodeDefinition) {
-            this.__nodeDefinition = {
+        if (!this._nodeDefinition) {
+            this._nodeDefinition = {
                 package: this.eo.eClass.eContainer.get("name") as string,
                 name: this.eo.eClass.get("name") as string,
                 properties: this.getProperties()
             };
         }
-        return this.__nodeDefinition;
+        return this._nodeDefinition;
     }
 
     get(...path: string[]): NodeAdapter | undefined {
@@ -876,13 +876,13 @@ export class ECoreNode extends NodeAdapter {
         return result;
     }
 
-    private __children?: ECoreNode[] = undefined;
+    private _children?: ECoreNode[] = undefined;
 
     getChildren(role?: string): ECoreNode[] {
-        if (this.__children === undefined) {
-            this.__children = this.getChildrenEObjects().map(c => new ECoreNode(c, this));
+        if (this._children === undefined) {
+            this._children = this.getChildrenEObjects().map(c => new ECoreNode(c, this));
         }
-        return this.__children!.filter(c => !role || c.getRole() == role);
+        return this._children!.filter(c => !role || c.getRole() == role);
     }
 
     getId(): string {

src/interop/lionweb.ts

@@ -125,7 +125,10 @@ function allFeatures(classifier: Classifier) {
 export class LionwebNode extends NodeAdapter {
 
     parent: LionwebNode;
-    public readonly nodeDefinition: NodeDefinition;
+    private _nodeDefinition?: NodeDefinition;
+    public get nodeDefinition(): NodeDefinition {
+        return this._nodeDefinition!;
+    }
 
     constructor(
         public readonly classifier: Classifier,
@@ -136,20 +139,37 @@ export class LionwebNode extends NodeAdapter {
         allFeatures(classifier).forEach(f => {
             properties[f.name] = featureToProperty(f);
         });
-        this.nodeDefinition = {
+        this._nodeDefinition = {
             name: classifier.name,
             properties: properties,
             resolved: true
         };
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    get(...path: string[]): NodeAdapter | undefined {
-        return undefined; // TODO
+    get(...path: string[]): LionwebNode | undefined {
+        let result: LionwebNode | undefined = undefined;
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        let parent: LionwebNode = this;
+        for (const element of path) {
+            result = parent.getChild(element) as LionwebNode;
+            if (result) {
+                parent = result;
+            } else {
+                return undefined;
+            }
+        }
+        return result;
     }
 
     getAttributes(): { [p: string]: any } {
-        return {}; // TODO
+        const attributes = {};
+        for (const p in this.nodeDefinition.properties) {
+            if (!this.nodeDefinition.properties[p].child) {
+                attributes[p] = this.getAttribute(p);
+            }
+        }
+        return attributes;
     }
 
     getId(): string {