Merge pull request #714 from SteKoe/fix/one-selector

fix: some expressions

lib/components/expressions/BodyBasedExpression.ts

@@ -0,0 +1,25 @@
+import {OclExecutionContext} from "../OclExecutionContext";
+import {Expression} from "./Expression";
+import {SourceBasedExpression} from "./SourceBasedExpression";
+
+export abstract class BodyBasedExpression extends SourceBasedExpression {
+    private body: Expression;
+
+    setBody(body: Expression): any {
+        this.body = body;
+    }
+
+    getBody(): Expression {
+        return this.body;
+    }
+
+    _evaluateBodyAndSource(visitor: OclExecutionContext, localVariables?: any): { source: any, body: any } {
+        const body = this.getSource()
+            .evaluate(visitor, localVariables);
+
+        const source = this.getBody()
+            .evaluate(visitor, localVariables);
+
+        return {source, body};
+    }
+}

lib/components/expressions/Expression.ts

@@ -1,4 +1,4 @@
-import { OclExecutionContext } from '../OclExecutionContext';
+import {OclExecutionContext} from '../OclExecutionContext';
 
 export abstract class Expression {
     private readonly type: string;
@@ -15,49 +15,3 @@ export abstract class Expression {
     abstract evaluate(visitor: OclExecutionContext, localVariables?: any): any;
 }
 
-export abstract class SourceBasedExpression extends Expression {
-    private readonly source: any;
-
-    constructor(source) {
-        super();
-        this.source = source;
-    }
-
-    getSource(): Expression {
-        return this.source;
-    }
-}
-
-export abstract class BodyBasedExpression extends SourceBasedExpression {
-    private body: Expression;
-
-    setBody(body: Expression): any {
-        this.body = body;
-    }
-
-    getBody(): Expression {
-        return this.body;
-    }
-
-    _evaluateBodyAndSource(visitor: OclExecutionContext, localVariables?: any): { source: any, body: any } {
-        const body = this.getSource()
-            .evaluate(visitor, localVariables);
-
-        const source = this.getBody()
-            .evaluate(visitor, localVariables);
-
-        return {source, body};
-    }
-}
-
-export abstract class IteratorExpression extends BodyBasedExpression {
-    private iterators: Array<any>;
-
-    setIterators(iterators: Array<any>): void {
-        this.iterators = iterators;
-    }
-
-    getIterators(): Array<any> {
-        return this.iterators;
-    }
-}

lib/components/expressions/IteratorExpression.ts

@@ -0,0 +1,29 @@
+import {OclExecutionContext} from "../OclExecutionContext";
+import {Utils} from "../Utils";
+
+import {BodyBasedExpression} from "./BodyBasedExpression";
+
+export abstract class IteratorExpression extends BodyBasedExpression {
+    private iterators: Array<any>;
+
+    setIterators(iterators: Array<any>): void {
+        this.iterators = iterators;
+    }
+
+    getIterators(): Array<any> {
+        return this.iterators;
+    }
+
+    protected evaluateBody(visitor: OclExecutionContext, localVariables: any, item: any) {
+        const variables = {};
+        if (this.getIterators()) {
+            variables[this.getIterators()[0]] = item;
+        } else {
+            const variableName = Utils.getVariableName(this);
+            const varName = variableName.getVariable();
+            variables[varName] = varName === "self" ? item : (item[varName] ?? item);
+        }
+
+        return this.getBody().evaluate(visitor, {...localVariables, ...variables});
+    }
+}

lib/components/expressions/LeftRightBasedExpression.ts

@@ -1,6 +1,5 @@
-import { OclExecutionContext } from '../OclExecutionContext';
-
-import { Expression } from './Expression';
+import {OclExecutionContext} from '../OclExecutionContext';
+import {Expression} from './Expression';
 
 export abstract class LeftRightBasedExpression extends Expression {
     private readonly left: any;

lib/components/expressions/NativeJsFunctionCallExpression.ts

@@ -1,6 +1,7 @@
 import { OclExecutionContext } from '../OclExecutionContext';
 
-import { Expression, SourceBasedExpression } from './Expression';
+import { Expression } from './Expression';
+import {SourceBasedExpression} from "./SourceBasedExpression";
 
 export class NativeJsFunctionCallExpression extends SourceBasedExpression {
     private readonly fn: any;

lib/components/expressions/OclIsKindOfExpression.ts

@@ -1,6 +1,7 @@
 import { OclExecutionContext } from '../OclExecutionContext';
 
-import { BodyBasedExpression } from './Expression';
+
+import {BodyBasedExpression} from "./BodyBasedExpression";
 
 /**
  * Checks if *self* is an instance of the class identified by the name

lib/components/expressions/OclIsTypeOfExpression.ts

@@ -1,7 +1,8 @@
 import { OclExecutionContext } from '../OclExecutionContext';
 import { Utils } from '../Utils';
 
-import { BodyBasedExpression } from './Expression';
+
+import {BodyBasedExpression} from "./BodyBasedExpression";
 
 /**
  * Checks if *self* is an instance of exact the class identified by the name

lib/components/expressions/OclIsUndefinedExpression.ts

@@ -1,6 +1,7 @@
 import { OclExecutionContext } from '../OclExecutionContext';
 
-import { SourceBasedExpression } from './Expression';
+
+import {SourceBasedExpression} from "./SourceBasedExpression";
 
 /**
  * Checks if *self* is not defined or  null

lib/components/expressions/SourceBasedExpression.ts

@@ -0,0 +1,14 @@
+import {Expression} from "./Expression";
+
+export abstract class SourceBasedExpression extends Expression {
+    private readonly source: any;
+
+    constructor(source) {
+        super();
+        this.source = source;
+    }
+
+    getSource(): Expression {
+        return this.source;
+    }
+}

lib/components/expressions/VariableExpression.ts

@@ -1,6 +1,7 @@
 import {OclExecutionContext} from '../OclExecutionContext';
 
-import {SourceBasedExpression} from './Expression';
+
+import {SourceBasedExpression} from "./SourceBasedExpression";
 
 /**
  * Resolve variables. Simple values are returned as is (e.g. self.age: number), collections are aggregated.

lib/components/expressions/collection/AnyExpression.ts

@@ -1,6 +1,5 @@
-import { IteratorExpression } from '../Expression';
-import { OclExecutionContext } from '../../OclExecutionContext';
-import { Utils } from '../../Utils';
+import {OclExecutionContext} from '../../OclExecutionContext';
+import {IteratorExpression} from "../IteratorExpression";
 
 /**
  * Returns the first element that validates the given expression.
@@ -14,17 +13,7 @@ export class AnyExpression extends IteratorExpression {
             .evaluate(visitor, localVariables);
 
         if (collection instanceof Array) {
-            return collection.find(c => {
-                const variables = {};
-                if (this.getIterators()) {
-                    variables[this.getIterators()[0]] = c;
-                } else {
-                    const variableName = Utils.getVariableName(this);
-                    variables[variableName.getVariable()] = c[variableName.getVariable()] || c;
-                }
-
-                return this.getBody().evaluate(visitor, {...localVariables, ...variables});
-            });
+            return collection.find(c => this.evaluateBody(visitor, localVariables, c));
         }
 
         return;

lib/components/expressions/collection/AppendExpression.ts

@@ -1,5 +1,5 @@
-import { BodyBasedExpression } from '../Expression';
 import { OclExecutionContext } from '../../OclExecutionContext';
+import {BodyBasedExpression} from "../BodyBasedExpression";
 
 /**
  * Appends the given element to the given collection and returns the extended collection.

lib/components/expressions/collection/AsSetExpression.ts

@@ -1,5 +1,5 @@
-import { SourceBasedExpression } from '../Expression';
 import { OclExecutionContext } from '../../OclExecutionContext';
+import {SourceBasedExpression} from "../SourceBasedExpression";
 
 /**
  * Returns the given collection as set, containing unique entries.

lib/components/expressions/collection/AtExpression.ts

@@ -1,5 +1,5 @@
-import { BodyBasedExpression } from '../Expression';
 import { OclExecutionContext } from '../../OclExecutionContext';
+import {BodyBasedExpression} from "../BodyBasedExpression";
 
 /**
  * Returns the element of the collection at index index.