npm - ifc-expressions - Versions diffs - 0.3.4 → 2.0.0-beta.0 - Mend

ifc-expressions 0.3.4 → 2.0.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (579) hide show

package/dist/cjs/ExprVisitor.js CHANGED Viewed

@@ -12,46 +12,122 @@ const PlusExpr_js_1 = require("./expression/numeric/PlusExpr.js");
 const MinusExpr_js_1 = require("./expression/numeric/MinusExpr.js");
 const MultiplyExpr_js_1 = require("./expression/numeric/MultiplyExpr.js");
 const DivideExpr_js_1 = require("./expression/numeric/DivideExpr.js");
-const NumParenthesisExpr_js_1 = require("./expression/numeric/NumParenthesisExpr.js");
-const AttributeReferenceExpr_js_1 = require("./expression/reference/AttributeReferenceExpr.js");
 const PropObjectReferenceExpr_js_1 = require("./expression/reference/PropObjectReferenceExpr.js");
 const ElemObjectReferenceExpr_js_1 = require("./expression/reference/ElemObjectReferenceExpr.js");
-const NestedObjectChainExpr_js_1 = require("./expression/reference/NestedObjectChainExpr.js");
-const NestedObjectChainEndExpr_js_1 = require("./expression/reference/NestedObjectChainEndExpr.js");
-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_js_1 = require("./expression/structure/ArrayExpr.js");
 const FunctionExpr_js_1 = require("./expression/function/FunctionExpr.js");
