ifc-expressions 0.2.2 → 0.3.0

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

@@ -1,4 +1,4 @@
-import { Expr } from "../Expr";
-import { ObjectAccessor } from "../../context/ObjectAccessor";
+import { Expr } from "../Expr.js";
+import { ObjectAccessor } from "../../context/ObjectAccessor.js";
 export interface ObjectReferenceExpr extends Expr<ObjectAccessor> {
 }

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

@@ -1,8 +1,8 @@
-import { IfcExpressionContext } from "../../context/IfcExpressionContext";
-import { Expr0 } from "../Expr0";
-import { ObjectReferenceExpr } from "./ObjectReferenceExpr";
-import { ObjectAccessor } from "../../context/ObjectAccessor";
+import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
+import { Expr0 } from "../Expr0.js";
+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

@@ -1,8 +1,8 @@
-import { Expr2 } from "../Expr2";
-import { Expr } from "../Expr";
-import { IfcExpressionContext } from "../../context/IfcExpressionContext";
-import { StringValue } from "../../value/StringValue";
-export declare class StringConcatExpr extends Expr2<Expr<StringValue>, Expr<StringValue>, StringValue> {
+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<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";
-import { IfcExpressionContext } from "../../context/IfcExpressionContext";
-import { StringValue } from "../../value/StringValue";
-export declare class StringLiteralExpr extends Expr1<StringValue, StringValue> {
+import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
+import { StringValue } from "../../value/StringValue.js";
+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/{parser → 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/{parser → 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,21 +1,23 @@
-import IfcExpressionVisitor from "../generated/parser/IfcExpressionVisitor";
-import { NumericLiteralExpr } from "./expression/numeric/NumericLiteralExpr";
-import { notNullish } from "./utils";
+import IfcExpressionVisitor from "./gen/parser/IfcExpressionVisitor.js";
+import { NumericLiteralExpr } from "./expression/numeric/NumericLiteralExpr.js";
+import { isNullish, isPresent } from "./IfcExpressionUtils.js";
 import Decimal from "decimal.js";
-import { PlusExpr } from "./expression/numeric/PlusExpr";
-import { MinusExpr } from "./expression/numeric/MinusExpr";
-import { MultiplyExpr } from "./expression/numeric/MultiplyExpr";
-import { DivideExpr } from "./expression/numeric/DivideExpr";
-import { NumParenthesisExpr } from "./expression/numeric/NumParenthesisExpr";
-import { AttributeReferenceExpr } from "./expression/reference/AttributeReferenceExpr";
-import { PropObjectReferenceExpr } from "./expression/reference/PropObjectReferenceExpr";
-import { ElemObjectReferenceExpr } from "./expression/reference/ElemObjectReferenceExpr";
-import { NestedObjectChainExpr } from "./expression/reference/NestedObjectChainExpr";
-import { NestedObjectChainEndExpr } from "./expression/reference/NestedObjectChainEndExpr";
-import { NumericValue } from "./value/NumericValue";
-import { StringValue } from "./value/StringValue";
-import { StringLiteralExpr } from "./expression/string/StringLiteralExpr";
-import { StringConcatExpr } from "./expression/string/StringConcatExpr";
+import { PlusExpr } from "./expression/numeric/PlusExpr.js";
+import { MinusExpr } from "./expression/numeric/MinusExpr.js";
+import { MultiplyExpr } from "./expression/numeric/MultiplyExpr.js";
+import { DivideExpr } from "./expression/numeric/DivideExpr.js";
+import { NumParenthesisExpr } from "./expression/numeric/NumParenthesisExpr.js";
+import { AttributeReferenceExpr } from "./expression/reference/AttributeReferenceExpr.js";
+import { PropObjectReferenceExpr } from "./expression/reference/PropObjectReferenceExpr.js";
+import { ElemObjectReferenceExpr } from "./expression/reference/ElemObjectReferenceExpr.js";
+import { NestedObjectChainExpr } from "./expression/reference/NestedObjectChainExpr.js";
+import { NestedObjectChainEndExpr } from "./expression/reference/NestedObjectChainEndExpr.js";
+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();
@@ -28,10 +30,10 @@ export class ExprVisitor extends IfcExpressionVisitor {
             return new AttributeReferenceExpr(objectRefExpr, nestedObjectChainExpr);
         };
         this.visitObjectRef = (ctx) => {
-            if (notNullish(ctx.PROP())) {
+            if (isPresent(ctx.PROP())) {
                 return new PropObjectReferenceExpr();
             }
-            else if (notNullish(ctx.ELEM())) {
+            else if (isPresent(ctx.ELEM())) {
                 return new ElemObjectReferenceExpr();
             }
             this.failNode(ctx);
@@ -67,12 +69,12 @@ export class ExprVisitor extends IfcExpressionVisitor {
         };
         this.visitNumLiteral = (ctx) => {
             let val = ctx.INT();
-            if (notNullish(val)) {
-                return new NumericLiteralExpr(new NumericValue(new Decimal(val.symbol.text)));
+            if (isPresent(val)) {
+                return new NumericLiteralExpr(new NumericValue(new Decimal(ctx.getText())));
             }
             val = ctx.FLOAT();
-            if (notNullish(val)) {
-                return new NumericLiteralExpr(new NumericValue(new Decimal(val.symbol.text)));
+            if (isPresent(val)) {
+                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 \"../generated/parser/IfcExpressionVisitor\";\nimport { NumericLiteralExpr } from \"./expression/numeric/NumericLiteralExpr\";\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 \"../generated/parser/IfcExpressionParser\";\nimport { Expr } from \"./expression/Expr\";\nimport { notNullish } from \"./utils\";\nimport Decimal from \"decimal.js\";\nimport { PlusExpr } from \"./expression/numeric/PlusExpr\";\nimport { MinusExpr } from \"./expression/numeric/MinusExpr\";\nimport { ParserRuleContext } from \"antlr4\";\nimport { MultiplyExpr } from \"./expression/numeric/MultiplyExpr\";\nimport { DivideExpr } from \"./expression/numeric/DivideExpr\";\nimport { NumParenthesisExpr } from \"./expression/numeric/NumParenthesisExpr\";\nimport { AttributeReferenceExpr } from \"./expression/reference/AttributeReferenceExpr\";\nimport { PropObjectReferenceExpr } from \"./expression/reference/PropObjectReferenceExpr\";\nimport { ElemObjectReferenceExpr } from \"./expression/reference/ElemObjectReferenceExpr\";\nimport { NestedObjectChainExpr } from \"./expression/reference/NestedObjectChainExpr\";\nimport { NestedObjectChainEndExpr } from \"./expression/reference/NestedObjectChainEndExpr\";\nimport { NumericValue } from \"./value/NumericValue\";\nimport { StringValue } from \"./value/StringValue\";\nimport { StringLiteralExpr } from \"./expression/string/StringLiteralExpr\";\nimport { StringConcatExpr } from \"./expression/string/StringConcatExpr\";\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 (notNullish(ctx.PROP())) {\n      return new PropObjectReferenceExpr();\n    } else if (notNullish(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 (notNullish(val)) {\n      return new NumericLiteralExpr(\n        new NumericValue(new Decimal(val.symbol.text))\n      );\n    }\n    val = ctx.FLOAT();\n    if (notNullish(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,31 +1,30 @@
 import { CharStream, CommonTokenStream } from "antlr4";
-import { ExprVisitor } from "./ExprVisitor";
-import { IfcExpressionErrorListener } from "./IfcExpressionErrorListener";
-import { notNullish } from "./utils";
-import IfcExpressionParser from "../generated/parser/IfcExpressionParser";
-import IfcExpressionLexer from "../generated/parser/IfcExpressionLexer";
-import { IfcElementAccessor } from "./context/IfcElementAccessor";
-import { Value } from "./value/Value";
-import { StringValue } from "./value/StringValue";
-import { NumericValue } from "./value/NumericValue";
-import { BooleanValue } from "./value/BooleanValue";
-import { LogicalValue } from "./value/LogicalValue";
-import { ReferenceValue } from "./value/ReferenceValue";
-import { IfcPropertySetAccessor } from "./context/IfcPropertySetAccessor";
-import { IfcPropertyAccessor } from "./context/IfcPropertyAccessor";
-import { IfcRootObjectAccessor } from "./context/IfcRootObjectAccessor";
-import { IfcTypeObjectAccessor } from "./context/IfcTypeObjectAccessor";
-import { NamedObjectAccessor } from "./context/NamedObjectAccessor";
-import { IfcExpressionEvaluationException } from "./expression/IfcExpressionEvaluationException";
-import IfcExpressionVisitor from "../generated/parser/IfcExpressionVisitor";
-export { IfcElementAccessor, Value, StringValue, BooleanValue, LogicalValue, NumericValue, ReferenceValue, IfcPropertySetAccessor, IfcPropertyAccessor, IfcRootObjectAccessor, IfcTypeObjectAccessor, NamedObjectAccessor, IfcExpressionEvaluationException, IfcExpressionErrorListener, IfcExpressionVisitor, };
+import { ExprVisitor } from "./ExprVisitor.js";
+import { IfcExpressionErrorListener } from "./IfcExpressionErrorListener.js";
+import { isNullish, isPresent } from "./IfcExpressionUtils.js";
+import { IfcElementAccessor } from "./context/IfcElementAccessor.js";
+import { StringValue } from "./value/StringValue.js";
+import { NumericValue } from "./value/NumericValue.js";
+import { BooleanValue } from "./value/BooleanValue.js";
+import { LogicalValue } from "./value/LogicalValue.js";
+import { ReferenceValue } from "./value/ReferenceValue.js";
+import { IfcPropertySetAccessor } from "./context/IfcPropertySetAccessor.js";
+import { IfcPropertyAccessor } from "./context/IfcPropertyAccessor.js";
+import { IfcRootObjectAccessor } from "./context/IfcRootObjectAccessor.js";
+import { IfcTypeObjectAccessor } from "./context/IfcTypeObjectAccessor.js";
+import { NamedObjectAccessor } from "./context/NamedObjectAccessor.js";
+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, 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
         const lexer = new IfcExpressionLexer(chars);
         const tokens = new CommonTokenStream(lexer);
         const parser = new IfcExpressionParser(tokens);
-        if (notNullish(errorListener)) {
+        if (isPresent(errorListener)) {
             parser.removeErrorListeners();
             parser.addErrorListener(errorListener);
         }
@@ -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":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAwB,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,mBAEN,MAAM,yCAAyC,CAAC;AACjD,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,oBAAoB,MAAM,0CAA0C,CAAC;AAG5E,OAAO,EACL,kBAAkB,EAElB,KAAK,EACL,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,YAAY,EAEZ,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EAGnB,gCAAgC,EAChC,0BAA0B,EAC1B,oBAAoB,GACrB,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,UAAU,CAAC,aAAa,CAAC,EAAE;YAC7B,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,CAAC,CAAC;IAC5C,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,IAAiB;QAC9C,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\";\nimport { IfcExpressionErrorListener } from \"./IfcExpressionErrorListener\";\nimport { notNullish } from \"./utils\";\nimport { IfcExpressionContext } from \"./context/IfcExpressionContext\";\nimport { Expr } from \"./expression/Expr\";\nimport IfcExpressionParser, {\n  ExprContext,\n} from \"../generated/parser/IfcExpressionParser\";\nimport IfcExpressionLexer from \"../generated/parser/IfcExpressionLexer\";\n\nimport { IfcElementAccessor } from \"./context/IfcElementAccessor\";\nimport { Value } from \"./value/Value\";\nimport { StringValue } from \"./value/StringValue\";\nimport { NumericValue } from \"./value/NumericValue\";\nimport { BooleanValue } from \"./value/BooleanValue\";\nimport { LogicalValue } from \"./value/LogicalValue\";\nimport { LiteralValue } from \"./value/LiteralValue\";\nimport { ReferenceValue } from \"./value/ReferenceValue\";\nimport { IfcPropertySetAccessor } from \"./context/IfcPropertySetAccessor\";\nimport { IfcPropertyAccessor } from \"./context/IfcPropertyAccessor\";\nimport { IfcRootObjectAccessor } from \"./context/IfcRootObjectAccessor\";\nimport { IfcTypeObjectAccessor } from \"./context/IfcTypeObjectAccessor\";\nimport { NamedObjectAccessor } from \"./context/NamedObjectAccessor\";\nimport { ObjectAccessor } from \"./context/ObjectAccessor\";\nimport { IfcExpressionEvaluationException } from \"./expression/IfcExpressionEvaluationException\";\nimport IfcExpressionVisitor from \"../generated/parser/IfcExpressionVisitor\";\nimport type { LiteralValueAnyArity } from \"./value/LiteralValueAnyArity\";\nimport type { PrimitiveValueType } from \"./value/PrimitiveValueType\";\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  IfcExpressionEvaluationException,\n  IfcExpressionErrorListener,\n  IfcExpressionVisitor,\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 (notNullish(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/IfcExpressionErrorListener.js

@@ -1,6 +1,6 @@
 import { ErrorListener } from "antlr4";
-import { notNullish } from "./utils";
-import { SyntaxErrorException } from "./SyntaxErrorException";
+import { isPresent } from "./IfcExpressionUtils.js";
+import { SyntaxErrorException } from "./SyntaxErrorException.js";
 export class IfcExpressionErrorListener extends ErrorListener {
     constructor() {
         super(...arguments);
@@ -10,7 +10,7 @@ export class IfcExpressionErrorListener extends ErrorListener {
         this.exception = new SyntaxErrorException(offendingSymbol, line, column, msg);
     }
     isErrorOccurred() {
-        return notNullish(this.exception);
+        return isPresent(this.exception);
     }
     getException() {
         return this.exception;

package/dist/mjs/IfcExpressionErrorListener.js.map

@@ -1 +1 @@
-{"version":3,"sources":["IfcExpressionErrorListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA2C,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,OAAO,0BAA2B,SAAQ,aAAoB;IAApE;;QACU,cAAS,GAAyB,IAAI,CAAC;IAyBjD,CAAC;IAvBC,WAAW,CACT,UAA6B,EAC7B,eAAsB,EACtB,IAAY,EACZ,MAAc,EACd,GAAW,EACX,CAAmC;QAEnC,IAAI,CAAC,SAAS,GAAG,IAAI,oBAAoB,CACvC,eAAe,EACf,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CAAC;IACJ,CAAC;IAEM,eAAe;QACpB,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF","file":"IfcExpressionErrorListener.js","sourcesContent":["import { ErrorListener, RecognitionException, Recognizer, Token } from \"antlr4\";\nimport { notNullish } from \"./utils\";\nimport { SyntaxErrorException } from \"./SyntaxErrorException\";\n\nexport class IfcExpressionErrorListener extends ErrorListener<Token> {\n  private exception: SyntaxErrorException = null;\n\n  syntaxError(\n    recognizer: Recognizer<Token>,\n    offendingSymbol: Token,\n    line: number,\n    column: number,\n    msg: string,\n    e: RecognitionException | undefined\n  ) {\n    this.exception = new SyntaxErrorException(\n      offendingSymbol,\n      line,\n      column,\n      msg\n    );\n  }\n\n  public isErrorOccurred(): boolean {\n    return notNullish(this.exception);\n  }\n\n  public getException(): SyntaxErrorException {\n    return this.exception;\n  }\n}\n"]}
+{"version":3,"sources":["IfcExpressionErrorListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA2C,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,OAAO,0BAA2B,SAAQ,aAAoB;IAApE;;QACU,cAAS,GAAyB,IAAI,CAAC;IAyBjD,CAAC;IAvBC,WAAW,CACT,UAA6B,EAC7B,eAAsB,EACtB,IAAY,EACZ,MAAc,EACd,GAAW,EACX,CAAmC;QAEnC,IAAI,CAAC,SAAS,GAAG,IAAI,oBAAoB,CACvC,eAAe,EACf,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CAAC;IACJ,CAAC;IAEM,eAAe;QACpB,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF","file":"IfcExpressionErrorListener.js","sourcesContent":["import { ErrorListener, RecognitionException, Recognizer, Token } from \"antlr4\";\nimport { isPresent } from \"./IfcExpressionUtils.js\";\nimport { SyntaxErrorException } from \"./SyntaxErrorException.js\";\n\nexport class IfcExpressionErrorListener extends ErrorListener<Token> {\n  private exception: SyntaxErrorException = null;\n\n  syntaxError(\n    recognizer: Recognizer<Token>,\n    offendingSymbol: Token,\n    line: number,\n    column: number,\n    msg: string,\n    e: RecognitionException | undefined\n  ) {\n    this.exception = new SyntaxErrorException(\n      offendingSymbol,\n      line,\n      column,\n      msg\n    );\n  }\n\n  public isErrorOccurred(): boolean {\n    return isPresent(this.exception);\n  }\n\n  public getException(): SyntaxErrorException {\n    return this.exception;\n  }\n}\n"]}

package/dist/mjs/IfcExpressionUtils.js

@@ -0,0 +1,7 @@
+export function isNullish(val) {
+    return typeof val === "undefined" || val === null;
+}
+export function isPresent(val) {
+    return !isNullish(val);
+}
+//# sourceMappingURL=IfcExpressionUtils.js.map

package/dist/mjs/IfcExpressionUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["IfcExpressionUtils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,GAAQ;IAChC,OAAO,OAAO,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,IAAI,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAQ;IAChC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC","file":"IfcExpressionUtils.js","sourcesContent":["export function isNullish(val: any) {\n  return typeof val === \"undefined\" || val === null;\n}\n\nexport function isPresent(val: any): boolean {\n  return !isNullish(val);\n}\n"]}

package/dist/mjs/SyntaxErrorException.js

@@ -1,8 +1,8 @@
-import { notNullish } from "./utils";
+import { isPresent } from "./IfcExpressionUtils.js";
 export class SyntaxErrorException extends Error {
     constructor(offendingSymbol, line, column, msg) {
         super(`Syntax Error in line ${line}, column ${column}` +
-            (notNullish(msg) ? `: ${msg}` : ""));
+            (isPresent(msg) ? `: ${msg}` : ""));
         this._offendingSymbol = offendingSymbol;
         this._line = line;
         this._column = column;

package/dist/mjs/SyntaxErrorException.js.map

@@ -1 +1 @@
-{"version":3,"sources":["SyntaxErrorException.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAK7C,YACE,eAAsB,EACtB,IAAY,EACZ,MAAc,EACd,GAAW;QAEX,KAAK,CACH,wBAAwB,IAAI,YAAY,MAAM,EAAE;YAC9C,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACtC,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF","file":"SyntaxErrorException.js","sourcesContent":["import { Token } from \"antlr4\";\nimport { notNullish } from \"./utils\";\n\nexport class SyntaxErrorException extends Error {\n  private readonly _offendingSymbol: Token;\n  private readonly _line: number;\n  private readonly _column: number;\n\n  constructor(\n    offendingSymbol: Token,\n    line: number,\n    column: number,\n    msg: string\n  ) {\n    super(\n      `Syntax Error in line ${line}, column ${column}` +\n        (notNullish(msg) ? `: ${msg}` : \"\")\n    );\n    this._offendingSymbol = offendingSymbol;\n    this._line = line;\n    this._column = column;\n  }\n\n  get offendingSymbol(): Token {\n    return this._offendingSymbol;\n  }\n\n  get line(): number {\n    return this._line;\n  }\n\n  get column(): number {\n    return this._column;\n  }\n}\n"]}
+{"version":3,"sources":["SyntaxErrorException.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAK7C,YACE,eAAsB,EACtB,IAAY,EACZ,MAAc,EACd,GAAW;QAEX,KAAK,CACH,wBAAwB,IAAI,YAAY,MAAM,EAAE;YAC9C,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrC,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF","file":"SyntaxErrorException.js","sourcesContent":["import { Token } from \"antlr4\";\nimport { isPresent } from \"./IfcExpressionUtils.js\";\n\nexport class SyntaxErrorException extends Error {\n  private readonly _offendingSymbol: Token;\n  private readonly _line: number;\n  private readonly _column: number;\n\n  constructor(\n    offendingSymbol: Token,\n    line: number,\n    column: number,\n    msg: string\n  ) {\n    super(\n      `Syntax Error in line ${line}, column ${column}` +\n        (isPresent(msg) ? `: ${msg}` : \"\")\n    );\n    this._offendingSymbol = offendingSymbol;\n    this._line = line;\n    this._column = column;\n  }\n\n  get offendingSymbol(): Token {\n    return this._offendingSymbol;\n  }\n\n  get line(): number {\n    return this._line;\n  }\n\n  get column(): number {\n    return this._column;\n  }\n}\n"]}

package/dist/mjs/context/IfcElementAccessor.js

@@ -1,16 +1,16 @@
-import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor";
-import { StringValue } from "../value/StringValue";
-import { notNullish } from "../utils";
+import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor.js";
+import { StringValue } from "../value/StringValue.js";
+import { isPresent } from "../IfcExpressionUtils.js";
 export class IfcElementAccessor extends IfcRootObjectAccessor {
     getNestedObjectAccessor(name) {
         if (name === "type") {
             return this.getTypeObjectAccessor();
         }
-        let val = this.getIfcPropertyAccessor(name);
-        if (notNullish(val)) {
+        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,yBAAyB,CAAC;AAIhE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,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,UAAU,CAAC,GAAG,CAAC,EAAE;YACnB,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\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor\";\nimport { IfcTypeObjectAccessor } from \"./IfcTypeObjectAccessor\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity\";\nimport { StringValue } from \"../value/StringValue\";\nimport { notNullish } from \"../utils\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor\";\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 (notNullish(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/IfcExpressionContext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcExpressionContext.ts"],"names":[],"mappings":"","file":"context/IfcExpressionContext.js","sourcesContent":["import { IfcPropertyAccessor } from \"./IfcPropertyAccessor\";\nimport { IfcElementAccessor } from \"./IfcElementAccessor\";\n\nexport interface IfcExpressionContext {\n  resolvePropRef(): IfcPropertyAccessor;\n\n  resolveElemRef(): IfcElementAccessor;\n}\n"]}
+{"version":3,"sources":["context/IfcExpressionContext.ts"],"names":[],"mappings":"","file":"context/IfcExpressionContext.js","sourcesContent":["import { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\nimport { IfcElementAccessor } from \"./IfcElementAccessor.js\";\n\nexport interface IfcExpressionContext {\n  resolvePropRef(): IfcPropertyAccessor;\n\n  resolveElemRef(): IfcElementAccessor;\n}\n"]}

package/dist/mjs/context/IfcPropertyAccessor.js

@@ -1,4 +1,4 @@
-import { NamedObjectAccessor } from "./NamedObjectAccessor";
+import { NamedObjectAccessor } from "./NamedObjectAccessor.js";
 export class IfcPropertyAccessor extends NamedObjectAccessor {
     getNestedObjectAccessor(name) {
         switch (name) {

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

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcPropertyAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,OAAgB,mBAAoB,SAAQ,mBAAmB;IACnE,uBAAuB,CAAC,IAAY;QAClC,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACxC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CAIF","file":"context/IfcPropertyAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor\";\nimport { NamedObjectAccessor } from \"./NamedObjectAccessor\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity\";\n\nexport abstract class IfcPropertyAccessor extends NamedObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    switch (name) {\n      case \"pset\":\n        return this.getPropertySetAccessor();\n    }\n    return undefined;\n  }\n\n  listNestedObjects(): Array<string> {\n    return [\"pset\"];\n  }\n\n  listAttributes(): Array<string> {\n    return [\"value\", ...super.listAttributes()];\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"value\":\n        return this.getValue();\n    }\n    return super.getAttribute(name);\n  }\n\n  protected abstract getValue(): LiteralValueAnyArity;\n  protected abstract getPropertySetAccessor(): IfcPropertySetAccessor;\n}\n"]}
+{"version":3,"sources":["context/IfcPropertyAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D,MAAM,OAAgB,mBAAoB,SAAQ,mBAAmB;IACnE,uBAAuB,CAAC,IAAY;QAClC,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACxC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO;gBACV,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CAIF","file":"context/IfcPropertyAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { NamedObjectAccessor } from \"./NamedObjectAccessor.js\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\n\nexport abstract class IfcPropertyAccessor extends NamedObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    switch (name) {\n      case \"pset\":\n        return this.getPropertySetAccessor();\n    }\n    return undefined;\n  }\n\n  listNestedObjects(): Array<string> {\n    return [\"pset\"];\n  }\n\n  listAttributes(): Array<string> {\n    return [\"value\", ...super.listAttributes()];\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"value\":\n        return this.getValue();\n    }\n    return super.getAttribute(name);\n  }\n\n  protected abstract getValue(): LiteralValueAnyArity;\n  protected abstract getPropertySetAccessor(): IfcPropertySetAccessor;\n}\n"]}

package/dist/mjs/context/IfcPropertySetAccessor.js

@@ -1,4 +1,4 @@
-import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor";
+import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor.js";
 export class IfcPropertySetAccessor extends IfcRootObjectAccessor {
     listAttributes() {
         return [...super.listAttributes(), ...this.listIfcProperties()];

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

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcPropertySetAccessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,OAAgB,sBAAuB,SAAQ,qBAAqB;IACxE,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CAMF","file":"context/IfcPropertySetAccessor.js","sourcesContent":["import { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor\";\nimport { ObjectAccessor } from \"./ObjectAccessor\";\n\nexport abstract class IfcPropertySetAccessor extends IfcRootObjectAccessor {\n  listAttributes(): Array<string> {\n    return [...super.listAttributes(), ...this.listIfcProperties()];\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    return super.getAttribute(name);\n  }\n\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    return this.getIfcPropertyAccessor(name);\n  }\n\n  protected abstract listIfcProperties(): Array<string>;\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n}\n"]}
+{"version":3,"sources":["context/IfcPropertySetAccessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,MAAM,OAAgB,sBAAuB,SAAQ,qBAAqB;IACxE,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,uBAAuB,CAAC,IAAY;QAClC,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CAMF","file":"context/IfcPropertySetAccessor.js","sourcesContent":["import { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\nimport { ObjectAccessor } from \"./ObjectAccessor.js\";\n\nexport abstract class IfcPropertySetAccessor extends IfcRootObjectAccessor {\n  listAttributes(): Array<string> {\n    return [...super.listAttributes(), ...this.listIfcProperties()];\n  }\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    return super.getAttribute(name);\n  }\n\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    return this.getIfcPropertyAccessor(name);\n  }\n\n  protected abstract listIfcProperties(): Array<string>;\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n}\n"]}

package/dist/mjs/context/IfcRootObjectAccessor.js

@@ -1,5 +1,5 @@
-import { NamedObjectAccessor } from "./NamedObjectAccessor";
-import { StringValue } from "../value/StringValue";
+import { NamedObjectAccessor } from "./NamedObjectAccessor.js";
+import { StringValue } from "../value/StringValue.js";
 export class IfcRootObjectAccessor extends NamedObjectAccessor {
     getAttribute(name) {
         switch (name) {

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

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcRootObjectAccessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,OAAgB,qBAAsB,SAAQ,mBAAmB;IACrE,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1C;QACD,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAID,cAAc;QACZ,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF","file":"context/IfcRootObjectAccessor.js","sourcesContent":["import { NamedObjectAccessor } from \"./NamedObjectAccessor\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity\";\nimport { StringValue } from \"../value/StringValue\";\n\nexport abstract class IfcRootObjectAccessor extends NamedObjectAccessor {\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"guid\":\n        return new StringValue(this.getGuid());\n    }\n    return super.getAttribute(name);\n  }\n\n  abstract getGuid(): string;\n\n  listAttributes(): Array<string> {\n    return [\"guid\", ...super.listAttributes()];\n  }\n}\n"]}
+{"version":3,"sources":["context/IfcRootObjectAccessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,OAAgB,qBAAsB,SAAQ,mBAAmB;IACrE,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1C;QACD,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAID,cAAc;QACZ,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF","file":"context/IfcRootObjectAccessor.js","sourcesContent":["import { NamedObjectAccessor } from \"./NamedObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\nimport { StringValue } from \"../value/StringValue.js\";\n\nexport abstract class IfcRootObjectAccessor extends NamedObjectAccessor {\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"guid\":\n        return new StringValue(this.getGuid());\n    }\n    return super.getAttribute(name);\n  }\n\n  abstract getGuid(): string;\n\n  listAttributes(): Array<string> {\n    return [\"guid\", ...super.listAttributes()];\n  }\n}\n"]}

package/dist/mjs/context/IfcTypeObjectAccessor.js

@@ -1,9 +1,9 @@
-import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor";
-import { notNullish } from "../utils";
+import { IfcRootObjectAccessor } from "./IfcRootObjectAccessor.js";
+import { isPresent } from "../IfcExpressionUtils.js";
 export class IfcTypeObjectAccessor extends IfcRootObjectAccessor {
     getNestedObjectAccessor(name) {
         let val = this.getIfcPropertyAccessor(name);
-        if (notNullish(val)) {
+        if (isPresent(val)) {
             return val;
         }
         return this.getIfcPropertySetAccessor(name);

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

@@ -1 +1 @@
-{"version":3,"sources":["context/IfcTypeObjectAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,MAAM,OAAgB,qBAAsB,SAAQ,qBAAqB;IACvE,uBAAuB,CAAC,IAAY;QAClC,IAAI,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACrC,CAAC;CAYF","file":"context/IfcTypeObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor\";\nimport { notNullish } from \"../utils\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor\";\n\nexport abstract class IfcTypeObjectAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    let val = this.getIfcPropertyAccessor(name);\n    if (notNullish(val)) {\n      return val;\n    }\n    return this.getIfcPropertySetAccessor(name);\n  }\n\n  listNestedObjects(): Array<string> {\n    return [...this.listIfcPropertyNames(), ...this.listIfcPropertySetNames()];\n  }\n\n  listAttributes(): Array<string> {\n    return [...super.listAttributes()];\n  }\n\n  protected abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract listIfcPropertySetNames(): Array<string>;\n  abstract listIfcPropertyNames(): Array<string>;\n}\n"]}
+{"version":3,"sources":["context/IfcTypeObjectAccessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAGrD,MAAM,OAAgB,qBAAsB,SAAQ,qBAAqB;IACvE,uBAAuB,CAAC,IAAY;QAClC,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,iBAAiB;QACf,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACrC,CAAC;CAYF","file":"context/IfcTypeObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor.js\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor.js\";\nimport { isPresent } from \"../IfcExpressionUtils.js\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\n\nexport abstract class IfcTypeObjectAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    let val = this.getIfcPropertyAccessor(name);\n    if (isPresent(val)) {\n      return val;\n    }\n    return this.getIfcPropertySetAccessor(name);\n  }\n\n  listNestedObjects(): Array<string> {\n    return [...this.listIfcPropertyNames(), ...this.listIfcPropertySetNames()];\n  }\n\n  listAttributes(): Array<string> {\n    return [...super.listAttributes()];\n  }\n\n  protected abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract listIfcPropertySetNames(): Array<string>;\n  abstract listIfcPropertyNames(): Array<string>;\n}\n"]}

package/dist/mjs/context/NamedObjectAccessor.js

@@ -1,4 +1,4 @@
-import { StringValue } from "../value/StringValue";
+import { StringValue } from "../value/StringValue.js";
 export class NamedObjectAccessor {
     getAttribute(name) {
         switch (name) {