ifc-expressions 0.2.3 → 0.3.1

package/dist/cjs/expression/function/impl/MAP.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAP = void 0;
+const Func_js_1 = require("../Func.js");
+const ExprEvalResult_1 = require("../../ExprEvalResult");
+const IfcExpression_js_1 = require("../../../IfcExpression.js");
+const FuncArg_js_1 = require("../FuncArg.js");
+const ExprKind_js_1 = require("../../ExprKind.js");
+class MAP extends Func_js_1.Func {
+    constructor() {
+        super("MAP", [
+            new FuncArg_js_1.FuncArg(true, MAP.ARG_NAME_MAPPING_INPUT),
+            new MappingsArg(true, MAP.ARG_NAME_MAPPINGS),
+            new FuncArg_js_1.FuncArg(false, MAP.ARG_NAME_DEFAULT_VALUE),
+        ]);
+    }
+    calculateResult(evaluatedArguments) {
+        const mappings = evaluatedArguments.get(MAP.ARG_NAME_MAPPINGS);
+        const input = evaluatedArguments.get(MAP.ARG_NAME_MAPPING_INPUT);
+        const defaultValue = evaluatedArguments.get(MAP.ARG_NAME_DEFAULT_VALUE);
+        let matchIndex = -1;
+        const leftColumn = mappings.getValue()[0].getValue();
+        const rightColumn = mappings.getValue()[1].getValue();
+        const numMappings = leftColumn.length;
+        for (let i = 0; i < numMappings; i++) {
+            if (leftColumn[i].equals(input)) {
+                matchIndex = i;
+                break;
+            }
+        }
+        if (matchIndex === -1) {
+            if ((0, IfcExpression_js_1.isNullish)(defaultValue)) {
+                return new ExprEvalResult_1.ExprEvalFunctionEvaluationErrorObj(ExprKind_js_1.ExprKind.FUNCTION, ExprEvalResult_1.ExprEvalStatus.UNDEFINED_RESULT, "Input value not found in left column. No default return value specified, therefore the result of MAP() is undefined ", this.name);
+            }
+            else {
+                return new ExprEvalResult_1.ExprEvalSuccessObj(defaultValue);
+            }
+        }
+        return new ExprEvalResult_1.ExprEvalSuccessObj(rightColumn[matchIndex]);
+    }
+}
+exports.MAP = MAP;
+MAP.ARG_NAME_MAPPINGS = "mappings";
+MAP.ARG_NAME_MAPPING_INPUT = "input";
+MAP.ARG_NAME_DEFAULT_VALUE = "defaultValue";
+class MappingsArg extends FuncArg_js_1.FuncArg {
+    constructor(required, name) {
+        super(required, name);
+    }
+    transformValue(invocationValue) {
+        if ((0, ExprEvalResult_1.isExprEvalSuccess)(invocationValue)) {
+            const mappings = invocationValue.result;
+            if (!Array.isArray(mappings.getValue())) {
+                return this.makeError(mappings, "The value is not an array");
+            }
+            if (mappings.getValue().length !== 2) {
+                return this.makeError(mappings, "The array is not of length 2");
+            }
+            const firstElement = mappings.getValue()[0];
+            if (!Array.isArray(firstElement.getValue())) {
+                return this.makeError(mappings, "The first element of the array is not itself an array");
+            }
+            const secondElement = mappings.getValue()[1];
+            if (!Array.isArray(secondElement.getValue())) {
+                return this.makeError(mappings, "The second element of the array is not itself an array");
+            }
+            if (firstElement.getValue().length !== secondElement.getValue().length) {
+                return this.makeError(mappings, `The first element of the array and the second differ in length ${firstElement.getValue().length} and ${secondElement.getValue().length}`);
+            }
+        }
+        return invocationValue;
+    }
+    makeError(mappings, problem) {
+        return new ExprEvalResult_1.ExprEvalTypeErrorObj(ExprKind_js_1.ExprKind.FUNCTION_ARGUMENTS, `Argument ${this.name} must be an array containing two arrays of the same length (i.e., a 2xn matrix: 2 rows, N columns). Problem: ${problem}.`, mappings);
+    }
+}
+//# sourceMappingURL=MAP.js.map