+const PowerExpr_js_1 = require("./expression/numeric/PowerExpr.js");
+const UnaryMinusExpr_js_1 = require("./expression/numeric/UnaryMinusExpr.js");
+const AndExpr_js_1 = require("./expression/boolean/AndExpr.js");
+const BooleanLiteralExpr_js_1 = require("./expression/boolean/BooleanLiteralExpr.js");
+const OrExpr_js_1 = require("./expression/boolean/OrExpr.js");
+const XorExpr_js_1 = require("./expression/boolean/XorExpr.js");
+const SyntaxErrorException_js_1 = require("./error/SyntaxErrorException.js");
+const NotExpr_js_1 = require("./expression/boolean/NotExpr.js");
+const ParenthesisExpr_js_1 = require("./expression/structure/ParenthesisExpr.js");
+const EqualsExpr_js_1 = require("./expression/comparison/EqualsExpr.js");
+const NotEqualsExpr_js_1 = require("./expression/comparison/NotEqualsExpr.js");
+const StringConcatExpr_js_1 = require("./expression/string/StringConcatExpr.js");
+const PlusOrConcatExpr_js_1 = require("./expression/poly/PlusOrConcatExpr.js");
+const ExpressionTypeError_js_1 = require("./error/ExpressionTypeError.js");
+const GreaterThan_js_1 = require("./expression/comparison/GreaterThan.js");
+const GreaterThanOrEqual_js_1 = require("./expression/comparison/GreaterThanOrEqual.js");
+const LessThan_js_1 = require("./expression/comparison/LessThan.js");
+const LessThanOrEqual_js_1 = require("./expression/comparison/LessThanOrEqual.js");
 class ExprVisitor extends IfcExpressionVisitor_js_1.default {
-    constructor() {
+    constructor(typeManager) {
         super();
+        this.methodCallTargetStack = [];
+        this.visitExpr = (ctx) => {
+            return this.visit(ctx.singleExpr());
+        };
         /*================================================
-         * AttributeRef
+         * VariableRef
          *==============================================*/
-        this.visitAttributeRef = (ctx) => {
-            const objectRefExpr = this.visit(ctx.objectRef());
-            const nestedObjectChainExpr = this.visit(ctx.nestedObjectChain());
-            return new AttributeReferenceExpr_js_1.AttributeReferenceExpr(objectRefExpr, nestedObjectChainExpr);
-        };
-        this.visitObjectRef = (ctx) => {
-            if ((0, IfcExpressionUtils_js_1.isPresent)(ctx.PROP())) {
+        this.visitVariableRef = (ctx) => {
+            if (ctx.IDENTIFIER().getText().toUpperCase() === "PROPERTY") {
                 return new PropObjectReferenceExpr_js_1.PropObjectReferenceExpr();
             }
-            else if ((0, IfcExpressionUtils_js_1.isPresent)(ctx.ELEM())) {
+            else if (ctx.IDENTIFIER().getText().toUpperCase() === "ELEMENT") {
                 return new ElemObjectReferenceExpr_js_1.ElemObjectReferenceExpr();
             }
-            this.failNode(ctx);
+            throw new Error(`Parsing error: No variable '${ctx.getText()}' found  `);
+        };
+        this.visitSEComparison = (ctx) => {
+            const left = this.visit(ctx.singleExpr(0));
+            const right = this.visit(ctx.singleExpr(1));
+            switch (ctx.CMP_OP().getText()) {
+                case "==":
+                    return new EqualsExpr_js_1.EqualsExpr(left, right);
+                case "!=":
+                    return new NotEqualsExpr_js_1.NotEqualsExpr(left, right);
+                case ">":
+                    return new GreaterThan_js_1.GreaterThan(left, right);
+                case ">=":
+                    return new GreaterThanOrEqual_js_1.GreaterThanOrEqual(left, right);
+                case "<":
+                    return new LessThan_js_1.LessThan(left, right);
+                case "<=":
+                    return new LessThanOrEqual_js_1.LessThanOrEqual(left, right);
+            }
+            throw new Error(`Parsing error: comparison operator '${ctx
+                .CMP_OP()
+                .getText()}' not supported`);
+        };
+        this.visitSEMethodCall = (ctx) => {
+            this.methodCallTargetStack.push(this.visit(ctx.singleExpr()));
+            return this.visit(ctx.methodCallChain());
+        };
+        this.visitSELiteral = (ctx) => {
+            return this.visit(ctx.literal());
         };
-        this.visitNestedObjectChainInner = (ctx) => {
-            let name = ctx.namedRef().getChild(0).getText();
-            name = this.stripBrackets(name);
-            return new NestedObjectChainExpr_js_1.NestedObjectChainExpr(name, this.visit(ctx.nestedObjectChain()));
+        this.visitSEVariableRef = (ctx) => {
+            return this.visit(ctx.variableRef());
         };
-        this.visitNestedObjectChainEnd = (ctx) => {
-            let name = ctx.RESERVED_ATTRIBUTE_NAME().getText();
-            return new NestedObjectChainEndExpr_js_1.NestedObjectChainEndExpr(name);
+        this.visitSEArrayExpr = (ctx) => {
+            return this.visit(ctx.arrayExpr());
+        };
+        this.visitSEFunctionCall = (ctx) => {
+            return this.visit(ctx.functionCall());
+        };
+        this.visitSEParenthesis = (ctx) => {
+            return new ParenthesisExpr_js_1.ParenthesisExpr(this.visit(ctx._sub));
+        };
+        /*================================================
+         * MethodCallChain
+         *==============================================*/
+        this.visitMethodCallChainInner = (ctx) => {
+            this.methodCallTargetStack.push(new FunctionExpr_js_1.FunctionExpr(ctx.functionCall().IDENTIFIER().getText(), this.collectFunctionArguments(ctx.functionCall().exprList(), [
+                this.methodCallTargetStack.pop(),
+            ])));
+            return this.visit(ctx.methodCallChain());
+        };
+        this.visitMethodCallChainEnd = (ctx) => {
+            return new FunctionExpr_js_1.FunctionExpr(ctx.functionCall().IDENTIFIER().getText(), this.collectFunctionArguments(ctx.functionCall().exprList(), [
+                this.methodCallTargetStack.pop(),
+            ]));
+        };
+        this.visitSEAddSub = (ctx) => {
+            this.typeManager.requireTypesOverlap(ctx._left, ctx._right);
+            switch (ctx._op.text) {
+                case "+":
+                    return this.makePlusExpr(ctx);
+                case "-":
+                    return new MinusExpr_js_1.MinusExpr(this.visit(ctx._left), this.visit(ctx._right));
+                default:
+                    ExprVisitor.failNode(ctx);
+            }
+        };
+        this.visitSEMulDiv = (ctx) => {
+            switch (ctx._op.text) {
+                case "*":
+                    return new MultiplyExpr_js_1.MultiplyExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
+                case "/":
+                    return new DivideExpr_js_1.DivideExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
+                default:
+                    ExprVisitor.failNode(ctx);
+            }
         };
         /*================================================
          * StringExpr
@@ -59,68 +135,59 @@ class ExprVisitor extends IfcExpressionVisitor_js_1.default {
         this.visitStringLiteral = (ctx) => {
             const quotedString = ctx.QUOTED_STRING().getText();
             const text = quotedString.substring(1, quotedString.length - 1);
-            return new StringLiteralExpr_js_1.StringLiteralExpr(new StringValue_js_1.StringValue(text));
-        };
-        this.visitStringAttributeRef = (ctx) => {
-            return this.visit(ctx.getChild(0));
-        };
-        this.visitStringConcat = (ctx) => {
-            return new StringConcatExpr_js_1.StringConcatExpr(this.visit(ctx._left), this.visit(ctx._right));
+            return new StringLiteralExpr_js_1.StringLiteralExpr(text);
         };
         /*================================================
          * NumExpr
          *===============================================*/
-        this.visitNumAttributeRef = (ctx) => {
-            return this.visit(ctx.getChild(0));
-        };
         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(ctx.getText())));
+                return new NumericLiteralExpr_js_1.NumericLiteralExpr(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(ctx.getText())));
+                return new NumericLiteralExpr_js_1.NumericLiteralExpr(new decimal_js_1.default(ctx.getText()));
             }
-            this.failNode(ctx);
+            ExprVisitor.failNode(ctx);
         };
-        this.visitNumAddSub = (ctx) => {
-            switch (ctx._op.text) {
-                case "+":
-                    return new PlusExpr_js_1.PlusExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
-                case "-":
-                    return new MinusExpr_js_1.MinusExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
-                default:
-                    this.failNode(ctx);
-            }
+        this.visitSEUnaryMultipleMinus = (ctx) => {
+            return this.visit(ctx.singleExpr());
+        };
+        this.visitSEPower = (ctx) => {
+            return new PowerExpr_js_1.PowerExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(1)));
+        };
+        this.visitSEUnaryMinus = (ctx) => {
+            return new UnaryMinusExpr_js_1.UnaryMinusExpr(this.visit(ctx.singleExpr()));
         };
-        this.visitNumMulDiv = (ctx) => {
+        /*================================================
+         * BooleanExpr
+         *===============================================*/
+        this.visitSEBooleanBinaryOp = (ctx) => {
             switch (ctx._op.text) {
-                case "*":
-                    return new MultiplyExpr_js_1.MultiplyExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
-                case "/":
-                    return new DivideExpr_js_1.DivideExpr(this.visit(ctx.getChild(0)), this.visit(ctx.getChild(2)));
-                default:
-                    this.failNode(ctx);
+                case "&&":
+                    return new AndExpr_js_1.AndExpr(this.visit(ctx.singleExpr(0)), this.visit(ctx.singleExpr(1)));
+                case "||":
+                    return new OrExpr_js_1.OrExpr(this.visit(ctx.singleExpr(0)), this.visit(ctx.singleExpr(1)));
+                case "><":
+                    return new XorExpr_js_1.XorExpr(this.visit(ctx.singleExpr(0)), this.visit(ctx.singleExpr(1)));
             }
+            throw new SyntaxErrorException_js_1.SyntaxErrorException(ctx._op.text, ctx._op.line, ctx._op.column, `Unknown boolean operator ${ctx._op.text}`);
         };
-        this.visitNumParens = (ctx) => {
-            return new NumParenthesisExpr_js_1.NumParenthesisExpr(this.visit(ctx.getChild(1)));
+        this.visitBooleanLiteral = (ctx) => {
+            return new BooleanLiteralExpr_js_1.BooleanLiteralExpr(ctx.BOOLEAN().getText().toUpperCase() === "TRUE");
         };
-        this.visitExpr = (ctx) => {
-            return this.visit(ctx.getChild(0));
-        };
-        this.visitNumLit = (ctx) => {
-            return this.visit(ctx.getChild(0));
+        this.visitSENot = (ctx) => {
+            return new NotExpr_js_1.NotExpr(this.visit(ctx.singleExpr()));
         };
         /*================================================
          * ArrayExpr
          *===============================================*/
-        this.visitArray = (ctx) => {
+        this.visitArrayExpr = (ctx) => {
             return new ArrayExpr_js_1.ArrayExpr(this.collectArrayElements(ctx.arrayElementList()));
         };
         this.collectArrayElements = (ctx) => {
-            const first = this.visit(ctx.expr());
+            const first = this.visit(ctx.singleExpr());
             const rest = ctx.arrayElementList();
             if (!(0, IfcExpressionUtils_js_1.isNullish)(rest)) {
                 const arr = this.collectArrayElements(rest);
@@ -133,26 +200,43 @@ class ExprVisitor extends IfcExpressionVisitor_js_1.default {
          * FuncExpr
          *===============================================*/
         this.visitFunctionCall = (ctx) => {
-            return new FunctionExpr_js_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;
+            const args = (0, IfcExpressionUtils_js_1.isNullish)(ctx.exprList())
+                ? []
+                : this.collectFunctionArguments(ctx.exprList());
+            return new FunctionExpr_js_1.FunctionExpr(ctx.IDENTIFIER().getText(), args);
+        };
+        this.collectFunctionArguments = (ctx, resultSoFar) => {
+            if ((0, IfcExpressionUtils_js_1.isNullish)(resultSoFar)) {
+                resultSoFar = [];
             }
-            return [first];
+            if (!(0, IfcExpressionUtils_js_1.isNullish)(ctx)) {
+                resultSoFar.push(this.visit(ctx.singleExpr()));
+                const rest = ctx.exprList();
+                if (!(0, IfcExpressionUtils_js_1.isNullish)(rest)) {
+                    return this.collectFunctionArguments(rest, resultSoFar);
+                }
+            }
+            return resultSoFar;
+        };
+        this.visitLiteral = (ctx) => {
+            return this.visit(ctx.getChild(0));
         };
+        this.typeManager = typeManager;
     }
-    stripBrackets(name) {
-        if (name.startsWith("{")) {
-            return name.substring(1, name.length - 1);
+    makePlusExpr(ctx) {
+        if (this.typeManager.isNumeric(ctx._left, ctx._right)) {
+            return new PlusExpr_js_1.PlusExpr(this.visit(ctx._left), this.visit(ctx._right));
+        }
+        if (this.typeManager.isString(ctx._left, ctx._right)) {
+            return new StringConcatExpr_js_1.StringConcatExpr(this.visit(ctx._left), this.visit(ctx._right));
+        }
+        if (this.typeManager.overlapsWithString(ctx._left, ctx._right) ||
+            this.typeManager.overlapsWithNumeric(ctx._left, ctx._right)) {
+            return new PlusOrConcatExpr_js_1.PlusOrConcatExpr(this.visit(ctx._left), this.visit(ctx._right));
         }
-        return name;
+        throw new ExpressionTypeError_js_1.ExpressionTypeError("Operator '+' requires the operands to be either both of type numeric or both of type string, but they are not.", ctx);
     }
-    failNode(ctx) {
+    static failNode(ctx) {
         throw new Error(`Cannot parse (sub)expression ${ctx.getText()}`);
     }
 }

package/dist/cjs/ExprVisitor.js.map CHANGED Viewed

	@@ -1 +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 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.js\";\nimport { FunctionExpr } from \"./expression/function/FunctionExpr.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(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"]}
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 ArrayElementListContext,\n ArrayExprContext,\n BooleanLiteralContext,\n ExprContext,\n ExprListContext,\n FunctionCallContext,\n LiteralContext,\n MethodCallChainEndContext,\n MethodCallChainInnerContext,\n NumLiteralContext,\n SEAddSubContext,\n SEArrayExprContext,\n SEBooleanBinaryOpContext,\n SEComparisonContext,\n SEFunctionCallContext,\n SELiteralContext,\n SEMethodCallContext,\n SEMulDivContext,\n SENotContext,\n SEParenthesisContext,\n SEPowerContext,\n SEUnaryMinusContext,\n SEUnaryMultipleMinusContext,\n SEVariableRefContext,\n StringLiteralContext,\n VariableRefContext,\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 { PropObjectReferenceExpr } from \"./expression/reference/PropObjectReferenceExpr.js\";\nimport { ElemObjectReferenceExpr } from \"./expression/reference/ElemObjectReferenceExpr.js\";\nimport { StringLiteralExpr } from \"./expression/string/StringLiteralExpr.js\";\nimport { ArrayExpr } from \"./expression/structure/ArrayExpr.js\";\nimport { FunctionExpr } from \"./expression/function/FunctionExpr.js\";\nimport { PowerExpr } from \"./expression/numeric/PowerExpr.js\";\nimport { UnaryMinusExpr } from \"./expression/numeric/UnaryMinusExpr.js\";\nimport { AndExpr } from \"./expression/boolean/AndExpr.js\";\nimport { BooleanLiteralExpr } from \"./expression/boolean/BooleanLiteralExpr.js\";\nimport { OrExpr } from \"./expression/boolean/OrExpr.js\";\nimport { XorExpr } from \"./expression/boolean/XorExpr.js\";\nimport { SyntaxErrorException } from \"./error/SyntaxErrorException.js\";\nimport { NotExpr } from \"./expression/boolean/NotExpr.js\";\nimport { ParenthesisExpr } from \"./expression/structure/ParenthesisExpr.js\";\nimport { EqualsExpr } from \"./expression/comparison/EqualsExpr.js\";\nimport { NotEqualsExpr } from \"./expression/comparison/NotEqualsExpr.js\";\nimport { TypeManager } from \"./type/TypeManager.js\";\nimport { StringConcatExpr } from \"./expression/string/StringConcatExpr.js\";\nimport { PlusOrConcatExpr } from \"./expression/poly/PlusOrConcatExpr.js\";\nimport { ExpressionTypeError } from \"./error/ExpressionTypeError.js\";\nimport { GreaterThan } from \"./expression/comparison/GreaterThan.js\";\nimport { GreaterThanOrEqual } from \"./expression/comparison/GreaterThanOrEqual.js\";\nimport { LessThan } from \"./expression/comparison/LessThan.js\";\nimport { LessThanOrEqual } from \"./expression/comparison/LessThanOrEqual.js\";\n\nexport class ExprVisitor extends IfcExpressionVisitor<Expr<any>> {\n private readonly methodCallTargetStack = [];\n private readonly typeManager: TypeManager;\n\n constructor(typeManager: TypeManager) {\n super();\n this.typeManager = typeManager;\n }\n\n visitExpr: (ctx: ExprContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.singleExpr());\n };\n\n /================================================\n VariableRef\n ==============================================/\n\n visitVariableRef: (ctx: VariableRefContext) => Expr<any> = (ctx) => {\n if (ctx.IDENTIFIER().getText().toUpperCase() === \"PROPERTY\") {\n return new PropObjectReferenceExpr();\n } else if (ctx.IDENTIFIER().getText().toUpperCase() === \"ELEMENT\") {\n return new ElemObjectReferenceExpr();\n }\n throw new Error(`Parsing error: No variable '${ctx.getText()}' found `);\n };\n\n visitSEComparison: (ctx: SEComparisonContext) => Expr<any> = (ctx) => {\n const left = this.visit(ctx.singleExpr(0));\n const right = this.visit(ctx.singleExpr(1));\n switch (ctx.CMP_OP().getText()) {\n case \"==\":\n return new EqualsExpr(left, right);\n case \"!=\":\n return new NotEqualsExpr(left, right);\n case \">\":\n return new GreaterThan(left, right);\n case \">=\":\n return new GreaterThanOrEqual(left, right);\n case \"<\":\n return new LessThan(left, right);\n case \"<=\":\n return new LessThanOrEqual(left, right);\n }\n throw new Error(\n `Parsing error: comparison operator '${ctx\n .CMP_OP()\n .getText()}' not supported`\n );\n };\n\n visitSEMethodCall: (ctx: SEMethodCallContext) => Expr<any> = (ctx) => {\n this.methodCallTargetStack.push(this.visit(ctx.singleExpr()));\n return this.visit(ctx.methodCallChain());\n };\n\n visitSELiteral: (ctx: SELiteralContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.literal());\n };\n\n visitSEVariableRef: (ctx: SEVariableRefContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.variableRef());\n };\n visitSEArrayExpr: (ctx: SEArrayExprContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.arrayExpr());\n };\n visitSEFunctionCall: (ctx: SEFunctionCallContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.functionCall());\n };\n visitSEParenthesis: (ctx: SEParenthesisContext) => Expr<any> = (ctx) => {\n return new ParenthesisExpr(this.visit(ctx._sub));\n };\n\n /================================================\n MethodCallChain\n ==============================================/\n\n visitMethodCallChainInner: (ctx: MethodCallChainInnerContext) => Expr<any> = (\n ctx\n ) => {\n this.methodCallTargetStack.push(\n new FunctionExpr(\n ctx.functionCall().IDENTIFIER().getText(),\n this.collectFunctionArguments(ctx.functionCall().exprList(), [\n this.methodCallTargetStack.pop(),\n ])\n )\n );\n return this.visit(ctx.methodCallChain());\n };\n\n visitMethodCallChainEnd: (ctx: MethodCallChainEndContext) => Expr<any> = (\n ctx\n ) => {\n return new FunctionExpr(\n ctx.functionCall().IDENTIFIER().getText(),\n this.collectFunctionArguments(ctx.functionCall().exprList(), [\n this.methodCallTargetStack.pop(),\n ])\n );\n };\n\n visitSEAddSub: (ctx: SEAddSubContext) => Expr<any> = (ctx) => {\n this.typeManager.requireTypesOverlap(ctx._left, ctx._right);\n switch (ctx._op.text) {\n case \"+\":\n return this.makePlusExpr(ctx);\n case \"-\":\n return new MinusExpr(this.visit(ctx._left), this.visit(ctx._right));\n default:\n ExprVisitor.failNode(ctx);\n }\n };\n\n private makePlusExpr(ctx: SEAddSubContext) {\n if (this.typeManager.isNumeric(ctx._left, ctx._right)) {\n return new PlusExpr(this.visit(ctx._left), this.visit(ctx._right));\n }\n if (this.typeManager.isString(ctx._left, ctx._right)) {\n return new StringConcatExpr(\n this.visit(ctx._left),\n this.visit(ctx._right)\n );\n }\n if (\n this.typeManager.overlapsWithString(ctx._left, ctx._right) \|\|\n this.typeManager.overlapsWithNumeric(ctx._left, ctx._right)\n ) {\n return new PlusOrConcatExpr(\n this.visit(ctx._left),\n this.visit(ctx._right)\n );\n }\n throw new ExpressionTypeError(\n \"Operator '+' requires the operands to be either both of type numeric or both of type string, but they are not.\",\n ctx\n );\n }\n\n visitSEMulDiv: (ctx: SEMulDivContext) => 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 ExprVisitor.failNode(ctx);\n }\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(text);\n };\n\n /================================================\n NumExpr\n ===============================================/\n\n visitNumLiteral: (ctx: NumLiteralContext) => Expr<any> = (ctx) => {\n let val = ctx.INT();\n if (isPresent(val)) {\n return new NumericLiteralExpr(new Decimal(ctx.getText()));\n }\n val = ctx.FLOAT();\n if (isPresent(val)) {\n return new NumericLiteralExpr(new Decimal(ctx.getText()));\n }\n ExprVisitor.failNode(ctx);\n };\n\n visitSEUnaryMultipleMinus: (ctx: SEUnaryMultipleMinusContext) => Expr<any> = (\n ctx\n ) => {\n return this.visit(ctx.singleExpr());\n };\n visitSEPower: (ctx: SEPowerContext) => Expr<any> = (ctx) => {\n return new PowerExpr(\n this.visit(ctx.getChild(0)),\n this.visit(ctx.getChild(1))\n );\n };\n visitSEUnaryMinus: (ctx: SEUnaryMinusContext) => Expr<any> = (ctx) => {\n return new UnaryMinusExpr(this.visit(ctx.singleExpr()));\n };\n\n /================================================\n BooleanExpr\n ===============================================/\n\n visitSEBooleanBinaryOp: (ctx: SEBooleanBinaryOpContext) => Expr<any> = (\n ctx\n ) => {\n switch (ctx._op.text) {\n case \"&&\":\n return new AndExpr(\n this.visit(ctx.singleExpr(0)),\n this.visit(ctx.singleExpr(1))\n );\n case \"\|\|\":\n return new OrExpr(\n this.visit(ctx.singleExpr(0)),\n this.visit(ctx.singleExpr(1))\n );\n case \"><\":\n return new XorExpr(\n this.visit(ctx.singleExpr(0)),\n this.visit(ctx.singleExpr(1))\n );\n }\n throw new SyntaxErrorException(\n ctx._op.text,\n ctx._op.line,\n ctx._op.column,\n `Unknown boolean operator ${ctx._op.text}`\n );\n };\n\n visitBooleanLiteral: (ctx: BooleanLiteralContext) => Expr<any> = (ctx) => {\n return new BooleanLiteralExpr(\n ctx.BOOLEAN().getText().toUpperCase() === \"TRUE\"\n );\n };\n\n visitSENot: (ctx: SENotContext) => Expr<any> = (ctx) => {\n return new NotExpr(this.visit(ctx.singleExpr()));\n };\n\n /================================================\n ArrayExpr\n ===============================================/\n\n visitArrayExpr: (ctx: ArrayExprContext) => 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.singleExpr());\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 const args = isNullish(ctx.exprList())\n ? []\n : this.collectFunctionArguments(ctx.exprList());\n return new FunctionExpr(ctx.IDENTIFIER().getText(), args);\n };\n\n collectFunctionArguments: (\n ctx: ExprListContext,\n resultSoFar?: Array<Expr<any>>\n ) => Array<Expr<any>> = (ctx, resultSoFar?: Array<Expr<any>>) => {\n if (isNullish(resultSoFar)) {\n resultSoFar = [];\n }\n if (!isNullish(ctx)) {\n resultSoFar.push(this.visit(ctx.singleExpr()));\n const rest = ctx.exprList();\n if (!isNullish(rest)) {\n return this.collectFunctionArguments(rest, resultSoFar);\n }\n }\n return resultSoFar;\n };\n\n private static failNode(ctx: ParserRuleContext) {\n throw new Error(`Cannot parse (sub)expression ${ctx.getText()}`);\n }\n\n visitLiteral: (ctx: LiteralContext) => Expr<any> = (ctx) => {\n return this.visit(ctx.getChild(0));\n };\n}\n"]}

package/dist/cjs/IfcExpression.js CHANGED Viewed

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IfcExpression = exports.isExprEvalSuccess = exports.isExprEvalError = exports.isNullish = exports.isPresent = exports.IfcExpressionVisitor = exports.IfcExpressionErrorListener = exports.IfcExpressionEvaluationException = exports.ExprKind = 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;
+exports.IfcExpression = exports.IfcExpressionParseResult = exports.isExprEvalSuccess = exports.isExprEvalError = exports.isNullish = exports.isPresent = exports.IfcExpressionVisitor = exports.IfcExpressionErrorListener = exports.IfcExpressionEvaluationException = exports.ExprKind = 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 IfcExpressionValidationListener_js_1 = require("./IfcExpressionValidationListener.js");
 const IfcExpressionUtils_js_1 = require("./IfcExpressionUtils.js");
 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; } });
@@ -41,34 +42,71 @@ const IfcExpressionLexer_js_1 = __importDefault(require("./gen/parser/IfcExpress
 const IfcExpressionEvaluationException_js_1 = require("./expression/IfcExpressionEvaluationException.js");
 Object.defineProperty(exports, "IfcExpressionEvaluationException", { enumerable: true, get: function () { return IfcExpressionEvaluationException_js_1.IfcExpressionEvaluationException; } });
 const ExprEvalResult_js_1 = require("./expression/ExprEvalResult.js");
-Object.defineProperty(exports, "isExprEvalSuccess", { enumerable: true, get: function () { return ExprEvalResult_js_1.isExprEvalSuccess; } });
 Object.defineProperty(exports, "isExprEvalError", { enumerable: true, get: function () { return ExprEvalResult_js_1.isExprEvalError; } });
+Object.defineProperty(exports, "isExprEvalSuccess", { enumerable: true, get: function () { return ExprEvalResult_js_1.isExprEvalSuccess; } });
 const ExprKind_js_1 = require("./expression/ExprKind.js");
 Object.defineProperty(exports, "ExprKind", { enumerable: true, get: function () { return ExprKind_js_1.ExprKind; } });
+const ValidationException_js_1 = require("./error/ValidationException.js");
+const ExceptionToExprEvalErrorMapper_js_1 = require("./error/ExceptionToExprEvalErrorMapper.js");
+const NopContext_js_1 = require("./context/NopContext.js");
+class IfcExpressionParseResult {
+    constructor(typeManager, exprContext) {
+        this._typeManager = typeManager;
+        this._parseTree = exprContext;
+    }
+    get typeManager() {
+        return this._typeManager;
+    }
+    get parseTree() {
+        return this._parseTree;
+    }
+}
+exports.IfcExpressionParseResult = IfcExpressionParseResult;
 class IfcExpression {
     static parse(input, errorListener) {
         const chars = new antlr4_1.CharStream(input); // replace this with a FileStream as required
         const lexer = new IfcExpressionLexer_js_1.default(chars);
         const tokens = new antlr4_1.CommonTokenStream(lexer);
         const parser = new IfcExpressionParser_js_1.default(tokens);
+        lexer.removeErrorListeners();
+        parser.removeErrorListeners();
+        const myErrorListener = new IfcExpressionErrorListener_js_1.IfcExpressionErrorListener();
         if ((0, IfcExpressionUtils_js_1.isPresent)(errorListener)) {
-            parser.removeErrorListeners();
+            lexer.addErrorListener(errorListener);
             parser.addErrorListener(errorListener);
         }
-        return parser.expr();
+        lexer.addErrorListener(myErrorListener);
+        parser.addErrorListener(myErrorListener);
+        const expr = parser.expr();
+        const validationListener = new IfcExpressionValidationListener_js_1.IfcExpressionValidationListener();
+        if (!myErrorListener.isErrorOccurred()) {
+            const walker = new antlr4_1.ParseTreeWalker();
+            try {
+                walker.walk(validationListener, expr);
+            }
+            catch (e) {
+                if (e instanceof ValidationException_js_1.ValidationException) {
+                    if (errorListener instanceof IfcExpressionErrorListener_js_1.IfcExpressionErrorListener) {
+                        errorListener.validationException(e);
+                    }
+                    myErrorListener.validationException(e);
+                }
+            }
+        }
+        return new IfcExpressionParseResult(validationListener.getTypeManager(), expr);
     }
-    static evaluate(expression, context) {
+    static compile(parseResult) {
+        const visitor = new ExprVisitor_js_1.ExprVisitor(parseResult.typeManager);
+        return visitor.visit(parseResult.parseTree);
+    }
+    static evaluate(expression, context = new NopContext_js_1.NopContext()) {
         const errorListener = new IfcExpressionErrorListener_js_1.IfcExpressionErrorListener();
-        const tree = IfcExpression.parse(expression, errorListener);
+        const parseResult = IfcExpression.parse(expression, errorListener);
         if (errorListener.isErrorOccurred()) {
-            throw errorListener.getException();
+            return (0, ExceptionToExprEvalErrorMapper_js_1.mapException)(errorListener.getException());
         }
-        const parsedExpression = this.extractExprTree(tree);
-        return parsedExpression.evaluate(context, new Map());
-    }
-    static extractExprTree(tree) {
-        const visitor = new ExprVisitor_js_1.ExprVisitor();
-        return visitor.visit(tree);
+        const compiledExpression = this.compile(parseResult);
+        return compiledExpression.evaluate(context, new Map());
     }
 }
 exports.IfcExpression = IfcExpression;

package/dist/cjs/IfcExpression.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/IfcExpression.ts"],"names":[],"mappings":";;;;;;AAAA,~~mCAA6E~~;~~AAC7E~~,qDAA+C;~~AAsD7C~~,~~4FAtDO~~,4BAAW,~~OAsDP~~;~~AArDb~~,mFAA6E;~~AAwD3E~~,~~2GAxDO~~,0DAA0B,~~OAwDP~~;~~AAvD5B~~,mEAA+D;AA0D7D,0FA1DO,iCAAS,OA0DP;AADT,0FAzDkB,iCAAS,OAyDlB;AArDX,2EAAqE;AAgCnE,mGAhCO,0CAAkB,OAgCP;AA9BpB,2DAAqD;AAiCnD,4FAjCO,4BAAW,OAiCP;AAhCb,6DAAuD;AAmCrD,6FAnCO,8BAAY,OAmCP;AAlCd,6DAAuD;AAgCrD,6FAhCO,8BAAY,OAgCP;AA/Bd,6DAAuD;AAgCrD,6FAhCO,8BAAY,OAgCP;~~AA9Bd~~,iEAA2D;~~AAiCzD~~,+~~FAjCO~~,kCAAc,~~OAiCP~~;~~AAhChB~~,mFAA6E;~~AAiC3E~~,~~uGAjCO~~,kDAAsB,~~OAiCP~~;~~AAhCxB~~,6EAAuE;~~AAiCrE~~,~~oGAjCO~~,4CAAmB,~~OAiCP~~;~~AAhCrB~~,iFAA2E;~~AAiCzE~~,~~sGAjCO~~,gDAAqB,~~OAiCP~~;~~AAhCvB~~,iFAA2E;~~AAiCzE~~,~~sGAjCO~~,gDAAqB,~~OAiCP~~;~~AAhCvB~~,6EAAuE;~~AAiCrE~~,~~oGAjCO~~,4CAAmB,~~OAiCP~~;~~AAhCrB~~,~~iGAE6C~~;~~AAC7C~~,mGAAwE;~~AAoCtE~~,+~~BApCK~~,iCAAoB,~~CAoCL~~;~~AAnCtB~~,+FAAoE;AAEpE,0GAAoG;~~AA+BlG~~,~~iHA/BO~~,sEAAgC,~~OA+BP~~;~~AA5BlC~~,~~sEAMwC~~;~~AA8BtC~~,~~kGAlCA~~,~~qCAAiB~~,~~OAkCA~~;~~AADjB~~,~~gGA/BA~~,~~mCAAe~~,~~OA+BA~~;~~AA5BjB~~,0DAAoD;~~AAoBlD~~,~~yFApBO~~,sBAAQ,~~OAoBP~~;~~AAcV~~,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 {\n ~~ExprEvalResult~~,\n ~~isExprEvalSuccess~~,\n ~~ExprEvalError,\n~~ isExprEvalError,\n ~~ExprEvalStatus~~,\n} from \"./expression/ExprEvalResult.js\";\nimport { ExprKind } from \"./expression/ExprKind.js\";\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 ExprKind,\n IfcExpressionEvaluationException,\n IfcExpressionErrorListener,\n IfcExpressionVisitor,\n isPresent,\n isNullish,\n ExprEvalResult,\n ExprEvalError,\n isExprEvalError,\n isExprEvalSuccess,\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~~"]}
1	+ {"version":3,"sources":["../../src/IfcExpression.ts"],"names":[],"mappings":"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","file":"IfcExpression.js","sourcesContent":["import {\n CharStream,\n CommonTokenStream,\n ErrorListener,\n ParserRuleContext,\n ParseTreeWalker,\n Token,\n} from \"antlr4\";\nimport { ExprVisitor } from \"./ExprVisitor.js\";\nimport { IfcExpressionErrorListener } from \"./IfcExpressionErrorListener.js\";\nimport { IfcExpressionValidationListener } from \"./IfcExpressionValidationListener.js\";\n\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 { 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 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 { ExpressionValue } from \"./value/ExpressionValue.js\";\nimport type { BoxedValueTypes } from \"./value/BoxedValueTypes.js\";\nimport {\n ExprEvalError,\n ExprEvalResult,\n isExprEvalError,\n isExprEvalSuccess,\n} from \"./expression/ExprEvalResult.js\";\nimport { ExprKind } from \"./expression/ExprKind.js\";\nimport { ValidationException } from \"./error/ValidationException.js\";\nimport { TypeManager } from \"./type/TypeManager.js\";\nimport { mapException } from \"./error/ExceptionToExprEvalErrorMapper.js\";\nimport { NopContext } from \"./context/NopContext.js\";\n\nexport {\n IfcElementAccessor,\n IfcExpressionContext,\n Value,\n StringValue,\n BooleanValue,\n LogicalValue,\n NumericValue,\n ExpressionValue,\n ReferenceValue,\n IfcPropertySetAccessor,\n IfcPropertyAccessor,\n IfcRootObjectAccessor,\n IfcTypeObjectAccessor,\n NamedObjectAccessor,\n ObjectAccessor,\n Expr,\n ExprVisitor,\n ExprKind,\n IfcExpressionEvaluationException,\n IfcExpressionErrorListener,\n IfcExpressionVisitor,\n isPresent,\n isNullish,\n ExprEvalResult,\n ExprEvalError,\n isExprEvalError,\n isExprEvalSuccess,\n};\n\nexport type { BoxedValueTypes };\n\nexport class IfcExpressionParseResult {\n private readonly _typeManager: TypeManager;\n private readonly _parseTree: ParserRuleContext;\n\n constructor(typeManager: TypeManager, exprContext) {\n this._typeManager = typeManager;\n this._parseTree = exprContext;\n }\n\n get typeManager(): TypeManager {\n return this._typeManager;\n }\n\n get parseTree(): ParserRuleContext {\n return this._parseTree;\n }\n}\n\nexport class IfcExpression {\n public static parse(\n input: string,\n errorListener?: ErrorListener<Token \| number>\n ): IfcExpressionParseResult {\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 lexer.removeErrorListeners();\n parser.removeErrorListeners();\n const myErrorListener = new IfcExpressionErrorListener();\n if (isPresent(errorListener)) {\n lexer.addErrorListener(errorListener);\n parser.addErrorListener(errorListener);\n }\n lexer.addErrorListener(myErrorListener);\n parser.addErrorListener(myErrorListener);\n const expr = parser.expr();\n const validationListener = new IfcExpressionValidationListener();\n if (!myErrorListener.isErrorOccurred()) {\n const walker = new ParseTreeWalker();\n try {\n walker.walk(validationListener, expr);\n } catch (e) {\n if (e instanceof ValidationException) {\n if (errorListener instanceof IfcExpressionErrorListener) {\n errorListener.validationException(e);\n }\n myErrorListener.validationException(e);\n }\n }\n }\n return new IfcExpressionParseResult(\n validationListener.getTypeManager(),\n expr\n );\n }\n\n private static compile(\n parseResult: IfcExpressionParseResult\n ): Expr<ExpressionValue> {\n const visitor = new ExprVisitor(parseResult.typeManager);\n return visitor.visit(parseResult.parseTree);\n }\n\n public static evaluate(\n expression: string,\n context: IfcExpressionContext = new NopContext()\n ): ExprEvalResult<ExpressionValue> {\n const errorListener = new IfcExpressionErrorListener();\n const parseResult = IfcExpression.parse(expression, errorListener);\n if (errorListener.isErrorOccurred()) {\n return mapException(errorListener.getException());\n }\n const compiledExpression = this.compile(parseResult);\n return compiledExpression.evaluate(context, new Map<string, any>());\n }\n}\n"]}

package/dist/cjs/IfcExpressionErrorListener.js CHANGED Viewed

@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcExpressionErrorListener = void 0;
 const antlr4_1 = require("antlr4");
 const IfcExpressionUtils_js_1 = require("./IfcExpressionUtils.js");
-const SyntaxErrorException_js_1 = require("./SyntaxErrorException.js");
+const SyntaxErrorException_js_1 = require("./error/SyntaxErrorException.js");
 class IfcExpressionErrorListener extends antlr4_1.ErrorListener {
-    constructor() {
-        super(...arguments);
-        this.exception = null;
+    validationException(validationException) {
+        this.exception = validationException;
     }
     syntaxError(recognizer, offendingSymbol, line, column, msg, e) {
-        this.exception = new SyntaxErrorException_js_1.SyntaxErrorException(offendingSymbol, line, column, msg);
+        if (typeof offendingSymbol === "number") {
+            this.exception = new SyntaxErrorException_js_1.SyntaxErrorException(offendingSymbol, line, column, msg);
+        }
+        else {
+            this.exception = new SyntaxErrorException_js_1.SyntaxErrorException((0, IfcExpressionUtils_js_1.isNullish)(offendingSymbol) ? "[no symbol]" : offendingSymbol.text, line, column, msg);
+        }
     }
     isErrorOccurred() {
         return (0, IfcExpressionUtils_js_1.isPresent)(this.exception);

package/dist/cjs/IfcExpressionErrorListener.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/IfcExpressionErrorListener.ts"],"names":[],"mappings":";;;AAAA,mCAAgF;AAChF,~~mEAAoD~~;~~AACpD~~,~~uEAAiE~~;~~AAEjE~~,MAAa,0BAA2B,SAAQ,~~sBAAoB~~;~~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,8CAAoB,CACvC,eAAe,EACf,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CAAC;~~IACJ~~,CAAC;IAEM,eAAe;QACpB,OAAO,IAAA,iCAAS,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF;~~AA1BD~~,~~gEA0BC~~","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"]}
1	+ {"version":3,"sources":["../../src/IfcExpressionErrorListener.ts"],"names":[],"mappings":";;;AAAA,mCAAgF;AAChF,mEAA+D;AAC/D,6EAAuE;AAGvE,MAAa,0BAA2B,SAAQ,sBAA6B;IAG3E,mBAAmB,CAAC,mBAAwC;QAC1D,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;IACvC,CAAC;IAED,WAAW,CACT,UAAsC,EACtC,eAA+B,EAC/B,IAAY,EACZ,MAAc,EACd,GAAW,EACX,CAAmC;QAEnC,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE;YACvC,IAAI,CAAC,SAAS,GAAG,IAAI,8CAAoB,CACvC,eAAe,EACf,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CAAC;SACH;aAAM;YACL,IAAI,CAAC,SAAS,GAAG,IAAI,8CAAoB,CACvC,IAAA,iCAAS,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EACjE,IAAI,EACJ,MAAM,EACN,GAAG,CACJ,CAAC;SACH;IACH,CAAC;IAEM,eAAe;QACpB,OAAO,IAAA,iCAAS,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF;AAvCD,gEAuCC","file":"IfcExpressionErrorListener.js","sourcesContent":["import { ErrorListener, RecognitionException, Recognizer, Token } from \"antlr4\";\nimport { isNullish, isPresent } from \"./IfcExpressionUtils.js\";\nimport { SyntaxErrorException } from \"./error/SyntaxErrorException.js\";\nimport { ValidationException } from \"./error/ValidationException.js\";\n\nexport class IfcExpressionErrorListener extends ErrorListener<Token \| number> {\n private exception: SyntaxErrorException \| ValidationException;\n\n validationException(validationException: ValidationException) {\n this.exception = validationException;\n }\n\n syntaxError(\n recognizer: Recognizer<Token \| number>,\n offendingSymbol: Token \| number,\n line: number,\n column: number,\n msg: string,\n e: RecognitionException \| undefined\n ) {\n if (typeof offendingSymbol === \"number\") {\n this.exception = new SyntaxErrorException(\n offendingSymbol,\n line,\n column,\n msg\n );\n } else {\n this.exception = new SyntaxErrorException(\n isNullish(offendingSymbol) ? \"[no symbol]\" : offendingSymbol.text,\n line,\n column,\n msg\n );\n }\n }\n\n public isErrorOccurred(): boolean {\n return isPresent(this.exception);\n }\n\n public getException(): SyntaxErrorException \| ValidationException {\n return this.exception;\n }\n}\n"]}

package/dist/cjs/IfcExpressionUtils.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPresent = exports.isNullish = void 0;
+exports.isFunction = exports.isPresent = exports.isNullish = void 0;
 function isNullish(val) {
     return typeof val === "undefined" || val === null;
 }
@@ -9,4 +9,8 @@ function isPresent(val) {
     return !isNullish(val);
 }
 exports.isPresent = isPresent;
+function isFunction(val) {
+    return typeof val === "function";
+}
+exports.isFunction = isFunction;
 //# sourceMappingURL=IfcExpressionUtils.js.map

package/dist/cjs/IfcExpressionUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../../src/IfcExpressionUtils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,OAAO,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,IAAI,CAAC;AACpD,CAAC;AAFD,8BAEC;AAED,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAFD,8BAEC","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"]}
1	+ {"version":3,"sources":["../../src/IfcExpressionUtils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,OAAO,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,IAAI,CAAC;AACpD,CAAC;AAFD,8BAEC;AAED,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAFD,8BAEC;AAED,SAAgB,UAAU,CAAC,GAAQ;IACjC,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC;AACnC,CAAC;AAFD,gCAEC","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\nexport function isFunction(val: any): boolean {\n return typeof val === \"function\";\n}\n"]}