Fix treatment of containments in ECore nodes, release version 1.6.6

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.7] – 2024-03-06
+
+### Fixed
+- Treatment of references in ECore nodes
+
 ## [1.6.6] – 2024-03-06
 
 ### Fixed

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

src/interop/ecore.ts

@@ -810,8 +810,10 @@ export function registerPackages(resource: ECore.Resource): ECore.EPackage[] {
 }
 
 export function isNodeType(type: EClassifier) {
-    return (type.get("interface") && type != THE_DESTINATION_INTERFACE) ||
-        type.get("eAllSuperTypes")?.find(t => t == THE_NODE_ECLASS_V2 || t == THE_NODE_ECLASS_V1);
+    return type && (
+        (type.get("interface") && type != THE_DESTINATION_INTERFACE) ||
+        type.get("eAllSuperTypes")?.find(t => t == THE_NODE_ECLASS_V2 || t == THE_NODE_ECLASS_V1) ||
+        type == THE_REFERENCE_BY_NAME_ECLASS);
 }
 
 export interface EcoreMetamodelSupport {
@@ -901,12 +903,14 @@ export class ECoreNode extends NodeAdapter {
         for (const ft of this.eo.eClass.get("eAllStructuralFeatures")) {
             const name = ft.get("name");
             const isReference = ft.isTypeOf('EReference');
-            if (isReference && !isNodeType(ft.get("eType"))) {
+            if (isReference && !isNodeType(ft.get("eType") || ft.get("eGenericType")?.get("eClassifier"))) {
                 // skip
             } else {
                 result[name] = {
                     name,
-                    child: isReference && ft.get('containment'),
+                    child: isReference &&
+                        ft.get('containment') &&
+                        ft.get("eGenericType")?.get("eClassifier") != THE_REFERENCE_BY_NAME_ECLASS,
                     multiple: isReference ? ft.get('many') : undefined,
                 };
             }

tests/ecore.test.ts

@@ -161,21 +161,30 @@ describe("Import/export", function () {
         expect(node instanceof Node).to.be.true;
         expect(node.statementsAndDeclarations.length).to.equal(26);
     });
-    it("containments and inheritance", function () {
+    it("containments and references", function () {
         const resourceSet = ECore.ResourceSet.create();
         const resource = resourceSet.create({ uri: 'file:data/rpg.metamodel.json' });
         const mmBuffer = fs.readFileSync("tests/data/rpg.metamodel.json");
         const ePackages = loadEPackages(JSON.parse(mmBuffer.toString()), resource);
         expect(ePackages.length).to.equal(2);
+
         const PlistParameter = ePackages[1].eContents().find(x => x.get("name") == "PlistParameter");
-        const eo = PlistParameter.create({});
-        const properties = new ECoreNode(eo).getProperties();
+        let eo = PlistParameter.create({});
+        let properties = new ECoreNode(eo).getProperties();
         expect(properties).to.eql({
             "name": {"child": true, "multiple": false, "name": "name"},
             "sourceField": {"child": true, "multiple": false, "name": "sourceField"},
             "targetField": {"child": true, "multiple": false, "name": "targetField"},
             "type": {"child": true, "multiple": false, "name": "type"}
         });
+
+        const InvokeSubroutineStatement = ePackages[1].eContents().find(x => x.get("name") == "InvokeSubroutineStatement");
+        eo = InvokeSubroutineStatement.create({});
+        properties = new ECoreNode(eo).getProperties();
+        expect(properties).to.eql({
+            "conditionalIndicator": {"child": true, "multiple": false, "name": "conditionalIndicator"},
+            "subroutine": {"child": false, "multiple": false, "name": "subroutine"}
+        });
     });
     it("importing using raw Ecore.js",
         function () {