Merge pull request #711 from SteKoe/fix/709

fix: #709 attempt to fix omitted "self" in expressions
SteKoe · Aug 13, 2024 · 64fa2fc · 64fa2fc
2 parents e735747 + b42888b
commit 64fa2fc
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/lib/components/expressions/VariableExpression.ts b/lib/components/expressions/VariableExpression.ts
@@ -1,6 +1,6 @@
-import { OclExecutionContext } from '../OclExecutionContext';
+import {OclExecutionContext} from '../OclExecutionContext';
 
-import { SourceBasedExpression } from './Expression';
+import {SourceBasedExpression} from './Expression';
 
 /**
  * Resolve variables. Simple values are returned as is (e.g. self.age: number), collections are aggregated.
@@ -19,20 +19,31 @@ export class VariableExpression extends SourceBasedExpression {
 
     evaluate(visitor: OclExecutionContext, localVariables?: any): any {
         let obj;
-        const _variables = localVariables;
+
+        const objectToEvaluate = visitor.getObjectToEvaluate();
+        let _variables = {
+            ...localVariables,
+        };
+
         const source = this.getVariable();
-        const parts = source.split('.');
+        let parts = source.split('.');
 
+        const type = visitor.getRegisteredType(source);
+        if (type) {
+            return type;
+        }
+
+        if (parts[0] !== 'self' && Object.prototype.hasOwnProperty.call(objectToEvaluate, [parts[0]])) {
+            _variables = {
+                ...localVariables,
+                self: localVariables?.self ?? localVariables
+            };
+            parts = ['self', ...parts]
+        }
+
         if (parts[0] === 'self') {
             parts.shift();
-            obj = (_variables && _variables['self']) || visitor.getObjectToEvaluate();
-        } else if (_variables === undefined) {
-            const type = visitor.getRegisteredType(source);
-            if (type) {
-                return type;
-            } else {
-                obj = visitor.getObjectToEvaluate();
-            }
+            obj = (_variables && _variables['self']) || objectToEvaluate;
         } else {
             obj = _variables;
         }

diff --git a/lib/components/expressions/collection/ForAllExpression.ts b/lib/components/expressions/collection/ForAllExpression.ts
@@ -18,7 +18,9 @@ export class ForAllExpression extends IteratorExpression {
             const body = this.getBody();
 
             if (!iterators || iterators.length === 0) {
-                return false;
+                return !collection.some(c => {
+                    return body.evaluate(visitor, {['self']: c}) === false;
+                });
             } else if (iterators.length === 1) {
                 return !collection.some(c => {
                     const iterator = this.getIterators()[0];

diff --git a/test/expressions/collection/forAll.spec.ts b/test/expressions/collection/forAll.spec.ts
@@ -59,10 +59,13 @@ describe('Collection->forAll', () => {
             FixtureFactory.createPerson('B', 2),
             FixtureFactory.createPerson('C', 4),
             FixtureFactory.createPerson('D', 8),
-            FixtureFactory.createPerson('E', 10)
+            FixtureFactory.createPerson('E', 10),
         ];
 
-        const oclExpression = 'context Person inv: self.children->forAll(age < 10)';
+        let oclExpression = 'context Person inv: self.children->forAll(age <= 10)';
+        expectOclRuleValidatesToTrue(oclExpression, mother);
+
+        oclExpression = 'context Person inv: self.children->forAll(age < 10)';
         expectOclRuleValidatesToFalse(oclExpression, mother);
     });
 

diff --git a/test/expressions/collection/select.spec.ts b/test/expressions/collection/select.spec.ts
@@ -5,7 +5,7 @@ describe('Collection->select ', () => {
     const mother = FixtureFactory.createPerson('Hilde', 50);
 
     it('should parse select', () => {
-        const oclExpression = 'context Object inv: self.a->select(a | a < 2)->size = 1';
+        const oclExpression = 'context Object inv: self.a->select(b | b < 2)->size = 1';
         expectOclRuleValidatesToTrue(oclExpression, {a: [1, 4]});
     });
 

diff --git a/test/expressions/variable.spec.ts b/test/expressions/variable.spec.ts
@@ -6,4 +6,10 @@ describe('VariableExpression', () => {
         const oclExpression = 'context Object inv: self.a = 12';
         expectOclRuleValidatesToTrue(oclExpression, obj);
     });
+
+    it('returns simple value without self', () => {
+        const obj = {a: 12};
+        const oclExpression = 'context Object inv: a = 12';
+        expectOclRuleValidatesToTrue(oclExpression, obj);
+    });
 });