ifc-expressions 0.2.3 → 0.3.0

package/dist/expression/numeric/PlusExpr.d.ts

@@ -2,7 +2,7 @@ import { Expr2 } from "../Expr2.js";
 import { Expr } from "../Expr.js";
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
 import { NumericValue } from "../../value/NumericValue.js";
-export declare class PlusExpr extends Expr2<Expr<NumericValue>, Expr<NumericValue>, NumericValue> {
+export declare class PlusExpr extends Expr2<NumericValue, NumericValue, NumericValue> {
     constructor(left: Expr<NumericValue>, right: Expr<NumericValue>);
-    evaluate(ctx: IfcExpressionContext): NumericValue;
+    calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftResult: NumericValue, rightResult: NumericValue): NumericValue;
 }

package/dist/expression/reference/AttributeReferenceExpr.d.ts

@@ -1,9 +1,13 @@
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
 import { Expr2 } from "../Expr2.js";
-import { NestedObjectChainExpr } from "./NestedObjectChainExpr.js";
-import { ObjectReferenceExpr } from "./ObjectReferenceExpr.js";
 import { LiteralValueAnyArity } from "../../value/LiteralValueAnyArity.js";
-export declare class AttributeReferenceExpr extends Expr2<ObjectReferenceExpr, NestedObjectChainExpr, LiteralValueAnyArity> {
-    constructor(left: ObjectReferenceExpr, right: NestedObjectChainExpr);
-    evaluate(ctx: IfcExpressionContext): LiteralValueAnyArity;
+import { ObjectAccessor } from "../../context/ObjectAccessor.js";
+import { ExprEvalError, ExprEvalResult } from "../ExprEvalResult";
+import { Expr } from "../Expr";
+export declare class AttributeReferenceExpr extends Expr2<ObjectAccessor, LiteralValueAnyArity, LiteralValueAnyArity> {
+    constructor(left: Expr<ObjectAccessor>, right: Expr<LiteralValueAnyArity>);
+    protected onAfterLeftRecursion(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftResult: ObjectAccessor): void;
+    calculateResult(ctx: IfcExpressionContext, localCtx: any, objectAccessor: ObjectAccessor, dereferencedValue: LiteralValueAnyArity): LiteralValueAnyArity | ExprEvalError;
+    protected makeResultForRightSubExprError(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftResult: ExprEvalResult<ObjectAccessor>, rightResult: ExprEvalError): ExprEvalResult<LiteralValueAnyArity>;
+    protected handleError(error: any, leftResult: ExprEvalResult<ObjectAccessor>, rightResult: ExprEvalResult<LiteralValueAnyArity>): ExprEvalError;
 }

package/dist/expression/reference/ElemObjectReferenceExpr.d.ts

@@ -4,5 +4,5 @@ import { ObjectAccessor } from "../../context/ObjectAccessor.js";
 import { Expr0 } from "../Expr0.js";
 export declare class ElemObjectReferenceExpr extends Expr0<ObjectAccessor> implements ObjectReferenceExpr {
     constructor();
-    evaluate(ctx: IfcExpressionContext): ObjectAccessor;
+    doEvaluate(ctx: IfcExpressionContext): ObjectAccessor;
 }

package/dist/expression/reference/NestedObjectChainEndExpr.d.ts

@@ -1,8 +1,9 @@
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
-import { Expr1 } from "../Expr1.js";
-import { ObjectAccessor } from "../../context/ObjectAccessor.js";
 import { LiteralValueAnyArity } from "../../value/LiteralValueAnyArity.js";
-export declare class NestedObjectChainEndExpr extends Expr1<string, (oa: ObjectAccessor) => LiteralValueAnyArity> {
+import { ExprEvalError } from "../ExprEvalResult";
+import { Expr0 } from "../Expr0";
+export declare class NestedObjectChainEndExpr extends Expr0<LiteralValueAnyArity> {
+    private readonly attributeName;
     constructor(value: string);
-    evaluate(ctx: IfcExpressionContext): (oa: ObjectAccessor) => LiteralValueAnyArity;
+    protected doEvaluate(ctx: IfcExpressionContext, localCtx: Map<string, any>): ExprEvalError | LiteralValueAnyArity;
 }

package/dist/expression/reference/NestedObjectChainExpr.d.ts

@@ -1,9 +1,12 @@
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
-import { Expr2 } from "../Expr2.js";
-import { NestedObjectChainEndExpr } from "./NestedObjectChainEndExpr.js";
-import { ObjectAccessor } from "../../context/ObjectAccessor.js";
 import { LiteralValueAnyArity } from "../../value/LiteralValueAnyArity.js";
-export declare class NestedObjectChainExpr extends Expr2<string, NestedObjectChainExpr | NestedObjectChainEndExpr, (oa: ObjectAccessor) => LiteralValueAnyArity> {
-    constructor(left: string, right: NestedObjectChainExpr);
-    evaluate(ctx: IfcExpressionContext): (oa: ObjectAccessor) => LiteralValueAnyArity;
+import { ExprEvalError, ExprEvalResult } from "../ExprEvalResult";
+import { Expr1 } from "../Expr1";
+export declare class NestedObjectChainExpr extends Expr1<LiteralValueAnyArity, LiteralValueAnyArity> {
+    private readonly literalObjectRef;
+    constructor(literalObjectRef: string, nextLink: NestedObjectChainExpr);
+    protected onBeforeRecusion(ctx: IfcExpressionContext, localCtx: Map<string, any>): undefined | ExprEvalError;
+    calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, result: LiteralValueAnyArity): LiteralValueAnyArity | ExprEvalError;
+    protected obtainResultForSubExpressionError(ctx: IfcExpressionContext, localCtx: Map<string, any>, subExpressionResult: ExprEvalError): ExprEvalResult<LiteralValueAnyArity>;
+    protected handleError(error: any, subResult: ExprEvalResult<LiteralValueAnyArity>): ExprEvalError;
 }

package/dist/expression/reference/PropObjectReferenceExpr.d.ts

@@ -4,5 +4,5 @@ import { ObjectReferenceExpr } from "./ObjectReferenceExpr.js";
 import { ObjectAccessor } from "../../context/ObjectAccessor.js";
 export declare class PropObjectReferenceExpr extends Expr0<ObjectAccessor> implements ObjectReferenceExpr {
     constructor();
-    evaluate(ctx: IfcExpressionContext): ObjectAccessor;
+    doEvaluate(ctx: IfcExpressionContext): ObjectAccessor;
 }

package/dist/expression/string/StringConcatExpr.d.ts

@@ -2,7 +2,7 @@ import { Expr2 } from "../Expr2.js";
 import { Expr } from "../Expr.js";
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
 import { StringValue } from "../../value/StringValue.js";
-export declare class StringConcatExpr extends Expr2<Expr<StringValue>, Expr<StringValue>, StringValue> {
+export declare class StringConcatExpr extends Expr2<StringValue, StringValue, StringValue> {
     constructor(left: Expr<StringValue>, right: Expr<StringValue>);
-    evaluate(ctx: IfcExpressionContext): StringValue;
+    calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, left: StringValue, right: StringValue): StringValue;
 }

package/dist/expression/string/StringLiteralExpr.d.ts

@@ -1,7 +1,7 @@
-import { Expr1 } from "../Expr1.js";
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
 import { StringValue } from "../../value/StringValue.js";
-export declare class StringLiteralExpr extends Expr1<StringValue, StringValue> {
+import { LiteralExpr } from "../LiteralExpr";
+export declare class StringLiteralExpr extends LiteralExpr<StringValue, StringValue> {
     constructor(value: StringValue);
-    evaluate(ctx: IfcExpressionContext): StringValue;
+    calculateResult(ctx: IfcExpressionContext): StringValue;
 }

package/dist/expression/structure/ArrayExpr.d.ts

@@ -0,0 +1,11 @@
+import { IfcExpressionContext } from "../../context/IfcExpressionContext";
+import { ExprEvalError } from "../ExprEvalResult";
+import { Expr } from "../Expr";
+import { Expr0 } from "../Expr0";
+import { ArrayValue } from "../../value/ArrayValue";
+import { LiteralValue } from "../../value/LiteralValue";
+export declare class ArrayExpr extends Expr0<ArrayValue> {
+    private elements;
+    constructor(elements: Array<Expr<LiteralValue>>);
+    protected doEvaluate(ctx: IfcExpressionContext, localCtx: Map<string, any>): ExprEvalError | ArrayValue;
+}

package/dist/gen/parser/IfcExpressionLexer.d.ts

@@ -13,15 +13,16 @@ export default class IfcExpressionLexer extends Lexer {
     static readonly T__10 = 11;
     static readonly INT = 12;
     static readonly FLOAT = 13;
-    static readonly PROP = 14;
-    static readonly ELEM = 15;
-    static readonly RESERVED_ATTRIBUTE_NAME = 16;
-    static readonly RESERVED_RELATION_NAME = 17;
-    static readonly QUOTED_STRING = 18;
-    static readonly BRACKETED_STRING = 19;
-    static readonly IDENTIFIER = 20;
-    static readonly WS = 21;
-    static readonly NEWLINE = 22;
+    static readonly SIGN = 14;
+    static readonly PROP = 15;
+    static readonly ELEM = 16;
+    static readonly RESERVED_ATTRIBUTE_NAME = 17;
+    static readonly RESERVED_RELATION_NAME = 18;
+    static readonly QUOTED_STRING = 19;
+    static readonly BRACKETED_STRING = 20;
+    static readonly IDENTIFIER = 21;
+    static readonly WS = 22;
+    static readonly NEWLINE = 23;
     static readonly EOF: number;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];

package/dist/gen/parser/IfcExpressionParser.d.ts

@@ -15,15 +15,16 @@ export default class IfcExpressionParser extends Parser {
     static readonly T__10 = 11;
     static readonly INT = 12;
     static readonly FLOAT = 13;
-    static readonly PROP = 14;
-    static readonly ELEM = 15;
-    static readonly RESERVED_ATTRIBUTE_NAME = 16;
-    static readonly RESERVED_RELATION_NAME = 17;
-    static readonly QUOTED_STRING = 18;
-    static readonly BRACKETED_STRING = 19;
-    static readonly IDENTIFIER = 20;
-    static readonly WS = 21;
-    static readonly NEWLINE = 22;
+    static readonly SIGN = 14;
+    static readonly PROP = 15;
+    static readonly ELEM = 16;
+    static readonly RESERVED_ATTRIBUTE_NAME = 17;
+    static readonly RESERVED_RELATION_NAME = 18;
+    static readonly QUOTED_STRING = 19;
+    static readonly BRACKETED_STRING = 20;
+    static readonly IDENTIFIER = 21;
+    static readonly WS = 22;
+    static readonly NEWLINE = 23;
     static readonly EOF: number;
     static readonly RULE_expr = 0;
     static readonly RULE_numExpr = 1;

package/dist/mjs/ExprVisitor.js

@@ -1,6 +1,6 @@
 import IfcExpressionVisitor from "./gen/parser/IfcExpressionVisitor.js";
 import { NumericLiteralExpr } from "./expression/numeric/NumericLiteralExpr.js";
-import { isPresent } from "./IfcExpressionUtils.js";
+import { isNullish, isPresent } from "./IfcExpressionUtils.js";
 import Decimal from "decimal.js";
 import { PlusExpr } from "./expression/numeric/PlusExpr.js";
 import { MinusExpr } from "./expression/numeric/MinusExpr.js";
@@ -16,6 +16,8 @@ import { NumericValue } from "./value/NumericValue.js";
 import { StringValue } from "./value/StringValue.js";
 import { StringLiteralExpr } from "./expression/string/StringLiteralExpr.js";
 import { StringConcatExpr } from "./expression/string/StringConcatExpr.js";
+import { ArrayExpr } from "./expression/structure/ArrayExpr";
+import { FunctionExpr } from "./expression/function/FunctionExpr";
 export class ExprVisitor extends IfcExpressionVisitor {
     constructor() {
         super();
@@ -68,11 +70,11 @@ export class ExprVisitor extends IfcExpressionVisitor {
         this.visitNumLiteral = (ctx) => {
             let val = ctx.INT();
             if (isPresent(val)) {
-                return new NumericLiteralExpr(new NumericValue(new Decimal(val.symbol.text)));
+                return new NumericLiteralExpr(new NumericValue(new Decimal(ctx.getText())));
             }
             val = ctx.FLOAT();
             if (isPresent(val)) {
-                return new NumericLiteralExpr(new NumericValue(new Decimal(val.symbol.text)));
+                return new NumericLiteralExpr(new NumericValue(new Decimal(ctx.getText())));
             }
             this.failNode(ctx);
         };
@@ -105,6 +107,38 @@ export class ExprVisitor extends IfcExpressionVisitor {
         this.visitNumLit = (ctx) => {
             return this.visit(ctx.getChild(0));
         };
+        /*================================================
+         * ArrayExpr
+         *===============================================*/
+        this.visitArray = (ctx) => {
+            return new ArrayExpr(this.collectArrayElements(ctx.arrayElementList()));
+        };
+        this.collectArrayElements = (ctx) => {
+            const first = this.visit(ctx.expr());
+            const rest = ctx.arrayElementList();
+            if (!isNullish(rest)) {
+                const arr = this.collectArrayElements(rest);
+                arr.unshift(first);
+                return arr;
+            }
+            return [first];
+        };
+        /*================================================
+         * FuncExpr
+         *===============================================*/
+        this.visitFunctionCall = (ctx) => {
+            return new FunctionExpr(ctx._name.text, this.collectFunctionArguments(ctx.exprList()));
+        };
+        this.collectFunctionArguments = (ctx) => {
+            const first = this.visit(ctx.expr());
+            const rest = ctx.exprList();
+            if (!isNullish(rest)) {
+                const arr = this.collectFunctionArguments(rest);
+                arr.unshift(first);
+                return arr;
+            }
+            return [first];
+        };
     }
     stripBrackets(name) {
         if (name.startsWith("{")) {

package/dist/mjs/ExprVisitor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ExprVisitor.ts"],"names":[],"mappings":"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","file":"ExprVisitor.js","sourcesContent":["import IfcExpressionVisitor from \"./gen/parser/IfcExpressionVisitor.js\";\nimport { NumericLiteralExpr } from \"./expression/numeric/NumericLiteralExpr.js\";\nimport {\n  AttributeRefContext,\n  ExprContext,\n  NestedObjectChainEndContext,\n  NestedObjectChainInnerContext,\n  NumAddSubContext,\n  NumAttributeRefContext,\n  NumLitContext,\n  NumLiteralContext,\n  NumMulDivContext,\n  NumParensContext,\n  ObjectRefContext,\n  StringAttributeRefContext,\n  StringConcatContext,\n  StringLiteralContext,\n} from \"./gen/parser/IfcExpressionParser.js\";\nimport { Expr } from \"./expression/Expr.js\";\nimport { isPresent } from \"./IfcExpressionUtils.js\";\nimport Decimal from \"decimal.js\";\nimport { PlusExpr } from \"./expression/numeric/PlusExpr.js\";\nimport { MinusExpr } from \"./expression/numeric/MinusExpr.js\";\nimport { ParserRuleContext } from \"antlr4\";\nimport { MultiplyExpr } from \"./expression/numeric/MultiplyExpr.js\";\nimport { DivideExpr } from \"./expression/numeric/DivideExpr.js\";\nimport { NumParenthesisExpr } from \"./expression/numeric/NumParenthesisExpr.js\";\nimport { AttributeReferenceExpr } from \"./expression/reference/AttributeReferenceExpr.js\";\nimport { PropObjectReferenceExpr } from \"./expression/reference/PropObjectReferenceExpr.js\";\nimport { ElemObjectReferenceExpr } from \"./expression/reference/ElemObjectReferenceExpr.js\";\nimport { NestedObjectChainExpr } from \"./expression/reference/NestedObjectChainExpr.js\";\nimport { NestedObjectChainEndExpr } from \"./expression/reference/NestedObjectChainEndExpr.js\";\nimport { NumericValue } from \"./value/NumericValue.js\";\nimport { StringValue } from \"./value/StringValue.js\";\nimport { StringLiteralExpr } from \"./expression/string/StringLiteralExpr.js\";\nimport { StringConcatExpr } from \"./expression/string/StringConcatExpr.js\";\n\nexport class ExprVisitor extends IfcExpressionVisitor<Expr<any>> {\n  constructor() {\n    super();\n  }\n\n  /*================================================\n   * AttributeRef\n   *==============================================*/\n\n  visitAttributeRef: (ctx: AttributeRefContext) => Expr<any> = (ctx) => {\n    const objectRefExpr = this.visit(ctx.objectRef());\n    const nestedObjectChainExpr = this.visit(ctx.nestedObjectChain());\n    return new AttributeReferenceExpr(\n      objectRefExpr,\n      nestedObjectChainExpr as NestedObjectChainExpr\n    );\n  };\n\n  visitObjectRef: (ctx: ObjectRefContext) => Expr<any> = (ctx) => {\n    if (isPresent(ctx.PROP())) {\n      return new PropObjectReferenceExpr();\n    } else if (isPresent(ctx.ELEM())) {\n      return new ElemObjectReferenceExpr();\n    }\n    this.failNode(ctx);\n  };\n\n  visitNestedObjectChainInner: (\n    ctx: NestedObjectChainInnerContext\n  ) => Expr<any> = (ctx) => {\n    let name = ctx.namedRef().getChild(0).getText();\n    name = this.stripBrackets(name);\n    return new NestedObjectChainExpr(\n      name,\n      this.visit(ctx.nestedObjectChain()) as NestedObjectChainExpr\n    );\n  };\n\n  visitNestedObjectChainEnd: (ctx: NestedObjectChainEndContext) => Expr<any> = (\n    ctx\n  ) => {\n    let name = ctx.RESERVED_ATTRIBUTE_NAME().getText();\n    return new NestedObjectChainEndExpr(name);\n  };\n\n  private stripBrackets(name: string) {\n    if (name.startsWith(\"{\")) {\n      return name.substring(1, name.length - 1);\n    }\n    return name;\n  }\n\n  /*================================================\n   * StringExpr\n   *===============================================*/\n\n  visitStringLiteral: (ctx: StringLiteralContext) => Expr<any> = (ctx) => {\n    const quotedString = ctx.QUOTED_STRING().getText();\n    const text = quotedString.substring(1, quotedString.length - 1);\n    return new StringLiteralExpr(new StringValue(text));\n  };\n\n  visitStringAttributeRef: (ctx: StringAttributeRefContext) => Expr<any> = (\n    ctx\n  ) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitStringConcat: (ctx: StringConcatContext) => Expr<any> = (ctx) => {\n    return new StringConcatExpr(this.visit(ctx._left), this.visit(ctx._right));\n  };\n\n  /*================================================\n   * NumExpr\n   *===============================================*/\n\n  visitNumAttributeRef: (ctx: NumAttributeRefContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitNumLiteral: (ctx: NumLiteralContext) => Expr<any> = (ctx) => {\n    let val = ctx.INT();\n    if (isPresent(val)) {\n      return new NumericLiteralExpr(\n        new NumericValue(new Decimal(val.symbol.text))\n      );\n    }\n    val = ctx.FLOAT();\n    if (isPresent(val)) {\n      return new NumericLiteralExpr(\n        new NumericValue(new Decimal(val.symbol.text))\n      );\n    }\n    this.failNode(ctx);\n  };\n\n  visitNumAddSub: (ctx: NumAddSubContext) => Expr<any> = (ctx) => {\n    switch (ctx._op.text) {\n      case \"+\":\n        return new PlusExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      case \"-\":\n        return new MinusExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      default:\n        this.failNode(ctx);\n    }\n  };\n\n  visitNumMulDiv: (ctx: NumMulDivContext) => Expr<any> = (ctx) => {\n    switch (ctx._op.text) {\n      case \"*\":\n        return new MultiplyExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      case \"/\":\n        return new DivideExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      default:\n        this.failNode(ctx);\n    }\n  };\n\n  visitNumParens: (ctx: NumParensContext) => Expr<any> = (ctx) => {\n    return new NumParenthesisExpr(this.visit(ctx.getChild(1)));\n  };\n\n  visitExpr: (ctx: ExprContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitNumLit: (ctx: NumLitContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  private failNode(ctx: ParserRuleContext) {\n    throw new Error(`Cannot parse (sub)expression ${ctx.getText()}`);\n  }\n}\n"]}
+{"version":3,"sources":["ExprVisitor.ts"],"names":[],"mappings":"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","file":"ExprVisitor.js","sourcesContent":["import IfcExpressionVisitor from \"./gen/parser/IfcExpressionVisitor.js\";\nimport { NumericLiteralExpr } from \"./expression/numeric/NumericLiteralExpr.js\";\nimport {\n  ArrayContext,\n  ArrayElementListContext,\n  AttributeRefContext,\n  ExprContext,\n  ExprListContext,\n  FunctionCallContext,\n  NestedObjectChainEndContext,\n  NestedObjectChainInnerContext,\n  NumAddSubContext,\n  NumAttributeRefContext,\n  NumLitContext,\n  NumLiteralContext,\n  NumMulDivContext,\n  NumParensContext,\n  ObjectRefContext,\n  StringAttributeRefContext,\n  StringConcatContext,\n  StringLiteralContext,\n} from \"./gen/parser/IfcExpressionParser.js\";\nimport { Expr } from \"./expression/Expr.js\";\nimport { isNullish, isPresent } from \"./IfcExpressionUtils.js\";\nimport Decimal from \"decimal.js\";\nimport { PlusExpr } from \"./expression/numeric/PlusExpr.js\";\nimport { MinusExpr } from \"./expression/numeric/MinusExpr.js\";\nimport { ParserRuleContext } from \"antlr4\";\nimport { MultiplyExpr } from \"./expression/numeric/MultiplyExpr.js\";\nimport { DivideExpr } from \"./expression/numeric/DivideExpr.js\";\nimport { NumParenthesisExpr } from \"./expression/numeric/NumParenthesisExpr.js\";\nimport { AttributeReferenceExpr } from \"./expression/reference/AttributeReferenceExpr.js\";\nimport { PropObjectReferenceExpr } from \"./expression/reference/PropObjectReferenceExpr.js\";\nimport { ElemObjectReferenceExpr } from \"./expression/reference/ElemObjectReferenceExpr.js\";\nimport { NestedObjectChainExpr } from \"./expression/reference/NestedObjectChainExpr.js\";\nimport { NestedObjectChainEndExpr } from \"./expression/reference/NestedObjectChainEndExpr.js\";\nimport { NumericValue } from \"./value/NumericValue.js\";\nimport { StringValue } from \"./value/StringValue.js\";\nimport { StringLiteralExpr } from \"./expression/string/StringLiteralExpr.js\";\nimport { StringConcatExpr } from \"./expression/string/StringConcatExpr.js\";\nimport { ArrayExpr } from \"./expression/structure/ArrayExpr\";\nimport { FunctionExpr } from \"./expression/function/FunctionExpr\";\n\nexport class ExprVisitor extends IfcExpressionVisitor<Expr<any>> {\n  constructor() {\n    super();\n  }\n\n  /*================================================\n   * AttributeRef\n   *==============================================*/\n\n  visitAttributeRef: (ctx: AttributeRefContext) => Expr<any> = (ctx) => {\n    const objectRefExpr = this.visit(ctx.objectRef());\n    const nestedObjectChainExpr = this.visit(ctx.nestedObjectChain());\n    return new AttributeReferenceExpr(\n      objectRefExpr,\n      nestedObjectChainExpr as NestedObjectChainExpr\n    );\n  };\n\n  visitObjectRef: (ctx: ObjectRefContext) => Expr<any> = (ctx) => {\n    if (isPresent(ctx.PROP())) {\n      return new PropObjectReferenceExpr();\n    } else if (isPresent(ctx.ELEM())) {\n      return new ElemObjectReferenceExpr();\n    }\n    this.failNode(ctx);\n  };\n\n  visitNestedObjectChainInner: (\n    ctx: NestedObjectChainInnerContext\n  ) => Expr<any> = (ctx) => {\n    let name = ctx.namedRef().getChild(0).getText();\n    name = this.stripBrackets(name);\n    return new NestedObjectChainExpr(\n      name,\n      this.visit(ctx.nestedObjectChain()) as NestedObjectChainExpr\n    );\n  };\n\n  visitNestedObjectChainEnd: (ctx: NestedObjectChainEndContext) => Expr<any> = (\n    ctx\n  ) => {\n    let name = ctx.RESERVED_ATTRIBUTE_NAME().getText();\n    return new NestedObjectChainEndExpr(name);\n  };\n\n  private stripBrackets(name: string) {\n    if (name.startsWith(\"{\")) {\n      return name.substring(1, name.length - 1);\n    }\n    return name;\n  }\n\n  /*================================================\n   * StringExpr\n   *===============================================*/\n\n  visitStringLiteral: (ctx: StringLiteralContext) => Expr<any> = (ctx) => {\n    const quotedString = ctx.QUOTED_STRING().getText();\n    const text = quotedString.substring(1, quotedString.length - 1);\n    return new StringLiteralExpr(new StringValue(text));\n  };\n\n  visitStringAttributeRef: (ctx: StringAttributeRefContext) => Expr<any> = (\n    ctx\n  ) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitStringConcat: (ctx: StringConcatContext) => Expr<any> = (ctx) => {\n    return new StringConcatExpr(this.visit(ctx._left), this.visit(ctx._right));\n  };\n\n  /*================================================\n   * NumExpr\n   *===============================================*/\n\n  visitNumAttributeRef: (ctx: NumAttributeRefContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitNumLiteral: (ctx: NumLiteralContext) => Expr<any> = (ctx) => {\n    let val = ctx.INT();\n    if (isPresent(val)) {\n      return new NumericLiteralExpr(\n        new NumericValue(new Decimal(ctx.getText()))\n      );\n    }\n    val = ctx.FLOAT();\n    if (isPresent(val)) {\n      return new NumericLiteralExpr(\n        new NumericValue(new Decimal(ctx.getText()))\n      );\n    }\n    this.failNode(ctx);\n  };\n\n  visitNumAddSub: (ctx: NumAddSubContext) => Expr<any> = (ctx) => {\n    switch (ctx._op.text) {\n      case \"+\":\n        return new PlusExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      case \"-\":\n        return new MinusExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      default:\n        this.failNode(ctx);\n    }\n  };\n\n  visitNumMulDiv: (ctx: NumMulDivContext) => Expr<any> = (ctx) => {\n    switch (ctx._op.text) {\n      case \"*\":\n        return new MultiplyExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      case \"/\":\n        return new DivideExpr(\n          this.visit(ctx.getChild(0)),\n          this.visit(ctx.getChild(2))\n        );\n      default:\n        this.failNode(ctx);\n    }\n  };\n\n  visitNumParens: (ctx: NumParensContext) => Expr<any> = (ctx) => {\n    return new NumParenthesisExpr(this.visit(ctx.getChild(1)));\n  };\n\n  visitExpr: (ctx: ExprContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  visitNumLit: (ctx: NumLitContext) => Expr<any> = (ctx) => {\n    return this.visit(ctx.getChild(0));\n  };\n\n  /*================================================\n   * ArrayExpr\n   *===============================================*/\n\n  visitArray: (ctx: ArrayContext) => Expr<any> = (ctx) => {\n    return new ArrayExpr(this.collectArrayElements(ctx.arrayElementList()));\n  };\n\n  collectArrayElements: (ctx: ArrayElementListContext) => Array<Expr<any>> = (\n    ctx\n  ) => {\n    const first = this.visit(ctx.expr());\n    const rest = ctx.arrayElementList();\n    if (!isNullish(rest)) {\n      const arr = this.collectArrayElements(rest);\n      arr.unshift(first);\n      return arr;\n    }\n    return [first];\n  };\n\n  /*================================================\n   * FuncExpr\n   *===============================================*/\n\n  visitFunctionCall: (ctx: FunctionCallContext) => Expr<any> = (ctx) => {\n    return new FunctionExpr(\n      ctx._name.text,\n      this.collectFunctionArguments(ctx.exprList())\n    );\n  };\n\n  collectFunctionArguments: (ctx: ExprListContext) => Array<Expr<any>> = (\n    ctx\n  ) => {\n    const first = this.visit(ctx.expr());\n    const rest = ctx.exprList();\n    if (!isNullish(rest)) {\n      const arr = this.collectFunctionArguments(rest);\n      arr.unshift(first);\n      return arr;\n    }\n    return [first];\n  };\n\n  private failNode(ctx: ParserRuleContext) {\n    throw new Error(`Cannot parse (sub)expression ${ctx.getText()}`);\n  }\n}\n"]}

package/dist/mjs/IfcExpression.js

@@ -1,9 +1,8 @@
 import { CharStream, CommonTokenStream } from "antlr4";
 import { ExprVisitor } from "./ExprVisitor.js";
 import { IfcExpressionErrorListener } from "./IfcExpressionErrorListener.js";
-import { isPresent, isNullish } from "./IfcExpressionUtils.js";
+import { isNullish, isPresent } from "./IfcExpressionUtils.js";
 import { IfcElementAccessor } from "./context/IfcElementAccessor.js";
-import { Value } from "./value/Value.js";
 import { StringValue } from "./value/StringValue.js";
 import { NumericValue } from "./value/NumericValue.js";
 import { BooleanValue } from "./value/BooleanValue.js";
@@ -18,7 +17,7 @@ import IfcExpressionParser from "./gen/parser/IfcExpressionParser.js";
 import IfcExpressionVisitor from "./gen/parser/IfcExpressionVisitor.js";
 import IfcExpressionLexer from "./gen/parser/IfcExpressionLexer.js";
 import { IfcExpressionEvaluationException } from "./expression/IfcExpressionEvaluationException.js";
-export { IfcElementAccessor, Value, StringValue, BooleanValue, LogicalValue, NumericValue, ReferenceValue, IfcPropertySetAccessor, IfcPropertyAccessor, IfcRootObjectAccessor, IfcTypeObjectAccessor, NamedObjectAccessor, ExprVisitor, IfcExpressionEvaluationException, IfcExpressionErrorListener, IfcExpressionVisitor, isPresent, isNullish, };
+export { IfcElementAccessor, StringValue, BooleanValue, LogicalValue, NumericValue, ReferenceValue, IfcPropertySetAccessor, IfcPropertyAccessor, IfcRootObjectAccessor, IfcTypeObjectAccessor, NamedObjectAccessor, ExprVisitor, IfcExpressionEvaluationException, IfcExpressionErrorListener, IfcExpressionVisitor, isPresent, isNullish, };
 export class IfcExpression {
     static parse(input, errorListener) {
         const chars = new CharStream(input); // replace this with a FileStream as required
@@ -38,7 +37,7 @@ export class IfcExpression {
             throw errorListener.getException();
         }
         const parsedExpression = this.extractExprTree(tree);
-        return parsedExpression.evaluate(context);
+        return parsedExpression.evaluate(context, new Map());
     }
     static extractExprTree(tree) {
         const visitor = new ExprVisitor();

package/dist/mjs/IfcExpression.js.map

@@ -1 +1 @@
-{"version":3,"sources":["IfcExpression.ts"],"names":[],"mappings":"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","file":"IfcExpression.js","sourcesContent":["import { CharStream, CommonTokenStream, ErrorListener, Token } from \"antlr4\";\nimport { ExprVisitor } from \"./ExprVisitor.js\";\nimport { IfcExpressionErrorListener } from \"./IfcExpressionErrorListener.js\";\nimport { isPresent, isNullish } from \"./IfcExpressionUtils.js\";\nimport { IfcExpressionContext } from \"./context/IfcExpressionContext.js\";\nimport { Expr } from \"./expression/Expr.js\";\n\nimport { IfcElementAccessor } from \"./context/IfcElementAccessor.js\";\nimport { Value } from \"./value/Value.js\";\nimport { StringValue } from \"./value/StringValue.js\";\nimport { NumericValue } from \"./value/NumericValue.js\";\nimport { BooleanValue } from \"./value/BooleanValue.js\";\nimport { LogicalValue } from \"./value/LogicalValue.js\";\nimport { LiteralValue } from \"./value/LiteralValue.js\";\nimport { ReferenceValue } from \"./value/ReferenceValue.js\";\nimport { IfcPropertySetAccessor } from \"./context/IfcPropertySetAccessor.js\";\nimport { IfcPropertyAccessor } from \"./context/IfcPropertyAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./context/IfcRootObjectAccessor.js\";\nimport { IfcTypeObjectAccessor } from \"./context/IfcTypeObjectAccessor.js\";\nimport { NamedObjectAccessor } from \"./context/NamedObjectAccessor.js\";\nimport { ExprContext } from \"./gen/parser/IfcExpressionParser.js\";\nimport IfcExpressionParser from \"./gen/parser/IfcExpressionParser.js\";\nimport IfcExpressionVisitor from \"./gen/parser/IfcExpressionVisitor.js\";\nimport IfcExpressionLexer from \"./gen/parser/IfcExpressionLexer.js\";\nimport { ObjectAccessor } from \"./context/ObjectAccessor.js\";\nimport { IfcExpressionEvaluationException } from \"./expression/IfcExpressionEvaluationException.js\";\nimport type { LiteralValueAnyArity } from \"./value/LiteralValueAnyArity.js\";\nimport type { PrimitiveValueType } from \"./value/PrimitiveValueType.js\";\nexport {\n  IfcElementAccessor,\n  IfcExpressionContext,\n  Value,\n  StringValue,\n  BooleanValue,\n  LogicalValue,\n  NumericValue,\n  LiteralValue,\n  ReferenceValue,\n  IfcPropertySetAccessor,\n  IfcPropertyAccessor,\n  IfcRootObjectAccessor,\n  IfcTypeObjectAccessor,\n  NamedObjectAccessor,\n  ObjectAccessor,\n  Expr,\n  ExprVisitor,\n  IfcExpressionEvaluationException,\n  IfcExpressionErrorListener,\n  IfcExpressionVisitor,\n  isPresent,\n  isNullish,\n};\n\nexport type { PrimitiveValueType, LiteralValueAnyArity };\n\nexport class IfcExpression {\n  public static parse(\n    input: string,\n    errorListener?: ErrorListener<Token>\n  ): ExprContext {\n    const chars = new CharStream(input); // replace this with a FileStream as required\n    const lexer = new IfcExpressionLexer(chars);\n    const tokens = new CommonTokenStream(lexer);\n    const parser = new IfcExpressionParser(tokens);\n    if (isPresent(errorListener)) {\n      parser.removeErrorListeners();\n      parser.addErrorListener(errorListener);\n    }\n    return parser.expr();\n  }\n\n  public static evaluate(\n    expression: string,\n    context: IfcExpressionContext\n  ): LiteralValueAnyArity {\n    const errorListener = new IfcExpressionErrorListener();\n    const tree: ExprContext = IfcExpression.parse(expression, errorListener);\n    if (errorListener.isErrorOccurred()) {\n      throw errorListener.getException();\n    }\n    const parsedExpression = this.extractExprTree(tree);\n    return parsedExpression.evaluate(context);\n  }\n\n  private static extractExprTree(tree: ExprContext): Expr<any> {\n    const visitor = new ExprVisitor();\n    return visitor.visit(tree);\n  }\n}\n"]}
+{"version":3,"sources":["IfcExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAwB,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,mBAEN,MAAM,qCAAqC,CAAC;AAC7C,OAAO,oBAAoB,MAAM,sCAAsC,CAAC;AACxE,OAAO,kBAAkB,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,kDAAkD,CAAC;AAKpG,OAAO,EACL,kBAAkB,EAGlB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,YAAY,EAEZ,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EAGnB,WAAW,EACX,gCAAgC,EAChC,0BAA0B,EAC1B,oBAAoB,EACpB,SAAS,EACT,SAAS,GACV,CAAC;AAIF,MAAM,OAAO,aAAa;IACjB,MAAM,CAAC,KAAK,CACjB,KAAa,EACb,aAAoC;QAEpC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,6CAA6C;QAClF,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE;YAC5B,MAAM,CAAC,oBAAoB,EAAE,CAAC;YAC9B,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,QAAQ,CACpB,UAAkB,EAClB,OAA6B;QAE7B,MAAM,aAAa,GAAG,IAAI,0BAA0B,EAAE,CAAC;QACvD,MAAM,IAAI,GAAgB,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QACzE,IAAI,aAAa,CAAC,eAAe,EAAE,EAAE;YACnC,MAAM,aAAa,CAAC,YAAY,EAAE,CAAC;SACpC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO,gBAAgB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,GAAG,EAAe,CAAC,CAAC;IACpE,CAAC;IAEO,MAAM,CAAC,eAAe,CAC5B,IAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF","file":"IfcExpression.js","sourcesContent":["import { CharStream, CommonTokenStream, ErrorListener, Token } from \"antlr4\";\nimport { ExprVisitor } from \"./ExprVisitor.js\";\nimport { IfcExpressionErrorListener } from \"./IfcExpressionErrorListener.js\";\nimport { isNullish, isPresent } from \"./IfcExpressionUtils.js\";\nimport { IfcExpressionContext } from \"./context/IfcExpressionContext.js\";\nimport { Expr } from \"./expression/Expr.js\";\n\nimport { IfcElementAccessor } from \"./context/IfcElementAccessor.js\";\nimport { Value } from \"./value/Value.js\";\nimport { StringValue } from \"./value/StringValue.js\";\nimport { NumericValue } from \"./value/NumericValue.js\";\nimport { BooleanValue } from \"./value/BooleanValue.js\";\nimport { LogicalValue } from \"./value/LogicalValue.js\";\nimport { LiteralValue } from \"./value/LiteralValue.js\";\nimport { ReferenceValue } from \"./value/ReferenceValue.js\";\nimport { IfcPropertySetAccessor } from \"./context/IfcPropertySetAccessor.js\";\nimport { IfcPropertyAccessor } from \"./context/IfcPropertyAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./context/IfcRootObjectAccessor.js\";\nimport { IfcTypeObjectAccessor } from \"./context/IfcTypeObjectAccessor.js\";\nimport { NamedObjectAccessor } from \"./context/NamedObjectAccessor.js\";\nimport IfcExpressionParser, {\n  ExprContext,\n} from \"./gen/parser/IfcExpressionParser.js\";\nimport IfcExpressionVisitor from \"./gen/parser/IfcExpressionVisitor.js\";\nimport IfcExpressionLexer from \"./gen/parser/IfcExpressionLexer.js\";\nimport { ObjectAccessor } from \"./context/ObjectAccessor.js\";\nimport { IfcExpressionEvaluationException } from \"./expression/IfcExpressionEvaluationException.js\";\nimport type { LiteralValueAnyArity } from \"./value/LiteralValueAnyArity.js\";\nimport type { PrimitiveValueType } from \"./value/PrimitiveValueType.js\";\nimport { ExprEvalResult } from \"./expression/ExprEvalResult\";\n\nexport {\n  IfcElementAccessor,\n  IfcExpressionContext,\n  Value,\n  StringValue,\n  BooleanValue,\n  LogicalValue,\n  NumericValue,\n  LiteralValue,\n  ReferenceValue,\n  IfcPropertySetAccessor,\n  IfcPropertyAccessor,\n  IfcRootObjectAccessor,\n  IfcTypeObjectAccessor,\n  NamedObjectAccessor,\n  ObjectAccessor,\n  Expr,\n  ExprVisitor,\n  IfcExpressionEvaluationException,\n  IfcExpressionErrorListener,\n  IfcExpressionVisitor,\n  isPresent,\n  isNullish,\n};\n\nexport type { PrimitiveValueType, LiteralValueAnyArity };\n\nexport class IfcExpression {\n  public static parse(\n    input: string,\n    errorListener?: ErrorListener<Token>\n  ): ExprContext {\n    const chars = new CharStream(input); // replace this with a FileStream as required\n    const lexer = new IfcExpressionLexer(chars);\n    const tokens = new CommonTokenStream(lexer);\n    const parser = new IfcExpressionParser(tokens);\n    if (isPresent(errorListener)) {\n      parser.removeErrorListeners();\n      parser.addErrorListener(errorListener);\n    }\n    return parser.expr();\n  }\n\n  public static evaluate(\n    expression: string,\n    context: IfcExpressionContext\n  ): ExprEvalResult<any> {\n    const errorListener = new IfcExpressionErrorListener();\n    const tree: ExprContext = IfcExpression.parse(expression, errorListener);\n    if (errorListener.isErrorOccurred()) {\n      throw errorListener.getException();\n    }\n    const parsedExpression = this.extractExprTree(tree);\n    return parsedExpression.evaluate(context, new Map<string, any>());\n  }\n\n  private static extractExprTree(\n    tree: ExprContext\n  ): Expr<LiteralValueAnyArity> {\n    const visitor = new ExprVisitor();\n    return visitor.visit(tree);\n  }\n}\n"]}

package/dist/mjs/context/IfcElementAccessor.js

@@ -6,11 +6,11 @@ export class IfcElementAccessor extends IfcRootObjectAccessor {
         if (name === "type") {
             return this.getTypeObjectAccessor();
         }
-        let val = this.getIfcPropertyAccessor(name);
+        let val = this.getIfcPropertySetAccessor(name);
         if (isPresent(val)) {
             return val;
         }
-        return this.getIfcPropertySetAccessor(name);
+        return this.getIfcPropertyAccessor(name);
     }
     getAttribute(name) {
         switch (name) {

package/dist/mjs/context/IfcElementAccessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcElementAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAInE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAGrD,MAAM,OAAgB,kBAAmB,SAAQ,qBAAqB;IACpE,uBAAuB,CAAC,IAAY;QAClC,IAAI,IAAI,KAAK,MAAM,EAAE;YACnB,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;SACrC;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,UAAU;gBACb,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7C;gBACE,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SACnC;IACH,CAAC;IAID,iBAAiB;QACf,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACjD,CAAC;CAcF","file":"context/IfcElementAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor.js\";\nimport { IfcTypeObjectAccessor } from \"./IfcTypeObjectAccessor.js\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\nimport { StringValue } from \"../value/StringValue.js\";\nimport { isPresent } from \"../IfcExpressionUtils.js\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor.js\";\n\nexport abstract class IfcElementAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    if (name === \"type\") {\n      return this.getTypeObjectAccessor();\n    }\n    let val = this.getIfcPropertyAccessor(name);\n    if (isPresent(val)) {\n      return val;\n    }\n    return this.getIfcPropertySetAccessor(name);\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"ifcClass\":\n        return new StringValue(this.getIfcClass());\n      default:\n        return super.getAttribute(name);\n    }\n  }\n\n  abstract getIfcClass(): string;\n\n  listNestedObjects(): Array<string> {\n    return [\"type\", ...this.listIfcProperties(), ...this.listIfcPropertySets()];\n  }\n\n  listAttributes(): Array<string> {\n    return [\"ifcClass\", ...super.listAttributes()];\n  }\n\n  abstract listIfcProperties(): Array<string>;\n\n  abstract listIfcPropertySets(): Array<string>;\n\n  abstract getTypeObjectAccessor(): IfcTypeObjectAccessor | undefined;\n  abstract getIfcPropertyAccessor(\n    propertyName: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n}\n"]}
+{"version":3,"sources":["context/IfcElementAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAInE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAGrD,MAAM,OAAgB,kBAAmB,SAAQ,qBAAqB;IACpE,uBAAuB,CAAC,IAAY;QAClC,IAAI,IAAI,KAAK,MAAM,EAAE;YACnB,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;SACrC;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,UAAU;gBACb,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7C;gBACE,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SACnC;IACH,CAAC;IAID,iBAAiB;QACf,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,EAAE,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACjD,CAAC;CAcF","file":"context/IfcElementAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor.js\";\nimport { IfcTypeObjectAccessor } from \"./IfcTypeObjectAccessor.js\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\nimport { StringValue } from \"../value/StringValue.js\";\nimport { isPresent } from \"../IfcExpressionUtils.js\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor.js\";\n\nexport abstract class IfcElementAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    if (name === \"type\") {\n      return this.getTypeObjectAccessor();\n    }\n    let val = this.getIfcPropertySetAccessor(name);\n    if (isPresent(val)) {\n      return val;\n    }\n    return this.getIfcPropertyAccessor(name);\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"ifcClass\":\n        return new StringValue(this.getIfcClass());\n      default:\n        return super.getAttribute(name);\n    }\n  }\n\n  abstract getIfcClass(): string;\n\n  listNestedObjects(): Array<string> {\n    return [\"type\", ...this.listIfcProperties(), ...this.listIfcPropertySets()];\n  }\n\n  listAttributes(): Array<string> {\n    return [\"ifcClass\", ...super.listAttributes()];\n  }\n\n  abstract listIfcProperties(): Array<string>;\n\n  abstract listIfcPropertySets(): Array<string>;\n\n  abstract getTypeObjectAccessor(): IfcTypeObjectAccessor | undefined;\n  abstract getIfcPropertyAccessor(\n    propertyName: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n}\n"]}

package/dist/mjs/context/ObjectAccessor.js

@@ -1,2 +1,8 @@
-export {};
+export function isObjectAccessor(arg) {
+    return (typeof arg === "object" &&
+        typeof arg.getNestedObjectAccessor === "function" &&
+        typeof arg.getAttribute === "function" &&
+        typeof arg.listNestedObjects === "function" &&
+        typeof arg.listAttributes === "function");
+}
 //# sourceMappingURL=ObjectAccessor.js.map

package/dist/mjs/context/ObjectAccessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["context/ObjectAccessor.ts"],"names":[],"mappings":"","file":"context/ObjectAccessor.js","sourcesContent":["import { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\n\nexport interface ObjectAccessor {\n  /**\n   * If there is a nested object with the specified name (.e.g the 'pset' in $prop.pset),\n   * return an ObjectAccessor for it.\n   * @param name\n   */\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined;\n\n  /**\n   * If the object has the attribute of the specified name, return it as (an array of (array of)) LiteralValue.\n   * @param name\n   */\n  getAttribute(name: string): LiteralValueAnyArity | undefined;\n\n  listNestedObjects(): Array<string>;\n\n  listAttributes(): Array<string>;\n}\n"]}
+{"version":3,"sources":["context/ObjectAccessor.ts"],"names":[],"mappings":"AAqBA,MAAM,UAAU,gBAAgB,CAAC,GAAQ;IACvC,OAAO,CACL,OAAO,GAAG,KAAK,QAAQ;QACvB,OAAO,GAAG,CAAC,uBAAuB,KAAK,UAAU;QACjD,OAAO,GAAG,CAAC,YAAY,KAAK,UAAU;QACtC,OAAO,GAAG,CAAC,iBAAiB,KAAK,UAAU;QAC3C,OAAO,GAAG,CAAC,cAAc,KAAK,UAAU,CACzC,CAAC;AACJ,CAAC","file":"context/ObjectAccessor.js","sourcesContent":["import { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\n\nexport interface ObjectAccessor {\n  /**\n   * If there is a nested object with the specified name (.e.g the 'pset' in $prop.pset),\n   * return an ObjectAccessor for it.\n   * @param name\n   */\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined;\n\n  /**\n   * If the object has the attribute of the specified name, return it as (an array of (array of)) LiteralValue.\n   * @param name\n   */\n  getAttribute(name: string): LiteralValueAnyArity | undefined;\n\n  listNestedObjects(): Array<string>;\n\n  listAttributes(): Array<string>;\n}\n\nexport function isObjectAccessor(arg: any): arg is ObjectAccessor {\n  return (\n    typeof arg === \"object\" &&\n    typeof arg.getNestedObjectAccessor === \"function\" &&\n    typeof arg.getAttribute === \"function\" &&\n    typeof arg.listNestedObjects === \"function\" &&\n    typeof arg.listAttributes === \"function\"\n  );\n}\n"]}

package/dist/mjs/expression/Expr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["expression/Expr.ts"],"names":[],"mappings":"","file":"expression/Expr.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\n\nexport interface Expr<T> {\n  evaluate(ctx: IfcExpressionContext): T;\n}\n"]}
+{"version":3,"sources":["expression/Expr.ts"],"names":[],"mappings":"","file":"expression/Expr.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind\";\nimport { ExprEvalResult } from \"./ExprEvalResult\";\n\nexport interface Expr<T> {\n  evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<T>;\n  getKind(): ExprKind;\n}\n"]}

package/dist/mjs/expression/Expr0.js

@@ -1,4 +1,20 @@
-export class Expr0 {
-    constructor() { }
+import { ExprBase } from "./ExprBase";
+import { ExprEvalErrorObj, ExprEvalStatus, } from "./ExprEvalResult";
+export class Expr0 extends ExprBase {
+    constructor(kind) {
+        super(kind);
+    }
+    evaluate(ctx, localCtx) {
+        try {
+            const result = this.doEvaluate(ctx, localCtx);
+            return this.wrapInResultIfNecessary(result);
+        }
+        catch (error) {
+            return this.handleError(error);
+        }
+    }
+    handleError(error) {
+        return new ExprEvalErrorObj(this.getKind(), ExprEvalStatus.ERROR, error);
+    }
 }
 //# sourceMappingURL=Expr0.js.map

package/dist/mjs/expression/Expr0.js.map

@@ -1 +1 @@
-{"version":3,"sources":["expression/Expr0.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,KAAK;IACzB,gBAAyB,CAAC;CAG3B","file":"expression/Expr0.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\n\nexport abstract class Expr0<E> implements Expr<E> {\n  protected constructor() {}\n\n  abstract evaluate(ctx: IfcExpressionContext): E;\n}\n"]}
+{"version":3,"sources":["expression/Expr0.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAEL,gBAAgB,EAEhB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAE1B,MAAM,OAAgB,KAAS,SAAQ,QAAW;IAChD,YAAsB,IAAc;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAOM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAChC;IACH,CAAC;IAES,WAAW,CAAC,KAAU;QAC9B,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;CACF","file":"expression/Expr0.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind\";\nimport { ExprBase } from \"./ExprBase\";\nimport {\n  ExprEvalError,\n  ExprEvalErrorObj,\n  ExprEvalResult,\n  ExprEvalStatus,\n} from \"./ExprEvalResult\";\n\nexport abstract class Expr0<E> extends ExprBase<E> {\n  protected constructor(kind: ExprKind) {\n    super(kind);\n  }\n\n  protected abstract doEvaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): E | ExprEvalError;\n\n  public evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<E> {\n    try {\n      const result = this.doEvaluate(ctx, localCtx);\n      return this.wrapInResultIfNecessary(result);\n    } catch (error) {\n      return this.handleError(error);\n    }\n  }\n\n  protected handleError(error: any): ExprEvalError {\n    return new ExprEvalErrorObj(this.getKind(), ExprEvalStatus.ERROR, error);\n  }\n}\n"]}

package/dist/mjs/expression/Expr1.js

@@ -1,6 +1,50 @@
-export class Expr1 {
-    constructor(value) {
+import { ExprEvalConsequentialError1Obj, ExprEvalError1Obj, ExprEvalErrorUndefinedResult, ExprEvalStatus, isExprEvalError, } from "./ExprEvalResult";
+import { ExprBase } from "./ExprBase";
+import { isNullish } from "../IfcExpressionUtils";
+export class Expr1 extends ExprBase {
+    constructor(exprKind, value) {
+        super(exprKind);
         this.value = value;
     }
+    /**
+     * Override to generate a more specific error result.
+     * @param ctx
+     * @param localCtx
+     * @param subExpressionResult
+     * @protected
+     */
+    obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult) {
+        return new ExprEvalConsequentialError1Obj(this.getKind(), subExpressionResult);
+    }
+    // calculate the final result
+    makeErrorOrCalculate(ctx, localCtx, subExpressionResult) {
+        if (isExprEvalError(subExpressionResult)) {
+            return this.obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult);
+        }
+        return this.wrapInResultIfNecessary(this.calculateResult(ctx, localCtx, subExpressionResult.result));
+    }
+    onBeforeRecusion(ctx, localCtx) {
+        // do something before we calculate the subresult
+        return undefined;
+    }
+    evaluate(ctx, localCtx) {
+        const beforeRecursionError = this.onBeforeRecusion(ctx, localCtx);
+        if (!isNullish(beforeRecursionError)) {
+            return beforeRecursionError;
+        }
+        const subResult = this.value.evaluate(ctx, localCtx);
+        if (isNullish(subResult)) {
+            return new ExprEvalError1Obj(this.getKind(), new ExprEvalErrorUndefinedResult(this.value.getKind()), ExprEvalStatus.MISSING_OPERAND);
+        }
+        try {
+            return this.makeErrorOrCalculate(ctx, localCtx, subResult);
+        }
+        catch (error) {
+            return this.handleError(error, subResult);
+        }
+    }
+    handleError(error, subResult) {
+        return new ExprEvalError1Obj(this.getKind(), subResult, ExprEvalStatus.ERROR, error);
+    }
 }
 //# sourceMappingURL=Expr1.js.map

package/dist/mjs/expression/Expr1.js.map

@@ -1 +1 @@
-{"version":3,"sources":["expression/Expr1.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,KAAK;IAGzB,YAAsB,KAAQ;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CAGF","file":"expression/Expr1.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\n\nexport abstract class Expr1<V, E> implements Expr<E> {\n  readonly value: V;\n\n  protected constructor(value: V) {\n    this.value = value;\n  }\n\n  abstract evaluate(ctx: IfcExpressionContext): E;\n}\n"]}
+{"version":3,"sources":["expression/Expr1.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAE9B,iBAAiB,EACjB,4BAA4B,EAE5B,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,OAAgB,KAAY,SAAQ,QAAW;IAGnD,YAAsB,QAAkB,EAAE,KAAc;QACtD,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAQD;;;;;;OAMG;IACO,iCAAiC,CACzC,GAAyB,EACzB,QAA0B,EAC1B,mBAAkC;QAElC,OAAO,IAAI,8BAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,6BAA6B;IACrB,oBAAoB,CAC1B,GAAyB,EACzB,QAA0B,EAC1B,mBAAsC;QAEtC,IAAI,eAAe,CAAC,mBAAmB,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC,iCAAiC,CAC3C,GAAG,EACH,QAAQ,EACR,mBAAmB,CACpB,CAAC;SACH;QACD,OAAO,IAAI,CAAC,uBAAuB,CACjC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAChE,CAAC;IACJ,CAAC;IAES,gBAAgB,CACxB,GAAyB,EACzB,QAA0B;QAE1B,iDAAiD;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,MAAM,oBAAoB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE;YACpC,OAAO,oBAAoB,CAAC;SAC7B;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE;YACxB,OAAO,IAAI,iBAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,IAAI,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EACtD,cAAc,CAAC,eAAe,CAC/B,CAAC;SACH;QACD,IAAI;YACF,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;SAC5D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SAC3C;IACH,CAAC;IAES,WAAW,CACnB,KAAU,EACV,SAA4B;QAE5B,OAAO,IAAI,iBAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,SAAS,EACT,cAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF","file":"expression/Expr1.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind\";\nimport {\n  ExprEvalConsequentialError1Obj,\n  ExprEvalError,\n  ExprEvalError1Obj,\n  ExprEvalErrorUndefinedResult,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalError,\n} from \"./ExprEvalResult\";\nimport { ExprBase } from \"./ExprBase\";\nimport { Expr } from \"./Expr\";\nimport { isNullish } from \"../IfcExpressionUtils\";\n\nexport abstract class Expr1<V, E> extends ExprBase<E> {\n  readonly value: Expr<V>;\n\n  protected constructor(exprKind: ExprKind, value: Expr<V>) {\n    super(exprKind);\n    this.value = value;\n  }\n\n  protected abstract calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    subExpressionResult: V\n  ): E | ExprEvalError;\n\n  /**\n   * Override to generate a more specific error result.\n   * @param ctx\n   * @param localCtx\n   * @param subExpressionResult\n   * @protected\n   */\n  protected obtainResultForSubExpressionError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    subExpressionResult: ExprEvalError\n  ): ExprEvalResult<E> {\n    return new ExprEvalConsequentialError1Obj(\n      this.getKind(),\n      subExpressionResult\n    );\n  }\n\n  // calculate the final result\n  private makeErrorOrCalculate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    subExpressionResult: ExprEvalResult<V>\n  ): ExprEvalResult<E> {\n    if (isExprEvalError(subExpressionResult)) {\n      return this.obtainResultForSubExpressionError(\n        ctx,\n        localCtx,\n        subExpressionResult\n      );\n    }\n    return this.wrapInResultIfNecessary(\n      this.calculateResult(ctx, localCtx, subExpressionResult.result)\n    );\n  }\n\n  protected onBeforeRecusion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): undefined | ExprEvalError {\n    // do something before we calculate the subresult\n    return undefined;\n  }\n\n  public evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<E> {\n    const beforeRecursionError = this.onBeforeRecusion(ctx, localCtx);\n    if (!isNullish(beforeRecursionError)) {\n      return beforeRecursionError;\n    }\n    const subResult = this.value.evaluate(ctx, localCtx);\n    if (isNullish(subResult)) {\n      return new ExprEvalError1Obj(\n        this.getKind(),\n        new ExprEvalErrorUndefinedResult(this.value.getKind()),\n        ExprEvalStatus.MISSING_OPERAND\n      );\n    }\n    try {\n      return this.makeErrorOrCalculate(ctx, localCtx, subResult);\n    } catch (error) {\n      return this.handleError(error, subResult);\n    }\n  }\n\n  protected handleError(\n    error: any,\n    subResult: ExprEvalResult<V>\n  ): ExprEvalError {\n    return new ExprEvalError1Obj(\n      this.getKind(),\n      subResult,\n      ExprEvalStatus.ERROR,\n      error\n    );\n  }\n}\n"]}

package/dist/mjs/expression/Expr2.js

@@ -1,7 +1,53 @@
-export class Expr2 {
-    constructor(left, right) {
+import { ExprBase } from "./ExprBase";
+import { ExprEvalConsequentialError1Obj, ExprEvalConsequentialError2Obj, ExprEvalError2Obj, ExprEvalErrorUndefinedResult, ExprEvalStatus, isExprEvalError, isExprEvalSuccess, } from "./ExprEvalResult";
+import { isNullish } from "../IfcExpressionUtils";
+export class Expr2 extends ExprBase {
+    constructor(exprKind, left, right) {
+        super(exprKind);
         this.left = left;
         this.right = right;
     }
+    onBeforeRecursion(ctx, localCtx) {
+        // override if subclass needs to do something before recursing
+    }
+    onAfterLeftRecursion(ctx, localCtx, leftResult) {
+        // override if subclass needs to do something with the left result, such as put it in the local context
+    }
+    evaluate(ctx, localCtx) {
+        this.onBeforeRecursion(ctx, localCtx);
+        const leftResult = this.left.evaluate(ctx, localCtx);
+        if (isNullish(leftResult)) {
+            return new ExprEvalErrorUndefinedResult(this.left.getKind());
+        }
+        if (isExprEvalError(leftResult)) {
+            return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);
+        }
+        this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);
+        const rightResult = this.right.evaluate(ctx, localCtx);
+        if (isNullish(rightResult)) {
+            return new ExprEvalErrorUndefinedResult(this.right.getKind());
+        }
+        if (isExprEvalSuccess(rightResult)) {
+            try {
+                const result = this.calculateResult(ctx, localCtx, leftResult.result, rightResult.result);
+                return this.wrapInResultIfNecessary(result);
+            }
+            catch (error) {
+                return this.handleError(error, leftResult, rightResult);
+            }
+        }
+        else {
+            return this.makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult);
+        }
+    }
+    makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult) {
+        return new ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
+    }
+    makeErrorForLeftSubExprError(ctx, localCtx, leftResult) {
+        return new ExprEvalConsequentialError1Obj(this.getKind(), leftResult, "Cannot evaluate attribute reference");
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalStatus.ERROR, error);
+    }
 }
 //# sourceMappingURL=Expr2.js.map

package/dist/mjs/expression/Expr2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["expression/Expr2.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,KAAK;IAIzB,YAAsB,IAAO,EAAE,KAAQ;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CAGF","file":"expression/Expr2.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\n\nexport abstract class Expr2<L, R, E> implements Expr<E> {\n  readonly left: L;\n  readonly right: R;\n\n  protected constructor(left: L, right: R) {\n    this.left = left;\n    this.right = right;\n  }\n\n  abstract evaluate(ctx: IfcExpressionContext): E;\n}\n"]}
+{"version":3,"sources":["expression/Expr2.ts"],"names":[],"mappings":"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","file":"expression/Expr2.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprBase } from \"./ExprBase\";\nimport { ExprKind } from \"./ExprKind\";\nimport {\n  ExprEvalConsequentialError1Obj,\n  ExprEvalConsequentialError2Obj,\n  ExprEvalError,\n  ExprEvalError2Obj,\n  ExprEvalErrorUndefinedResult,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalError,\n  isExprEvalSuccess,\n} from \"./ExprEvalResult\";\nimport { isNullish } from \"../IfcExpressionUtils\";\nimport { Expr } from \"./Expr\";\n\nexport abstract class Expr2<L, R, E> extends ExprBase<E> {\n  readonly left: Expr<L>;\n  readonly right: Expr<R>;\n\n  protected constructor(exprKind: ExprKind, left: Expr<L>, right: Expr<R>) {\n    super(exprKind);\n    this.left = left;\n    this.right = right;\n  }\n\n  protected abstract calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftOperand: L,\n    rightOperand: R\n  ): E | ExprEvalError;\n\n  protected onBeforeRecursion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ) {\n    // override if subclass needs to do something before recursing\n  }\n\n  protected onAfterLeftRecursion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: L\n  ) {\n    // override if subclass needs to do something with the left result, such as put it in the local context\n  }\n\n  public evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<E> {\n    this.onBeforeRecursion(ctx, localCtx);\n    const leftResult = this.left.evaluate(ctx, localCtx);\n    if (isNullish(leftResult)) {\n      return new ExprEvalErrorUndefinedResult(this.left.getKind());\n    }\n    if (isExprEvalError(leftResult)) {\n      return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);\n    }\n    this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);\n    const rightResult = this.right.evaluate(ctx, localCtx);\n    if (isNullish(rightResult)) {\n      return new ExprEvalErrorUndefinedResult(this.right.getKind());\n    }\n    if (isExprEvalSuccess(rightResult)) {\n      try {\n        const result = this.calculateResult(\n          ctx,\n          localCtx,\n          leftResult.result,\n          rightResult.result\n        );\n        return this.wrapInResultIfNecessary(result);\n      } catch (error) {\n        return this.handleError(error, leftResult, rightResult);\n      }\n    } else {\n      return this.makeResultForRightSubExprError(\n        ctx,\n        localCtx,\n        leftResult,\n        rightResult\n      );\n    }\n  }\n\n  protected makeResultForRightSubExprError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ExprEvalResult<L>,\n    rightResult: ExprEvalError\n  ): ExprEvalResult<E> {\n    return new ExprEvalConsequentialError2Obj(\n      this.getKind(),\n      leftResult,\n      rightResult\n    );\n  }\n\n  protected makeErrorForLeftSubExprError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ExprEvalError\n  ): ExprEvalError {\n    return new ExprEvalConsequentialError1Obj(\n      this.getKind(),\n      leftResult,\n      \"Cannot evaluate attribute reference\"\n    );\n  }\n\n  protected handleError(\n    error: any,\n    leftResult: ExprEvalResult<L>,\n    rightResult: ExprEvalResult<R>\n  ): ExprEvalError {\n    return new ExprEvalError2Obj(\n      this.getKind(),\n      leftResult,\n      rightResult,\n      ExprEvalStatus.ERROR,\n      error\n    );\n  }\n}\n"]}