package/dist/cjs/expression/function/impl/MAP.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/expression/function/impl/MAP.ts"],"names":[],"mappings":";;;AAAA,wCAAkC;AAElC,yDAO8B;AAC9B,gEAAoE;AACpE,8CAAwC;AACxC,mDAA6C;AAG7C,MAAa,GAAI,SAAQ,cAAI;IAK3B;QACE,KAAK,CAAC,KAAK,EAAE;YACX,IAAI,oBAAO,CAAC,IAAI,EAAE,GAAG,CAAC,sBAAsB,CAAC;YAC7C,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,iBAAiB,CAAC;YAC5C,IAAI,oBAAO,CAAC,KAAK,EAAE,GAAG,CAAC,sBAAsB,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC;IAES,eAAe,CACvB,kBAAqD;QAErD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CACrC,GAAG,CAAC,iBAAiB,CACG,CAAC;QAC3B,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAClC,GAAG,CAAC,sBAAsB,CACQ,CAAC;QACrC,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CACzC,GAAG,CAAC,sBAAsB,CACA,CAAC;QAC7B,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;QACpB,MAAM,UAAU,GACd,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CACtB,CAAC,QAAQ,EAAE,CAAC;QACb,MAAM,WAAW,GACf,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CACtB,CAAC,QAAQ,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;YACpC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC/B,UAAU,GAAG,CAAC,CAAC;gBACf,MAAM;aACP;SACF;QACD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE;YACrB,IAAI,IAAA,4BAAS,EAAC,YAAY,CAAC,EAAE;gBAC3B,OAAO,IAAI,mDAAkC,CAC3C,sBAAQ,CAAC,QAAQ,EACjB,+BAAc,CAAC,gBAAgB,EAC/B,sHAAsH,EACtH,IAAI,CAAC,IAAI,CACV,CAAC;aACH;iBAAM;gBACL,OAAO,IAAI,mCAAkB,CAAC,YAAY,CAAC,CAAC;aAC7C;SACF;QACD,OAAO,IAAI,mCAAkB,CAC3B,WAAW,CAAC,UAAU,CAAyB,CAChD,CAAC;IACJ,CAAC;;AAtDH,kBAuDC;AAtDyB,qBAAiB,GAAG,UAAU,CAAC;AAC/B,0BAAsB,GAAG,OAAO,CAAC;AACjC,0BAAsB,GAAG,cAAc,CAAC;AAsDlE,MAAM,WAAY,SAAQ,oBAAY;IACpC,YAAY,QAAiB,EAAE,IAAY;QACzC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CACZ,eAAqD;QAErD,IAAI,IAAA,kCAAiB,EAAC,eAAe,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAoB,CAAC;YACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE;gBACvC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC;aAC9D;YACD,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;aACjE;YACD,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAA0B,CAAC;YACrE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC,SAAS,CACnB,QAAQ,EACR,uDAAuD,CACxD,CAAC;aACH;YACD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAA0B,CAAC;YACtE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,SAAS,CACnB,QAAQ,EACR,wDAAwD,CACzD,CAAC;aACH;YACD,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;gBACtE,OAAO,IAAI,CAAC,SAAS,CACnB,QAAQ,EACR,kEACE,YAAY,CAAC,QAAQ,EAAE,CAAC,MAC1B,QAAQ,aAAa,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAC1C,CAAC;aACH;SACF;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAEO,SAAS,CAAC,QAA8B,EAAE,OAAe;QAC/D,OAAO,IAAI,qCAAoB,CAC7B,sBAAQ,CAAC,kBAAkB,EAC3B,YAAY,IAAI,CAAC,IAAI,gHAAgH,OAAO,GAAG,EAC/I,QAAQ,CACT,CAAC;IACJ,CAAC;CACF","file":"expression/function/impl/MAP.js","sourcesContent":["import { Func } from \"../Func.js\";\nimport { LiteralValueAnyArity } from \"../../../value/LiteralValueAnyArity.js\";\nimport {\n  ExprEvalFunctionEvaluationErrorObj,\n  ExprEvalResult,\n  ExprEvalStatus,\n  ExprEvalSuccessObj,\n  ExprEvalTypeErrorObj,\n  isExprEvalSuccess,\n} from \"../../ExprEvalResult\";\nimport { isNullish, LiteralValue } from \"../../../IfcExpression.js\";\nimport { FuncArg } from \"../FuncArg.js\";\nimport { ExprKind } from \"../../ExprKind.js\";\nimport { ArrayValue } from \"../../../value/ArrayValue.js\";\n\nexport class MAP extends Func {\n  private static readonly ARG_NAME_MAPPINGS = \"mappings\";\n  private static readonly ARG_NAME_MAPPING_INPUT = \"input\";\n  private static readonly ARG_NAME_DEFAULT_VALUE = \"defaultValue\";\n\n  constructor() {\n    super(\"MAP\", [\n      new FuncArg(true, MAP.ARG_NAME_MAPPING_INPUT),\n      new MappingsArg(true, MAP.ARG_NAME_MAPPINGS),\n      new FuncArg(false, MAP.ARG_NAME_DEFAULT_VALUE),\n    ]);\n  }\n\n  protected calculateResult(\n    evaluatedArguments: Map<string, LiteralValueAnyArity>\n  ): ExprEvalResult<LiteralValueAnyArity> {\n    const mappings = evaluatedArguments.get(\n      MAP.ARG_NAME_MAPPINGS\n    ) as unknown as ArrayValue;\n    const input = evaluatedArguments.get(\n      MAP.ARG_NAME_MAPPING_INPUT\n    ) as unknown as LiteralValueAnyArity;\n    const defaultValue = evaluatedArguments.get(\n      MAP.ARG_NAME_DEFAULT_VALUE\n    ) as unknown as LiteralValue;\n    let matchIndex = -1;\n    const leftColumn = (\n      mappings.getValue()[0] as unknown as ArrayValue\n    ).getValue();\n    const rightColumn = (\n      mappings.getValue()[1] as unknown as ArrayValue\n    ).getValue();\n    const numMappings = leftColumn.length;\n    for (let i = 0; i < numMappings; i++) {\n      if (leftColumn[i].equals(input)) {\n        matchIndex = i;\n        break;\n      }\n    }\n    if (matchIndex === -1) {\n      if (isNullish(defaultValue)) {\n        return new ExprEvalFunctionEvaluationErrorObj(\n          ExprKind.FUNCTION,\n          ExprEvalStatus.UNDEFINED_RESULT,\n          \"Input value not found in left column. No default return value specified, therefore the result of MAP() is undefined \",\n          this.name\n        );\n      } else {\n        return new ExprEvalSuccessObj(defaultValue);\n      }\n    }\n    return new ExprEvalSuccessObj(\n      rightColumn[matchIndex] as LiteralValueAnyArity\n    );\n  }\n}\n\nclass MappingsArg extends FuncArg<any> {\n  constructor(required: boolean, name: string) {\n    super(required, name);\n  }\n\n  transformValue(\n    invocationValue: ExprEvalResult<LiteralValueAnyArity>\n  ): ExprEvalResult<LiteralValueAnyArity> {\n    if (isExprEvalSuccess(invocationValue)) {\n      const mappings = invocationValue.result as ArrayValue;\n      if (!Array.isArray(mappings.getValue())) {\n        return this.makeError(mappings, \"The value is not an array\");\n      }\n      if (mappings.getValue().length !== 2) {\n        return this.makeError(mappings, \"The array is not of length 2\");\n      }\n      const firstElement = mappings.getValue()[0] as unknown as ArrayValue;\n      if (!Array.isArray(firstElement.getValue())) {\n        return this.makeError(\n          mappings,\n          \"The first element of the array is not itself an array\"\n        );\n      }\n      const secondElement = mappings.getValue()[1] as unknown as ArrayValue;\n      if (!Array.isArray(secondElement.getValue())) {\n        return this.makeError(\n          mappings,\n          \"The second element of the array is not itself an array\"\n        );\n      }\n      if (firstElement.getValue().length !== secondElement.getValue().length) {\n        return this.makeError(\n          mappings,\n          `The first element of the array and the second differ in length ${\n            firstElement.getValue().length\n          } and ${secondElement.getValue().length}`\n        );\n      }\n    }\n    return invocationValue;\n  }\n\n  private makeError(mappings: LiteralValueAnyArity, problem: string) {\n    return new ExprEvalTypeErrorObj(\n      ExprKind.FUNCTION_ARGUMENTS,\n      `Argument ${this.name} must be an array containing two arrays of the same length (i.e., a 2xn matrix: 2 rows, N columns). Problem: ${problem}.`,\n      mappings\n    );\n  }\n}\n"]}

package/dist/cjs/expression/function/impl/ROUND.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ROUND = void 0;
+const Func_js_1 = require("../Func.js");
+const FuncArgInt_js_1 = require("../arg/FuncArgInt.js");
+const NumericValue_js_1 = require("../../../value/NumericValue.js");
+const FuncArgNumeric_js_1 = require("../arg/FuncArgNumeric.js");
+const ExprEvalResult_js_1 = require("../../ExprEvalResult.js");
+const decimal_js_1 = require("decimal.js");
+class ROUND extends Func_js_1.Func {
+    constructor() {
+        super("ROUND", [
+            new FuncArgNumeric_js_1.FuncArgNumeric(true, ROUND.KEY_INPUT),
+            new FuncArgInt_js_1.FuncArgInt(false, ROUND.KEY_NUM_DECMIALS, new NumericValue_js_1.NumericValue(0)),
+        ]);
+    }
+    calculateResult(evaluatedArguments) {
+        const input = evaluatedArguments.get(ROUND.KEY_INPUT);
+        const numDecimals = evaluatedArguments.get(ROUND.KEY_NUM_DECMIALS);
+        const rounded = input
+            .getValue()
+            .toDecimalPlaces(numDecimals.getValue().toNumber(), decimal_js_1.Decimal.ROUND_HALF_UP);
+        return new ExprEvalResult_js_1.ExprEvalSuccessObj(new NumericValue_js_1.NumericValue(rounded));
+    }
+}
+exports.ROUND = ROUND;
+ROUND.KEY_INPUT = "input";
+ROUND.KEY_NUM_DECMIALS = "num_decimals";
+//# sourceMappingURL=ROUND.js.map

package/dist/cjs/expression/function/impl/ROUND.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/expression/function/impl/ROUND.ts"],"names":[],"mappings":";;;AAAA,wCAAkC;AAClC,wDAAkD;AAClD,oEAA8D;AAC9D,gEAA0D;AAE1D,+DAA6E;AAC7E,2CAAqC;AAErC,MAAa,KAAM,SAAQ,cAAI;IAI7B;QACE,KAAK,CAAC,OAAO,EAAE;YACb,IAAI,kCAAc,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;YACzC,IAAI,0BAAU,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,IAAI,8BAAY,CAAC,CAAC,CAAC,CAAC;SACnE,CAAC,CAAC;IACL,CAAC;IAES,eAAe,CACvB,kBAAqD;QAErD,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAiB,CAAC;QACtE,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CACxC,KAAK,CAAC,gBAAgB,CACP,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK;aAClB,QAAQ,EAAE;aACV,eAAe,CACd,WAAW,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EACjC,oBAAO,CAAC,aAAa,CACtB,CAAC;QACJ,OAAO,IAAI,sCAAkB,CAAC,IAAI,8BAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC;;AAzBH,sBA0BC;AAzBgB,eAAS,GAAG,OAAO,CAAC;AACpB,sBAAgB,GAAG,cAAc,CAAC","file":"expression/function/impl/ROUND.js","sourcesContent":["import { Func } from \"../Func.js\";\nimport { FuncArgInt } from \"../arg/FuncArgInt.js\";\nimport { NumericValue } from \"../../../value/NumericValue.js\";\nimport { FuncArgNumeric } from \"../arg/FuncArgNumeric.js\";\nimport { LiteralValueAnyArity } from \"../../../value/LiteralValueAnyArity.js\";\nimport { ExprEvalResult, ExprEvalSuccessObj } from \"../../ExprEvalResult.js\";\nimport { Decimal } from \"decimal.js\";\n\nexport class ROUND extends Func {\n  private static KEY_INPUT = \"input\";\n  private static KEY_NUM_DECMIALS = \"num_decimals\";\n\n  constructor() {\n    super(\"ROUND\", [\n      new FuncArgNumeric(true, ROUND.KEY_INPUT),\n      new FuncArgInt(false, ROUND.KEY_NUM_DECMIALS, new NumericValue(0)),\n    ]);\n  }\n\n  protected calculateResult(\n    evaluatedArguments: Map<string, LiteralValueAnyArity>\n  ): ExprEvalResult<LiteralValueAnyArity> {\n    const input = evaluatedArguments.get(ROUND.KEY_INPUT) as NumericValue;\n    const numDecimals = evaluatedArguments.get(\n      ROUND.KEY_NUM_DECMIALS\n    ) as NumericValue;\n    const rounded = input\n      .getValue()\n      .toDecimalPlaces(\n        numDecimals.getValue().toNumber(),\n        Decimal.ROUND_HALF_UP\n      );\n    return new ExprEvalSuccessObj(new NumericValue(rounded));\n  }\n}\n"]}

