Fix treatment of containments in ECore nodes, release version 1.6.5

Author: alessiostalla

CHANGELOG.md

@@ -2,6 +2,11 @@
 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.5] – 2024-03-06
+
+### Fixed
+- Treatment of containments in ECore nodes 
+
 ## [1.6.4] – 2024-03-06
 
 ### Added

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.4",
+	"version": "1.6.5",
 	"license": "Apache-2.0",
 	"keywords": [
 		"antlr",

src/interop/ecore.ts

@@ -892,16 +892,19 @@ export class ECoreNode extends NodeAdapter {
 
     getProperties(): { [name: string | symbol]: PropertyDefinition } {
         const result: { [name: string | symbol]: PropertyDefinition } = {};
-        for (const attr of this.eo.eClass.get("eAllAttributes")) {
-            const name = attr.get("name");
-            result[name] = {name: name, child: false};
+        for (const ft of this.eo.eClass.get("eAllStructuralFeatures")) {
+            const name = ft.get("name");
+            const isReference = ft.isTypeOf('EReference');
+            if (isReference && !ft.get("eType")?.get("eAllSuperTypes")?.find(t => t == THE_NODE_ECLASS_V2 || t == THE_NODE_ECLASS_V1)) {
+                // skip
+            } else {
+                result[name] = {
+                    name,
+                    child: isReference && ft.get('containment'),
+                    multiple: (isReference && ft.get('many')) || undefined,
+                };
+            }
         }
-        this.eo.eContents()
-            .filter((c) => c.eContainingFeature.get("name") != "position")
-            .forEach((c) => {
-                const name = c.eContainingFeature.get("name");
-                result[name] = {name, child: true, multiple: c.eContainingFeature.get("many")};
-            });
         return result;
     }
 

tests/interop/parser-trace.test.ts

@@ -47,7 +47,7 @@ describe('Parser traces – Kolasu metamodel V1', function() {
             expect(rootNode.getSimpleType()).to.eql("CompilationUnit");
             const child = rootNode.getChildren("dataDefinitions")[3];
             expect(child.nodeDefinition.properties).to.eql({
-                name: { name: "name", child: false },
+                name: { name: "name", child: false, multiple: undefined },
                 keywords: { name: "keywords", child: true, multiple: true }
             });
             expect(child.getAttributes()).to.eql({ name: 'ENDPOINT' });