ifc-expressions 0.2.3 → 0.3.0

package/dist/ExprVisitor.d.ts

@@ -1,5 +1,5 @@
 import IfcExpressionVisitor from "./gen/parser/IfcExpressionVisitor.js";
-import { AttributeRefContext, ExprContext, NestedObjectChainEndContext, NestedObjectChainInnerContext, NumAddSubContext, NumAttributeRefContext, NumLitContext, NumLiteralContext, NumMulDivContext, NumParensContext, ObjectRefContext, StringAttributeRefContext, StringConcatContext, StringLiteralContext } from "./gen/parser/IfcExpressionParser.js";
+import { ArrayContext, ArrayElementListContext, AttributeRefContext, ExprContext, ExprListContext, FunctionCallContext, NestedObjectChainEndContext, NestedObjectChainInnerContext, NumAddSubContext, NumAttributeRefContext, NumLitContext, NumLiteralContext, NumMulDivContext, NumParensContext, ObjectRefContext, StringAttributeRefContext, StringConcatContext, StringLiteralContext } from "./gen/parser/IfcExpressionParser.js";
 import { Expr } from "./expression/Expr.js";
 export declare class ExprVisitor extends IfcExpressionVisitor<Expr<any>> {
     constructor();
@@ -18,5 +18,9 @@ export declare class ExprVisitor extends IfcExpressionVisitor<Expr<any>> {
     visitNumParens: (ctx: NumParensContext) => Expr<any>;
     visitExpr: (ctx: ExprContext) => Expr<any>;
     visitNumLit: (ctx: NumLitContext) => Expr<any>;
+    visitArray: (ctx: ArrayContext) => Expr<any>;
+    collectArrayElements: (ctx: ArrayElementListContext) => Array<Expr<any>>;
+    visitFunctionCall: (ctx: FunctionCallContext) => Expr<any>;
+    collectFunctionArguments: (ctx: ExprListContext) => Array<Expr<any>>;
     private failNode;
 }

package/dist/IfcExpression.d.ts

@@ -1,7 +1,7 @@
 import { ErrorListener, Token } 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 { IfcExpressionContext } from "./context/IfcExpressionContext.js";
 import { Expr } from "./expression/Expr.js";
 import { IfcElementAccessor } from "./context/IfcElementAccessor.js";
@@ -23,10 +23,11 @@ import { ObjectAccessor } from "./context/ObjectAccessor.js";
 import { IfcExpressionEvaluationException } from "./expression/IfcExpressionEvaluationException.js";
 import type { LiteralValueAnyArity } from "./value/LiteralValueAnyArity.js";
 import type { PrimitiveValueType } from "./value/PrimitiveValueType.js";
+import { ExprEvalResult } from "./expression/ExprEvalResult";
 export { IfcElementAccessor, IfcExpressionContext, Value, StringValue, BooleanValue, LogicalValue, NumericValue, LiteralValue, ReferenceValue, IfcPropertySetAccessor, IfcPropertyAccessor, IfcRootObjectAccessor, IfcTypeObjectAccessor, NamedObjectAccessor, ObjectAccessor, Expr, ExprVisitor, IfcExpressionEvaluationException, IfcExpressionErrorListener, IfcExpressionVisitor, isPresent, isNullish, };
 export type { PrimitiveValueType, LiteralValueAnyArity };
 export declare class IfcExpression {
     static parse(input: string, errorListener?: ErrorListener<Token>): ExprContext;
-    static evaluate(expression: string, context: IfcExpressionContext): LiteralValueAnyArity;
+    static evaluate(expression: string, context: IfcExpressionContext): ExprEvalResult<any>;
     private static extractExprTree;
 }

package/dist/cjs/ExprVisitor.js

@@ -22,6 +22,8 @@ const NumericValue_js_1 = require("./value/NumericValue.js");
 const StringValue_js_1 = require("./value/StringValue.js");
 const StringLiteralExpr_js_1 = require("./expression/string/StringLiteralExpr.js");
 const StringConcatExpr_js_1 = require("./expression/string/StringConcatExpr.js");
+const ArrayExpr_1 = require("./expression/structure/ArrayExpr");
+const FunctionExpr_1 = require("./expression/function/FunctionExpr");
 class ExprVisitor extends IfcExpressionVisitor_js_1.default {
     constructor() {
         super();
@@ -74,11 +76,11 @@ class ExprVisitor extends IfcExpressionVisitor_js_1.default {
         this.visitNumLiteral = (ctx) => {
             let val = ctx.INT();
             if ((0, IfcExpressionUtils_js_1.isPresent)(val)) {
-                return new NumericLiteralExpr_js_1.NumericLiteralExpr(new NumericValue_js_1.NumericValue(new decimal_js_1.default(val.symbol.text)));
+                return new NumericLiteralExpr_js_1.NumericLiteralExpr(new NumericValue_js_1.NumericValue(new decimal_js_1.default(ctx.getText())));
             }
             val = ctx.FLOAT();
             if ((0, IfcExpressionUtils_js_1.isPresent)(val)) {
-                return new NumericLiteralExpr_js_1.NumericLiteralExpr(new NumericValue_js_1.NumericValue(new decimal_js_1.default(val.symbol.text)));
+                return new NumericLiteralExpr_js_1.NumericLiteralExpr(new NumericValue_js_1.NumericValue(new decimal_js_1.default(ctx.getText())));
             }
             this.failNode(ctx);
         };
@@ -111,6 +113,38 @@ class ExprVisitor extends IfcExpressionVisitor_js_1.default {
         this.visitNumLit = (ctx) => {
             return this.visit(ctx.getChild(0));
         };
+        /*================================================
+         * ArrayExpr
+         *===============================================*/
+        this.visitArray = (ctx) => {
+            return new ArrayExpr_1.ArrayExpr(this.collectArrayElements(ctx.arrayElementList()));
+        };
+        this.collectArrayElements = (ctx) => {
+            const first = this.visit(ctx.expr());
+            const rest = ctx.arrayElementList();
+            if (!(0, IfcExpressionUtils_js_1.isNullish)(rest)) {
+                const arr = this.collectArrayElements(rest);
+                arr.unshift(first);
+                return arr;
+            }
+            return [first];
+        };
+        /*================================================
+         * FuncExpr
+         *===============================================*/
+        this.visitFunctionCall = (ctx) => {
+            return new FunctionExpr_1.FunctionExpr(ctx._name.text, this.collectFunctionArguments(ctx.exprList()));
+        };
+        this.collectFunctionArguments = (ctx) => {
+            const first = this.visit(ctx.expr());
+            const rest = ctx.exprList();
+            if (!(0, IfcExpressionUtils_js_1.isNullish)(rest)) {
+                const arr = this.collectFunctionArguments(rest);
+                arr.unshift(first);
+                return arr;
+            }
+            return [first];
+        };
     }
     stripBrackets(name) {
         if (name.startsWith("{")) {

package/dist/cjs/ExprVisitor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/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":["../../src/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/cjs/IfcExpression.js

@@ -3,19 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IfcExpression = exports.isNullish = exports.isPresent = exports.IfcExpressionVisitor = exports.IfcExpressionErrorListener = exports.IfcExpressionEvaluationException = exports.ExprVisitor = exports.NamedObjectAccessor = exports.IfcTypeObjectAccessor = exports.IfcRootObjectAccessor = exports.IfcPropertyAccessor = exports.IfcPropertySetAccessor = exports.ReferenceValue = exports.NumericValue = exports.LogicalValue = exports.BooleanValue = exports.StringValue = exports.Value = exports.IfcElementAccessor = void 0;
+exports.IfcExpression = exports.isNullish = exports.isPresent = exports.IfcExpressionVisitor = exports.IfcExpressionErrorListener = exports.IfcExpressionEvaluationException = exports.ExprVisitor = exports.NamedObjectAccessor = exports.IfcTypeObjectAccessor = exports.IfcRootObjectAccessor = exports.IfcPropertyAccessor = exports.IfcPropertySetAccessor = exports.ReferenceValue = exports.NumericValue = exports.LogicalValue = exports.BooleanValue = exports.StringValue = exports.IfcElementAccessor = void 0;
 const antlr4_1 = require("antlr4");
 const ExprVisitor_js_1 = require("./ExprVisitor.js");
 Object.defineProperty(exports, "ExprVisitor", { enumerable: true, get: function () { return ExprVisitor_js_1.ExprVisitor; } });
 const IfcExpressionErrorListener_js_1 = require("./IfcExpressionErrorListener.js");
 Object.defineProperty(exports, "IfcExpressionErrorListener", { enumerable: true, get: function () { return IfcExpressionErrorListener_js_1.IfcExpressionErrorListener; } });
 const IfcExpressionUtils_js_1 = require("./IfcExpressionUtils.js");
-Object.defineProperty(exports, "isPresent", { enumerable: true, get: function () { return IfcExpressionUtils_js_1.isPresent; } });
 Object.defineProperty(exports, "isNullish", { enumerable: true, get: function () { return IfcExpressionUtils_js_1.isNullish; } });
+Object.defineProperty(exports, "isPresent", { enumerable: true, get: function () { return IfcExpressionUtils_js_1.isPresent; } });
 const IfcElementAccessor_js_1 = require("./context/IfcElementAccessor.js");
 Object.defineProperty(exports, "IfcElementAccessor", { enumerable: true, get: function () { return IfcElementAccessor_js_1.IfcElementAccessor; } });
-const Value_js_1 = require("./value/Value.js");
-Object.defineProperty(exports, "Value", { enumerable: true, get: function () { return Value_js_1.Value; } });
 const StringValue_js_1 = require("./value/StringValue.js");
 Object.defineProperty(exports, "StringValue", { enumerable: true, get: function () { return StringValue_js_1.StringValue; } });
 const NumericValue_js_1 = require("./value/NumericValue.js");
@@ -61,7 +59,7 @@ 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_js_1.ExprVisitor();

package/dist/cjs/IfcExpression.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/IfcExpression.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6E;AAC7E,qDAA+C;AA4C7C,4FA5CO,4BAAW,OA4CP;AA3Cb,mFAA6E;AA6C3E,2GA7CO,0DAA0B,OA6CP;AA5C5B,mEAA+D;AA8C7D,0FA9CO,iCAAS,OA8CP;AACT,0FA/CkB,iCAAS,OA+ClB;AA3CX,2EAAqE;AAsBnE,mGAtBO,0CAAkB,OAsBP;AArBpB,+CAAyC;AAuBvC,sFAvBO,gBAAK,OAuBP;AAtBP,2DAAqD;AAuBnD,4FAvBO,4BAAW,OAuBP;AAtBb,6DAAuD;AAyBrD,6FAzBO,8BAAY,OAyBP;AAxBd,6DAAuD;AAsBrD,6FAtBO,8BAAY,OAsBP;AArBd,6DAAuD;AAsBrD,6FAtBO,8BAAY,OAsBP;AApBd,iEAA2D;AAuBzD,+FAvBO,kCAAc,OAuBP;AAtBhB,mFAA6E;AAuB3E,uGAvBO,kDAAsB,OAuBP;AAtBxB,6EAAuE;AAuBrE,oGAvBO,4CAAmB,OAuBP;AAtBrB,iFAA2E;AAuBzE,sGAvBO,gDAAqB,OAuBP;AAtBvB,iFAA2E;AAuBzE,sGAvBO,gDAAqB,OAuBP;AAtBvB,6EAAuE;AAuBrE,oGAvBO,4CAAmB,OAuBP;AArBrB,iGAAsE;AACtE,mGAAwE;AA0BtE,+BA1BK,iCAAoB,CA0BL;AAzBtB,+FAAoE;AAEpE,0GAAoG;AAqBlG,iHArBO,sEAAgC,OAqBP;AASlC,MAAa,aAAa;IACjB,MAAM,CAAC,KAAK,CACjB,KAAa,EACb,aAAoC;QAEpC,MAAM,KAAK,GAAG,IAAI,mBAAU,CAAC,KAAK,CAAC,CAAC,CAAC,6CAA6C;QAClF,MAAM,KAAK,GAAG,IAAI,+BAAkB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,0BAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,gCAAmB,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,IAAA,iCAAS,EAAC,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,0DAA0B,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,CAAC,CAAC;IAC5C,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,IAAiB;QAC9C,MAAM,OAAO,GAAG,IAAI,4BAAW,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAjCD,sCAiCC","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":["../../src/IfcExpression.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA6E;AAC7E,qDAA+C;AA+C7C,4FA/CO,4BAAW,OA+CP;AA9Cb,mFAA6E;AAgD3E,2GAhDO,0DAA0B,OAgDP;AA/C5B,mEAA+D;AAkD7D,0FAlDO,iCAAS,OAkDP;AADT,0FAjDkB,iCAAS,OAiDlB;AA7CX,2EAAqE;AAyBnE,mGAzBO,0CAAkB,OAyBP;AAvBpB,2DAAqD;AA0BnD,4FA1BO,4BAAW,OA0BP;AAzBb,6DAAuD;AA4BrD,6FA5BO,8BAAY,OA4BP;AA3Bd,6DAAuD;AAyBrD,6FAzBO,8BAAY,OAyBP;AAxBd,6DAAuD;AAyBrD,6FAzBO,8BAAY,OAyBP;AAvBd,iEAA2D;AA0BzD,+FA1BO,kCAAc,OA0BP;AAzBhB,mFAA6E;AA0B3E,uGA1BO,kDAAsB,OA0BP;AAzBxB,6EAAuE;AA0BrE,oGA1BO,4CAAmB,OA0BP;AAzBrB,iFAA2E;AA0BzE,sGA1BO,gDAAqB,OA0BP;AAzBvB,iFAA2E;AA0BzE,sGA1BO,gDAAqB,OA0BP;AAzBvB,6EAAuE;AA0BrE,oGA1BO,4CAAmB,OA0BP;AAzBrB,iGAE6C;AAC7C,mGAAwE;AA4BtE,+BA5BK,iCAAoB,CA4BL;AA3BtB,+FAAoE;AAEpE,0GAAoG;AAuBlG,iHAvBO,sEAAgC,OAuBP;AASlC,MAAa,aAAa;IACjB,MAAM,CAAC,KAAK,CACjB,KAAa,EACb,aAAoC;QAEpC,MAAM,KAAK,GAAG,IAAI,mBAAU,CAAC,KAAK,CAAC,CAAC,CAAC,6CAA6C;QAClF,MAAM,KAAK,GAAG,IAAI,+BAAkB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,0BAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,gCAAmB,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,IAAA,iCAAS,EAAC,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,0DAA0B,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,4BAAW,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAnCD,sCAmCC","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/cjs/context/IfcElementAccessor.js

@@ -9,11 +9,11 @@ class IfcElementAccessor extends IfcRootObjectAccessor_js_1.IfcRootObjectAccesso
         if (name === "type") {
             return this.getTypeObjectAccessor();
         }
-        let val = this.getIfcPropertyAccessor(name);
+        let val = this.getIfcPropertySetAccessor(name);
         if ((0, IfcExpressionUtils_js_1.isPresent)(val)) {
             return val;
         }
-        return this.getIfcPropertySetAccessor(name);
+        return this.getIfcPropertyAccessor(name);
     }
     getAttribute(name) {
         switch (name) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/context/IfcElementAccessor.ts"],"names":[],"mappings":";;;AACA,yEAAmE;AAInE,4DAAsD;AACtD,oEAAqD;AAGrD,MAAsB,kBAAmB,SAAQ,gDAAqB;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,IAAA,iCAAS,EAAC,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,4BAAW,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;AA3CD,gDA2CC","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":["../../src/context/IfcElementAccessor.ts"],"names":[],"mappings":";;;AACA,yEAAmE;AAInE,4DAAsD;AACtD,oEAAqD;AAGrD,MAAsB,kBAAmB,SAAQ,gDAAqB;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,IAAA,iCAAS,EAAC,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,4BAAW,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;AA3CD,gDA2CC","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/cjs/context/ObjectAccessor.js

@@ -1,3 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isObjectAccessor = void 0;
+function isObjectAccessor(arg) {
+    return (typeof arg === "object" &&
+        typeof arg.getNestedObjectAccessor === "function" &&
+        typeof arg.getAttribute === "function" &&
+        typeof arg.listNestedObjects === "function" &&
+        typeof arg.listAttributes === "function");
+}
+exports.isObjectAccessor = isObjectAccessor;
 //# sourceMappingURL=ObjectAccessor.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/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":["../../src/context/ObjectAccessor.ts"],"names":[],"mappings":";;;AAqBA,SAAgB,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;AARD,4CAQC","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/cjs/expression/Expr.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/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":["../../src/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/cjs/expression/Expr0.js

@@ -1,8 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr0 = void 0;
-class Expr0 {
-    constructor() { }
+const ExprBase_1 = require("./ExprBase");
+const ExprEvalResult_1 = require("./ExprEvalResult");
+class Expr0 extends ExprBase_1.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 ExprEvalResult_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr0 = Expr0;
 //# sourceMappingURL=Expr0.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/Expr0.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IACzB,gBAAyB,CAAC;CAG3B;AAJD,sBAIC","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":["../../src/expression/Expr0.ts"],"names":[],"mappings":";;;AAEA,yCAAsC;AACtC,qDAK0B;AAE1B,MAAsB,KAAS,SAAQ,mBAAW;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,iCAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,+BAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;CACF;AAzBD,sBAyBC","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/cjs/expression/Expr1.js

@@ -1,10 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr1 = void 0;
-class Expr1 {
-    constructor(value) {
+const ExprEvalResult_1 = require("./ExprEvalResult");
+const ExprBase_1 = require("./ExprBase");
+const IfcExpressionUtils_1 = require("../IfcExpressionUtils");
+class Expr1 extends ExprBase_1.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 ExprEvalResult_1.ExprEvalConsequentialError1Obj(this.getKind(), subExpressionResult);
+    }
+    // calculate the final result
+    makeErrorOrCalculate(ctx, localCtx, subExpressionResult) {
+        if ((0, ExprEvalResult_1.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 (!(0, IfcExpressionUtils_1.isNullish)(beforeRecursionError)) {
+            return beforeRecursionError;
+        }
+        const subResult = this.value.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(subResult)) {
+            return new ExprEvalResult_1.ExprEvalError1Obj(this.getKind(), new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.value.getKind()), ExprEvalResult_1.ExprEvalStatus.MISSING_OPERAND);
+        }
+        try {
+            return this.makeErrorOrCalculate(ctx, localCtx, subResult);
+        }
+        catch (error) {
+            return this.handleError(error, subResult);
+        }
+    }
+    handleError(error, subResult) {
+        return new ExprEvalResult_1.ExprEvalError1Obj(this.getKind(), subResult, ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr1 = Expr1;
 //# sourceMappingURL=Expr1.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/Expr1.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IAGzB,YAAsB,KAAQ;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CAGF;AARD,sBAQC","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":["../../src/expression/Expr1.ts"],"names":[],"mappings":";;;AAEA,qDAQ0B;AAC1B,yCAAsC;AAEtC,8DAAkD;AAElD,MAAsB,KAAY,SAAQ,mBAAW;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,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,6BAA6B;IACrB,oBAAoB,CAC1B,GAAyB,EACzB,QAA0B,EAC1B,mBAAsC;QAEtC,IAAI,IAAA,gCAAe,EAAC,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,IAAA,8BAAS,EAAC,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,IAAA,8BAAS,EAAC,SAAS,CAAC,EAAE;YACxB,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,IAAI,6CAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EACtD,+BAAc,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,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,SAAS,EACT,+BAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA5FD,sBA4FC","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/cjs/expression/Expr2.js

@@ -1,11 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr2 = void 0;
-class Expr2 {
-    constructor(left, right) {
+const ExprBase_1 = require("./ExprBase");
+const ExprEvalResult_1 = require("./ExprEvalResult");
+const IfcExpressionUtils_1 = require("../IfcExpressionUtils");
+class Expr2 extends ExprBase_1.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 ((0, IfcExpressionUtils_1.isNullish)(leftResult)) {
+            return new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.left.getKind());
+        }
+        if ((0, ExprEvalResult_1.isExprEvalError)(leftResult)) {
+            return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);
+        }
+        this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);
+        const rightResult = this.right.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(rightResult)) {
+            return new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.right.getKind());
+        }
+        if ((0, ExprEvalResult_1.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 ExprEvalResult_1.ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
+    }
+    makeErrorForLeftSubExprError(ctx, localCtx, leftResult) {
+        return new ExprEvalResult_1.ExprEvalConsequentialError1Obj(this.getKind(), leftResult, "Cannot evaluate attribute reference");
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr2 = Expr2;
 //# sourceMappingURL=Expr2.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IAIzB,YAAsB,IAAO,EAAE,KAAQ;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CAGF;AAVD,sBAUC","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":["../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AAEtC,qDAU0B;AAC1B,8DAAkD;AAGlD,MAAsB,KAAe,SAAQ,mBAAW;IAItD,YAAsB,QAAkB,EAAE,IAAa,EAAE,KAAc;QACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IASS,iBAAiB,CACzB,GAAyB,EACzB,QAA0B;QAE1B,8DAA8D;IAChE,CAAC;IAES,oBAAoB,CAC5B,GAAyB,EACzB,QAA0B,EAC1B,UAAa;QAEb,uGAAuG;IACzG,CAAC;IAEM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,8BAAS,EAAC,UAAU,CAAC,EAAE;YACzB,OAAO,IAAI,6CAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,IAAA,gCAAe,EAAC,UAAU,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACrE;QACD,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAA,8BAAS,EAAC,WAAW,CAAC,EAAE;YAC1B,OAAO,IAAI,6CAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,IAAA,kCAAiB,EAAC,WAAW,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CACjC,GAAG,EACH,QAAQ,EACR,UAAU,CAAC,MAAM,EACjB,WAAW,CAAC,MAAM,CACnB,CAAC;gBACF,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;aACzD;SACF;aAAM;YACL,OAAO,IAAI,CAAC,8BAA8B,CACxC,GAAG,EACH,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAES,8BAA8B,CACtC,GAAyB,EACzB,QAA0B,EAC1B,UAA6B,EAC7B,WAA0B;QAE1B,OAAO,IAAI,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC;IAES,4BAA4B,CACpC,GAAyB,EACzB,QAA0B,EAC1B,UAAyB;QAEzB,OAAO,IAAI,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,qCAAqC,CACtC,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA6B,EAC7B,WAA8B;QAE9B,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,+BAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA7GD,sBA6GC","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"]}

package/dist/cjs/expression/Expr2LeftBeforeRight.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Expr2LeftBeforeRight = void 0;
+const ExprBase_1 = require("./ExprBase");
+const ExprEvalResult_1 = require("./ExprEvalResult");
+const IfcExpressionUtils_1 = require("../IfcExpressionUtils");
+class Expr2LeftBeforeRight extends ExprBase_1.ExprBase {
+    constructor(exprKind, left, right) {
+        super(exprKind);
+        this.left = left;
+        this.right = right;
+    }
+    evaluate(ctx, localCtx) {
+        const leftResult = this.left.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(leftResult)) {
+            return new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.left.getKind());
+        }
+        this.handleLeftResult(leftResult);
+        const rightResult = this.right.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(leftResult) || (0, IfcExpressionUtils_1.isNullish)(rightResult)) {
+            return new ExprEvalResult_1.ExprEvalError2Obj(this.getKind(), (0, IfcExpressionUtils_1.isNullish)(leftResult)
+                ? new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.left.getKind())
+                : leftResult, (0, IfcExpressionUtils_1.isNullish)(rightResult)
+                ? new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.right.getKind())
+                : rightResult, ExprEvalResult_1.ExprEvalStatus.MISSING_OPERAND);
+        }
+        if ((0, ExprEvalResult_1.isExprEvalSuccess)(leftResult) && (0, ExprEvalResult_1.isExprEvalSuccess)(rightResult)) {
+            try {
+                const result = this.doEvaluate(ctx, leftResult.result, rightResult.result);
+                return this.wrapInResultIfNecessary(result);
+            }
+            catch (error) {
+                return this.handleError(error, leftResult, rightResult);
+            }
+        }
+        else {
+            return new ExprEvalResult_1.ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
+        }
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
+}
+exports.Expr2LeftBeforeRight = Expr2LeftBeforeRight;
+//# sourceMappingURL=Expr2LeftBeforeRight.js.map

package/dist/cjs/expression/Expr2LeftBeforeRight.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/expression/Expr2LeftBeforeRight.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AAEtC,qDAQ0B;AAC1B,8DAAkD;AAGlD,MAAsB,oBAA8B,SAAQ,mBAAW;IAIrE,YAAsB,QAAkB,EAAE,IAAa,EAAE,KAAc;QACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAUM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,8BAAS,EAAC,UAAU,CAAC,EAAE;YACzB,OAAO,IAAI,6CAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAA,8BAAS,EAAC,UAAU,CAAC,IAAI,IAAA,8BAAS,EAAC,WAAW,CAAC,EAAE;YACnD,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,IAAA,8BAAS,EAAC,UAAU,CAAC;gBACnB,CAAC,CAAC,IAAI,6CAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvD,CAAC,CAAC,UAAU,EACd,IAAA,8BAAS,EAAC,WAAW,CAAC;gBACpB,CAAC,CAAC,IAAI,6CAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACxD,CAAC,CAAC,WAAW,EACf,+BAAc,CAAC,eAAe,CAC/B,CAAC;SACH;QACD,IAAI,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,kCAAiB,EAAC,WAAW,CAAC,EAAE;YACnE,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAC5B,GAAG,EACH,UAAU,CAAC,MAAM,EACjB,WAAW,CAAC,MAAM,CACnB,CAAC;gBACF,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;aACzD;SACF;aAAM;YACL,OAAO,IAAI,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA6B,EAC7B,WAA8B;QAE9B,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,+BAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AAzED,oDAyEC","file":"expression/Expr2LeftBeforeRight.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprBase } from \"./ExprBase\";\nimport { ExprKind } from \"./ExprKind\";\nimport {\n  ExprEvalConsequentialError2Obj,\n  ExprEvalError,\n  ExprEvalError2Obj,\n  ExprEvalErrorUndefinedResult,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalSuccess,\n} from \"./ExprEvalResult\";\nimport { isNullish } from \"../IfcExpressionUtils\";\nimport { Expr } from \"./Expr\";\n\nexport abstract class Expr2LeftBeforeRight<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 doEvaluate(\n    ctx: IfcExpressionContext,\n    leftOperand: L,\n    rightOperand: R\n  ): E | ExprEvalError;\n\n  protected abstract handleLeftResult(leftResult: ExprEvalResult<L>);\n\n  public evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<E> {\n    const leftResult = this.left.evaluate(ctx, localCtx);\n    if (isNullish(leftResult)) {\n      return new ExprEvalErrorUndefinedResult(this.left.getKind());\n    }\n    this.handleLeftResult(leftResult);\n    const rightResult = this.right.evaluate(ctx, localCtx);\n    if (isNullish(leftResult) || isNullish(rightResult)) {\n      return new ExprEvalError2Obj(\n        this.getKind(),\n        isNullish(leftResult)\n          ? new ExprEvalErrorUndefinedResult(this.left.getKind())\n          : leftResult,\n        isNullish(rightResult)\n          ? new ExprEvalErrorUndefinedResult(this.right.getKind())\n          : rightResult,\n        ExprEvalStatus.MISSING_OPERAND\n      );\n    }\n    if (isExprEvalSuccess(leftResult) && isExprEvalSuccess(rightResult)) {\n      try {\n        const result = this.doEvaluate(\n          ctx,\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 new ExprEvalConsequentialError2Obj(\n        this.getKind(),\n        leftResult,\n        rightResult\n      );\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"]}

package/dist/cjs/expression/ExprBase.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprBase = void 0;
+const ExprEvalResult_1 = require("./ExprEvalResult");
+class ExprBase {
+    constructor(exprKind) {
+        this.exprKind = exprKind;
+    }
+    getKind() {
+        return this.exprKind;
+    }
+    wrapInResultIfNecessary(result) {
+        if ((0, ExprEvalResult_1.isExprEvalError)(result)) {
+            return result;
+        }
+        return new ExprEvalResult_1.ExprEvalSuccessObj(result);
+    }
+}
+exports.ExprBase = ExprBase;
+//# sourceMappingURL=ExprBase.js.map

package/dist/cjs/expression/ExprBase.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/expression/ExprBase.ts"],"names":[],"mappings":";;;AAEA,qDAK0B;AAG1B,MAAsB,QAAQ;IAG5B,YAAY,QAAkB;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAOD,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAES,uBAAuB,CAC/B,MAAyB;QAEzB,IAAI,IAAA,gCAAe,EAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,MAAM,CAAC;SACf;QACD,OAAO,IAAI,mCAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AAxBD,4BAwBC","file":"expression/ExprBase.js","sourcesContent":["import { Expr } from \"./Expr\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext\";\nimport {\n  ExprEvalError,\n  ExprEvalResult,\n  ExprEvalSuccessObj,\n  isExprEvalError,\n} from \"./ExprEvalResult\";\nimport { ExprKind } from \"./ExprKind\";\n\nexport abstract class ExprBase<T> implements Expr<T> {\n  private readonly exprKind: ExprKind;\n\n  constructor(exprKind: ExprKind) {\n    this.exprKind = exprKind;\n  }\n\n  abstract evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<T>;\n\n  getKind(): ExprKind {\n    return this.exprKind;\n  }\n\n  protected wrapInResultIfNecessary(\n    result: T | ExprEvalError\n  ): ExprEvalResult<T> {\n    if (isExprEvalError(result)) {\n      return result;\n    }\n    return new ExprEvalSuccessObj(result);\n  }\n}\n"]}