package/dist/cjs/expression/numeric/DivideExpr.js

@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DivideExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
 const NumericValue_js_1 = require("../../value/NumericValue.js");
+const ExprKind_js_1 = require("../ExprKind.js");
+const ExprEvalResult_1 = require("../ExprEvalResult");
 class DivideExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.NUM_DIVIDE, left, right);
     }
-    evaluate(ctx) {
-        return NumericValue_js_1.NumericValue.of(this.left
-            .evaluate(ctx)
-            .getValue()
-            .dividedBy(this.right.evaluate(ctx).getValue()));
+    calculateResult(ctx, localCtx, left, right) {
+        return NumericValue_js_1.NumericValue.of(left.getValue().dividedBy(right.getValue()));
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalError2Obj(error, leftResult, rightResult, ExprEvalResult_1.ExprEvalStatus.MATH_ERROR, error);
     }
 }
 exports.DivideExpr = DivideExpr;

package/dist/cjs/expression/numeric/DivideExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/DivideExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAE3D,MAAa,UAAW,SAAQ,gBAI/B;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,8BAAY,CAAC,EAAE,CACpB,IAAI,CAAC,IAAI;aACN,QAAQ,CAAC,GAAG,CAAC;aACb,QAAQ,EAAE;aACV,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;CACF;AAjBD,gCAiBC","file":"expression/numeric/DivideExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class DivideExpr extends Expr2<\n  Expr<NumericValue>,\n  Expr<NumericValue>,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return NumericValue.of(\n      this.left\n        .evaluate(ctx)\n        .getValue()\n        .dividedBy(this.right.evaluate(ctx).getValue())\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/DivideExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAC3D,gDAA0C;AAC1C,sDAK2B;AAE3B,MAAa,UAAW,SAAQ,gBAI/B;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,sBAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAES,eAAe,CACvB,GAAyB,EACzB,QAA0B,EAC1B,IAAkB,EAClB,KAAmB;QAEnB,OAAO,8BAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAAwC,EACxC,WAAyC;QAEzC,OAAO,IAAI,kCAAiB,CAC1B,KAAK,EACL,UAAU,EACV,WAAW,EACX,+BAAc,CAAC,UAAU,EACzB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA/BD,gCA+BC","file":"expression/numeric/DivideExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport {\n  ExprEvalError,\n  ExprEvalError2Obj,\n  ExprEvalResult,\n  ExprEvalStatus,\n} from \"../ExprEvalResult\";\n\nexport class DivideExpr extends Expr2<\n  NumericValue,\n  NumericValue,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(ExprKind.NUM_DIVIDE, left, right);\n  }\n\n  protected calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    left: NumericValue,\n    right: NumericValue\n  ): NumericValue | ExprEvalError {\n    return NumericValue.of(left.getValue().dividedBy(right.getValue()));\n  }\n\n  protected handleError(\n    error: any,\n    leftResult: ExprEvalResult<NumericValue>,\n    rightResult: ExprEvalResult<NumericValue>\n  ): ExprEvalError {\n    return new ExprEvalError2Obj(\n      error,\n      leftResult,\n      rightResult,\n      ExprEvalStatus.MATH_ERROR,\n      error\n    );\n  }\n}\n"]}

package/dist/cjs/expression/numeric/MinusExpr.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MinusExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
 const NumericValue_js_1 = require("../../value/NumericValue.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class MinusExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.NUM_MINUS, left, right);
     }
-    evaluate(ctx) {
-        return NumericValue_js_1.NumericValue.of(this.left
-            .evaluate(ctx)
-            .getValue()
-            .minus(this.right.evaluate(ctx).getValue()));
+    calculateResult(ctx, localCtx, left, right) {
+        return NumericValue_js_1.NumericValue.of(left.getValue().minus(right.getValue()));
     }
 }
 exports.MinusExpr = MinusExpr;

package/dist/cjs/expression/numeric/MinusExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/MinusExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAE3D,MAAa,SAAU,SAAQ,gBAI9B;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,8BAAY,CAAC,EAAE,CACpB,IAAI,CAAC,IAAI;aACN,QAAQ,CAAC,GAAG,CAAC;aACb,QAAQ,EAAE;aACV,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC9C,CAAC;IACJ,CAAC;CACF;AAjBD,8BAiBC","file":"expression/numeric/MinusExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class MinusExpr extends Expr2<\n  Expr<NumericValue>,\n  Expr<NumericValue>,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return NumericValue.of(\n      this.left\n        .evaluate(ctx)\n        .getValue()\n        .minus(this.right.evaluate(ctx).getValue())\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/MinusExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAC3D,gDAA0C;AAG1C,MAAa,SAAU,SAAQ,gBAA+C;IAC5E,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,sBAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IAES,eAAe,CACvB,GAAyB,EACzB,QAA0B,EAC1B,IAAkB,EAClB,KAAmB;QAEnB,OAAO,8BAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAClE,CAAC;CACF;AAbD,8BAaC","file":"expression/numeric/MinusExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport { ExprEvalError } from \"../ExprEvalResult.js\";\n\nexport class MinusExpr extends Expr2<NumericValue, NumericValue, NumericValue> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(ExprKind.NUM_MINUS, left, right);\n  }\n\n  protected calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    left: NumericValue,\n    right: NumericValue\n  ): NumericValue | ExprEvalError {\n    return NumericValue.of(left.getValue().minus(right.getValue()));\n  }\n}\n"]}

package/dist/cjs/expression/numeric/MultiplyExpr.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiplyExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
 const NumericValue_js_1 = require("../../value/NumericValue.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class MultiplyExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.NUM_MULTIPLY, left, right);
     }
-    evaluate(ctx) {
-        return NumericValue_js_1.NumericValue.of(this.left
-            .evaluate(ctx)
-            .getValue()
-            .mul(this.right.evaluate(ctx).getValue()));
+    calculateResult(ctx, localCtx, left, right) {
+        return NumericValue_js_1.NumericValue.of(left.getValue().mul(right.getValue()));
     }
 }
 exports.MultiplyExpr = MultiplyExpr;

