ifc-expressions 0.3.1 → 0.3.2
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.
- package/dist/cjs/expression/Expr0.js +4 -4
- package/dist/cjs/expression/Expr0.js.map +1 -1
- package/dist/cjs/expression/Expr1.js +10 -10
- package/dist/cjs/expression/Expr1.js.map +1 -1
- package/dist/cjs/expression/Expr2.js +13 -13
- package/dist/cjs/expression/Expr2.js.map +1 -1
- package/dist/cjs/expression/Expr2LeftBeforeRight.js +15 -15
- package/dist/cjs/expression/Expr2LeftBeforeRight.js.map +1 -1
- package/dist/cjs/expression/ExprBase.js +3 -3
- package/dist/cjs/expression/ExprBase.js.map +1 -1
- package/dist/cjs/expression/ExprEvalResult.js +2 -2
- package/dist/cjs/expression/ExprEvalResult.js.map +1 -1
- package/dist/cjs/expression/LiteralExpr.js +4 -4
- package/dist/cjs/expression/LiteralExpr.js.map +1 -1
- package/dist/cjs/expression/function/Func.js +9 -9
- package/dist/cjs/expression/function/Func.js.map +1 -1
- package/dist/cjs/expression/function/FuncArg.js +2 -2
- package/dist/cjs/expression/function/FuncArg.js.map +1 -1
- package/dist/cjs/expression/function/FunctionExpr.js +5 -5
- package/dist/cjs/expression/function/FunctionExpr.js.map +1 -1
- package/dist/cjs/expression/function/IfcExpressionFunctions.js +4 -4
- package/dist/cjs/expression/function/IfcExpressionFunctions.js.map +1 -1
- package/dist/cjs/expression/function/arg/FuncArgBase.js +2 -2
- package/dist/cjs/expression/function/arg/FuncArgBase.js.map +1 -1
- package/dist/cjs/expression/function/arg/FuncArgInt.js +5 -5
- package/dist/cjs/expression/function/arg/FuncArgInt.js.map +1 -1
- package/dist/cjs/expression/function/arg/FuncArgNumeric.js +4 -4
- package/dist/cjs/expression/function/arg/FuncArgNumeric.js.map +1 -1
- package/dist/cjs/expression/function/impl/MAP.js +6 -6
- package/dist/cjs/expression/function/impl/MAP.js.map +1 -1
- package/dist/cjs/expression/numeric/DivideExpr.js +2 -2
- package/dist/cjs/expression/numeric/DivideExpr.js.map +1 -1
- package/dist/cjs/expression/reference/AttributeReferenceExpr.js +7 -7
- package/dist/cjs/expression/reference/AttributeReferenceExpr.js.map +1 -1
- package/dist/cjs/expression/reference/NestedObjectChainEndExpr.js +9 -9
- package/dist/cjs/expression/reference/NestedObjectChainEndExpr.js.map +1 -1
- package/dist/cjs/expression/reference/NestedObjectChainExpr.js +14 -14
- package/dist/cjs/expression/reference/NestedObjectChainExpr.js.map +1 -1
- package/dist/cjs/expression/structure/ArrayExpr.js +3 -3
- package/dist/cjs/expression/structure/ArrayExpr.js.map +1 -1
- package/dist/expression/Expr0.d.ts +2 -2
- package/dist/expression/Expr1.d.ts +2 -2
- package/dist/expression/Expr2.d.ts +2 -2
- package/dist/expression/Expr2LeftBeforeRight.d.ts +2 -2
- package/dist/expression/ExprBase.d.ts +1 -1
- package/dist/expression/LiteralExpr.d.ts +2 -2
- package/dist/expression/function/Func.d.ts +1 -1
- package/dist/expression/function/IfcExpressionFunctions.d.ts +1 -1
- package/dist/expression/function/arg/FuncArgBase.d.ts +1 -1
- package/dist/expression/function/arg/FuncArgInt.d.ts +2 -2
- package/dist/expression/function/arg/FuncArgNumeric.d.ts +2 -2
- package/dist/expression/function/impl/MAP.d.ts +1 -1
- package/dist/expression/numeric/DivideExpr.d.ts +1 -1
- package/dist/expression/reference/AttributeReferenceExpr.d.ts +1 -1
- package/dist/expression/reference/NestedObjectChainEndExpr.d.ts +1 -1
- package/dist/expression/reference/NestedObjectChainExpr.d.ts +1 -1
- package/dist/expression/structure/ArrayExpr.d.ts +1 -1
- package/dist/mjs/expression/Expr0.js +2 -2
- package/dist/mjs/expression/Expr0.js.map +1 -1
- package/dist/mjs/expression/Expr1.js +3 -3
- package/dist/mjs/expression/Expr1.js.map +1 -1
- package/dist/mjs/expression/Expr2.js +3 -3
- package/dist/mjs/expression/Expr2.js.map +1 -1
- package/dist/mjs/expression/Expr2LeftBeforeRight.js +3 -3
- package/dist/mjs/expression/Expr2LeftBeforeRight.js.map +1 -1
- package/dist/mjs/expression/ExprBase.js +1 -1
- package/dist/mjs/expression/ExprBase.js.map +1 -1
- package/dist/mjs/expression/ExprEvalResult.js +1 -1
- package/dist/mjs/expression/ExprEvalResult.js.map +1 -1
- package/dist/mjs/expression/LiteralExpr.js +2 -2
- package/dist/mjs/expression/LiteralExpr.js.map +1 -1
- package/dist/mjs/expression/function/Func.js +2 -2
- package/dist/mjs/expression/function/Func.js.map +1 -1
- package/dist/mjs/expression/function/FuncArg.js +1 -1
- package/dist/mjs/expression/function/FuncArg.js.map +1 -1
- package/dist/mjs/expression/function/FunctionExpr.js +2 -2
- package/dist/mjs/expression/function/FunctionExpr.js.map +1 -1
- package/dist/mjs/expression/function/IfcExpressionFunctions.js +2 -2
- package/dist/mjs/expression/function/IfcExpressionFunctions.js.map +1 -1
- package/dist/mjs/expression/function/arg/FuncArgBase.js +1 -1
- package/dist/mjs/expression/function/arg/FuncArgBase.js.map +1 -1
- package/dist/mjs/expression/function/arg/FuncArgInt.js +2 -2
- package/dist/mjs/expression/function/arg/FuncArgInt.js.map +1 -1
- package/dist/mjs/expression/function/arg/FuncArgNumeric.js +2 -2
- package/dist/mjs/expression/function/arg/FuncArgNumeric.js.map +1 -1
- package/dist/mjs/expression/function/impl/MAP.js +1 -1
- package/dist/mjs/expression/function/impl/MAP.js.map +1 -1
- package/dist/mjs/expression/numeric/DivideExpr.js +1 -1
- package/dist/mjs/expression/numeric/DivideExpr.js.map +1 -1
- package/dist/mjs/expression/reference/AttributeReferenceExpr.js +2 -2
- package/dist/mjs/expression/reference/AttributeReferenceExpr.js.map +1 -1
- package/dist/mjs/expression/reference/NestedObjectChainEndExpr.js +3 -3
- package/dist/mjs/expression/reference/NestedObjectChainEndExpr.js.map +1 -1
- package/dist/mjs/expression/reference/NestedObjectChainExpr.js +3 -3
- package/dist/mjs/expression/reference/NestedObjectChainExpr.js.map +1 -1
- package/dist/mjs/expression/structure/ArrayExpr.js +1 -1
- package/dist/mjs/expression/structure/ArrayExpr.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Expr0 = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
class Expr0 extends
|
|
4
|
+
const ExprBase_js_1 = require("./ExprBase.js");
|
|
5
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
6
|
+
class Expr0 extends ExprBase_js_1.ExprBase {
|
|
7
7
|
constructor(kind) {
|
|
8
8
|
super(kind);
|
|
9
9
|
}
|
|
@@ -17,7 +17,7 @@ class Expr0 extends ExprBase_1.ExprBase {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
handleError(error) {
|
|
20
|
-
return new
|
|
20
|
+
return new ExprEvalResult_js_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_js_1.ExprEvalStatus.ERROR, error);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.Expr0 = Expr0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/Expr0.ts"],"names":[],"mappings":";;;AAEA
|
|
1
|
+
{"version":3,"sources":["../../src/expression/Expr0.ts"],"names":[],"mappings":";;;AAEA,+CAAyC;AACzC,2DAK6B;AAE7B,MAAsB,KAAS,SAAQ,sBAAW;IAChD,YAAsB,IAAc;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAOM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAChC;IACH,CAAC;IAES,WAAW,CAAC,KAAU;QAC9B,OAAO,IAAI,oCAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,kCAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;CACF;AAzBD,sBAyBC","file":"expression/Expr0.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport { ExprBase } from \"./ExprBase.js\";\nimport {\n ExprEvalError,\n ExprEvalErrorObj,\n ExprEvalResult,\n ExprEvalStatus,\n} from \"./ExprEvalResult.js\";\n\nexport abstract class Expr0<E> extends ExprBase<E> {\n protected constructor(kind: ExprKind) {\n super(kind);\n }\n\n protected abstract doEvaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): E | ExprEvalError;\n\n public evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<E> {\n try {\n const result = this.doEvaluate(ctx, localCtx);\n return this.wrapInResultIfNecessary(result);\n } catch (error) {\n return this.handleError(error);\n }\n }\n\n protected handleError(error: any): ExprEvalError {\n return new ExprEvalErrorObj(this.getKind(), ExprEvalStatus.ERROR, error);\n }\n}\n"]}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Expr1 = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
class Expr1 extends
|
|
4
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
5
|
+
const ExprBase_js_1 = require("./ExprBase.js");
|
|
6
|
+
const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
|
|
7
|
+
class Expr1 extends ExprBase_js_1.ExprBase {
|
|
8
8
|
constructor(exprKind, value) {
|
|
9
9
|
super(exprKind);
|
|
10
10
|
this.value = value;
|
|
@@ -17,11 +17,11 @@ class Expr1 extends ExprBase_1.ExprBase {
|
|
|
17
17
|
* @protected
|
|
18
18
|
*/
|
|
19
19
|
obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult) {
|
|
20
|
-
return new
|
|
20
|
+
return new ExprEvalResult_js_1.ExprEvalConsequentialError1Obj(this.getKind(), subExpressionResult);
|
|
21
21
|
}
|
|
22
22
|
// calculate the final result
|
|
23
23
|
makeErrorOrCalculate(ctx, localCtx, subExpressionResult) {
|
|
24
|
-
if ((0,
|
|
24
|
+
if ((0, ExprEvalResult_js_1.isExprEvalError)(subExpressionResult)) {
|
|
25
25
|
return this.obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult);
|
|
26
26
|
}
|
|
27
27
|
return this.wrapInResultIfNecessary(this.calculateResult(ctx, localCtx, subExpressionResult.result));
|
|
@@ -32,12 +32,12 @@ class Expr1 extends ExprBase_1.ExprBase {
|
|
|
32
32
|
}
|
|
33
33
|
evaluate(ctx, localCtx) {
|
|
34
34
|
const beforeRecursionError = this.onBeforeRecusion(ctx, localCtx);
|
|
35
|
-
if (!(0,
|
|
35
|
+
if (!(0, IfcExpressionUtils_js_1.isNullish)(beforeRecursionError)) {
|
|
36
36
|
return beforeRecursionError;
|
|
37
37
|
}
|
|
38
38
|
const subResult = this.value.evaluate(ctx, localCtx);
|
|
39
|
-
if ((0,
|
|
40
|
-
return new
|
|
39
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(subResult)) {
|
|
40
|
+
return new ExprEvalResult_js_1.ExprEvalError1Obj(this.getKind(), new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.value.getKind()), ExprEvalResult_js_1.ExprEvalStatus.MISSING_OPERAND);
|
|
41
41
|
}
|
|
42
42
|
try {
|
|
43
43
|
return this.makeErrorOrCalculate(ctx, localCtx, subResult);
|
|
@@ -47,7 +47,7 @@ class Expr1 extends ExprBase_1.ExprBase {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
handleError(error, subResult) {
|
|
50
|
-
return new
|
|
50
|
+
return new ExprEvalResult_js_1.ExprEvalError1Obj(this.getKind(), subResult, ExprEvalResult_js_1.ExprEvalStatus.ERROR, error);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
exports.Expr1 = Expr1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/Expr1.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../src/expression/Expr1.ts"],"names":[],"mappings":";;;AAEA,2DAQ6B;AAC7B,+CAAyC;AAEzC,oEAAqD;AAErD,MAAsB,KAAY,SAAQ,sBAAW;IAGnD,YAAsB,QAAkB,EAAE,KAAc;QACtD,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAQD;;;;;;OAMG;IACO,iCAAiC,CACzC,GAAyB,EACzB,QAA0B,EAC1B,mBAAkC;QAElC,OAAO,IAAI,kDAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,6BAA6B;IACrB,oBAAoB,CAC1B,GAAyB,EACzB,QAA0B,EAC1B,mBAAsC;QAEtC,IAAI,IAAA,mCAAe,EAAC,mBAAmB,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC,iCAAiC,CAC3C,GAAG,EACH,QAAQ,EACR,mBAAmB,CACpB,CAAC;SACH;QACD,OAAO,IAAI,CAAC,uBAAuB,CACjC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAChE,CAAC;IACJ,CAAC;IAES,gBAAgB,CACxB,GAAyB,EACzB,QAA0B;QAE1B,iDAAiD;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,MAAM,oBAAoB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,IAAA,iCAAS,EAAC,oBAAoB,CAAC,EAAE;YACpC,OAAO,oBAAoB,CAAC;SAC7B;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,iCAAS,EAAC,SAAS,CAAC,EAAE;YACxB,OAAO,IAAI,qCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,IAAI,gDAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EACtD,kCAAc,CAAC,eAAe,CAC/B,CAAC;SACH;QACD,IAAI;YACF,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;SAC5D;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;SAC3C;IACH,CAAC;IAES,WAAW,CACnB,KAAU,EACV,SAA4B;QAE5B,OAAO,IAAI,qCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,SAAS,EACT,kCAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA5FD,sBA4FC","file":"expression/Expr1.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport {\n ExprEvalConsequentialError1Obj,\n ExprEvalError,\n ExprEvalError1Obj,\n ExprEvalErrorUndefinedResult,\n ExprEvalResult,\n ExprEvalStatus,\n isExprEvalError,\n} from \"./ExprEvalResult.js\";\nimport { ExprBase } from \"./ExprBase.js\";\nimport { Expr } from \"./Expr.js\";\nimport { isNullish } from \"../IfcExpressionUtils.js\";\n\nexport abstract class Expr1<V, E> extends ExprBase<E> {\n readonly value: Expr<V>;\n\n protected constructor(exprKind: ExprKind, value: Expr<V>) {\n super(exprKind);\n this.value = value;\n }\n\n protected abstract calculateResult(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n subExpressionResult: V\n ): E | ExprEvalError;\n\n /**\n * Override to generate a more specific error result.\n * @param ctx\n * @param localCtx\n * @param subExpressionResult\n * @protected\n */\n protected obtainResultForSubExpressionError(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n subExpressionResult: ExprEvalError\n ): ExprEvalResult<E> {\n return new ExprEvalConsequentialError1Obj(\n this.getKind(),\n subExpressionResult\n );\n }\n\n // calculate the final result\n private makeErrorOrCalculate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n subExpressionResult: ExprEvalResult<V>\n ): ExprEvalResult<E> {\n if (isExprEvalError(subExpressionResult)) {\n return this.obtainResultForSubExpressionError(\n ctx,\n localCtx,\n subExpressionResult\n );\n }\n return this.wrapInResultIfNecessary(\n this.calculateResult(ctx, localCtx, subExpressionResult.result)\n );\n }\n\n protected onBeforeRecusion(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): undefined | ExprEvalError {\n // do something before we calculate the subresult\n return undefined;\n }\n\n public evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<E> {\n const beforeRecursionError = this.onBeforeRecusion(ctx, localCtx);\n if (!isNullish(beforeRecursionError)) {\n return beforeRecursionError;\n }\n const subResult = this.value.evaluate(ctx, localCtx);\n if (isNullish(subResult)) {\n return new ExprEvalError1Obj(\n this.getKind(),\n new ExprEvalErrorUndefinedResult(this.value.getKind()),\n ExprEvalStatus.MISSING_OPERAND\n );\n }\n try {\n return this.makeErrorOrCalculate(ctx, localCtx, subResult);\n } catch (error) {\n return this.handleError(error, subResult);\n }\n }\n\n protected handleError(\n error: any,\n subResult: ExprEvalResult<V>\n ): ExprEvalError {\n return new ExprEvalError1Obj(\n this.getKind(),\n subResult,\n ExprEvalStatus.ERROR,\n error\n );\n }\n}\n"]}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Expr2 = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
class Expr2 extends
|
|
4
|
+
const ExprBase_js_1 = require("./ExprBase.js");
|
|
5
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
6
|
+
const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
|
|
7
|
+
class Expr2 extends ExprBase_js_1.ExprBase {
|
|
8
8
|
constructor(exprKind, left, right) {
|
|
9
9
|
super(exprKind);
|
|
10
10
|
this.left = left;
|
|
@@ -19,18 +19,18 @@ class Expr2 extends ExprBase_1.ExprBase {
|
|
|
19
19
|
evaluate(ctx, localCtx) {
|
|
20
20
|
this.onBeforeRecursion(ctx, localCtx);
|
|
21
21
|
const leftResult = this.left.evaluate(ctx, localCtx);
|
|
22
|
-
if ((0,
|
|
23
|
-
return new
|
|
22
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(leftResult)) {
|
|
23
|
+
return new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.left.getKind());
|
|
24
24
|
}
|
|
25
|
-
if ((0,
|
|
25
|
+
if ((0, ExprEvalResult_js_1.isExprEvalError)(leftResult)) {
|
|
26
26
|
return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);
|
|
27
27
|
}
|
|
28
28
|
this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);
|
|
29
29
|
const rightResult = this.right.evaluate(ctx, localCtx);
|
|
30
|
-
if ((0,
|
|
31
|
-
return new
|
|
30
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(rightResult)) {
|
|
31
|
+
return new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.right.getKind());
|
|
32
32
|
}
|
|
33
|
-
if ((0,
|
|
33
|
+
if ((0, ExprEvalResult_js_1.isExprEvalSuccess)(rightResult)) {
|
|
34
34
|
try {
|
|
35
35
|
const result = this.calculateResult(ctx, localCtx, leftResult.result, rightResult.result);
|
|
36
36
|
return this.wrapInResultIfNecessary(result);
|
|
@@ -44,13 +44,13 @@ class Expr2 extends ExprBase_1.ExprBase {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult) {
|
|
47
|
-
return new
|
|
47
|
+
return new ExprEvalResult_js_1.ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
|
|
48
48
|
}
|
|
49
49
|
makeErrorForLeftSubExprError(ctx, localCtx, leftResult) {
|
|
50
|
-
return new
|
|
50
|
+
return new ExprEvalResult_js_1.ExprEvalConsequentialError1Obj(this.getKind(), leftResult, "Cannot evaluate attribute reference");
|
|
51
51
|
}
|
|
52
52
|
handleError(error, leftResult, rightResult) {
|
|
53
|
-
return new
|
|
53
|
+
return new ExprEvalResult_js_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_js_1.ExprEvalStatus.ERROR, error);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
exports.Expr2 = Expr2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AACA
|
|
1
|
+
{"version":3,"sources":["../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AACA,+CAAyC;AAEzC,2DAU6B;AAC7B,oEAAqD;AAGrD,MAAsB,KAAe,SAAQ,sBAAW;IAItD,YAAsB,QAAkB,EAAE,IAAa,EAAE,KAAc;QACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IASS,iBAAiB,CACzB,GAAyB,EACzB,QAA0B;QAE1B,8DAA8D;IAChE,CAAC;IAES,oBAAoB,CAC5B,GAAyB,EACzB,QAA0B,EAC1B,UAAa;QAEb,uGAAuG;IACzG,CAAC;IAEM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,iCAAS,EAAC,UAAU,CAAC,EAAE;YACzB,OAAO,IAAI,gDAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,IAAA,mCAAe,EAAC,UAAU,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACrE;QACD,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAA,iCAAS,EAAC,WAAW,CAAC,EAAE;YAC1B,OAAO,IAAI,gDAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,IAAA,qCAAiB,EAAC,WAAW,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CACjC,GAAG,EACH,QAAQ,EACR,UAAU,CAAC,MAAM,EACjB,WAAW,CAAC,MAAM,CACnB,CAAC;gBACF,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;aACzD;SACF;aAAM;YACL,OAAO,IAAI,CAAC,8BAA8B,CACxC,GAAG,EACH,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAES,8BAA8B,CACtC,GAAyB,EACzB,QAA0B,EAC1B,UAA6B,EAC7B,WAA0B;QAE1B,OAAO,IAAI,kDAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC;IAES,4BAA4B,CACpC,GAAyB,EACzB,QAA0B,EAC1B,UAAyB;QAEzB,OAAO,IAAI,kDAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,qCAAqC,CACtC,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA6B,EAC7B,WAA8B;QAE9B,OAAO,IAAI,qCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,kCAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA7GD,sBA6GC","file":"expression/Expr2.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprBase } from \"./ExprBase.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport {\n ExprEvalConsequentialError1Obj,\n ExprEvalConsequentialError2Obj,\n ExprEvalError,\n ExprEvalError2Obj,\n ExprEvalErrorUndefinedResult,\n ExprEvalResult,\n ExprEvalStatus,\n isExprEvalError,\n isExprEvalSuccess,\n} from \"./ExprEvalResult.js\";\nimport { isNullish } from \"../IfcExpressionUtils.js\";\nimport { Expr } from \"./Expr.js\";\n\nexport abstract class Expr2<L, R, E> extends ExprBase<E> {\n readonly left: Expr<L>;\n readonly right: Expr<R>;\n\n protected constructor(exprKind: ExprKind, left: Expr<L>, right: Expr<R>) {\n super(exprKind);\n this.left = left;\n this.right = right;\n }\n\n protected abstract calculateResult(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n leftOperand: L,\n rightOperand: R\n ): E | ExprEvalError;\n\n protected onBeforeRecursion(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ) {\n // override if subclass needs to do something before recursing\n }\n\n protected onAfterLeftRecursion(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n leftResult: L\n ) {\n // override if subclass needs to do something with the left result, such as put it in the local context\n }\n\n public evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<E> {\n this.onBeforeRecursion(ctx, localCtx);\n const leftResult = this.left.evaluate(ctx, localCtx);\n if (isNullish(leftResult)) {\n return new ExprEvalErrorUndefinedResult(this.left.getKind());\n }\n if (isExprEvalError(leftResult)) {\n return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);\n }\n this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);\n const rightResult = this.right.evaluate(ctx, localCtx);\n if (isNullish(rightResult)) {\n return new ExprEvalErrorUndefinedResult(this.right.getKind());\n }\n if (isExprEvalSuccess(rightResult)) {\n try {\n const result = this.calculateResult(\n ctx,\n localCtx,\n leftResult.result,\n rightResult.result\n );\n return this.wrapInResultIfNecessary(result);\n } catch (error) {\n return this.handleError(error, leftResult, rightResult);\n }\n } else {\n return this.makeResultForRightSubExprError(\n ctx,\n localCtx,\n leftResult,\n rightResult\n );\n }\n }\n\n protected makeResultForRightSubExprError(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n leftResult: ExprEvalResult<L>,\n rightResult: ExprEvalError\n ): ExprEvalResult<E> {\n return new ExprEvalConsequentialError2Obj(\n this.getKind(),\n leftResult,\n rightResult\n );\n }\n\n protected makeErrorForLeftSubExprError(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>,\n leftResult: ExprEvalError\n ): ExprEvalError {\n return new ExprEvalConsequentialError1Obj(\n this.getKind(),\n leftResult,\n \"Cannot evaluate attribute reference\"\n );\n }\n\n protected handleError(\n error: any,\n leftResult: ExprEvalResult<L>,\n rightResult: ExprEvalResult<R>\n ): ExprEvalError {\n return new ExprEvalError2Obj(\n this.getKind(),\n leftResult,\n rightResult,\n ExprEvalStatus.ERROR,\n error\n );\n }\n}\n"]}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Expr2LeftBeforeRight = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
class Expr2LeftBeforeRight extends
|
|
4
|
+
const ExprBase_js_1 = require("./ExprBase.js");
|
|
5
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
6
|
+
const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
|
|
7
|
+
class Expr2LeftBeforeRight extends ExprBase_js_1.ExprBase {
|
|
8
8
|
constructor(exprKind, left, right) {
|
|
9
9
|
super(exprKind);
|
|
10
10
|
this.left = left;
|
|
@@ -12,19 +12,19 @@ class Expr2LeftBeforeRight extends ExprBase_1.ExprBase {
|
|
|
12
12
|
}
|
|
13
13
|
evaluate(ctx, localCtx) {
|
|
14
14
|
const leftResult = this.left.evaluate(ctx, localCtx);
|
|
15
|
-
if ((0,
|
|
16
|
-
return new
|
|
15
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(leftResult)) {
|
|
16
|
+
return new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.left.getKind());
|
|
17
17
|
}
|
|
18
18
|
this.handleLeftResult(leftResult);
|
|
19
19
|
const rightResult = this.right.evaluate(ctx, localCtx);
|
|
20
|
-
if ((0,
|
|
21
|
-
return new
|
|
22
|
-
? new
|
|
23
|
-
: leftResult, (0,
|
|
24
|
-
? new
|
|
25
|
-
: rightResult,
|
|
20
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(leftResult) || (0, IfcExpressionUtils_js_1.isNullish)(rightResult)) {
|
|
21
|
+
return new ExprEvalResult_js_1.ExprEvalError2Obj(this.getKind(), (0, IfcExpressionUtils_js_1.isNullish)(leftResult)
|
|
22
|
+
? new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.left.getKind())
|
|
23
|
+
: leftResult, (0, IfcExpressionUtils_js_1.isNullish)(rightResult)
|
|
24
|
+
? new ExprEvalResult_js_1.ExprEvalErrorUndefinedResult(this.right.getKind())
|
|
25
|
+
: rightResult, ExprEvalResult_js_1.ExprEvalStatus.MISSING_OPERAND);
|
|
26
26
|
}
|
|
27
|
-
if ((0,
|
|
27
|
+
if ((0, ExprEvalResult_js_1.isExprEvalSuccess)(leftResult) && (0, ExprEvalResult_js_1.isExprEvalSuccess)(rightResult)) {
|
|
28
28
|
try {
|
|
29
29
|
const result = this.doEvaluate(ctx, leftResult.result, rightResult.result);
|
|
30
30
|
return this.wrapInResultIfNecessary(result);
|
|
@@ -34,11 +34,11 @@ class Expr2LeftBeforeRight extends ExprBase_1.ExprBase {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
return new
|
|
37
|
+
return new ExprEvalResult_js_1.ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
handleError(error, leftResult, rightResult) {
|
|
41
|
-
return new
|
|
41
|
+
return new ExprEvalResult_js_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_js_1.ExprEvalStatus.ERROR, error);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
exports.Expr2LeftBeforeRight = Expr2LeftBeforeRight;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/Expr2LeftBeforeRight.ts"],"names":[],"mappings":";;;AACA
|
|
1
|
+
{"version":3,"sources":["../../src/expression/Expr2LeftBeforeRight.ts"],"names":[],"mappings":";;;AACA,+CAAyC;AAEzC,2DAQ6B;AAC7B,oEAAqD;AAGrD,MAAsB,oBAA8B,SAAQ,sBAAW;IAIrE,YAAsB,QAAkB,EAAE,IAAa,EAAE,KAAc;QACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAUM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,iCAAS,EAAC,UAAU,CAAC,EAAE;YACzB,OAAO,IAAI,gDAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAA,iCAAS,EAAC,UAAU,CAAC,IAAI,IAAA,iCAAS,EAAC,WAAW,CAAC,EAAE;YACnD,OAAO,IAAI,qCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,IAAA,iCAAS,EAAC,UAAU,CAAC;gBACnB,CAAC,CAAC,IAAI,gDAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACvD,CAAC,CAAC,UAAU,EACd,IAAA,iCAAS,EAAC,WAAW,CAAC;gBACpB,CAAC,CAAC,IAAI,gDAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACxD,CAAC,CAAC,WAAW,EACf,kCAAc,CAAC,eAAe,CAC/B,CAAC;SACH;QACD,IAAI,IAAA,qCAAiB,EAAC,UAAU,CAAC,IAAI,IAAA,qCAAiB,EAAC,WAAW,CAAC,EAAE;YACnE,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAC5B,GAAG,EACH,UAAU,CAAC,MAAM,EACjB,WAAW,CAAC,MAAM,CACnB,CAAC;gBACF,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;aACzD;SACF;aAAM;YACL,OAAO,IAAI,kDAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA6B,EAC7B,WAA8B;QAE9B,OAAO,IAAI,qCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,kCAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AAzED,oDAyEC","file":"expression/Expr2LeftBeforeRight.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprBase } from \"./ExprBase.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport {\n ExprEvalConsequentialError2Obj,\n ExprEvalError,\n ExprEvalError2Obj,\n ExprEvalErrorUndefinedResult,\n ExprEvalResult,\n ExprEvalStatus,\n isExprEvalSuccess,\n} from \"./ExprEvalResult.js\";\nimport { isNullish } from \"../IfcExpressionUtils.js\";\nimport { Expr } from \"./Expr.js\";\n\nexport abstract class Expr2LeftBeforeRight<L, R, E> extends ExprBase<E> {\n readonly left: Expr<L>;\n readonly right: Expr<R>;\n\n protected constructor(exprKind: ExprKind, left: Expr<L>, right: Expr<R>) {\n super(exprKind);\n this.left = left;\n this.right = right;\n }\n\n protected abstract doEvaluate(\n ctx: IfcExpressionContext,\n leftOperand: L,\n rightOperand: R\n ): E | ExprEvalError;\n\n protected abstract handleLeftResult(leftResult: ExprEvalResult<L>);\n\n public evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<E> {\n const leftResult = this.left.evaluate(ctx, localCtx);\n if (isNullish(leftResult)) {\n return new ExprEvalErrorUndefinedResult(this.left.getKind());\n }\n this.handleLeftResult(leftResult);\n const rightResult = this.right.evaluate(ctx, localCtx);\n if (isNullish(leftResult) || isNullish(rightResult)) {\n return new ExprEvalError2Obj(\n this.getKind(),\n isNullish(leftResult)\n ? new ExprEvalErrorUndefinedResult(this.left.getKind())\n : leftResult,\n isNullish(rightResult)\n ? new ExprEvalErrorUndefinedResult(this.right.getKind())\n : rightResult,\n ExprEvalStatus.MISSING_OPERAND\n );\n }\n if (isExprEvalSuccess(leftResult) && isExprEvalSuccess(rightResult)) {\n try {\n const result = this.doEvaluate(\n ctx,\n leftResult.result,\n rightResult.result\n );\n return this.wrapInResultIfNecessary(result);\n } catch (error) {\n return this.handleError(error, leftResult, rightResult);\n }\n } else {\n return new ExprEvalConsequentialError2Obj(\n this.getKind(),\n leftResult,\n rightResult\n );\n }\n }\n\n protected handleError(\n error: any,\n leftResult: ExprEvalResult<L>,\n rightResult: ExprEvalResult<R>\n ): ExprEvalError {\n return new ExprEvalError2Obj(\n this.getKind(),\n leftResult,\n rightResult,\n ExprEvalStatus.ERROR,\n error\n );\n }\n}\n"]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ExprBase = void 0;
|
|
4
|
-
const
|
|
4
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
5
5
|
class ExprBase {
|
|
6
6
|
constructor(exprKind) {
|
|
7
7
|
this.exprKind = exprKind;
|
|
@@ -10,10 +10,10 @@ class ExprBase {
|
|
|
10
10
|
return this.exprKind;
|
|
11
11
|
}
|
|
12
12
|
wrapInResultIfNecessary(result) {
|
|
13
|
-
if ((0,
|
|
13
|
+
if ((0, ExprEvalResult_js_1.isExprEvalError)(result)) {
|
|
14
14
|
return result;
|
|
15
15
|
}
|
|
16
|
-
return new
|
|
16
|
+
return new ExprEvalResult_js_1.ExprEvalSuccessObj(result);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.ExprBase = ExprBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/ExprBase.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../src/expression/ExprBase.ts"],"names":[],"mappings":";;;AAEA,2DAK6B;AAG7B,MAAsB,QAAQ;IAG5B,YAAY,QAAkB;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAOD,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAES,uBAAuB,CAC/B,MAAyB;QAEzB,IAAI,IAAA,mCAAe,EAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,MAAM,CAAC;SACf;QACD,OAAO,IAAI,sCAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AAxBD,4BAwBC","file":"expression/ExprBase.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport {\n ExprEvalError,\n ExprEvalResult,\n ExprEvalSuccessObj,\n isExprEvalError,\n} from \"./ExprEvalResult.js\";\nimport { ExprKind } from \"./ExprKind.js\";\n\nexport abstract class ExprBase<T> implements Expr<T> {\n private readonly exprKind: ExprKind;\n\n constructor(exprKind: ExprKind) {\n this.exprKind = exprKind;\n }\n\n abstract evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<T>;\n\n getKind(): ExprKind {\n return this.exprKind;\n }\n\n protected wrapInResultIfNecessary(\n result: T | ExprEvalError\n ): ExprEvalResult<T> {\n if (isExprEvalError(result)) {\n return result;\n }\n return new ExprEvalSuccessObj(result);\n }\n}\n"]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ExprEvalTypeErrorObj = exports.ExprEvalValueErrorObj = exports.ExprEvalMissingRequiredFunctionArgumentErrorObj = exports.ExprEvalFunctionEvaluationConsequentialErrorObj = exports.ExprEvalFunctionEvaluationErrorObj = exports.ExprEvalConsequentialError2Obj = exports.ExprEvalConsequentialError1Obj = exports.isExprEvalRefChainError = exports.isExprEvalError = exports.ExprEvalError2Obj = exports.ExprEvalError1Obj = exports.ExprEvalRefChainErrorObj = exports.ExprEvalErrorUndefinedResult = exports.mapErrorObjectToMessage = exports.ExprEvalErrorObj = exports.ExprEvalSuccessObj = exports.isExprEvalSuccess = exports.isExprEvalStatus = exports.ExprEvalStatus = void 0;
|
|
4
|
-
const
|
|
4
|
+
const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
|
|
5
5
|
var ExprEvalStatus;
|
|
6
6
|
(function (ExprEvalStatus) {
|
|
7
7
|
ExprEvalStatus[ExprEvalStatus["SUCCESS"] = 1000] = "SUCCESS";
|
|
@@ -41,7 +41,7 @@ class ExprEvalErrorObj {
|
|
|
41
41
|
}
|
|
42
42
|
this.status = status;
|
|
43
43
|
this.exprKind = exprKind;
|
|
44
|
-
if (!(0,
|
|
44
|
+
if (!(0, IfcExpressionUtils_js_1.isNullish)(message)) {
|
|
45
45
|
this.message = mapErrorObjectToMessage(message);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/ExprEvalResult.ts"],"names":[],"mappings":";;;AAEA,8DAAkD;AAElD,IAAY,cAWX;AAXD,WAAY,cAAc;IACxB,4DAAc,CAAA;IACd,wDAAY,CAAA;IACZ,8EAAuB,CAAA;IACvB,4EAAsB,CAAA;IACtB,4EAAe,CAAA;IACf,kHAAyC,CAAA;IACzC,8EAAuB,CAAA;IACvB,oFAA0B,CAAA;IAC1B,kEAAiB,CAAA;IACjB,kEAAiB,CAAA;AACnB,CAAC,EAXW,cAAc,8BAAd,cAAc,QAWzB;AAED,SAAgB,gBAAgB,CAAC,SAAiB;IAChD,OAAO,CACL,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,WAAW,CACjD,CAAC;AACJ,CAAC;AALD,4CAKC;AASD,SAAgB,iBAAiB,CAAC,GAAQ;IACxC,OAAO,CACL,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC;QAC5B,GAAG,CAAC,MAAM,IAAI,cAAc,CAAC,OAAO;QACpC,GAAG,CAAC,MAAM,GAAG,cAAc,CAAC,KAAK;QACjC,OAAO,GAAG,CAAC,MAAM,KAAK,WAAW,CAClC,CAAC;AACJ,CAAC;AAPD,8CAOC;AAED,MAAa,kBAAkB;IAI7B,YAAY,MAAS;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC;IACvC,CAAC;CACF;AARD,gDAQC;AAED,MAAa,gBAAgB;IAI3B,YACE,QAAkB,EAClB,SAAyB,cAAc,CAAC,KAAK,EAC7C,OAAa;QAEb,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE;YAC9D,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,0BAA0B,CAAC,CAAC;SACrE;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAA,8BAAS,EAAC,OAAO,CAAC,EAAE;YACvB,IAAI,CAAC,OAAO,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;SACjD;IACH,CAAC;CACF;AAlBD,4CAkBC;AAED,SAAgB,uBAAuB,CAAC,oBAAyB;IAC/D,IAAI,OAAO,oBAAoB,KAAK,QAAQ,EAAE;QAC5C,OAAO,oBAAoB,CAAC;KAC7B;SAAM,IAAI,oBAAoB,YAAY,KAAK,EAAE;QAChD,OAAO,oBAAoB,CAAC,OAAO,CAAC;KACrC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;QAC9C,OAAO,oBAAoB;aACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;aACtC,IAAI,CAAC,GAAG,CAAC,CAAC;KACd;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAC9C,CAAC;AAXD,0DAWC;AAED,MAAa,4BAA6B,SAAQ,gBAAgB;IAChE,YAAY,QAAkB;QAC5B,KAAK,CACH,QAAQ,EACR,cAAc,CAAC,gBAAgB,EAC/B,sEAAsE,CACvE,CAAC;IACJ,CAAC;CACF;AARD,oEAQC;AAED,MAAa,wBAAyB,SAAQ,gBAAgB;IAI5D,YACE,QAAkB,EAClB,MAAsB,EACtB,gBAAwB,EACxB,OAAa;QAEb,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,QAAQ,CACpB,KAA4B,EAC5B,kBAAkB;QAElB,OAAO;YACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,IAAI,EAAE,CAAC,kBAAkB,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;YACzC,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;IACJ,CAAC;CACF;AA3BD,4DA2BC;AAED,MAAa,iBAAkB,SAAQ,gBAAgB;IAGrD,YACE,QAAkB,EAClB,GAA4B,EAC5B,MAAsB,EACtB,OAAa;QAEb,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;CACF;AAZD,8CAYC;AAED,MAAa,iBAAkB,SAAQ,gBAAgB;IAIrD,YACE,QAAkB,EAClB,IAA6B,EAC7B,KAA8B,EAC9B,MAAuB,EACvB,OAAa;QAEb,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAfD,8CAeC;AAED,SAAgB,eAAe,CAAC,GAAQ;IACtC,OAAO,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,IAAI,cAAc,CAAC,KAAK,CAAC;AAC5E,CAAC;AAFD,0CAEC;AAoBD,SAAgB,uBAAuB,CACrC,GAAQ;IAER,OAAO,CACL,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC;QAC5B,GAAG,CAAC,MAAM,IAAI,cAAc,CAAC,KAAK;QAClC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACvB,OAAO,GAAG,CAAC,gBAAgB,KAAK,QAAQ,CACzC,CAAC;AACJ,CAAC;AATD,0DASC;AAaD,MAAa,8BAA+B,SAAQ,gBAAgB;IAIlE,YACE,QAAkB,EAClB,KAA8B,EAC9B,OAAa;QAEb,KAAK,CACH,QAAQ,EACR,cAAc,CAAC,mBAAmB,EAClC,OAAO,IAAI,qBAAqB,CACjC,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAjBD,wEAiBC;AASD,MAAa,8BAA+B,SAAQ,gBAAgB;IAIlE,YACE,QAAkB,EAClB,SAAkC,EAClC,UAAmC,EACnC,OAAa;QAEb,KAAK,CACH,QAAQ,EACR,cAAc,CAAC,mBAAmB,EAClC,OAAO,IAAI,qBAAqB,CACjC,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAlBD,wEAkBC;AAiBD,MAAa,kCAAmC,SAAQ,gBAAgB;IAGtE,YACE,QAAkB,EAClB,MAAsB,EACtB,OAAY,EACZ,YAAoB;QAEpB,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AAZD,gFAYC;AAED,MAAa,+CAAgD,SAAQ,kCAAkC;IAGrG,YAAY,QAAkB,EAAE,YAAoB,EAAE,KAAoB;QACxE,KAAK,CACH,QAAQ,EACR,cAAc,CAAC,mBAAmB,EAClC,6BAA6B,YAAY,EAAE,EAC3C,YAAY,CACb,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAZD,0GAYC;AAED,MAAa,+CAAgD,SAAQ,kCAAkC;IAIrG,YACE,QAAkB,EAClB,OAAY,EACZ,YAAoB,EACpB,YAAoB,EACpB,aAAqB;QAErB,KAAK,CACH,QAAQ,EACR,cAAc,CAAC,kCAAkC,EACjD,OAAO,EACP,YAAY,CACb,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AApBD,0GAoBC;AAUD,MAAa,qBAAyB,SAAQ,gBAAgB;IAG5D,YACE,QAAkB,EAClB,MAAsB,EACtB,OAAY,EACZ,cAAiB;QAEjB,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF;AAZD,sDAYC;AAED,MAAa,oBAAwB,SAAQ,qBAAwB;IACnE,YAAY,QAAkB,EAAE,OAAY,EAAE,cAAiB;QAC7D,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,UAAU,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;CACF;AAJD,oDAIC","file":"expression/ExprEvalResult.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport { isNullish } from \"../IfcExpressionUtils\";\n\nexport enum ExprEvalStatus {\n SUCCESS = 1000,\n ERROR = 2000,\n UNDEFINED_RESULT = 2001,\n REFERENCE_ERROR = 2010,\n MISSING_OPERAND,\n MISSING_REQUIRED_FUNCTION_ARGUMENT = 2012,\n UNKNOWN_FUNCTION = 2014,\n CONSEQUENTIAL_ERROR = 2020,\n MATH_ERROR = 2030,\n TYPE_ERROR = 2040,\n}\n\nexport function isExprEvalStatus(candidate: number): boolean {\n return (\n typeof candidate === \"number\" &&\n typeof ExprEvalStatus[candidate] !== \"undefined\"\n );\n}\n\nexport type ExprEvalResult<T> = ExprEvalSuccess<T> | ExprEvalError;\n\nexport type ExprEvalSuccess<T> = {\n status: ExprEvalStatus;\n result: T;\n};\n\nexport function isExprEvalSuccess(arg: any): arg is ExprEvalSuccess<unknown> {\n return (\n isExprEvalStatus(arg.status) &&\n arg.status >= ExprEvalStatus.SUCCESS &&\n arg.status < ExprEvalStatus.ERROR &&\n typeof arg.result !== \"undefined\"\n );\n}\n\nexport class ExprEvalSuccessObj<T> {\n public readonly result: T;\n public readonly status: ExprEvalStatus;\n\n constructor(result: T) {\n this.result = result;\n this.status = ExprEvalStatus.SUCCESS;\n }\n}\n\nexport class ExprEvalErrorObj {\n public readonly status: ExprEvalStatus;\n public readonly exprKind: ExprKind;\n public readonly message?: string;\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus = ExprEvalStatus.ERROR,\n message?: any\n ) {\n if (!isExprEvalStatus(status) || status < ExprEvalStatus.ERROR) {\n throw new Error(`ExprEvalStatus ${status} is not an error status\"`);\n }\n this.status = status;\n this.exprKind = exprKind;\n if (!isNullish(message)) {\n this.message = mapErrorObjectToMessage(message);\n }\n }\n}\n\nexport function mapErrorObjectToMessage(errorObjectOrMessage: any): string {\n if (typeof errorObjectOrMessage === \"string\") {\n return errorObjectOrMessage;\n } else if (errorObjectOrMessage instanceof Error) {\n return errorObjectOrMessage.message;\n } else if (Array.isArray(errorObjectOrMessage)) {\n return errorObjectOrMessage\n .map((m) => this.createErrorMessage(m))\n .join(\" \");\n }\n return JSON.stringify(errorObjectOrMessage);\n}\n\nexport class ExprEvalErrorUndefinedResult extends ExprEvalErrorObj {\n constructor(epxrKind: ExprKind) {\n super(\n epxrKind,\n ExprEvalStatus.UNDEFINED_RESULT,\n \"Expression evaluated to undefined or null - this should never happen\"\n );\n }\n}\n\nexport class ExprEvalRefChainErrorObj extends ExprEvalErrorObj {\n public readonly errorPathElement: string;\n public readonly path: Array<string>;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n errorPathElement: string,\n message?: any\n ) {\n super(exprKind, status, message);\n this.errorPathElement = errorPathElement;\n this.path = [errorPathElement];\n }\n\n public static bubbleUp(\n error: ExprEvalRefChainError,\n currentPathElement\n ): ExprEvalRefChainError {\n return {\n exprKind: error.exprKind,\n status: error.status,\n errorPathElement: error.errorPathElement,\n path: [currentPathElement, ...error.path],\n message: error.message,\n };\n }\n}\n\nexport class ExprEvalError1Obj extends ExprEvalErrorObj {\n public readonly sub: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n sub: ExprEvalResult<unknown>,\n status: ExprEvalStatus,\n message?: any\n ) {\n super(exprKind, status, message);\n this.sub = sub;\n }\n}\n\nexport class ExprEvalError2Obj extends ExprEvalErrorObj {\n public readonly left: ExprEvalResult<unknown>;\n public readonly right: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n left: ExprEvalResult<unknown>,\n right: ExprEvalResult<unknown>,\n status?: ExprEvalStatus,\n message?: any\n ) {\n super(exprKind, status, message);\n this.left = left;\n this.right = right;\n }\n}\n\nexport function isExprEvalError(arg: any): arg is ExprEvalError {\n return isExprEvalStatus(arg.status) && arg.status >= ExprEvalStatus.ERROR;\n}\n\nexport type ExprEvalError =\n | ExprEvalUnspecificError\n | ExprEvalReferencError\n | ExprEvalErrorUndefinedResult\n | ExprEvalMissingRequiredFunctionArgumentError\n | ExprEvalValueError<unknown>;\n\ntype ExprEvalUnspecificError = {\n readonly exprKind: ExprKind;\n readonly status: ExprEvalStatus;\n readonly message?: string;\n};\n\nexport type ExprEvalRefChainError = ExprEvalUnspecificError & {\n readonly errorPathElement: string;\n readonly path: Array<string>;\n};\n\nexport function isExprEvalRefChainError(\n arg: any\n): arg is ExprEvalRefChainError {\n return (\n isExprEvalStatus(arg.status) &&\n arg.status >= ExprEvalStatus.ERROR &&\n Array.isArray(arg.path) &&\n typeof arg.errorPathElement === \"string\"\n );\n}\n\nexport type ExprEvalReferencError = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.REFERENCE_ERROR;\n readonly expr: Expr<unknown>;\n};\n\nexport type ExprEvalConsequentialError1 = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.CONSEQUENTIAL_ERROR;\n readonly exprKind: ExprKind;\n readonly cause: ExprEvalError;\n};\n\nexport class ExprEvalConsequentialError1Obj extends ExprEvalErrorObj {\n public readonly exprKind: ExprKind;\n public readonly cause: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n cause: ExprEvalResult<unknown>,\n message?: any\n ) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n message || \"Consequential error\"\n );\n this.exprKind = exprKind;\n this.cause = cause;\n }\n}\n\nexport type ExprEvalConsequentialError2 = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.CONSEQUENTIAL_ERROR;\n readonly exprKind: ExprKind;\n readonly leftCause: ExprEvalResult<unknown>;\n readonly rightCause: ExprEvalResult<unknown>;\n};\n\nexport class ExprEvalConsequentialError2Obj extends ExprEvalErrorObj {\n public readonly leftCause: ExprEvalResult<unknown>;\n public readonly rightCause: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n leftCause: ExprEvalResult<unknown>,\n rightCause: ExprEvalResult<unknown>,\n message?: any\n ) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n message || \"Consequential error\"\n );\n this.leftCause = leftCause;\n this.rightCause = rightCause;\n }\n}\n\nexport type ExprEvalFunctionEvaluationError = ExprEvalUnspecificError & {\n functionName: string;\n};\n\nexport type ExprEvalMissingRequiredFunctionArgumentError =\n ExprEvalFunctionEvaluationError & {\n argumentName: string;\n argumentIndex: number;\n };\n\nexport type ExprEvalFunctionEvaluationConsequentialError =\n ExprEvalFunctionEvaluationError & {\n cause: ExprEvalUnspecificError;\n };\n\nexport class ExprEvalFunctionEvaluationErrorObj extends ExprEvalErrorObj {\n public readonly functionName: string;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n message: any,\n functionName: string\n ) {\n super(exprKind, status, message);\n this.functionName = functionName;\n }\n}\n\nexport class ExprEvalFunctionEvaluationConsequentialErrorObj extends ExprEvalFunctionEvaluationErrorObj {\n public readonly cause: ExprEvalError;\n\n constructor(exprKind: ExprKind, functionName: string, cause: ExprEvalError) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n `Error evaluating function ${functionName}`,\n functionName\n );\n this.cause = cause;\n }\n}\n\nexport class ExprEvalMissingRequiredFunctionArgumentErrorObj extends ExprEvalFunctionEvaluationErrorObj {\n public readonly argumentName: string;\n public readonly argumentIndex: number;\n\n constructor(\n exprKind: ExprKind,\n message: any,\n functionName: string,\n argumentName: string,\n argumentIndex: number\n ) {\n super(\n exprKind,\n ExprEvalStatus.MISSING_REQUIRED_FUNCTION_ARGUMENT,\n message,\n functionName\n );\n this.argumentName = argumentName;\n this.argumentIndex = argumentIndex;\n }\n}\n\nexport type ExprEvalTypeError = ExprEvalUnspecificError & {\n status: ExprEvalStatus.TYPE_ERROR;\n};\n\nexport type ExprEvalValueError<T> = ExprEvalUnspecificError & {\n offendingValue: T;\n};\n\nexport class ExprEvalValueErrorObj<T> extends ExprEvalErrorObj {\n public readonly offendingValue: T;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n message: any,\n offendingValue: T\n ) {\n super(exprKind, status, message);\n this.offendingValue = offendingValue;\n }\n}\n\nexport class ExprEvalTypeErrorObj<T> extends ExprEvalValueErrorObj<T> {\n constructor(exprKind: ExprKind, message: any, offendingValue: T) {\n super(exprKind, ExprEvalStatus.TYPE_ERROR, message, offendingValue);\n }\n}\n"]}
|
|
1
|
+
{"version":3,"sources":["../../src/expression/ExprEvalResult.ts"],"names":[],"mappings":"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","file":"expression/ExprEvalResult.js","sourcesContent":["import { Expr } from \"./Expr.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport { isNullish } from \"../IfcExpressionUtils.js\";\n\nexport enum ExprEvalStatus {\n SUCCESS = 1000,\n ERROR = 2000,\n UNDEFINED_RESULT = 2001,\n REFERENCE_ERROR = 2010,\n MISSING_OPERAND,\n MISSING_REQUIRED_FUNCTION_ARGUMENT = 2012,\n UNKNOWN_FUNCTION = 2014,\n CONSEQUENTIAL_ERROR = 2020,\n MATH_ERROR = 2030,\n TYPE_ERROR = 2040,\n}\n\nexport function isExprEvalStatus(candidate: number): boolean {\n return (\n typeof candidate === \"number\" &&\n typeof ExprEvalStatus[candidate] !== \"undefined\"\n );\n}\n\nexport type ExprEvalResult<T> = ExprEvalSuccess<T> | ExprEvalError;\n\nexport type ExprEvalSuccess<T> = {\n status: ExprEvalStatus;\n result: T;\n};\n\nexport function isExprEvalSuccess(arg: any): arg is ExprEvalSuccess<unknown> {\n return (\n isExprEvalStatus(arg.status) &&\n arg.status >= ExprEvalStatus.SUCCESS &&\n arg.status < ExprEvalStatus.ERROR &&\n typeof arg.result !== \"undefined\"\n );\n}\n\nexport class ExprEvalSuccessObj<T> {\n public readonly result: T;\n public readonly status: ExprEvalStatus;\n\n constructor(result: T) {\n this.result = result;\n this.status = ExprEvalStatus.SUCCESS;\n }\n}\n\nexport class ExprEvalErrorObj {\n public readonly status: ExprEvalStatus;\n public readonly exprKind: ExprKind;\n public readonly message?: string;\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus = ExprEvalStatus.ERROR,\n message?: any\n ) {\n if (!isExprEvalStatus(status) || status < ExprEvalStatus.ERROR) {\n throw new Error(`ExprEvalStatus ${status} is not an error status\"`);\n }\n this.status = status;\n this.exprKind = exprKind;\n if (!isNullish(message)) {\n this.message = mapErrorObjectToMessage(message);\n }\n }\n}\n\nexport function mapErrorObjectToMessage(errorObjectOrMessage: any): string {\n if (typeof errorObjectOrMessage === \"string\") {\n return errorObjectOrMessage;\n } else if (errorObjectOrMessage instanceof Error) {\n return errorObjectOrMessage.message;\n } else if (Array.isArray(errorObjectOrMessage)) {\n return errorObjectOrMessage\n .map((m) => this.createErrorMessage(m))\n .join(\" \");\n }\n return JSON.stringify(errorObjectOrMessage);\n}\n\nexport class ExprEvalErrorUndefinedResult extends ExprEvalErrorObj {\n constructor(epxrKind: ExprKind) {\n super(\n epxrKind,\n ExprEvalStatus.UNDEFINED_RESULT,\n \"Expression evaluated to undefined or null - this should never happen\"\n );\n }\n}\n\nexport class ExprEvalRefChainErrorObj extends ExprEvalErrorObj {\n public readonly errorPathElement: string;\n public readonly path: Array<string>;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n errorPathElement: string,\n message?: any\n ) {\n super(exprKind, status, message);\n this.errorPathElement = errorPathElement;\n this.path = [errorPathElement];\n }\n\n public static bubbleUp(\n error: ExprEvalRefChainError,\n currentPathElement\n ): ExprEvalRefChainError {\n return {\n exprKind: error.exprKind,\n status: error.status,\n errorPathElement: error.errorPathElement,\n path: [currentPathElement, ...error.path],\n message: error.message,\n };\n }\n}\n\nexport class ExprEvalError1Obj extends ExprEvalErrorObj {\n public readonly sub: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n sub: ExprEvalResult<unknown>,\n status: ExprEvalStatus,\n message?: any\n ) {\n super(exprKind, status, message);\n this.sub = sub;\n }\n}\n\nexport class ExprEvalError2Obj extends ExprEvalErrorObj {\n public readonly left: ExprEvalResult<unknown>;\n public readonly right: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n left: ExprEvalResult<unknown>,\n right: ExprEvalResult<unknown>,\n status?: ExprEvalStatus,\n message?: any\n ) {\n super(exprKind, status, message);\n this.left = left;\n this.right = right;\n }\n}\n\nexport function isExprEvalError(arg: any): arg is ExprEvalError {\n return isExprEvalStatus(arg.status) && arg.status >= ExprEvalStatus.ERROR;\n}\n\nexport type ExprEvalError =\n | ExprEvalUnspecificError\n | ExprEvalReferencError\n | ExprEvalErrorUndefinedResult\n | ExprEvalMissingRequiredFunctionArgumentError\n | ExprEvalValueError<unknown>;\n\ntype ExprEvalUnspecificError = {\n readonly exprKind: ExprKind;\n readonly status: ExprEvalStatus;\n readonly message?: string;\n};\n\nexport type ExprEvalRefChainError = ExprEvalUnspecificError & {\n readonly errorPathElement: string;\n readonly path: Array<string>;\n};\n\nexport function isExprEvalRefChainError(\n arg: any\n): arg is ExprEvalRefChainError {\n return (\n isExprEvalStatus(arg.status) &&\n arg.status >= ExprEvalStatus.ERROR &&\n Array.isArray(arg.path) &&\n typeof arg.errorPathElement === \"string\"\n );\n}\n\nexport type ExprEvalReferencError = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.REFERENCE_ERROR;\n readonly expr: Expr<unknown>;\n};\n\nexport type ExprEvalConsequentialError1 = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.CONSEQUENTIAL_ERROR;\n readonly exprKind: ExprKind;\n readonly cause: ExprEvalError;\n};\n\nexport class ExprEvalConsequentialError1Obj extends ExprEvalErrorObj {\n public readonly exprKind: ExprKind;\n public readonly cause: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n cause: ExprEvalResult<unknown>,\n message?: any\n ) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n message || \"Consequential error\"\n );\n this.exprKind = exprKind;\n this.cause = cause;\n }\n}\n\nexport type ExprEvalConsequentialError2 = ExprEvalUnspecificError & {\n readonly status: ExprEvalStatus.CONSEQUENTIAL_ERROR;\n readonly exprKind: ExprKind;\n readonly leftCause: ExprEvalResult<unknown>;\n readonly rightCause: ExprEvalResult<unknown>;\n};\n\nexport class ExprEvalConsequentialError2Obj extends ExprEvalErrorObj {\n public readonly leftCause: ExprEvalResult<unknown>;\n public readonly rightCause: ExprEvalResult<unknown>;\n\n constructor(\n exprKind: ExprKind,\n leftCause: ExprEvalResult<unknown>,\n rightCause: ExprEvalResult<unknown>,\n message?: any\n ) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n message || \"Consequential error\"\n );\n this.leftCause = leftCause;\n this.rightCause = rightCause;\n }\n}\n\nexport type ExprEvalFunctionEvaluationError = ExprEvalUnspecificError & {\n functionName: string;\n};\n\nexport type ExprEvalMissingRequiredFunctionArgumentError =\n ExprEvalFunctionEvaluationError & {\n argumentName: string;\n argumentIndex: number;\n };\n\nexport type ExprEvalFunctionEvaluationConsequentialError =\n ExprEvalFunctionEvaluationError & {\n cause: ExprEvalUnspecificError;\n };\n\nexport class ExprEvalFunctionEvaluationErrorObj extends ExprEvalErrorObj {\n public readonly functionName: string;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n message: any,\n functionName: string\n ) {\n super(exprKind, status, message);\n this.functionName = functionName;\n }\n}\n\nexport class ExprEvalFunctionEvaluationConsequentialErrorObj extends ExprEvalFunctionEvaluationErrorObj {\n public readonly cause: ExprEvalError;\n\n constructor(exprKind: ExprKind, functionName: string, cause: ExprEvalError) {\n super(\n exprKind,\n ExprEvalStatus.CONSEQUENTIAL_ERROR,\n `Error evaluating function ${functionName}`,\n functionName\n );\n this.cause = cause;\n }\n}\n\nexport class ExprEvalMissingRequiredFunctionArgumentErrorObj extends ExprEvalFunctionEvaluationErrorObj {\n public readonly argumentName: string;\n public readonly argumentIndex: number;\n\n constructor(\n exprKind: ExprKind,\n message: any,\n functionName: string,\n argumentName: string,\n argumentIndex: number\n ) {\n super(\n exprKind,\n ExprEvalStatus.MISSING_REQUIRED_FUNCTION_ARGUMENT,\n message,\n functionName\n );\n this.argumentName = argumentName;\n this.argumentIndex = argumentIndex;\n }\n}\n\nexport type ExprEvalTypeError = ExprEvalUnspecificError & {\n status: ExprEvalStatus.TYPE_ERROR;\n};\n\nexport type ExprEvalValueError<T> = ExprEvalUnspecificError & {\n offendingValue: T;\n};\n\nexport class ExprEvalValueErrorObj<T> extends ExprEvalErrorObj {\n public readonly offendingValue: T;\n\n constructor(\n exprKind: ExprKind,\n status: ExprEvalStatus,\n message: any,\n offendingValue: T\n ) {\n super(exprKind, status, message);\n this.offendingValue = offendingValue;\n }\n}\n\nexport class ExprEvalTypeErrorObj<T> extends ExprEvalValueErrorObj<T> {\n constructor(exprKind: ExprKind, message: any, offendingValue: T) {\n super(exprKind, ExprEvalStatus.TYPE_ERROR, message, offendingValue);\n }\n}\n"]}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LiteralExpr = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
class LiteralExpr extends
|
|
4
|
+
const ExprEvalResult_js_1 = require("./ExprEvalResult.js");
|
|
5
|
+
const ExprBase_js_1 = require("./ExprBase.js");
|
|
6
|
+
class LiteralExpr extends ExprBase_js_1.ExprBase {
|
|
7
7
|
constructor(exprKind, value) {
|
|
8
8
|
super(exprKind);
|
|
9
9
|
this.value = value;
|
|
@@ -18,7 +18,7 @@ class LiteralExpr extends ExprBase_1.ExprBase {
|
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
handleError(error) {
|
|
21
|
-
return new
|
|
21
|
+
return new ExprEvalResult_js_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_js_1.ExprEvalStatus.ERROR, error);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
exports.LiteralExpr = LiteralExpr;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/LiteralExpr.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../src/expression/LiteralExpr.ts"],"names":[],"mappings":";;;AAEA,2DAK6B;AAC7B,+CAAyC;AAEzC,MAAsB,WAAkB,SAAQ,sBAAW;IAGzD,YAAsB,QAAkB,EAAE,KAAQ;QAChD,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAMM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAChC;IACH,CAAC;IAES,WAAW,CAAC,KAAU;QAC9B,OAAO,IAAI,oCAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,kCAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;CACF;AA3BD,kCA2BC","file":"expression/LiteralExpr.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprKind } from \"./ExprKind.js\";\nimport {\n ExprEvalError,\n ExprEvalErrorObj,\n ExprEvalResult,\n ExprEvalStatus,\n} from \"./ExprEvalResult.js\";\nimport { ExprBase } from \"./ExprBase.js\";\n\nexport abstract class LiteralExpr<V, E> extends ExprBase<E> {\n readonly value: V;\n\n protected constructor(exprKind: ExprKind, value: V) {\n super(exprKind);\n this.value = value;\n }\n\n protected abstract calculateResult(\n ctx: IfcExpressionContext\n ): E | ExprEvalError;\n\n public evaluate(\n ctx: IfcExpressionContext,\n localCtx: Map<string, any>\n ): ExprEvalResult<E> {\n try {\n const result = this.calculateResult(ctx);\n return this.wrapInResultIfNecessary(result);\n } catch (error) {\n return this.handleError(error);\n }\n }\n\n protected handleError(error: any): ExprEvalError {\n return new ExprEvalErrorObj(this.getKind(), ExprEvalStatus.ERROR, error);\n }\n}\n"]}
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Func = void 0;
|
|
4
4
|
const IfcExpressionFunctionConfigException_js_1 = require("./IfcExpressionFunctionConfigException.js");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const IfcExpressionUtils_js_1 = require("../../IfcExpressionUtils.js");
|
|
6
|
+
const ExprEvalResult_js_1 = require("../ExprEvalResult.js");
|
|
7
7
|
const ExprKind_js_1 = require("../ExprKind.js");
|
|
8
8
|
class Func {
|
|
9
9
|
constructor(name, args) {
|
|
10
10
|
this.name = name;
|
|
11
|
-
if ((0,
|
|
11
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(this.name)) {
|
|
12
12
|
throw new IfcExpressionFunctionConfigException_js_1.IfcExpressionFunctionConfigException("Function must have a name");
|
|
13
13
|
}
|
|
14
14
|
this.formalArguments = args;
|
|
@@ -16,13 +16,13 @@ class Func {
|
|
|
16
16
|
}
|
|
17
17
|
evaluate(funcArgs) {
|
|
18
18
|
const evaluatedArguments = this.getArgumentValues(funcArgs);
|
|
19
|
-
if ((0,
|
|
19
|
+
if ((0, ExprEvalResult_js_1.isExprEvalError)(evaluatedArguments)) {
|
|
20
20
|
return evaluatedArguments;
|
|
21
21
|
}
|
|
22
22
|
const argumentsReadyForUse = new Map();
|
|
23
23
|
for (const [argName, argValue] of evaluatedArguments.entries()) {
|
|
24
|
-
if ((0,
|
|
25
|
-
return new
|
|
24
|
+
if ((0, ExprEvalResult_js_1.isExprEvalError)(argValue)) {
|
|
25
|
+
return new ExprEvalResult_js_1.ExprEvalFunctionEvaluationConsequentialErrorObj(ExprKind_js_1.ExprKind.FUNCTION, this.name, argValue);
|
|
26
26
|
}
|
|
27
27
|
argumentsReadyForUse.set(argName, argValue.result);
|
|
28
28
|
}
|
|
@@ -46,7 +46,7 @@ class Func {
|
|
|
46
46
|
getArgumentValues(provided) {
|
|
47
47
|
const result = new Map();
|
|
48
48
|
const numProvided = provided.length;
|
|
49
|
-
if (!(0,
|
|
49
|
+
if (!(0, IfcExpressionUtils_js_1.isNullish)(this.formalArguments)) {
|
|
50
50
|
let j = 0;
|
|
51
51
|
for (let i = 0; i < this.formalArguments.length; i++) {
|
|
52
52
|
const currentArg = this.formalArguments[i];
|
|
@@ -55,10 +55,10 @@ class Func {
|
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
57
|
if (currentArg.hasDefaultValue()) {
|
|
58
|
-
result.set(currentArg.name, new
|
|
58
|
+
result.set(currentArg.name, new ExprEvalResult_js_1.ExprEvalSuccessObj(currentArg.defaultValue));
|
|
59
59
|
}
|
|
60
60
|
if (currentArg.required) {
|
|
61
|
-
return new
|
|
61
|
+
return new ExprEvalResult_js_1.ExprEvalMissingRequiredFunctionArgumentErrorObj(ExprKind_js_1.ExprKind.FUNCTION_ARGUMENTS, `Required argument ${currentArg.name}, expected at position ${i} (starting at 0), is missing`, this.name, currentArg.name, i);
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/function/Func.ts"],"names":[],"mappings":";;;AACA,uGAAiG;AACjG,
|
|
1
|
+
{"version":3,"sources":["../../src/expression/function/Func.ts"],"names":[],"mappings":"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","file":"expression/function/Func.js","sourcesContent":["import { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { IfcExpressionFunctionConfigException } from \"./IfcExpressionFunctionConfigException.js\";\nimport { isNullish } from \"../../IfcExpressionUtils.js\";\nimport { FuncArg } from \"./FuncArg.js\";\nimport {\n ExprEvalError,\n ExprEvalFunctionEvaluationConsequentialErrorObj,\n ExprEvalMissingRequiredFunctionArgumentErrorObj,\n ExprEvalResult,\n ExprEvalSuccessObj,\n isExprEvalError,\n} from \"../ExprEvalResult.js\";\nimport { ExprKind } from \"../ExprKind.js\";\n\nexport abstract class Func {\n protected name: string;\n protected formalArguments: Array<FuncArg<unknown>>;\n\n constructor(name: string, args: Array<FuncArg<unknown>>) {\n this.name = name;\n if (isNullish(this.name)) {\n throw new IfcExpressionFunctionConfigException(\n \"Function must have a name\"\n );\n }\n this.formalArguments = args;\n this.checkArgs(args);\n }\n\n public evaluate(\n funcArgs: Array<ExprEvalResult<LiteralValueAnyArity>>\n ): ExprEvalResult<LiteralValueAnyArity> {\n const evaluatedArguments = this.getArgumentValues(funcArgs);\n if (isExprEvalError(evaluatedArguments)) {\n return evaluatedArguments;\n }\n const argumentsReadyForUse = new Map<string, LiteralValueAnyArity>();\n for (const [argName, argValue] of evaluatedArguments.entries()) {\n if (isExprEvalError(argValue)) {\n return new ExprEvalFunctionEvaluationConsequentialErrorObj(\n ExprKind.FUNCTION,\n this.name,\n argValue\n );\n }\n argumentsReadyForUse.set(argName, argValue.result);\n }\n return this.calculateResult(argumentsReadyForUse);\n }\n\n /**\n * Subclasses must provide the funcation evaluation code here.\n * @param evaluatedArguments\n * @protected\n */\n protected abstract calculateResult(\n evaluatedArguments: Map<string, LiteralValueAnyArity>\n ): ExprEvalResult<LiteralValueAnyArity>;\n\n /**\n * Override to transform individual arguments if needed. After this step, if any of the ExprEvalResult objects in the\n * returned array is an ExprEvalError, the function evaluation fails.\n * @param evaluatedArguments\n * @protected\n */\n protected transformArguments(\n evaluatedArguments: Map<string, ExprEvalResult<LiteralValueAnyArity>>\n ): Map<string, ExprEvalResult<LiteralValueAnyArity>> {\n return evaluatedArguments;\n }\n\n /**\n * Gets the argument values from the list of provided arguments in the form of 'name' -> ExprEvalResult (which may contain errors).\n * Generates an error if a required value is missing.\n * @param provided\n * @protected\n */\n protected getArgumentValues(\n provided: Array<ExprEvalResult<LiteralValueAnyArity>>\n ): Map<string, ExprEvalResult<LiteralValueAnyArity>> | ExprEvalError {\n const result = new Map<string, ExprEvalResult<LiteralValueAnyArity>>();\n const numProvided = provided.length;\n if (!isNullish(this.formalArguments)) {\n let j = 0;\n for (let i = 0; i < this.formalArguments.length; i++) {\n const currentArg: FuncArg<unknown> = this.formalArguments[i];\n if (numProvided > i) {\n result.set(currentArg.name, currentArg.transformValue(provided[i]));\n } else {\n if (currentArg.hasDefaultValue()) {\n result.set(\n currentArg.name,\n new ExprEvalSuccessObj(\n currentArg.defaultValue as LiteralValueAnyArity\n )\n );\n }\n if (currentArg.required) {\n return new ExprEvalMissingRequiredFunctionArgumentErrorObj(\n ExprKind.FUNCTION_ARGUMENTS,\n `Required argument ${currentArg.name}, expected at position ${i} (starting at 0), is missing`,\n this.name,\n currentArg.name,\n i\n );\n }\n }\n }\n }\n const transformedArguments = this.transformArguments(result);\n return result;\n }\n\n private checkArgs(args: Array<FuncArg<unknown>>): void {\n if (!Array.isArray(this.formalArguments)) {\n throw new IfcExpressionFunctionConfigException(\n \"Formal function arguments is not an array\"\n );\n }\n let optionalArgsReached: boolean = false;\n const names = new Set<string>();\n for (let i = 0; i < this.formalArguments.length; i++) {\n if (names.has(this.formalArguments[i].name)) {\n throw new IfcExpressionFunctionConfigException(\n `Duplicate argument name '${this.formalArguments[i].name}'.`\n );\n }\n if (optionalArgsReached) {\n if (this.formalArguments[i].required) {\n throw new IfcExpressionFunctionConfigException(\n `Optional arguments must follow required ones. Argument '${this.formalArguments[i].name}' is required but follows an optional one`\n );\n }\n } else {\n if (!this.formalArguments[i].required) {\n optionalArgsReached = true;\n }\n }\n }\n }\n}\n"]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FuncArg = void 0;
|
|
4
|
-
const
|
|
4
|
+
const IfcExpressionUtils_js_1 = require("../../IfcExpressionUtils.js");
|
|
5
5
|
class FuncArg {
|
|
6
6
|
constructor(required, name, defaultValue) {
|
|
7
7
|
this._required = required;
|
|
@@ -26,7 +26,7 @@ class FuncArg {
|
|
|
26
26
|
return this._defaultValue;
|
|
27
27
|
}
|
|
28
28
|
hasDefaultValue() {
|
|
29
|
-
return !(0,
|
|
29
|
+
return !(0, IfcExpressionUtils_js_1.isNullish)(this._defaultValue);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
exports.FuncArg = FuncArg;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/function/FuncArg.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../src/expression/function/FuncArg.ts"],"names":[],"mappings":";;;AAEA,uEAAwD;AAExD,MAAa,OAAO;IAKlB,YAAY,QAAiB,EAAE,IAAY,EAAE,YAAgB;QAC3D,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACI,cAAc,CACnB,eAAqD;QAErD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,eAAe;QACb,OAAO,CAAC,IAAA,iCAAS,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;CACF;AArCD,0BAqCC","file":"expression/function/FuncArg.js","sourcesContent":["import { LiteralValueAnyArity } from \"../../value/LiteralValueAnyArity.js\";\nimport { ExprEvalResult } from \"../ExprEvalResult.js\";\nimport { isNullish } from \"../../IfcExpressionUtils.js\";\n\nexport class FuncArg<T> {\n protected _required: boolean;\n protected _name: string;\n protected _defaultValue?: T;\n\n constructor(required: boolean, name: string, defaultValue?: T) {\n this._required = required;\n this._name = name;\n this._defaultValue = defaultValue;\n }\n\n /**\n * For the value provided for a specific invocation of the function, return an appropriate result (maybe some kind of type conversion or type check might happen here)\n *\n * @param invocationValue\n */\n public transformValue(\n invocationValue: ExprEvalResult<LiteralValueAnyArity>\n ): ExprEvalResult<LiteralValueAnyArity> {\n return invocationValue;\n }\n\n get required(): boolean {\n return this._required;\n }\n\n get name(): string {\n return this._name;\n }\n\n get defaultValue(): T | undefined {\n return this._defaultValue;\n }\n\n hasDefaultValue(): boolean {\n return !isNullish(this._defaultValue);\n }\n}\n"]}
|
|
@@ -4,15 +4,15 @@ exports.FunctionExpr = void 0;
|
|
|
4
4
|
const ExprEvalResult_js_1 = require("../ExprEvalResult.js");
|
|
5
5
|
const ExprKind_js_1 = require("../ExprKind.js");
|
|
6
6
|
const Expr0_js_1 = require("../Expr0.js");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const IfcExpressionFunctions_js_1 = require("./IfcExpressionFunctions.js");
|
|
8
|
+
const IfcExpressionUtils_js_1 = require("../../IfcExpressionUtils.js");
|
|
9
9
|
class FunctionExpr extends Expr0_js_1.Expr0 {
|
|
10
10
|
constructor(name, elements) {
|
|
11
11
|
super(ExprKind_js_1.ExprKind.ARRAY);
|
|
12
12
|
this.name = name;
|
|
13
13
|
this.elements = elements;
|
|
14
|
-
this.functionImplementation =
|
|
15
|
-
if ((0,
|
|
14
|
+
this.functionImplementation = IfcExpressionFunctions_js_1.IfcExpressionFunctions.getFunction(this.name);
|
|
15
|
+
if ((0, IfcExpressionUtils_js_1.isNullish)(this.functionImplementation)) {
|
|
16
16
|
throw new Error(`No such function: ${this.name}`);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -22,7 +22,7 @@ class FunctionExpr extends Expr0_js_1.Expr0 {
|
|
|
22
22
|
const evalResult = this.elements[i].evaluate(ctx, localCtx);
|
|
23
23
|
functionArguments.push(evalResult);
|
|
24
24
|
}
|
|
25
|
-
const evaluationResult =
|
|
25
|
+
const evaluationResult = IfcExpressionFunctions_js_1.IfcExpressionFunctions.applyFunction(this.name, functionArguments);
|
|
26
26
|
if ((0, ExprEvalResult_js_1.isExprEvalSuccess)(evaluationResult)) {
|
|
27
27
|
return evaluationResult.result;
|
|
28
28
|
}
|