ifc-expressions 0.2.2 → 0.3.0

package/dist/cjs/context/IfcElementAccessor.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcElementAccessor = void 0;
-const IfcRootObjectAccessor_1 = require("./IfcRootObjectAccessor");
-const StringValue_1 = require("../value/StringValue");
-const utils_1 = require("../utils");
-class IfcElementAccessor extends IfcRootObjectAccessor_1.IfcRootObjectAccessor {
+const IfcRootObjectAccessor_js_1 = require("./IfcRootObjectAccessor.js");
+const StringValue_js_1 = require("../value/StringValue.js");
+const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
+class IfcElementAccessor extends IfcRootObjectAccessor_js_1.IfcRootObjectAccessor {
     getNestedObjectAccessor(name) {
         if (name === "type") {
             return this.getTypeObjectAccessor();
         }
-        let val = this.getIfcPropertyAccessor(name);
-        if ((0, utils_1.notNullish)(val)) {
+        let val = this.getIfcPropertySetAccessor(name);
+        if ((0, IfcExpressionUtils_js_1.isPresent)(val)) {
             return val;
         }
-        return this.getIfcPropertySetAccessor(name);
+        return this.getIfcPropertyAccessor(name);
     }
     getAttribute(name) {
         switch (name) {
             case "ifcClass":
-                return new StringValue_1.StringValue(this.getIfcClass());
+                return new StringValue_js_1.StringValue(this.getIfcClass());
             default:
                 return super.getAttribute(name);
         }

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

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

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

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

package/dist/cjs/context/IfcPropertyAccessor.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcPropertyAccessor = void 0;
-const NamedObjectAccessor_1 = require("./NamedObjectAccessor");
-class IfcPropertyAccessor extends NamedObjectAccessor_1.NamedObjectAccessor {
+const NamedObjectAccessor_js_1 = require("./NamedObjectAccessor.js");
+class IfcPropertyAccessor extends NamedObjectAccessor_js_1.NamedObjectAccessor {
     getNestedObjectAccessor(name) {
         switch (name) {
             case "pset":

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

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

package/dist/cjs/context/IfcPropertySetAccessor.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcPropertySetAccessor = void 0;
-const IfcRootObjectAccessor_1 = require("./IfcRootObjectAccessor");
-class IfcPropertySetAccessor extends IfcRootObjectAccessor_1.IfcRootObjectAccessor {
+const IfcRootObjectAccessor_js_1 = require("./IfcRootObjectAccessor.js");
+class IfcPropertySetAccessor extends IfcRootObjectAccessor_js_1.IfcRootObjectAccessor {
     listAttributes() {
         return [...super.listAttributes(), ...this.listIfcProperties()];
     }

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

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

package/dist/cjs/context/IfcRootObjectAccessor.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcRootObjectAccessor = void 0;
-const NamedObjectAccessor_1 = require("./NamedObjectAccessor");
-const StringValue_1 = require("../value/StringValue");
-class IfcRootObjectAccessor extends NamedObjectAccessor_1.NamedObjectAccessor {
+const NamedObjectAccessor_js_1 = require("./NamedObjectAccessor.js");
+const StringValue_js_1 = require("../value/StringValue.js");
+class IfcRootObjectAccessor extends NamedObjectAccessor_js_1.NamedObjectAccessor {
     getAttribute(name) {
         switch (name) {
             case "guid":
-                return new StringValue_1.StringValue(this.getGuid());
+                return new StringValue_js_1.StringValue(this.getGuid());
         }
         return super.getAttribute(name);
     }

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

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

package/dist/cjs/context/IfcTypeObjectAccessor.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IfcTypeObjectAccessor = void 0;
-const IfcRootObjectAccessor_1 = require("./IfcRootObjectAccessor");
-const utils_1 = require("../utils");
-class IfcTypeObjectAccessor extends IfcRootObjectAccessor_1.IfcRootObjectAccessor {
+const IfcRootObjectAccessor_js_1 = require("./IfcRootObjectAccessor.js");
+const IfcExpressionUtils_js_1 = require("../IfcExpressionUtils.js");
+class IfcTypeObjectAccessor extends IfcRootObjectAccessor_js_1.IfcRootObjectAccessor {
     getNestedObjectAccessor(name) {
         let val = this.getIfcPropertyAccessor(name);
-        if ((0, utils_1.notNullish)(val)) {
+        if ((0, IfcExpressionUtils_js_1.isPresent)(val)) {
             return val;
         }
         return this.getIfcPropertySetAccessor(name);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/context/IfcTypeObjectAccessor.ts"],"names":[],"mappings":";;;AACA,mEAAgE;AAEhE,oCAAsC;AAGtC,MAAsB,qBAAsB,SAAQ,6CAAqB;IACvE,uBAAuB,CAAC,IAAY;QAClC,IAAI,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAA,kBAAU,EAAC,GAAG,CAAC,EAAE;YACnB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACrC,CAAC;CAYF;AA3BD,sDA2BC","file":"context/IfcTypeObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor\";\nimport { notNullish } from \"../utils\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor\";\n\nexport abstract class IfcTypeObjectAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    let val = this.getIfcPropertyAccessor(name);\n    if (notNullish(val)) {\n      return val;\n    }\n    return this.getIfcPropertySetAccessor(name);\n  }\n\n  listNestedObjects(): Array<string> {\n    return [...this.listIfcPropertyNames(), ...this.listIfcPropertySetNames()];\n  }\n\n  listAttributes(): Array<string> {\n    return [...super.listAttributes()];\n  }\n\n  protected abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract listIfcPropertySetNames(): Array<string>;\n  abstract listIfcPropertyNames(): Array<string>;\n}\n"]}
+{"version":3,"sources":["../../src/context/IfcTypeObjectAccessor.ts"],"names":[],"mappings":";;;AACA,yEAAmE;AAEnE,oEAAqD;AAGrD,MAAsB,qBAAsB,SAAQ,gDAAqB;IACvE,uBAAuB,CAAC,IAAY;QAClC,IAAI,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAA,iCAAS,EAAC,GAAG,CAAC,EAAE;YAClB,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IACrC,CAAC;CAYF;AA3BD,sDA2BC","file":"context/IfcTypeObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { IfcRootObjectAccessor } from \"./IfcRootObjectAccessor.js\";\nimport { IfcPropertySetAccessor } from \"./IfcPropertySetAccessor.js\";\nimport { isPresent } from \"../IfcExpressionUtils.js\";\nimport { IfcPropertyAccessor } from \"./IfcPropertyAccessor.js\";\n\nexport abstract class IfcTypeObjectAccessor extends IfcRootObjectAccessor {\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    let val = this.getIfcPropertyAccessor(name);\n    if (isPresent(val)) {\n      return val;\n    }\n    return this.getIfcPropertySetAccessor(name);\n  }\n\n  listNestedObjects(): Array<string> {\n    return [...this.listIfcPropertyNames(), ...this.listIfcPropertySetNames()];\n  }\n\n  listAttributes(): Array<string> {\n    return [...super.listAttributes()];\n  }\n\n  protected abstract getIfcPropertySetAccessor(\n    name: string\n  ): IfcPropertySetAccessor | undefined;\n\n  protected abstract getIfcPropertyAccessor(\n    name: string\n  ): IfcPropertyAccessor | undefined;\n\n  abstract listIfcPropertySetNames(): Array<string>;\n  abstract listIfcPropertyNames(): Array<string>;\n}\n"]}

package/dist/cjs/context/NamedObjectAccessor.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamedObjectAccessor = void 0;
-const StringValue_1 = require("../value/StringValue");
+const StringValue_js_1 = require("../value/StringValue.js");
 class NamedObjectAccessor {
     getAttribute(name) {
         switch (name) {
             case "name":
-                return new StringValue_1.StringValue(this.getName());
+                return new StringValue_js_1.StringValue(this.getName());
             case "description":
-                return new StringValue_1.StringValue(this.getDescription());
+                return new StringValue_js_1.StringValue(this.getDescription());
         }
         return undefined;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/context/NamedObjectAccessor.ts"],"names":[],"mappings":";;;AAEA,sDAAmD;AAEnD,MAAsB,mBAAmB;IAKvC,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,yBAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,KAAK,aAAa;gBAChB,OAAO,IAAI,yBAAW,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,uBAAuB,CAAC,IAAY;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iBAAiB;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA1BD,kDA0BC","file":"context/NamedObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity\";\nimport { StringValue } from \"../value/StringValue\";\n\nexport abstract class NamedObjectAccessor implements ObjectAccessor {\n  abstract getName(): string;\n\n  abstract getDescription(): string;\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"name\":\n        return new StringValue(this.getName());\n      case \"description\":\n        return new StringValue(this.getDescription());\n    }\n    return undefined;\n  }\n\n  listAttributes(): Array<string> {\n    return [\"name\", \"description\"];\n  }\n\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    return undefined;\n  }\n\n  listNestedObjects(): Array<string> {\n    return [];\n  }\n}\n"]}
+{"version":3,"sources":["../../src/context/NamedObjectAccessor.ts"],"names":[],"mappings":";;;AAEA,4DAAsD;AAEtD,MAAsB,mBAAmB;IAKvC,YAAY,CAAC,IAAY;QACvB,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM;gBACT,OAAO,IAAI,4BAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACzC,KAAK,aAAa;gBAChB,OAAO,IAAI,4BAAW,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;SACjD;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,uBAAuB,CAAC,IAAY;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iBAAiB;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA1BD,kDA0BC","file":"context/NamedObjectAccessor.js","sourcesContent":["import { ObjectAccessor } from \"./ObjectAccessor.js\";\nimport { LiteralValueAnyArity } from \"../value/LiteralValueAnyArity.js\";\nimport { StringValue } from \"../value/StringValue.js\";\n\nexport abstract class NamedObjectAccessor implements ObjectAccessor {\n  abstract getName(): string;\n\n  abstract getDescription(): string;\n\n  getAttribute(name: string): LiteralValueAnyArity | undefined {\n    switch (name) {\n      case \"name\":\n        return new StringValue(this.getName());\n      case \"description\":\n        return new StringValue(this.getDescription());\n    }\n    return undefined;\n  }\n\n  listAttributes(): Array<string> {\n    return [\"name\", \"description\"];\n  }\n\n  getNestedObjectAccessor(name: string): ObjectAccessor | undefined {\n    return undefined;\n  }\n\n  listNestedObjects(): Array<string> {\n    return [];\n  }\n}\n"]}

package/dist/cjs/context/ObjectAccessor.js

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

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

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

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

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

package/dist/cjs/expression/Expr0.js

@@ -1,8 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr0 = void 0;
-class Expr0 {
-    constructor() { }
+const ExprBase_1 = require("./ExprBase");
+const ExprEvalResult_1 = require("./ExprEvalResult");
+class Expr0 extends ExprBase_1.ExprBase {
+    constructor(kind) {
+        super(kind);
+    }
+    evaluate(ctx, localCtx) {
+        try {
+            const result = this.doEvaluate(ctx, localCtx);
+            return this.wrapInResultIfNecessary(result);
+        }
+        catch (error) {
+            return this.handleError(error);
+        }
+    }
+    handleError(error) {
+        return new ExprEvalResult_1.ExprEvalErrorObj(this.getKind(), ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr0 = Expr0;
 //# sourceMappingURL=Expr0.js.map

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

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

package/dist/cjs/expression/Expr1.js

@@ -1,10 +1,54 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr1 = void 0;
-class Expr1 {
-    constructor(value) {
+const ExprEvalResult_1 = require("./ExprEvalResult");
+const ExprBase_1 = require("./ExprBase");
+const IfcExpressionUtils_1 = require("../IfcExpressionUtils");
+class Expr1 extends ExprBase_1.ExprBase {
+    constructor(exprKind, value) {
+        super(exprKind);
         this.value = value;
     }
+    /**
+     * Override to generate a more specific error result.
+     * @param ctx
+     * @param localCtx
+     * @param subExpressionResult
+     * @protected
+     */
+    obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult) {
+        return new ExprEvalResult_1.ExprEvalConsequentialError1Obj(this.getKind(), subExpressionResult);
+    }
+    // calculate the final result
+    makeErrorOrCalculate(ctx, localCtx, subExpressionResult) {
+        if ((0, ExprEvalResult_1.isExprEvalError)(subExpressionResult)) {
+            return this.obtainResultForSubExpressionError(ctx, localCtx, subExpressionResult);
+        }
+        return this.wrapInResultIfNecessary(this.calculateResult(ctx, localCtx, subExpressionResult.result));
+    }
+    onBeforeRecusion(ctx, localCtx) {
+        // do something before we calculate the subresult
+        return undefined;
+    }
+    evaluate(ctx, localCtx) {
+        const beforeRecursionError = this.onBeforeRecusion(ctx, localCtx);
+        if (!(0, IfcExpressionUtils_1.isNullish)(beforeRecursionError)) {
+            return beforeRecursionError;
+        }
+        const subResult = this.value.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(subResult)) {
+            return new ExprEvalResult_1.ExprEvalError1Obj(this.getKind(), new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.value.getKind()), ExprEvalResult_1.ExprEvalStatus.MISSING_OPERAND);
+        }
+        try {
+            return this.makeErrorOrCalculate(ctx, localCtx, subResult);
+        }
+        catch (error) {
+            return this.handleError(error, subResult);
+        }
+    }
+    handleError(error, subResult) {
+        return new ExprEvalResult_1.ExprEvalError1Obj(this.getKind(), subResult, ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr1 = Expr1;
 //# sourceMappingURL=Expr1.js.map

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

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

package/dist/cjs/expression/Expr2.js

@@ -1,11 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expr2 = void 0;
-class Expr2 {
-    constructor(left, right) {
+const ExprBase_1 = require("./ExprBase");
+const ExprEvalResult_1 = require("./ExprEvalResult");
+const IfcExpressionUtils_1 = require("../IfcExpressionUtils");
+class Expr2 extends ExprBase_1.ExprBase {
+    constructor(exprKind, left, right) {
+        super(exprKind);
         this.left = left;
         this.right = right;
     }
+    onBeforeRecursion(ctx, localCtx) {
+        // override if subclass needs to do something before recursing
+    }
+    onAfterLeftRecursion(ctx, localCtx, leftResult) {
+        // override if subclass needs to do something with the left result, such as put it in the local context
+    }
+    evaluate(ctx, localCtx) {
+        this.onBeforeRecursion(ctx, localCtx);
+        const leftResult = this.left.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(leftResult)) {
+            return new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.left.getKind());
+        }
+        if ((0, ExprEvalResult_1.isExprEvalError)(leftResult)) {
+            return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);
+        }
+        this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);
+        const rightResult = this.right.evaluate(ctx, localCtx);
+        if ((0, IfcExpressionUtils_1.isNullish)(rightResult)) {
+            return new ExprEvalResult_1.ExprEvalErrorUndefinedResult(this.right.getKind());
+        }
+        if ((0, ExprEvalResult_1.isExprEvalSuccess)(rightResult)) {
+            try {
+                const result = this.calculateResult(ctx, localCtx, leftResult.result, rightResult.result);
+                return this.wrapInResultIfNecessary(result);
+            }
+            catch (error) {
+                return this.handleError(error, leftResult, rightResult);
+            }
+        }
+        else {
+            return this.makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult);
+        }
+    }
+    makeResultForRightSubExprError(ctx, localCtx, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalConsequentialError2Obj(this.getKind(), leftResult, rightResult);
+    }
+    makeErrorForLeftSubExprError(ctx, localCtx, leftResult) {
+        return new ExprEvalResult_1.ExprEvalConsequentialError1Obj(this.getKind(), leftResult, "Cannot evaluate attribute reference");
+    }
+    handleError(error, leftResult, rightResult) {
+        return new ExprEvalResult_1.ExprEvalError2Obj(this.getKind(), leftResult, rightResult, ExprEvalResult_1.ExprEvalStatus.ERROR, error);
+    }
 }
 exports.Expr2 = Expr2;
 //# sourceMappingURL=Expr2.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AAGA,MAAsB,KAAK;IAIzB,YAAsB,IAAO,EAAE,KAAQ;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CAGF;AAVD,sBAUC","file":"expression/Expr2.js","sourcesContent":["import { Expr } from \"./Expr\";\nimport { IfcExpressionContext } from \"../context/IfcExpressionContext\";\n\nexport abstract class Expr2<L, R, E> implements Expr<E> {\n  readonly left: L;\n  readonly right: R;\n\n  protected constructor(left: L, right: R) {\n    this.left = left;\n    this.right = right;\n  }\n\n  abstract evaluate(ctx: IfcExpressionContext): E;\n}\n"]}
+{"version":3,"sources":["../../src/expression/Expr2.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AAEtC,qDAU0B;AAC1B,8DAAkD;AAGlD,MAAsB,KAAe,SAAQ,mBAAW;IAItD,YAAsB,QAAkB,EAAE,IAAa,EAAE,KAAc;QACrE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IASS,iBAAiB,CACzB,GAAyB,EACzB,QAA0B;QAE1B,8DAA8D;IAChE,CAAC;IAES,oBAAoB,CAC5B,GAAyB,EACzB,QAA0B,EAC1B,UAAa;QAEb,uGAAuG;IACzG,CAAC;IAEM,QAAQ,CACb,GAAyB,EACzB,QAA0B;QAE1B,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,IAAA,8BAAS,EAAC,UAAU,CAAC,EAAE;YACzB,OAAO,IAAI,6CAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;SAC9D;QACD,IAAI,IAAA,gCAAe,EAAC,UAAU,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACrE;QACD,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAA,8BAAS,EAAC,WAAW,CAAC,EAAE;YAC1B,OAAO,IAAI,6CAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SAC/D;QACD,IAAI,IAAA,kCAAiB,EAAC,WAAW,CAAC,EAAE;YAClC,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CACjC,GAAG,EACH,QAAQ,EACR,UAAU,CAAC,MAAM,EACjB,WAAW,CAAC,MAAM,CACnB,CAAC;gBACF,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;aAC7C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;aACzD;SACF;aAAM;YACL,OAAO,IAAI,CAAC,8BAA8B,CACxC,GAAG,EACH,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAES,8BAA8B,CACtC,GAAyB,EACzB,QAA0B,EAC1B,UAA6B,EAC7B,WAA0B;QAE1B,OAAO,IAAI,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC;IAES,4BAA4B,CACpC,GAAyB,EACzB,QAA0B,EAC1B,UAAyB;QAEzB,OAAO,IAAI,+CAA8B,CACvC,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,qCAAqC,CACtC,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAU,EACV,UAA6B,EAC7B,WAA8B;QAE9B,OAAO,IAAI,kCAAiB,CAC1B,IAAI,CAAC,OAAO,EAAE,EACd,UAAU,EACV,WAAW,EACX,+BAAc,CAAC,KAAK,EACpB,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA7GD,sBA6GC","file":"expression/Expr2.js","sourcesContent":["import { IfcExpressionContext } from \"../context/IfcExpressionContext.js\";\nimport { ExprBase } from \"./ExprBase\";\nimport { ExprKind } from \"./ExprKind\";\nimport {\n  ExprEvalConsequentialError1Obj,\n  ExprEvalConsequentialError2Obj,\n  ExprEvalError,\n  ExprEvalError2Obj,\n  ExprEvalErrorUndefinedResult,\n  ExprEvalResult,\n  ExprEvalStatus,\n  isExprEvalError,\n  isExprEvalSuccess,\n} from \"./ExprEvalResult\";\nimport { isNullish } from \"../IfcExpressionUtils\";\nimport { Expr } from \"./Expr\";\n\nexport abstract class Expr2<L, R, E> extends ExprBase<E> {\n  readonly left: Expr<L>;\n  readonly right: Expr<R>;\n\n  protected constructor(exprKind: ExprKind, left: Expr<L>, right: Expr<R>) {\n    super(exprKind);\n    this.left = left;\n    this.right = right;\n  }\n\n  protected abstract calculateResult(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftOperand: L,\n    rightOperand: R\n  ): E | ExprEvalError;\n\n  protected onBeforeRecursion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ) {\n    // override if subclass needs to do something before recursing\n  }\n\n  protected onAfterLeftRecursion(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: L\n  ) {\n    // override if subclass needs to do something with the left result, such as put it in the local context\n  }\n\n  public evaluate(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>\n  ): ExprEvalResult<E> {\n    this.onBeforeRecursion(ctx, localCtx);\n    const leftResult = this.left.evaluate(ctx, localCtx);\n    if (isNullish(leftResult)) {\n      return new ExprEvalErrorUndefinedResult(this.left.getKind());\n    }\n    if (isExprEvalError(leftResult)) {\n      return this.makeErrorForLeftSubExprError(ctx, localCtx, leftResult);\n    }\n    this.onAfterLeftRecursion(ctx, localCtx, leftResult.result);\n    const rightResult = this.right.evaluate(ctx, localCtx);\n    if (isNullish(rightResult)) {\n      return new ExprEvalErrorUndefinedResult(this.right.getKind());\n    }\n    if (isExprEvalSuccess(rightResult)) {\n      try {\n        const result = this.calculateResult(\n          ctx,\n          localCtx,\n          leftResult.result,\n          rightResult.result\n        );\n        return this.wrapInResultIfNecessary(result);\n      } catch (error) {\n        return this.handleError(error, leftResult, rightResult);\n      }\n    } else {\n      return this.makeResultForRightSubExprError(\n        ctx,\n        localCtx,\n        leftResult,\n        rightResult\n      );\n    }\n  }\n\n  protected makeResultForRightSubExprError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ExprEvalResult<L>,\n    rightResult: ExprEvalError\n  ): ExprEvalResult<E> {\n    return new ExprEvalConsequentialError2Obj(\n      this.getKind(),\n      leftResult,\n      rightResult\n    );\n  }\n\n  protected makeErrorForLeftSubExprError(\n    ctx: IfcExpressionContext,\n    localCtx: Map<string, any>,\n    leftResult: ExprEvalError\n  ): ExprEvalError {\n    return new ExprEvalConsequentialError1Obj(\n      this.getKind(),\n      leftResult,\n      \"Cannot evaluate attribute reference\"\n    );\n  }\n\n  protected handleError(\n    error: any,\n    leftResult: ExprEvalResult<L>,\n    rightResult: ExprEvalResult<R>\n  ): ExprEvalError {\n    return new ExprEvalError2Obj(\n      this.getKind(),\n      leftResult,\n      rightResult,\n      ExprEvalStatus.ERROR,\n      error\n    );\n  }\n}\n"]}

package/dist/cjs/expression/Expr2LeftBeforeRight.js

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

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

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

package/dist/cjs/expression/ExprBase.js

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

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

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