package/dist/cjs/expression/numeric/MultiplyExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/MultiplyExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAE3D,MAAa,YAAa,SAAQ,gBAIjC;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,8BAAY,CAAC,EAAE,CACpB,IAAI,CAAC,IAAI;aACN,QAAQ,CAAC,GAAG,CAAC;aACb,QAAQ,EAAE;aACV,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF;AAjBD,oCAiBC","file":"expression/numeric/MultiplyExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class MultiplyExpr extends Expr2<\n  Expr<NumericValue>,\n  Expr<NumericValue>,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return NumericValue.of(\n      this.left\n        .evaluate(ctx)\n        .getValue()\n        .mul(this.right.evaluate(ctx).getValue())\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/MultiplyExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAC3D,gDAA0C;AAG1C,MAAa,YAAa,SAAQ,gBAIjC;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,sBAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAES,eAAe,CACvB,GAAyB,EACzB,QAA0B,EAC1B,IAAkB,EAClB,KAAmB;QAEnB,OAAO,8BAAY,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAjBD,oCAiBC","file":"expression/numeric/MultiplyExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport { ExprEvalError } from \"../ExprEvalResult.js\";\n\nexport class MultiplyExpr extends Expr2<\n  NumericValue,\n  NumericValue,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(ExprKind.NUM_MULTIPLY, left, right);\n  }\n\n  protected calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    left: NumericValue,\n    right: NumericValue\n  ): NumericValue | ExprEvalError {\n    return NumericValue.of(left.getValue().mul(right.getValue()));\n  }\n}\n"]}

package/dist/cjs/expression/numeric/NumParenthesisExpr.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumParenthesisExpr = void 0;
 const Expr1_js_1 = require("../Expr1.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class NumParenthesisExpr extends Expr1_js_1.Expr1 {
     constructor(expression) {
-        super(expression);
+        super(ExprKind_js_1.ExprKind.NUM_PARENTHESIS, expression);
     }
-    evaluate(ctx) {
-        return this.value.evaluate(ctx);
+    calculateResult(ctx, localCtx, subExpressionValue) {
+        return subExpressionValue;
     }
 }
 exports.NumParenthesisExpr = NumParenthesisExpr;

package/dist/cjs/expression/numeric/NumParenthesisExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/NumParenthesisExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAKpC,MAAa,kBAAmB,SAAQ,gBAGvC;IACC,YAAY,UAA8B;QACxC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;CACF;AAXD,gDAWC","file":"expression/numeric/NumParenthesisExpr.js","sourcesContent":["import { Expr1 } from \"../Expr1.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class NumParenthesisExpr extends Expr1<\n  Expr<NumericValue>,\n  NumericValue\n> {\n  constructor(expression: Expr<NumericValue>) {\n    super(expression);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return this.value.evaluate(ctx);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/NumParenthesisExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAIpC,gDAA0C;AAE1C,MAAa,kBAAmB,SAAQ,gBAAiC;IACvE,YAAY,UAA8B;QACxC,KAAK,CAAC,sBAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IAES,eAAe,CACvB,GAAyB,EACzB,QAA0B,EAC1B,kBAAgC;QAEhC,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF;AAZD,gDAYC","file":"expression/numeric/NumParenthesisExpr.js","sourcesContent":["import { Expr1 } from \"../Expr1.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class NumParenthesisExpr extends Expr1<NumericValue, NumericValue> {\n  constructor(expression: Expr<NumericValue>) {\n    super(ExprKind.NUM_PARENTHESIS, expression);\n  }\n\n  protected calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    subExpressionValue: NumericValue\n  ): NumericValue {\n    return subExpressionValue;\n  }\n}\n"]}

package/dist/cjs/expression/numeric/NumericLiteralExpr.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NumericLiteralExpr = void 0;
-const Expr1_js_1 = require("../Expr1.js");
-class NumericLiteralExpr extends Expr1_js_1.Expr1 {
+const ExprKind_js_1 = require("../ExprKind.js");
+const LiteralExpr_js_1 = require("../LiteralExpr.js");
+class NumericLiteralExpr extends LiteralExpr_js_1.LiteralExpr {
     constructor(value) {
-        super(value);
+        super(ExprKind_js_1.ExprKind.NUM_LITERAL, value);
     }
-    evaluate(ctx) {
+    calculateResult(ctx) {
         return this.value;
     }
 }

package/dist/cjs/expression/numeric/NumericLiteralExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/NumericLiteralExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAIpC,MAAa,kBAAmB,SAAQ,gBAAiC;IACvE,YAAY,KAAmB;QAC7B,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AARD,gDAQC","file":"expression/numeric/NumericLiteralExpr.js","sourcesContent":["import { Expr1 } from \"../Expr1.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class NumericLiteralExpr extends Expr1<NumericValue, NumericValue> {\n  constructor(value: NumericValue) {\n    super(value);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return this.value;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/NumericLiteralExpr.ts"],"names":[],"mappings":";;;AAGA,gDAA0C;AAC1C,sDAAgD;AAEhD,MAAa,kBAAmB,SAAQ,4BAGvC;IACC,YAAY,KAAmB;QAC7B,KAAK,CAAC,sBAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;IAES,eAAe,CACvB,GAAyB;QAEzB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAbD,gDAaC","file":"expression/numeric/NumericLiteralExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprEvalError } from \"../ExprEvalResult.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport { LiteralExpr } from \"../LiteralExpr.js\";\n\nexport class NumericLiteralExpr extends LiteralExpr<\n  NumericValue,\n  NumericValue\n> {\n  constructor(value: NumericValue) {\n    super(ExprKind.NUM_LITERAL, value);\n  }\n\n  protected calculateResult(\n    ctx: IfcExpressionContext\n  ): NumericValue | ExprEvalError {\n    return this.value;\n  }\n}\n"]}

package/dist/cjs/expression/numeric/PlusExpr.js

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlusExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
 const NumericValue_js_1 = require("../../value/NumericValue.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class PlusExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.NUM_PLUS, left, right);
     }
-    evaluate(ctx) {
-        return NumericValue_js_1.NumericValue.of(this.left
-            .evaluate(ctx)
-            .getValue()
-            .plus(this.right.evaluate(ctx).getValue()));
+    calculateResult(ctx, localCtx, leftResult, rightResult) {
+        return NumericValue_js_1.NumericValue.of(leftResult.getValue().plus(rightResult.getValue()));
     }
 }
 exports.PlusExpr = PlusExpr;

package/dist/cjs/expression/numeric/PlusExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/numeric/PlusExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAE3D,MAAa,QAAS,SAAQ,gBAI7B;IACC,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,8BAAY,CAAC,EAAE,CACpB,IAAI,CAAC,IAAI;aACN,QAAQ,CAAC,GAAG,CAAC;aACb,QAAQ,EAAE;aACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC7C,CAAC;IACJ,CAAC;CACF;AAjBD,4BAiBC","file":"expression/numeric/PlusExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\n\nexport class PlusExpr extends Expr2<\n  Expr<NumericValue>,\n  Expr<NumericValue>,\n  NumericValue\n> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): NumericValue {\n    return NumericValue.of(\n      this.left\n        .evaluate(ctx)\n        .getValue()\n        .plus(this.right.evaluate(ctx).getValue())\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/numeric/PlusExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,iEAA2D;AAC3D,gDAA0C;AAE1C,MAAa,QAAS,SAAQ,gBAA+C;IAC3E,YAAY,IAAwB,EAAE,KAAyB;QAC7D,KAAK,CAAC,sBAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,eAAe,CACb,GAAyB,EACzB,QAA0B,EAC1B,UAAwB,EACxB,WAAyB;QAEzB,OAAO,8BAAY,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF;AAbD,4BAaC","file":"expression/numeric/PlusExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { NumericValue } from \"../../value/NumericValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class PlusExpr extends Expr2<NumericValue, NumericValue, NumericValue> {\n  constructor(left: Expr<NumericValue>, right: Expr<NumericValue>) {\n    super(ExprKind.NUM_PLUS, left, right);\n  }\n\n  calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: NumericValue,\n    rightResult: NumericValue\n  ): NumericValue {\n    return NumericValue.of(leftResult.getValue().plus(rightResult.getValue()));\n  }\n}\n"]}

package/dist/cjs/expression/reference/AttributeReferenceExpr.js

@@ -2,14 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttributeReferenceExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
+const ExprKind_js_1 = require("../ExprKind.js");
+const ExprEvalResult_1 = require("../ExprEvalResult");
+const LocalContextKeys_1 = require("../LocalContextKeys");
 class AttributeReferenceExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.REF_ATTRIBUTE, left, right);
     }
