Fix treatment of containments in ECore nodes, release version 1.6.8

Author: alessiostalla

CHANGELOG.md

@@ -2,21 +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
+## [1.6.5 - 1.6.8] – 2024-03-06
 
 ### Fixed
 - Treatment of references in ECore nodes
 
-## [1.6.6] – 2024-03-06
-
-### Fixed
-- Treatment of containments in ECore nodes
-
-## [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.7",
+	"version": "1.6.8",
 	"license": "Apache-2.0",
 	"keywords": [
 		"antlr",

src/interop/ecore.ts

@@ -812,6 +812,7 @@ export function registerPackages(resource: ECore.Resource): ECore.EPackage[] {
 export function isNodeType(type: EClassifier) {
     return type && (
         (type.get("interface") && type != THE_DESTINATION_INTERFACE) ||
+        type == THE_NODE_ECLASS_V2 || type == THE_NODE_ECLASS_V1 ||
         type.get("eAllSuperTypes")?.find(t => t == THE_NODE_ECLASS_V2 || t == THE_NODE_ECLASS_V1) ||
         type == THE_REFERENCE_BY_NAME_ECLASS);
 }
@@ -900,7 +901,9 @@ export class ECoreNode extends NodeAdapter {
 
     getProperties(): { [name: string | symbol]: PropertyDefinition } {
         const result: { [name: string | symbol]: PropertyDefinition } = {};
-        for (const ft of this.eo.eClass.get("eAllStructuralFeatures")) {
+        const eClass = this.eo.eClass;
+        const features = eClass.get("eAllStructuralFeatures");
+        for (const ft of features) {
             const name = ft.get("name");
             const isReference = ft.isTypeOf('EReference');
             if (isReference && !isNodeType(ft.get("eType") || ft.get("eGenericType")?.get("eClassifier"))) {

tests/ecore.test.ts

@@ -161,7 +161,7 @@ describe("Import/export", function () {
         expect(node instanceof Node).to.be.true;
         expect(node.statementsAndDeclarations.length).to.equal(26);
     });
-    it("containments and references", function () {
+    it("containments and references - RPG", 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");
@@ -186,6 +186,28 @@ describe("Import/export", function () {
             "subroutine": {"child": false, "multiple": false, "name": "subroutine"}
         });
     });
+    it("containments and references - SAS", function () {
+        const resourceSet = ECore.ResourceSet.create();
+        const resource = resourceSet.create({ uri: 'file:data/sas.metamodel.json' });
+        const mmBuffer = fs.readFileSync("tests/data/sas.metamodel.json");
+        const ePackages = loadEPackages(JSON.parse(mmBuffer.toString()), resource);
+        expect(ePackages.length).to.equal(5);
+
+        const SourceFile = ePackages[0].eContents().find(x => x.get("name") == "SourceFile");
+        const sf = SourceFile.create({});
+
+        const VariableDeclaration = ePackages[2].eContents().find(x => x.get("name") == "VariableDeclaration");
+        const vd = VariableDeclaration.create({});
+        sf.get("statementsAndDeclarations").add(vd);
+        const eCoreNode = new ECoreNode(vd);
+        const properties = eCoreNode.getProperties();
+        expect(properties).to.eql({
+            "name": {"child": false, "multiple": undefined, "name": "name"},
+            "expression": {"child": true, "multiple": false, "name": "expression"},
+        });
+        expect(eCoreNode.getRole()).to.equal("statementsAndDeclarations");
+        expect(eCoreNode.parent!.containment("statementsAndDeclarations")).to.eql({"child": true, "multiple": true, "name": "statementsAndDeclarations"});
+    });
     it("importing using raw Ecore.js",
         function () {
             const resourceSet = ECore.ResourceSet.create();