-    evaluate(ctx) {
-        const oa = this.left.evaluate(ctx);
-        const valueAccessor = this.right.evaluate(ctx);
-        return valueAccessor(oa);
+    onAfterLeftRecursion(ctx, localCtx, leftResult) {
+        localCtx.set(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR, leftResult);
+    }
+    calculateResult(ctx, localCtx, objectAccessor, dereferencedValue) {
+        localCtx.delete(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR);
+        return dereferencedValue;
+    }
+    makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult) {
+        if ((0, ExprEvalResult_1.isExprEvalSuccess)(leftResult) && (0, ExprEvalResult_1.isExprEvalRefChainError)(rightResult)) {
+            return ExprEvalResult_1.ExprEvalRefChainErrorObj.bubbleUp(rightResult, this.left.getKind());
+        }
+        return super.makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult);
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_1.ExprEvalStatus.REFERENCE_ERROR, ["Unable to resolve attribute reference:", error]);
     }
 }
 exports.AttributeReferenceExpr = AttributeReferenceExpr;

package/dist/cjs/expression/reference/AttributeReferenceExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/reference/AttributeReferenceExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAMpC,MAAa,sBAAuB,SAAQ,gBAI3C;IACC,YAAY,IAAyB,EAAE,KAA4B;QACjE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,MAAM,EAAE,GAAmB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,aAAa,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;CACF;AAdD,wDAcC","file":"expression/reference/AttributeReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr2 } from \"../Expr2.js\";\nimport { NestedObjectChainExpr } from \"./NestedObjectChainExpr.js\";\nimport { ObjectReferenceExpr } from \"./ObjectReferenceExpr.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\n\nexport class AttributeReferenceExpr extends Expr2<\n  ObjectReferenceExpr,\n  NestedObjectChainExpr,\n  LiteralValueAnyArity\n> {\n  constructor(left: ObjectReferenceExpr, right: NestedObjectChainExpr) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): LiteralValueAnyArity {\n    const oa: ObjectAccessor = this.left.evaluate(ctx);\n    const valueAccessor = this.right.evaluate(ctx);\n    return valueAccessor(oa);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/reference/AttributeReferenceExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAGpC,gDAA0C;AAC1C,sDAQ2B;AAE3B,0DAAuD;AAEvD,MAAa,sBAAuB,SAAQ,gBAI3C;IACC,YAAY,IAA0B,EAAE,KAAiC;QACvE,KAAK,CAAC,sBAAQ,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAES,oBAAoB,CAC5B,GAAyB,EACzB,QAA0B,EAC1B,UAA0B;QAE1B,QAAQ,CAAC,GAAG,CAAC,mCAAgB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,eAAe,CACb,GAAyB,EACzB,QAAQ,EACR,cAA8B,EAC9B,iBAAuC;QAEvC,QAAQ,CAAC,MAAM,CAAC,mCAAgB,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAES,8BAA8B,CACtC,GAAyB,EACzB,QAA0B,EAC1B,UAA0C,EAC1C,WAA0B;QAE1B,IAAI,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,wCAAuB,EAAC,WAAW,CAAC,EAAE;YACzE,OAAO,yCAAwB,CAAC,QAAQ,CACtC,WAAW,EACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CACpB,CAAC;SACH;QACD,OAAO,KAAK,CAAC,8BAA8B,CACzC,GAAG,EACH,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA0C,EAC1C,WAAiD;QAEjD,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,+BAAc,CAAC,eAAe,EAC9B,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAClD,CAAC;IACJ,CAAC;CACF;AA5DD,wDA4DC","file":"expression/reference/AttributeReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr2 } from \"../Expr2.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport {\n  ExprEvalError,\n  ExprEvalError2Obj,\n  ExprEvalRefChainErrorObj,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalRefChainError,\n  isExprEvalSuccess,\n} from \"../ExprEvalResult\";\nimport { Expr } from \"../Expr.js\";\nimport { LocalContextKeys } from \"../LocalContextKeys\";\n\nexport class AttributeReferenceExpr extends Expr2<\n  ObjectAccessor,\n  LiteralValueAnyArity,\n  LiteralValueAnyArity\n> {\n  constructor(left: Expr<ObjectAccessor>, right: Expr<LiteralValueAnyArity>) {\n    super(ExprKind.REF_ATTRIBUTE, left, right);\n  }\n\n  protected onAfterLeftRecursion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ObjectAccessor\n  ) {\n    localCtx.set(LocalContextKeys.OBJECT_ACCESSOR, leftResult);\n  }\n\n  calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx,\n    objectAccessor: ObjectAccessor,\n    dereferencedValue: LiteralValueAnyArity\n  ): LiteralValueAnyArity | ExprEvalError {\n    localCtx.delete(LocalContextKeys.OBJECT_ACCESSOR);\n    return dereferencedValue;\n  }\n\n  protected makeResultForRightSubExprError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ExprEvalResult<ObjectAccessor>,\n    rightResult: ExprEvalError\n  ): ExprEvalResult<LiteralValueAnyArity> {\n    if (isExprEvalSuccess(leftResult) && isExprEvalRefChainError(rightResult)) {\n      return ExprEvalRefChainErrorObj.bubbleUp(\n        rightResult,\n        this.left.getKind()\n      );\n    }\n    return super.makeResultForRightSubExprError(\n      ctx,\n      localCtx,\n      leftResult,\n      rightResult\n    );\n  }\n\n  protected handleError(\n    error: any,\n    leftResult: ExprEvalResult<ObjectAccessor>,\n    rightResult: ExprEvalResult<LiteralValueAnyArity>\n  ): ExprEvalError {\n    return new ExprEvalError2Obj(\n      this.getKind(),\n      leftResult,\n      rightResult,\n      ExprEvalStatus.REFERENCE_ERROR,\n      [\"Unable to resolve attribute reference:\", error]\n    );\n  }\n}\n"]}

package/dist/cjs/expression/reference/ElemObjectReferenceExpr.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElemObjectReferenceExpr = void 0;
 const Expr0_js_1 = require("../Expr0.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class ElemObjectReferenceExpr extends Expr0_js_1.Expr0 {
     constructor() {
-        super();
+        super(ExprKind_js_1.ExprKind.REF_ELEMENT);
     }
-    evaluate(ctx) {
+    doEvaluate(ctx) {
         return ctx.resolveElemRef();
     }
 }

package/dist/cjs/expression/reference/ElemObjectReferenceExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/reference/ElemObjectReferenceExpr.ts"],"names":[],"mappings":";;;AAGA,0CAAoC;AAEpC,MAAa,uBACX,SAAQ,gBAAqB;IAG7B;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,GAAG,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF;AAXD,0DAWC","file":"expression/reference/ElemObjectReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { ObjectReferenceExpr } from \"./ObjectReferenceExpr.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { Expr0 } from \"../Expr0.js\";\n\nexport class ElemObjectReferenceExpr\n  extends Expr0<ObjectAccessor>\n  implements ObjectReferenceExpr\n{\n  constructor() {\n    super();\n  }\n\n  evaluate(ctx: IfcExpressionContext): ObjectAccessor {\n    return ctx.resolveElemRef();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/reference/ElemObjectReferenceExpr.ts"],"names":[],"mappings":";;;AAGA,0CAAoC;AACpC,gDAA0C;AAE1C,MAAa,uBACX,SAAQ,gBAAqB;IAG7B;QACE,KAAK,CAAC,sBAAQ,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IAED,UAAU,CAAC,GAAyB;QAClC,OAAO,GAAG,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF;AAXD,0DAWC","file":"expression/reference/ElemObjectReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { ObjectReferenceExpr } from \"./ObjectReferenceExpr.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { Expr0 } from \"../Expr0.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class ElemObjectReferenceExpr\n  extends Expr0<ObjectAccessor>\n  implements ObjectReferenceExpr\n{\n  constructor() {\n    super(ExprKind.REF_ELEMENT);\n  }\n\n  doEvaluate(ctx: IfcExpressionContext): ObjectAccessor {\n    return ctx.resolveElemRef();\n  }\n}\n"]}

package/dist/cjs/expression/reference/NestedObjectChainEndExpr.js

@@ -1,13 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestedObjectChainEndExpr = void 0;
-const Expr1_js_1 = require("../Expr1.js");
-class NestedObjectChainEndExpr extends Expr1_js_1.Expr1 {
+const ExprKind_js_1 = require("../ExprKind.js");
+const ExprEvalResult_1 = require("../ExprEvalResult");
+const IfcExpressionUtils_1 = require("../../IfcExpressionUtils");
+const Expr0_js_1 = require("../Expr0.js");
+const LocalContextKeys_1 = require("../LocalContextKeys");
+class NestedObjectChainEndExpr extends Expr0_js_1.Expr0 {
     constructor(value) {
-        super(value);
+        super(ExprKind_js_1.ExprKind.REF_NESTED_OBJECT_CHAIN_END);
+        this.attributeName = value;
     }
-    evaluate(ctx) {
-        return (oa) => oa.getAttribute(this.value);
+    doEvaluate(ctx, localCtx) {
+        const objectAccessor = localCtx.get(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR);
+        if ((0, IfcExpressionUtils_1.isNullish)(objectAccessor)) {
+            return new ExprEvalResult_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.MISSING_OPERAND, `No ObjectAccessor found in localContext when trying to access attribute with name'${this.attributeName}`);
+        }
+        const attributeValue = objectAccessor.getAttribute(this.attributeName);
+        if ((0, IfcExpressionUtils_1.isNullish)(attributeValue)) {
+            return new ExprEvalResult_1.ExprEvalRefChainErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.REFERENCE_ERROR, this.attributeName, `No such nested object: '${this.attributeName}'`);
+        }
+        localCtx.delete(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR);
+        return attributeValue;
     }
 }
 exports.NestedObjectChainEndExpr = NestedObjectChainEndExpr;

package/dist/cjs/expression/reference/NestedObjectChainEndExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/reference/NestedObjectChainEndExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAIpC,MAAa,wBAAyB,SAAQ,gBAG7C;IACC,YAAY,KAAa;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,QAAQ,CACN,GAAyB;QAEzB,OAAO,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;CACF;AAbD,4DAaC","file":"expression/reference/NestedObjectChainEndExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr1 } from \"../Expr1.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\n\nexport class NestedObjectChainEndExpr extends Expr1<\n  string,\n  (oa: ObjectAccessor) => LiteralValueAnyArity\n> {\n  constructor(value: string) {\n    super(value);\n  }\n\n  evaluate(\n    ctx: IfcExpressionContext\n  ): (oa: ObjectAccessor) => LiteralValueAnyArity {\n    return (oa: ObjectAccessor) => oa.getAttribute(this.value);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/reference/NestedObjectChainEndExpr.ts"],"names":[],"mappings":";;;AAEA,gDAA0C;AAC1C,sDAK2B;AAC3B,iEAAqD;AACrD,0CAAoC;AACpC,0DAAuD;AAGvD,MAAa,wBAAyB,SAAQ,gBAA2B;IAEvE,YAAY,KAAa;QACvB,KAAK,CAAC,sBAAQ,CAAC,2BAA2B,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAES,UAAU,CAClB,GAAyB,EACzB,QAA0B;QAE1B,MAAM,cAAc,GAAmB,QAAQ,CAAC,GAAG,CACjD,mCAAgB,CAAC,eAAe,CACjC,CAAC;QACF,IAAI,IAAA,8BAAS,EAAC,cAAc,CAAC,EAAE;YAC7B,OAAO,IAAI,iCAAgB,CACzB,IAAI,CAAC,OAAO,EAAE,EACd,+BAAc,CAAC,eAAe,EAC9B,qFAAqF,IAAI,CAAC,aAAa,EAAE,CAC1G,CAAC;SACH;QACD,MAAM,cAAc,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,IAAA,8BAAS,EAAC,cAAc,CAAC,EAAE;YAC7B,OAAO,IAAI,yCAAwB,CACjC,IAAI,CAAC,OAAO,EAAE,EACd,+BAAc,CAAC,eAAe,EAC9B,IAAI,CAAC,aAAa,EAClB,2BAA2B,IAAI,CAAC,aAAa,GAAG,CACjD,CAAC;SACH;QACD,QAAQ,CAAC,MAAM,CAAC,mCAAgB,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,cAAc,CAAC;IACxB,CAAC;CACF;AAjCD,4DAiCC","file":"expression/reference/NestedObjectChainEndExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport {\n  ExprEvalError,\n  ExprEvalErrorObj,\n  ExprEvalRefChainErrorObj,\n  ExprEvalStatus,\n} from \"../ExprEvalResult\";\nimport { isNullish } from \"../../IfcExpressionUtils\";\nimport { Expr0 } from \"../Expr0.js\";\nimport { LocalContextKeys } from \"../LocalContextKeys\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\n\nexport class NestedObjectChainEndExpr extends Expr0<LiteralValueAnyArity> {\n  private readonly attributeName: string;\n  constructor(value: string) {\n    super(ExprKind.REF_NESTED_OBJECT_CHAIN_END);\n    this.attributeName = value;\n  }\n\n  protected doEvaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalError | LiteralValueAnyArity {\n    const objectAccessor: ObjectAccessor = localCtx.get(\n      LocalContextKeys.OBJECT_ACCESSOR\n    );\n    if (isNullish(objectAccessor)) {\n      return new ExprEvalErrorObj(\n        this.getKind(),\n        ExprEvalStatus.MISSING_OPERAND,\n        `No ObjectAccessor found in localContext when trying to access attribute with name'${this.attributeName}`\n      );\n    }\n    const attributeValue = objectAccessor.getAttribute(this.attributeName);\n    if (isNullish(attributeValue)) {\n      return new ExprEvalRefChainErrorObj(\n        this.getKind(),\n        ExprEvalStatus.REFERENCE_ERROR,\n        this.attributeName,\n        `No such nested object: '${this.attributeName}'`\n      );\n    }\n    localCtx.delete(LocalContextKeys.OBJECT_ACCESSOR);\n    return attributeValue;\n  }\n}\n"]}

package/dist/cjs/expression/reference/NestedObjectChainExpr.js

@@ -1,14 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestedObjectChainExpr = void 0;
-const Expr2_js_1 = require("../Expr2.js");
-class NestedObjectChainExpr extends Expr2_js_1.Expr2 {
-    constructor(left, right) {
-        super(left, right);
-    }
-    evaluate(ctx) {
-        const nextLink = this.right.evaluate(ctx);
-        return (oa) => nextLink(oa.getNestedObjectAccessor(this.left));
+const ExprKind_js_1 = require("../ExprKind.js");
+const ExprEvalResult_1 = require("../ExprEvalResult");
+const Expr1_js_1 = require("../Expr1.js");
+const IfcExpressionUtils_1 = require("../../IfcExpressionUtils");
+const LocalContextKeys_1 = require("../LocalContextKeys");
+class NestedObjectChainExpr extends Expr1_js_1.Expr1 {
+    constructor(literalObjectRef, nextLink) {
+        super(ExprKind_js_1.ExprKind.REF_NESTED_OBJECT_CHAIN, nextLink);
+        this.literalObjectRef = literalObjectRef;
+    }
+    onBeforeRecusion(ctx, localCtx) {
+        const objectAccessor = localCtx.get(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR);
+        if ((0, IfcExpressionUtils_1.isNullish)(objectAccessor)) {
+            return new ExprEvalResult_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.MISSING_OPERAND, `No ObjectAccessor found in localContext when trying to access nested object with name'${this.literalObjectRef}`);
+        }
+        const nestedObjectAccessor = objectAccessor.getNestedObjectAccessor(this.literalObjectRef);
+        if ((0, IfcExpressionUtils_1.isNullish)(nestedObjectAccessor)) {
+            return new ExprEvalResult_1.ExprEvalRefChainErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.REFERENCE_ERROR, this.literalObjectRef, `No such nested object: '${this.literalObjectRef}'`);
+        }
+        localCtx.set(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR, nestedObjectAccessor);
+    }
+    calculateResult(ctx, localCtx, result) {
+        localCtx.delete(LocalContextKeys_1.LocalContextKeys.OBJECT_ACCESSOR);
+        return result;
+    }
+    obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult) {
+        if ((0, ExprEvalResult_1.isExprEvalRefChainError)(subExpressionResult)) {
+            return ExprEvalResult_1.ExprEvalRefChainErrorObj.bubbleUp(subExpressionResult, this.literalObjectRef);
+        }
+        return new ExprEvalResult_1.ExprEvalRefChainErrorObj(this.getKind(), subExpressionResult.status, this.literalObjectRef, subExpressionResult.message);
+    }
+    handleError(error, subResult) {
+        return new ExprEvalResult_1.ExprEvalRefChainErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.REFERENCE_ERROR, this.literalObjectRef, (0, ExprEvalResult_1.mapErrorObjectToMessage)(error));
     }
 }
 exports.NestedObjectChainExpr = NestedObjectChainExpr;

package/dist/cjs/expression/reference/NestedObjectChainExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/reference/NestedObjectChainExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAKpC,MAAa,qBAAsB,SAAQ,gBAI1C;IACC,YAAY,IAAY,EAAE,KAA4B;QACpD,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CACN,GAAyB;QAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,EAAkB,EAAE,EAAE,CAC5B,QAAQ,CAAC,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAhBD,sDAgBC","file":"expression/reference/NestedObjectChainExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr2 } from \"../Expr2.js\";\nimport { NestedObjectChainEndExpr } from \"./NestedObjectChainEndExpr.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\n\nexport class NestedObjectChainExpr extends Expr2<\n  string,\n  NestedObjectChainExpr | NestedObjectChainEndExpr,\n  (oa: ObjectAccessor) => LiteralValueAnyArity\n> {\n  constructor(left: string, right: NestedObjectChainExpr) {\n    super(left, right);\n  }\n\n  evaluate(\n    ctx: IfcExpressionContext\n  ): (oa: ObjectAccessor) => LiteralValueAnyArity {\n    const nextLink = this.right.evaluate(ctx);\n    return (oa: ObjectAccessor) =>\n      nextLink(oa.getNestedObjectAccessor(this.left));\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/reference/NestedObjectChainExpr.ts"],"names":[],"mappings":";;;AAGA,gDAA0C;AAC1C,sDAQ2B;AAC3B,0CAAoC;AACpC,iEAAqD;AACrD,0DAAuD;AAEvD,MAAa,qBAAsB,SAAQ,gBAG1C;IAEC,YAAY,gBAAwB,EAAE,QAA+B;QACnE,KAAK,CAAC,sBAAQ,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAES,gBAAgB,CACxB,GAAyB,EACzB,QAA0B;QAE1B,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CACjC,mCAAgB,CAAC,eAAe,CACf,CAAC;QACpB,IAAI,IAAA,8BAAS,EAAC,cAAc,CAAC,EAAE;YAC7B,OAAO,IAAI,iCAAgB,CACzB,IAAI,CAAC,OAAO,EAAE,EACd,+BAAc,CAAC,eAAe,EAC9B,yFAAyF,IAAI,CAAC,gBAAgB,EAAE,CACjH,CAAC;SACH;QACD,MAAM,oBAAoB,GAAG,cAAc,CAAC,uBAAuB,CACjE,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,IAAA,8BAAS,EAAC,oBAAoB,CAAC,EAAE;YACnC,OAAO,IAAI,yCAAwB,CACjC,IAAI,CAAC,OAAO,EAAE,EACd,+BAAc,CAAC,eAAe,EAC9B,IAAI,CAAC,gBAAgB,EACrB,2BAA2B,IAAI,CAAC,gBAAgB,GAAG,CACpD,CAAC;SACH;QACD,QAAQ,CAAC,GAAG,CAAC,mCAAgB,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;IACvE,CAAC;IAED,eAAe,CACb,GAAyB,EACzB,QAA0B,EAC1B,MAA4B;QAE5B,QAAQ,CAAC,MAAM,CAAC,mCAAgB,CAAC,eAAe,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,iCAAiC,CACzC,GAAyB,EACzB,QAA0B,EAC1B,mBAAkC;QAElC,IAAI,IAAA,wCAAuB,EAAC,mBAAmB,CAAC,EAAE;YAChD,OAAO,yCAAwB,CAAC,QAAQ,CACtC,mBAAmB,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;SACH;QACD,OAAO,IAAI,yCAAwB,CACjC,IAAI,CAAC,OAAO,EAAE,EACd,mBAAmB,CAAC,MAAM,EAC1B,IAAI,CAAC,gBAAgB,EACrB,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAU,EACV,SAA+C;QAE/C,OAAO,IAAI,yCAAwB,CACjC,IAAI,CAAC,OAAO,EAAE,EACd,+BAAc,CAAC,eAAe,EAC9B,IAAI,CAAC,gBAAgB,EACrB,IAAA,wCAAuB,EAAC,KAAK,CAAC,CAC/B,CAAC;IACJ,CAAC;CACF;AA7ED,sDA6EC","file":"expression/reference/NestedObjectChainExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { ExprKind } from \"../ExprKind.js\";\nimport {\n  ExprEvalError,\n  ExprEvalErrorObj,\n  ExprEvalRefChainErrorObj,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalRefChainError,\n  mapErrorObjectToMessage,\n} from \"../ExprEvalResult\";\nimport { Expr1 } from \"../Expr1.js\";\nimport { isNullish } from \"../../IfcExpressionUtils\";\nimport { LocalContextKeys } from \"../LocalContextKeys\";\n\nexport class NestedObjectChainExpr extends Expr1<\n  LiteralValueAnyArity,\n  LiteralValueAnyArity\n> {\n  private readonly literalObjectRef: string;\n  constructor(literalObjectRef: string, nextLink: NestedObjectChainExpr) {\n    super(ExprKind.REF_NESTED_OBJECT_CHAIN, nextLink);\n    this.literalObjectRef = literalObjectRef;\n  }\n\n  protected onBeforeRecusion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): undefined | ExprEvalError {\n    const objectAccessor = localCtx.get(\n      LocalContextKeys.OBJECT_ACCESSOR\n    ) as ObjectAccessor;\n    if (isNullish(objectAccessor)) {\n      return new ExprEvalErrorObj(\n        this.getKind(),\n        ExprEvalStatus.MISSING_OPERAND,\n        `No ObjectAccessor found in localContext when trying to access nested object with name'${this.literalObjectRef}`\n      );\n    }\n    const nestedObjectAccessor = objectAccessor.getNestedObjectAccessor(\n      this.literalObjectRef\n    );\n    if (isNullish(nestedObjectAccessor)) {\n      return new ExprEvalRefChainErrorObj(\n        this.getKind(),\n        ExprEvalStatus.REFERENCE_ERROR,\n        this.literalObjectRef,\n        `No such nested object: '${this.literalObjectRef}'`\n      );\n    }\n    localCtx.set(LocalContextKeys.OBJECT_ACCESSOR, nestedObjectAccessor);\n  }\n\n  calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    result: LiteralValueAnyArity\n  ): LiteralValueAnyArity | ExprEvalError {\n    localCtx.delete(LocalContextKeys.OBJECT_ACCESSOR);\n    return result;\n  }\n\n  protected obtainResultForSubExpressionError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    subExpressionResult: ExprEvalError\n  ): ExprEvalResult<LiteralValueAnyArity> {\n    if (isExprEvalRefChainError(subExpressionResult)) {\n      return ExprEvalRefChainErrorObj.bubbleUp(\n        subExpressionResult,\n        this.literalObjectRef\n      );\n    }\n    return new ExprEvalRefChainErrorObj(\n      this.getKind(),\n      subExpressionResult.status,\n      this.literalObjectRef,\n      subExpressionResult.message\n    );\n  }\n\n  protected handleError(\n    error: any,\n    subResult: ExprEvalResult<LiteralValueAnyArity>\n  ): ExprEvalError {\n    return new ExprEvalRefChainErrorObj(\n      this.getKind(),\n      ExprEvalStatus.REFERENCE_ERROR,\n      this.literalObjectRef,\n      mapErrorObjectToMessage(error)\n    );\n  }\n}\n"]}

package/dist/cjs/expression/reference/PropObjectReferenceExpr.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropObjectReferenceExpr = void 0;
 const Expr0_js_1 = require("../Expr0.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class PropObjectReferenceExpr extends Expr0_js_1.Expr0 {
     constructor() {
-        super();
+        super(ExprKind_js_1.ExprKind.REF_PROPERTY);
     }
-    evaluate(ctx) {
+    doEvaluate(ctx) {
         return ctx.resolvePropRef();
     }
 }

package/dist/cjs/expression/reference/PropObjectReferenceExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/reference/PropObjectReferenceExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAIpC,MAAa,uBACX,SAAQ,gBAAqB;IAG7B;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,GAAG,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF;AAXD,0DAWC","file":"expression/reference/PropObjectReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr0 } from \"../Expr0.js\";\nimport { ObjectReferenceExpr } from \"./ObjectReferenceExpr.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\n\nexport class PropObjectReferenceExpr\n  extends Expr0<ObjectAccessor>\n  implements ObjectReferenceExpr\n{\n  constructor() {\n    super();\n  }\n\n  evaluate(ctx: IfcExpressionContext): ObjectAccessor {\n    return ctx.resolvePropRef();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/reference/PropObjectReferenceExpr.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAGpC,gDAA0C;AAE1C,MAAa,uBACX,SAAQ,gBAAqB;IAG7B;QACE,KAAK,CAAC,sBAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,GAAyB;QAClC,OAAO,GAAG,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;CACF;AAXD,0DAWC","file":"expression/reference/PropObjectReferenceExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { Expr0 } from \"../Expr0.js\";\nimport { ObjectReferenceExpr } from \"./ObjectReferenceExpr.js\";\nimport { ObjectAccessor } from \"../../context/ObjectAccessor.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class PropObjectReferenceExpr\n  extends Expr0<ObjectAccessor>\n  implements ObjectReferenceExpr\n{\n  constructor() {\n    super(ExprKind.REF_PROPERTY);\n  }\n\n  doEvaluate(ctx: IfcExpressionContext): ObjectAccessor {\n    return ctx.resolvePropRef();\n  }\n}\n"]}

package/dist/cjs/expression/string/StringConcatExpr.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringConcatExpr = void 0;
 const Expr2_js_1 = require("../Expr2.js");
 const StringValue_js_1 = require("../../value/StringValue.js");
+const ExprKind_js_1 = require("../ExprKind.js");
 class StringConcatExpr extends Expr2_js_1.Expr2 {
     constructor(left, right) {
-        super(left, right);
+        super(ExprKind_js_1.ExprKind.STR_CONCAT, left, right);
     }
-    evaluate(ctx) {
-        return StringValue_js_1.StringValue.of(this.left.evaluate(ctx).getValue() + this.right.evaluate(ctx).getValue());
+    calculateResult(ctx, localCtx, left, right) {
+        return StringValue_js_1.StringValue.of(left.getValue() + right.getValue());
     }
 }
 exports.StringConcatExpr = StringConcatExpr;

package/dist/cjs/expression/string/StringConcatExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/string/StringConcatExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,+DAAyD;AAEzD,MAAa,gBAAiB,SAAQ,gBAIrC;IACC,YAAY,IAAuB,EAAE,KAAwB;QAC3D,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,4BAAW,CAAC,EAAE,CACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CACzE,CAAC;IACJ,CAAC;CACF;AAdD,4CAcC","file":"expression/string/StringConcatExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { StringValue } from \"../../value/StringValue.js\";\n\nexport class StringConcatExpr extends Expr2<\n  Expr<StringValue>,\n  Expr<StringValue>,\n  StringValue\n> {\n  constructor(left: Expr<StringValue>, right: Expr<StringValue>) {\n    super(left, right);\n  }\n\n  evaluate(ctx: IfcExpressionContext): StringValue {\n    return StringValue.of(\n      this.left.evaluate(ctx).getValue() + this.right.evaluate(ctx).getValue()\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/string/StringConcatExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAGpC,+DAAyD;AACzD,gDAA0C;AAE1C,MAAa,gBAAiB,SAAQ,gBAIrC;IACC,YAAY,IAAuB,EAAE,KAAwB;QAC3D,KAAK,CAAC,sBAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,eAAe,CACb,GAAyB,EACzB,QAA0B,EAC1B,IAAiB,EACjB,KAAkB;QAElB,OAAO,4BAAW,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAjBD,4CAiBC","file":"expression/string/StringConcatExpr.js","sourcesContent":["import { Expr2 } from \"../Expr2.js\";\nimport { Expr } from \"../Expr.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { StringValue } from \"../../value/StringValue.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class StringConcatExpr extends Expr2<\n  StringValue,\n  StringValue,\n  StringValue\n> {\n  constructor(left: Expr<StringValue>, right: Expr<StringValue>) {\n    super(ExprKind.STR_CONCAT, left, right);\n  }\n\n  calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    left: StringValue,\n    right: StringValue\n  ): StringValue {\n    return StringValue.of(left.getValue() + right.getValue());\n  }\n}\n"]}

package/dist/cjs/expression/string/StringLiteralExpr.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringLiteralExpr = void 0;
-const Expr1_js_1 = require("../Expr1.js");
-class StringLiteralExpr extends Expr1_js_1.Expr1 {
+const LiteralExpr_js_1 = require("../LiteralExpr.js");
+const ExprKind_js_1 = require("../ExprKind.js");
+class StringLiteralExpr extends LiteralExpr_js_1.LiteralExpr {
     constructor(value) {
-        super(value);
+        super(ExprKind_js_1.ExprKind.STR_LITERAL, value);
     }
-    evaluate(ctx) {
+    calculateResult(ctx) {
         return this.value;
     }
 }

package/dist/cjs/expression/string/StringLiteralExpr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/string/StringLiteralExpr.ts"],"names":[],"mappings":";;;AAAA,0CAAoC;AAIpC,MAAa,iBAAkB,SAAQ,gBAA+B;IACpE,YAAY,KAAkB;QAC5B,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,GAAyB;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AARD,8CAQC","file":"expression/string/StringLiteralExpr.js","sourcesContent":["import { Expr1 } from \"../Expr1.js\";\nimport { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { StringValue } from \"../../value/StringValue.js\";\n\nexport class StringLiteralExpr extends Expr1<StringValue, StringValue> {\n  constructor(value: StringValue) {\n    super(value);\n  }\n\n  evaluate(ctx: IfcExpressionContext): StringValue {\n    return this.value;\n  }\n}\n"]}
+{"version":3,"sources":["../../src/expression/string/StringLiteralExpr.ts"],"names":[],"mappings":";;;AAEA,sDAAgD;AAChD,gDAA0C;AAE1C,MAAa,iBAAkB,SAAQ,4BAAqC;IAC1E,YAAY,KAAkB;QAC5B,KAAK,CAAC,sBAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,eAAe,CAAC,GAAyB;QACvC,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AARD,8CAQC","file":"expression/string/StringLiteralExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../../context/IfcExpressionContext.js\";\nimport { StringValue } from \"../../value/StringValue.js\";\nimport { LiteralExpr } from \"../LiteralExpr.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport class StringLiteralExpr extends LiteralExpr<StringValue, StringValue> {\n  constructor(value: StringValue) {\n    super(ExprKind.STR_LITERAL, value);\n  }\n\n  calculateResult(ctx: IfcExpressionContext): StringValue {\n    return this.value;\n  }\n}\n"]}