ifc-expressions 2.0.1-beta.7 → 2.0.1

package/dist/cjs/type/Types.js

@@ -39,6 +39,9 @@ class Types {
     static isBoolean(actualType) {
         return this.isType(actualType, Type.BOOLEAN);
     }
+    static isLogical(actualType) {
+        return this.isType(actualType, Type.LOGICAL);
+    }
     static isString(actualType) {
         return this.isType(actualType, Type.STRING);
     }
@@ -48,6 +51,9 @@ class Types {
     static boolean() {
         return Type.BOOLEAN;
     }
+    static logical() {
+        return Type.LOGICAL;
+    }
     static string() {
         return Type.STRING;
     }

package/dist/cjs/type/Types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/type/Types.ts"],"names":[],"mappings":"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","file":"type/Types.js","sourcesContent":["import { ExpressionTypeError } from \"../error/ExpressionTypeError.js\";\nimport { SimpleType } from \"./SimpleType.js\";\nimport { TypeDisjunction } from \"./TypeDisjunction.js\";\nimport { ExprType } from \"./ExprType.js\";\nimport { ArrayType } from \"./ArrayType.js\";\nimport { TupleType } from \"./TupleType.js\";\n\nexport class Type {\n  static readonly ANY = new SimpleType(\"any\");\n  static readonly NUMERIC = new SimpleType(\"numeric\");\n  static readonly STRING = new SimpleType(\"string\");\n  static readonly LOGICAL = new SimpleType(\"logical\");\n  static readonly BOOLEAN = new SimpleType(\"boolean\", Type.LOGICAL);\n  static readonly IFC_OBJECT_REF = new SimpleType(\"ifcObjectRef\");\n  static readonly IFC_ELEMENT_REF = new SimpleType(\n    \"ifcElementRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_PROPERTY_REF = new SimpleType(\n    \"ifcPropertyRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_PROPERTY_SET_REF = new SimpleType(\n    \"ifcPropertySetRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_TYPE_OBJECT_REF = new SimpleType(\n    \"ifcTypeObjectRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly ARRAY = new SimpleType(\"array\");\n}\n\nexport class Types {\n  public static or(...types: Array<ExprType>) {\n    const disjunction = new TypeDisjunction(...types);\n    if (disjunction.getTypes().length == 1) {\n      return disjunction.getTypes()[0];\n    }\n    return disjunction;\n  }\n  public static array(elementType: ExprType): ArrayType {\n    return new ArrayType(elementType);\n  }\n  public static tuple(...types: Array<ExprType>): TupleType {\n    return new TupleType(...types);\n  }\n  public static isNumeric(actualType: ExprType) {\n    return this.isType(actualType, Type.NUMERIC);\n  }\n  public static isBoolean(actualType: ExprType) {\n    return this.isType(actualType, Type.BOOLEAN);\n  }\n  public static isString(actualType: ExprType) {\n    return this.isType(actualType, Type.STRING);\n  }\n  public static isType(actualType: ExprType, type: ExprType) {\n    return actualType === type;\n  }\n  public static boolean() {\n    return Type.BOOLEAN;\n  }\n  public static string() {\n    return Type.STRING;\n  }\n  public static numeric() {\n    return Type.NUMERIC;\n  }\n  public static ifcObjectRef() {\n    return Type.IFC_OBJECT_REF;\n  }\n\n  public static requireIsAssignableFrom(\n    expectedType: ExprType,\n    actualType: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (!expectedType.isAssignableFrom(actualType)) {\n      throw exceptionProducer();\n    }\n  }\n\n  /**\n   * Requires overlap if actual is a disjunction, assignable from if it is a type\n   * @param expectedType\n   * @param actualType\n   * @param exceptionProducer\n   */\n  public static requireWeakIsAssignableFrom(\n    expectedType: ExprType,\n    actualType: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (expectedType.isAssignableFrom(actualType)) {\n      return;\n    }\n    if (actualType instanceof TypeDisjunction) {\n      if (expectedType.overlapsWith(actualType)) {\n        return;\n      }\n    }\n    if (actualType instanceof TupleType) {\n      const weakerType = Types.array(Types.or(...actualType.getTypes()));\n      if (expectedType.isAssignableFrom(weakerType)) {\n        return;\n      }\n    }\n    throw exceptionProducer();\n  }\n\n  static requireTypesOverlap(\n    actualType: ExprType,\n    actualType2: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (!actualType.overlapsWith(actualType2)) {\n      throw exceptionProducer();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/type/Types.ts"],"names":[],"mappings":"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","file":"type/Types.js","sourcesContent":["import { ExpressionTypeError } from \"../error/ExpressionTypeError.js\";\nimport { SimpleType } from \"./SimpleType.js\";\nimport { TypeDisjunction } from \"./TypeDisjunction.js\";\nimport { ExprType } from \"./ExprType.js\";\nimport { ArrayType } from \"./ArrayType.js\";\nimport { TupleType } from \"./TupleType.js\";\n\nexport class Type {\n  static readonly ANY = new SimpleType(\"any\");\n  static readonly NUMERIC = new SimpleType(\"numeric\");\n  static readonly STRING = new SimpleType(\"string\");\n  static readonly LOGICAL = new SimpleType(\"logical\");\n  static readonly BOOLEAN = new SimpleType(\"boolean\", Type.LOGICAL);\n  static readonly IFC_OBJECT_REF = new SimpleType(\"ifcObjectRef\");\n  static readonly IFC_ELEMENT_REF = new SimpleType(\n    \"ifcElementRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_PROPERTY_REF = new SimpleType(\n    \"ifcPropertyRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_PROPERTY_SET_REF = new SimpleType(\n    \"ifcPropertySetRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly IFC_TYPE_OBJECT_REF = new SimpleType(\n    \"ifcTypeObjectRef\",\n    Type.IFC_OBJECT_REF\n  );\n  static readonly ARRAY = new SimpleType(\"array\");\n}\n\nexport class Types {\n  public static or(...types: Array<ExprType>) {\n    const disjunction = new TypeDisjunction(...types);\n    if (disjunction.getTypes().length == 1) {\n      return disjunction.getTypes()[0];\n    }\n    return disjunction;\n  }\n  public static array(elementType: ExprType): ArrayType {\n    return new ArrayType(elementType);\n  }\n  public static tuple(...types: Array<ExprType>): TupleType {\n    return new TupleType(...types);\n  }\n  public static isNumeric(actualType: ExprType) {\n    return this.isType(actualType, Type.NUMERIC);\n  }\n  public static isBoolean(actualType: ExprType) {\n    return this.isType(actualType, Type.BOOLEAN);\n  }\n  public static isLogical(actualType: ExprType) {\n    return this.isType(actualType, Type.LOGICAL);\n  }\n  public static isString(actualType: ExprType) {\n    return this.isType(actualType, Type.STRING);\n  }\n  public static isType(actualType: ExprType, type: ExprType) {\n    return actualType === type;\n  }\n  public static boolean() {\n    return Type.BOOLEAN;\n  }\n  public static logical() {\n    return Type.LOGICAL;\n  }\n  public static string() {\n    return Type.STRING;\n  }\n  public static numeric() {\n    return Type.NUMERIC;\n  }\n  public static ifcObjectRef() {\n    return Type.IFC_OBJECT_REF;\n  }\n\n  public static requireIsAssignableFrom(\n    expectedType: ExprType,\n    actualType: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (!expectedType.isAssignableFrom(actualType)) {\n      throw exceptionProducer();\n    }\n  }\n\n  /**\n   * Requires overlap if actual is a disjunction, assignable from if it is a type\n   * @param expectedType\n   * @param actualType\n   * @param exceptionProducer\n   */\n  public static requireWeakIsAssignableFrom(\n    expectedType: ExprType,\n    actualType: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (expectedType.isAssignableFrom(actualType)) {\n      return;\n    }\n    if (actualType instanceof TypeDisjunction) {\n      if (expectedType.overlapsWith(actualType)) {\n        return;\n      }\n    }\n    if (actualType instanceof TupleType) {\n      const weakerType = Types.array(Types.or(...actualType.getTypes()));\n      if (expectedType.isAssignableFrom(weakerType)) {\n        return;\n      }\n    }\n    throw exceptionProducer();\n  }\n\n  static requireTypesOverlap(\n    actualType: ExprType,\n    actualType2: ExprType,\n    exceptionProducer: () => ExpressionTypeError\n  ) {\n    if (!actualType.overlapsWith(actualType2)) {\n      throw exceptionProducer();\n    }\n  }\n}\n"]}

package/dist/cjs/value/BooleanValue.js

@@ -2,12 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BooleanValue = void 0;
 const Types_js_1 = require("../type/Types.js");
+const LogicalValue_js_1 = require("./LogicalValue.js");
 class BooleanValue {
     constructor(value) {
         this.booleanValue = value;
     }
     static of(value) {
-        return new BooleanValue(value);
+        if (value === true) {
+            return this.TRUE_VALUE;
+        }
+        else if (value === false) {
+            return this.FALSE_VALUE;
+        }
+        throw new Error(`Cannot get boolean value of ${value}`);
     }
     getValue() {
         return this.booleanValue;
@@ -15,9 +22,20 @@ class BooleanValue {
     getType() {
         return Types_js_1.Type.BOOLEAN;
     }
-    equals(other) {
-        return (BooleanValue.isBooleanValueType(other) &&
-            other.booleanValue === this.booleanValue);
+    static true() {
+        return BooleanValue.of(true);
+    }
+    static false() {
+        return BooleanValue.of(false);
+    }
+    static isBoolean(val) {
+        return typeof val === "boolean";
+    }
+    isTrue() {
+        return this.booleanValue === true;
+    }
+    isFalse() {
+        return this.booleanValue === false;
     }
     compareTo(other) {
         return this.booleanValue ? (other.booleanValue ? 0 : 1) : -1;
@@ -28,6 +46,49 @@ class BooleanValue {
     static isBooleanValueType(arg) {
         return typeof arg.booleanValue === "boolean";
     }
+    and(other) {
+        if (other instanceof LogicalValue_js_1.LogicalValue) {
+            return other.and(this);
+        }
+        return BooleanValue.of(this.booleanValue && other.booleanValue);
+    }
+    or(other) {
+        if (other instanceof LogicalValue_js_1.LogicalValue) {
+            return other.or(this);
+        }
+        return BooleanValue.of(this.booleanValue || other.booleanValue);
+    }
+    xor(other) {
+        if (other instanceof LogicalValue_js_1.LogicalValue) {
+            return other.xor(this);
+        }
+        return BooleanValue.of(this.booleanValue != other.booleanValue);
+    }
+    implies(other) {
+        if (other instanceof LogicalValue_js_1.LogicalValue) {
+            if (other.isUnknown()) {
+                return (this.isFalse() ? LogicalValue_js_1.LogicalValue.true() : LogicalValue_js_1.LogicalValue.unknown());
+            }
+            else {
+                return LogicalValue_js_1.LogicalValue.of(!this.booleanValue || other.getValue());
+            }
+        }
+        return BooleanValue.of(!this.booleanValue || other.booleanValue);
+    }
+    not() {
+        return this.isTrue() ? BooleanValue.false() : BooleanValue.true();
+    }
+    equals(other) {
+        if (LogicalValue_js_1.LogicalValue.isLogicalValueType(other)) {
+            return this.booleanValue === other.getValue();
+        }
+        else if (BooleanValue.isBooleanValueType(other)) {
+            return this.booleanValue === other.booleanValue;
+        }
+        return false;
+    }
 }
 exports.BooleanValue = BooleanValue;
+BooleanValue.TRUE_VALUE = new BooleanValue(true);
+BooleanValue.FALSE_VALUE = new BooleanValue(false);
 //# sourceMappingURL=BooleanValue.js.map

package/dist/cjs/value/BooleanValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/value/BooleanValue.ts"],"names":[],"mappings":";;;AAGA,+CAAwC;AAExC,MAAa,YAAY;IAGvB,YAAY,KAAc;QACxB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,KAAc;QAC7B,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,OAAO;QACL,OAAO,eAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,KAAiB;QACtB,OAAO,CACL,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC;YACtC,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,CACzC,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,KAAmB;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,GAAQ;QAChC,OAAO,OAAO,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC;IAC/C,CAAC;CACF;AArCD,oCAqCC","file":"value/BooleanValue.js","sourcesContent":["import { Value } from \"./Value.js\";\nimport { Comparable } from \"./Comparable.js\";\nimport { ExprType } from \"../type/ExprType.js\";\nimport { Type } from \"../type/Types.js\";\n\nexport class BooleanValue implements Value<boolean>, Comparable<BooleanValue> {\n  private readonly booleanValue: boolean;\n\n  constructor(value: boolean) {\n    this.booleanValue = value;\n  }\n\n  public static of(value: boolean): BooleanValue {\n    return new BooleanValue(value);\n  }\n\n  getValue(): boolean {\n    return this.booleanValue;\n  }\n\n  getType(): ExprType {\n    return Type.BOOLEAN;\n  }\n\n  equals(other: Value<any>): boolean {\n    return (\n      BooleanValue.isBooleanValueType(other) &&\n      other.booleanValue === this.booleanValue\n    );\n  }\n\n  compareTo(other: BooleanValue): number {\n    return this.booleanValue ? (other.booleanValue ? 0 : 1) : -1;\n  }\n\n  toString(): string {\n    return this.booleanValue ? \"TRUE\" : \"FALSE\";\n  }\n\n  static isBooleanValueType(arg: any): arg is BooleanValueType {\n    return typeof arg.booleanValue === \"boolean\";\n  }\n}\n\nexport type BooleanValueType = {\n  booleanValue: boolean;\n};\n"]}
+{"version":3,"sources":["../../src/value/BooleanValue.ts"],"names":[],"mappings":"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","file":"value/BooleanValue.js","sourcesContent":["import { Value } from \"./Value.js\";\nimport { Comparable } from \"./Comparable.js\";\nimport { ExprType } from \"../type/ExprType.js\";\nimport { Type } from \"../type/Types.js\";\nimport { LogicalValue } from \"./LogicalValue\";\n\nexport class BooleanValue implements Value<boolean>, Comparable<BooleanValue> {\n  private readonly booleanValue: boolean;\n\n  private static readonly TRUE_VALUE = new BooleanValue(true);\n  private static readonly FALSE_VALUE = new BooleanValue(false);\n\n  private constructor(value: boolean) {\n    this.booleanValue = value;\n  }\n\n  public static of(value: boolean): BooleanValue {\n    if (value === true) {\n      return this.TRUE_VALUE;\n    } else if (value === false) {\n      return this.FALSE_VALUE;\n    }\n    throw new Error(`Cannot get boolean value of ${value}`);\n  }\n\n  getValue(): boolean {\n    return this.booleanValue;\n  }\n\n  getType(): ExprType {\n    return Type.BOOLEAN;\n  }\n\n  static true() {\n    return BooleanValue.of(true);\n  }\n\n  static false() {\n    return BooleanValue.of(false);\n  }\n\n  static isBoolean(val: any): val is boolean {\n    return typeof val === \"boolean\";\n  }\n\n  isTrue() {\n    return this.booleanValue === true;\n  }\n\n  isFalse() {\n    return this.booleanValue === false;\n  }\n\n  compareTo(other: BooleanValue): number {\n    return this.booleanValue ? (other.booleanValue ? 0 : 1) : -1;\n  }\n\n  toString(): string {\n    return this.booleanValue ? \"TRUE\" : \"FALSE\";\n  }\n\n  static isBooleanValueType(arg: any): arg is BooleanValueType {\n    return typeof arg.booleanValue === \"boolean\";\n  }\n\n  and<T extends LogicalValue | BooleanValue>(other: T): T {\n    if (other instanceof LogicalValue) {\n      return other.and(this) as T;\n    }\n    return BooleanValue.of(this.booleanValue && other.booleanValue) as T;\n  }\n\n  or<T extends LogicalValue | BooleanValue>(other: T): T {\n    if (other instanceof LogicalValue) {\n      return other.or(this) as T;\n    }\n    return BooleanValue.of(this.booleanValue || other.booleanValue) as T;\n  }\n\n  xor<T extends LogicalValue | BooleanValue>(other: T): T {\n    if (other instanceof LogicalValue) {\n      return other.xor(this) as T;\n    }\n    return BooleanValue.of(this.booleanValue != other.booleanValue) as T;\n  }\n\n  implies<T extends LogicalValue | BooleanValue>(other: T): T {\n    if (other instanceof LogicalValue) {\n      if (other.isUnknown()) {\n        return (\n          this.isFalse() ? LogicalValue.true() : LogicalValue.unknown()\n        ) as T;\n      } else {\n        return LogicalValue.of(!this.booleanValue || other.getValue()) as T;\n      }\n    }\n    return BooleanValue.of(!this.booleanValue || other.booleanValue) as T;\n  }\n\n  not(): BooleanValue {\n    return this.isTrue() ? BooleanValue.false() : BooleanValue.true();\n  }\n\n  equals(other: Value<any>): boolean {\n    if (LogicalValue.isLogicalValueType(other)) {\n      return this.booleanValue === other.getValue();\n    } else if (BooleanValue.isBooleanValueType(other)) {\n      return this.booleanValue === other.booleanValue;\n    }\n    return false;\n  }\n}\n\nexport type BooleanValueType = {\n  booleanValue: boolean;\n};\n"]}

package/dist/cjs/value/Logical.js

@@ -0,0 +1,2 @@
+
+//# sourceMappingURL=Logical.js.map

package/dist/cjs/value/Logical.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/value/Logical.ts"],"names":[],"mappings":"","file":"value/Logical.js","sourcesContent":[""]}

package/dist/cjs/value/LogicalValue.js

@@ -2,26 +2,126 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogicalValue = void 0;
 const Types_js_1 = require("../type/Types.js");
+const BooleanValue_js_1 = require("./BooleanValue.js");
 class LogicalValue {
     constructor(value) {
         this.logicalValue = value;
     }
+    static true() {
+        return this.LOGICAL_VALUE_TRUE;
+    }
+    static false() {
+        return this.LOGICAL_VALUE_FALSE;
+    }
+    static unknown() {
+        return this.LOGICAL_VALUE_UNKNOWN;
+    }
     static of(value) {
-        return new LogicalValue(value);
+        switch (value) {
+            case this.UNKNOWN_VALUE:
+                return this.LOGICAL_VALUE_UNKNOWN;
+            case false:
+                return this.LOGICAL_VALUE_FALSE;
+            case true:
+                return this.LOGICAL_VALUE_TRUE;
+        }
+        throw new Error(`Cannot get logical value of ${value}`);
     }
     getValue() {
         return this.logicalValue;
     }
+    isTrue() {
+        return this.logicalValue === true;
+    }
+    isFalse() {
+        return this.logicalValue === false;
+    }
+    isUnknown() {
+        return this.logicalValue === "UNKNOWN";
+    }
+    static isUnknown(val) {
+        return val === "UNKNOWN";
+    }
+    static isLogical(val) {
+        return typeof val === "boolean" || this.isUnknown(val);
+    }
+    and(other) {
+        const otherValue = other.getValue();
+        if (this.logicalValue === false || otherValue === false) {
+            return LogicalValue.false();
+        }
+        if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {
+            return LogicalValue.unknown();
+        }
+        return LogicalValue.true();
+    }
+    or(other) {
+        const otherValue = other.getValue();
+        if (this.logicalValue === true || otherValue === true) {
+            return LogicalValue.true();
+        }
+        if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {
+            return LogicalValue.unknown();
+        }
+        return LogicalValue.false();
+    }
+    xor(other) {
+        const otherValue = other.getValue();
+        if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {
+            return LogicalValue.unknown();
+        }
+        return LogicalValue.of(this.logicalValue !== other.getValue());
+    }
+    implies(other) {
+        const otherValue = other.getValue();
+        if (otherValue === true) {
+            return LogicalValue.true();
+        }
+        if (this.isUnknown()) {
+            return LogicalValue.unknown();
+        }
+        if (this.isFalse()) {
+            return LogicalValue.true();
+        }
+        return LogicalValue.of(otherValue);
+    }
+    not() {
+        switch (this.logicalValue) {
+            case LogicalValue.UNKNOWN_VALUE:
+                return LogicalValue.LOGICAL_VALUE_UNKNOWN;
+            case true:
+                return LogicalValue.LOGICAL_VALUE_FALSE;
+            case false:
+                return LogicalValue.LOGICAL_VALUE_TRUE;
+        }
+        throw new Error(`Cannot invert logical value ${this.logicalValue}`);
+    }
     equals(other) {
-        return (LogicalValue.isLogicalValueType(other) &&
-            other.logicalValue === this.logicalValue);
+        if (LogicalValue.isLogicalValueType(other)) {
+            return this.logicalValue === other.logicalValue;
+        }
+        else if (BooleanValue_js_1.BooleanValue.isBooleanValueType(other)) {
+            return this.logicalValue === other.booleanValue;
+        }
+        return false;
     }
     getType() {
         return Types_js_1.Type.LOGICAL;
     }
+    compareTo(other) {
+        switch (this.logicalValue) {
+            case true:
+                return other.isTrue() ? 0 : 1;
+            case false:
+                return other.isTrue() ? -1 : other.logicalValue === false ? 0 : 1;
+            case "UNKNOWN":
+                return other.isUnknown() ? 0 : -1;
+        }
+        throw new Error(`Unexpected logical value comparison: ${this.logicalValue} vs ${other.logicalValue}`);
+    }
     toString() {
-        return this.logicalValue === LogicalValue.UNKNOWN
-            ? "UNKNOWN"
+        return this.logicalValue === LogicalValue.UNKNOWN_VALUE
+            ? LogicalValue.UNKNOWN_VALUE
             : this.logicalValue
                 ? "TRUE"
                 : "FALSE";
@@ -29,9 +129,12 @@ class LogicalValue {
     static isLogicalValueType(arg) {
         return ((typeof arg.logicalValue !== "undefined" &&
             typeof arg.logicalValue === "boolean") ||
-            arg.logicalValue === LogicalValue.UNKNOWN);
+            arg.logicalValue === LogicalValue.UNKNOWN_VALUE);
     }
 }
 exports.LogicalValue = LogicalValue;
-LogicalValue.UNKNOWN = "UNKNOWN";
+LogicalValue.UNKNOWN_VALUE = "UNKNOWN";
+LogicalValue.LOGICAL_VALUE_TRUE = new LogicalValue(true);
+LogicalValue.LOGICAL_VALUE_FALSE = new LogicalValue(false);
+LogicalValue.LOGICAL_VALUE_UNKNOWN = new LogicalValue(LogicalValue.UNKNOWN_VALUE);
 //# sourceMappingURL=LogicalValue.js.map

package/dist/cjs/value/LogicalValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/value/LogicalValue.ts"],"names":[],"mappings":";;;AAEA,+CAAwC;AAExC,MAAa,YAAY;IAIvB,YAAY,KAA0B;QACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,KAA0B;QACzC,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,KAAiB;QACtB,OAAO,CACL,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC;YACtC,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,CACzC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,eAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC,OAAO;YAC/C,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,YAAY;gBACnB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,GAAQ;QACvC,OAAO,CACL,CAAC,OAAO,GAAG,CAAC,YAAY,KAAK,WAAW;YACtC,OAAO,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC;YACxC,GAAG,CAAC,YAAY,KAAK,YAAY,CAAC,OAAO,CAC1C,CAAC;IACJ,CAAC;;AAzCH,oCA0CC;AAzCwB,oBAAO,GAAG,SAAS,CAAC","file":"value/LogicalValue.js","sourcesContent":["import { Value } from \"./Value.js\";\nimport { ExprType } from \"../type/ExprType.js\";\nimport { Type } from \"../type/Types.js\";\n\nexport class LogicalValue implements Value<boolean | \"UNKNOWN\"> {\n  public static readonly UNKNOWN = \"UNKNOWN\";\n  private readonly logicalValue: boolean | \"UNKNOWN\";\n\n  constructor(value: boolean | \"UNKNOWN\") {\n    this.logicalValue = value;\n  }\n\n  public static of(value: boolean | \"UNKNOWN\"): LogicalValue {\n    return new LogicalValue(value);\n  }\n\n  getValue(): boolean | \"UNKNOWN\" {\n    return this.logicalValue;\n  }\n\n  equals(other: Value<any>): boolean {\n    return (\n      LogicalValue.isLogicalValueType(other) &&\n      other.logicalValue === this.logicalValue\n    );\n  }\n\n  getType(): ExprType {\n    return Type.LOGICAL;\n  }\n\n  toString(): string {\n    return this.logicalValue === LogicalValue.UNKNOWN\n      ? \"UNKNOWN\"\n      : this.logicalValue\n      ? \"TRUE\"\n      : \"FALSE\";\n  }\n\n  public static isLogicalValueType(arg: any): arg is LogicalValueType {\n    return (\n      (typeof arg.logicalValue !== \"undefined\" &&\n        typeof arg.logicalValue === \"boolean\") ||\n      arg.logicalValue === LogicalValue.UNKNOWN\n    );\n  }\n}\n\nexport type LogicalValueType = {\n  logicalValue: boolean | \"UNKNOWN\";\n};\n"]}
+{"version":3,"sources":["../../src/value/LogicalValue.ts"],"names":[],"mappings":"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","file":"value/LogicalValue.js","sourcesContent":["import { Value } from \"./Value.js\";\nimport { ExprType } from \"../type/ExprType.js\";\nimport { Type } from \"../type/Types.js\";\nimport { BooleanValue } from \"./BooleanValue\";\nimport { Comparable } from \"./Comparable\";\n\nexport type Logical = boolean | \"UNKNOWN\";\n\nexport class LogicalValue implements Value<Logical>, Comparable<LogicalValue> {\n  public static readonly UNKNOWN_VALUE = \"UNKNOWN\";\n  private readonly logicalValue: Logical;\n  private static readonly LOGICAL_VALUE_TRUE = new LogicalValue(true);\n  private static readonly LOGICAL_VALUE_FALSE = new LogicalValue(false);\n  private static readonly LOGICAL_VALUE_UNKNOWN = new LogicalValue(\n    LogicalValue.UNKNOWN_VALUE\n  );\n\n  private constructor(value: Logical) {\n    this.logicalValue = value;\n  }\n\n  public static true(): LogicalValue {\n    return this.LOGICAL_VALUE_TRUE;\n  }\n\n  public static false(): LogicalValue {\n    return this.LOGICAL_VALUE_FALSE;\n  }\n\n  public static unknown(): LogicalValue {\n    return this.LOGICAL_VALUE_UNKNOWN;\n  }\n\n  public static of(value: Logical): LogicalValue {\n    switch (value) {\n      case this.UNKNOWN_VALUE:\n        return this.LOGICAL_VALUE_UNKNOWN;\n      case false:\n        return this.LOGICAL_VALUE_FALSE;\n      case true:\n        return this.LOGICAL_VALUE_TRUE;\n    }\n    throw new Error(`Cannot get logical value of ${value}`);\n  }\n\n  getValue(): Logical {\n    return this.logicalValue;\n  }\n\n  isTrue(): boolean {\n    return this.logicalValue === true;\n  }\n\n  isFalse(): boolean {\n    return this.logicalValue === false;\n  }\n\n  isUnknown(): boolean {\n    return this.logicalValue === \"UNKNOWN\";\n  }\n\n  static isUnknown(val: any): boolean {\n    return val === \"UNKNOWN\";\n  }\n\n  static isLogical(val: any): val is Logical {\n    return typeof val === \"boolean\" || this.isUnknown(val);\n  }\n\n  and(other: LogicalValue | BooleanValue): LogicalValue {\n    const otherValue = other.getValue();\n    if (this.logicalValue === false || otherValue === false) {\n      return LogicalValue.false();\n    }\n    if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {\n      return LogicalValue.unknown();\n    }\n    return LogicalValue.true();\n  }\n\n  or(other: LogicalValue | BooleanValue): LogicalValue {\n    const otherValue = other.getValue();\n    if (this.logicalValue === true || otherValue === true) {\n      return LogicalValue.true();\n    }\n    if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {\n      return LogicalValue.unknown();\n    }\n    return LogicalValue.false();\n  }\n\n  xor(other: LogicalValue | BooleanValue): LogicalValue {\n    const otherValue = other.getValue();\n    if (this.isUnknown() || otherValue === LogicalValue.UNKNOWN_VALUE) {\n      return LogicalValue.unknown();\n    }\n    return LogicalValue.of(this.logicalValue !== other.getValue());\n  }\n\n  implies(other: LogicalValue | BooleanValue): LogicalValue {\n    const otherValue = other.getValue();\n    if (otherValue === true) {\n      return LogicalValue.true();\n    }\n    if (this.isUnknown()) {\n      return LogicalValue.unknown();\n    }\n    if (this.isFalse()) {\n      return LogicalValue.true();\n    }\n    return LogicalValue.of(otherValue);\n  }\n\n  public not(): LogicalValue {\n    switch (this.logicalValue) {\n      case LogicalValue.UNKNOWN_VALUE:\n        return LogicalValue.LOGICAL_VALUE_UNKNOWN;\n      case true:\n        return LogicalValue.LOGICAL_VALUE_FALSE;\n      case false:\n        return LogicalValue.LOGICAL_VALUE_TRUE;\n    }\n    throw new Error(`Cannot invert logical value ${this.logicalValue}`);\n  }\n\n  equals(other: Value<any>): boolean {\n    if (LogicalValue.isLogicalValueType(other)) {\n      return this.logicalValue === other.logicalValue;\n    } else if (BooleanValue.isBooleanValueType(other)) {\n      return this.logicalValue === other.booleanValue;\n    }\n    return false;\n  }\n\n  getType(): ExprType {\n    return Type.LOGICAL;\n  }\n\n  compareTo(other: LogicalValue): number {\n    switch (this.logicalValue) {\n      case true:\n        return other.isTrue() ? 0 : 1;\n      case false:\n        return other.isTrue() ? -1 : other.logicalValue === false ? 0 : 1;\n      case \"UNKNOWN\":\n        return other.isUnknown() ? 0 : -1;\n    }\n    throw new Error(\n      `Unexpected logical value comparison: ${this.logicalValue} vs ${other.logicalValue}`\n    );\n  }\n\n  toString(): string {\n    return this.logicalValue === LogicalValue.UNKNOWN_VALUE\n      ? LogicalValue.UNKNOWN_VALUE\n      : this.logicalValue\n      ? \"TRUE\"\n      : \"FALSE\";\n  }\n\n  public static isLogicalValueType(arg: any): arg is LogicalValue {\n    return (\n      (typeof arg.logicalValue !== \"undefined\" &&\n        typeof arg.logicalValue === \"boolean\") ||\n      arg.logicalValue === LogicalValue.UNKNOWN_VALUE\n    );\n  }\n}\n"]}

package/dist/compiler/ExprCompiler.d.ts

@@ -1,5 +1,5 @@
 import IfcExpressionVisitor from "../gen/parser/IfcExpressionVisitor.js";
-import { ArrayElementListContext, ArrayExprContext, BooleanLiteralContext, ExprContext, ExprListContext, FunctionCallContext, LiteralContext, MethodCallChainEndContext, MethodCallChainInnerContext, NumLiteralContext, SEAddSubContext, SEArrayExprContext, SEBooleanBinaryOpContext, SEComparisonContext, SEFunctionCallContext, SELiteralContext, SEMethodCallContext, SEMulDivContext, SENotContext, SEParenthesisContext, SEPowerContext, SEUnaryMinusContext, SEUnaryMultipleMinusContext, SEVariableRefContext, StringLiteralContext, VariableRefContext } from "../gen/parser/IfcExpressionParser.js";
+import { ArrayElementListContext, ArrayExprContext, BooleanLiteralContext, ExprContext, ExprListContext, FunctionCallContext, LiteralContext, LogicalLiteralContext, MethodCallChainEndContext, MethodCallChainInnerContext, NumLiteralContext, SEAddSubContext, SEArrayExprContext, SEBooleanBinaryOpContext, SEComparisonContext, SEFunctionCallContext, SELiteralContext, SEMethodCallContext, SEMulDivContext, SENotContext, SEParenthesisContext, SEPowerContext, SEUnaryMinusContext, SEUnaryMultipleMinusContext, SEVariableRefContext, StringLiteralContext, VariableRefContext } from "../gen/parser/IfcExpressionParser.js";
 import { Expr } from "../expression/Expr.js";
 import { TypeManager } from "./TypeManager.js";
 import { ExprManager } from "./ExprManager.js";
@@ -31,6 +31,7 @@ export declare class ExprCompiler extends IfcExpressionVisitor<Expr<any>> {
     visitSEUnaryMinus: (ctx: SEUnaryMinusContext) => Expr<any>;
     visitSEBooleanBinaryOp: (ctx: SEBooleanBinaryOpContext) => Expr<any>;
     visitBooleanLiteral: (ctx: BooleanLiteralContext) => Expr<any>;
+    visitLogicalLiteral: (ctx: LogicalLiteralContext) => Expr<any>;
     visitSENot: (ctx: SENotContext) => Expr<any>;
     visitArrayExpr: (ctx: ArrayExprContext) => Expr<any>;
     collectArrayElements: (ctx: ArrayElementListContext) => Array<Expr<any>>;

package/dist/compiler/IfcExpressionValidationListener.d.ts

@@ -1,5 +1,5 @@
 import IfcExpressionListener from "../gen/parser/IfcExpressionListener.js";
-import { ArrayElementListContext, ArrayExprContext, BooleanLiteralContext, ExprContext, ExprListContext, FunctionCallContext, LiteralContext, MethodCallChainEndContext, MethodCallChainInnerContext, NumLiteralContext, SEAddSubContext, SEArrayExprContext, SEBooleanBinaryOpContext, SEComparisonContext, SEFunctionCallContext, SELiteralContext, SEMethodCallContext, SEMulDivContext, SENotContext, SEParenthesisContext, SEPowerContext, SEUnaryMinusContext, SEUnaryMultipleMinusContext, SEVariableRefContext, StringLiteralContext, VariableRefContext } from "../gen/parser/IfcExpressionParser.js";
+import { ArrayElementListContext, ArrayExprContext, BooleanLiteralContext, ExprContext, ExprListContext, FunctionCallContext, LiteralContext, LogicalLiteralContext, MethodCallChainEndContext, MethodCallChainInnerContext, NumLiteralContext, SEAddSubContext, SEArrayExprContext, SEBooleanBinaryOpContext, SEComparisonContext, SEFunctionCallContext, SELiteralContext, SEMethodCallContext, SEMulDivContext, SENotContext, SEParenthesisContext, SEPowerContext, SEUnaryMinusContext, SEUnaryMultipleMinusContext, SEVariableRefContext, StringLiteralContext, VariableRefContext } from "../gen/parser/IfcExpressionParser.js";
 import { TypeManager } from "./TypeManager.js";
 export declare class IfcExpressionValidationListener extends IfcExpressionListener {
     private readonly typeManager;
@@ -16,6 +16,7 @@ export declare class IfcExpressionValidationListener extends IfcExpressionListen
     exitNumLiteral: (ctx: NumLiteralContext) => void;
     exitStringLiteral: (ctx: StringLiteralContext) => void;
     exitBooleanLiteral: (ctx: BooleanLiteralContext) => void;
+    exitLogicalLiteral: (ctx: LogicalLiteralContext) => void;
     exitExpr: (ctx: ExprContext) => void;
     exitSEMulDiv: (ctx: SEMulDivContext) => void;
     exitSEPower: (ctx: SEPowerContext) => void;

package/dist/compiler/TypeManager.d.ts

@@ -8,6 +8,8 @@ export declare class TypeManager {
     copyTypeFrom(ctx: ParserRuleContext, from: ParserRuleContext): void;
     requireString(ctx: ParserRuleContext): void;
     requireBoolean(ctx: ParserRuleContext): void;
+    requireLogicalOrBoolean(ctx: ParserRuleContext): void;
+    requireOneOf(ctx: ParserRuleContext, ...types: Array<ExprType>): void;
     requireNumeric(ctx: ParserRuleContext): void;
     requireTypesOverlap(ctxA: ParserRuleContext, ctxB: ParserRuleContext): void;
     isType(type: ExprType, ...ctxs: any[]): boolean;

package/dist/error/FunctionArgumentException.d.ts

@@ -0,0 +1,7 @@
+import { ValidationException } from "./ValidationException.js";
+export declare abstract class FunctionArgumentException extends ValidationException {
+    readonly functionName: string;
+    readonly argumentName: string;
+    readonly index: number;
+    constructor(message: string, functionName: string, argumentName: string, index: number, ctx: any);
+}

package/dist/error/MissingFunctionArgumentException.d.ts

@@ -1,7 +1,4 @@
-import { ValidationException } from "./ValidationException.js";
-export declare class MissingFunctionArgumentException extends ValidationException {
-    readonly functionName: string;
-    readonly argumentName: string;
-    readonly index: number;
-    constructor(functionName: string, argumentName: string, index: number, ctx: any);
+import { FunctionArgumentException } from "./FunctionArgumentException.js";
+export declare class MissingFunctionArgumentException extends FunctionArgumentException {
+    constructor(functionName: string, argumentName: string, index: number, ctx: any, message?: string);
 }

package/dist/error/SpuriousFunctionArgumentException.d.ts

@@ -0,0 +1,4 @@
+import { FunctionArgumentException } from "./FunctionArgumentException.js";
+export declare class SpuriousFunctionArgumentException extends FunctionArgumentException {
+    constructor(functionName: string, argumentName: string, index: number, ctx: any, message?: string);
+}

package/dist/error/mapper/MissingFunctionArgumentExceptionMapper.d.ts

@@ -1,6 +1,6 @@
 import { ExceptionToExprEvalErrorMapper } from "../ExceptionToExprEvalErrorMapper.js";
-import { ExprEvalValidationError } from "../../expression/ExprEvalResult.js";
+import { ExprEvalError } from "../../expression/ExprEvalResult.js";
 import { MissingFunctionArgumentException } from "../MissingFunctionArgumentException.js";
 export declare class MissingFunctionArgumentExceptionMapper implements ExceptionToExprEvalErrorMapper<MissingFunctionArgumentException> {
-    mapException(exception: MissingFunctionArgumentException): ExprEvalValidationError;
+    mapException(exception: MissingFunctionArgumentException): ExprEvalError;
 }

package/dist/error/mapper/SpuriousFunctionArgumentExceptionMapper.d.ts

@@ -0,0 +1,6 @@
+import { ExceptionToExprEvalErrorMapper } from "../ExceptionToExprEvalErrorMapper.js";
+import { ExprEvalError } from "../../expression/ExprEvalResult.js";
+import { SpuriousFunctionArgumentException } from "../SpuriousFunctionArgumentException.js";
+export declare class SpuriousFunctionArgumentExceptionMapper implements ExceptionToExprEvalErrorMapper<SpuriousFunctionArgumentException> {
+    mapException(exception: SpuriousFunctionArgumentException): ExprEvalError;
+}

package/dist/expression/ExprEvalResult.d.ts

@@ -20,7 +20,8 @@ export declare enum ExprEvalStatus {
     MISSING_OPERAND = 2084,
     MISSING_REQUIRED_FUNCTION_ARGUMENT = 2085,
     UNKNOWN_FUNCTION = 2086,
-    WRONG_FUNCTION_ARGUMENT_TYPE = 2088
+    WRONG_FUNCTION_ARGUMENT_TYPE = 2087,
+    SPURIOUS_FUNCTION_ARGUMENT = 2088
 }
 export declare function isExprEvalStatus(candidate: number): boolean;
 export type ExprEvalResult<T> = ExprEvalSuccess<T> | ExprEvalError;
@@ -138,7 +139,13 @@ export declare class ExprEvalUnknownFunctionErrorObj extends ExprEvalValidationE
     readonly functionName: string;
     constructor(message: any, functionName: any, textSpan: TextSpan);
 }
-export declare class ExprEvalMissingFunctionArgumentErrorObj extends ExprEvalValidationErrorObj {
+export declare class ExprEvalMissingFunctionArgumentErrorObj extends ExprEvalErrorObj {
+    readonly functionName: string;
+    readonly argumentName: string;
+    readonly argumentIndex: number;
+    constructor(message: any, functionName: string, argumentName: string, argumentIndex: number, textSpan: TextSpan);
+}
+export declare class ExprEvalSpuriousFunctionArgumentErrorObj extends ExprEvalErrorObj {
     readonly functionName: string;
     readonly argumentName: string;
     readonly argumentIndex: number;

package/dist/expression/ExprKind.d.ts

@@ -15,11 +15,12 @@ export declare enum ExprKind {
     REF_PROPERTY = "REF_PROPERTY",
     STR_CONCAT = "STR_CONCAT",
     STR_LITERAL = "STR_LITERAL",
-    BOOLEAN_AND = "BOOLEAN_AND",
-    BOOLEAN_OR = "BOOLEAN_OR",
-    BOOLEAN_XOR = "BOOLEAN_XOR",
-    BOOLEAN_NOT = "BOOLEAN_NOT",
+    AND = "AND",
+    OR = "OR",
+    XOR = "XOR",
+    NOT = "NOT",
     BOOLEAN_LITERAL = "BOOLEAN_LITERAL",
+    LOGICAL_LITERAL = "LOGICAL_LITERAL",
     CMP_EQUALS = "CMP_EQUALS",
     CMP_NOT_EQUALS = "CMP_NOT_EQUALS",
     CMP_LESS_THAN = "CMP_LESS_THAN",

package/dist/expression/boolean/AndExpr.d.ts

@@ -1,13 +1,9 @@
+import { BinaryBooleanOpExpr } from "./BinaryBooleanOpExpr.js";
 import { BooleanValue } from "../../value/BooleanValue.js";
-import { Expr2 } from "../Expr2.js";
+import { LogicalValue } from "../../value/LogicalValue.js";
 import { Expr } from "../Expr.js";
-import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
-import { ExprEvalError } from "../ExprEvalResult.js";
-import { ExprType } from "../../type/ExprType.js";
 import { ExprStringBuilder } from "../ExprStringBuilder.js";
-export declare class AndExpr extends Expr2<BooleanValue, BooleanValue, BooleanValue> {
-    constructor(left: Expr<BooleanValue>, right: Expr<BooleanValue>);
-    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftOperand: BooleanValue, rightOperand: BooleanValue): ExprEvalError | BooleanValue;
+export declare class AndExpr extends BinaryBooleanOpExpr {
+    constructor(left: Expr<BooleanValue | LogicalValue>, right: Expr<BooleanValue | LogicalValue>);
     protected buildExprString(builder: ExprStringBuilder): void;
-    getType(): ExprType;
 }

package/dist/expression/boolean/BinaryBooleanOpExpr.d.ts

@@ -0,0 +1,14 @@
+import { BooleanValue } from "../../value/BooleanValue.js";
+import { Expr2 } from "../Expr2.js";
+import { ExprKind } from "../ExprKind.js";
+import { Expr } from "../Expr.js";
+import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
+import { ExprEvalError } from "../ExprEvalResult.js";
+import { ExprType } from "../../type/ExprType.js";
+import { LogicalValue } from "../../value/LogicalValue.js";
+export declare abstract class BinaryBooleanOpExpr extends Expr2<BooleanValue | LogicalValue, BooleanValue | LogicalValue, BooleanValue | LogicalValue> {
+    private readonly method;
+    constructor(kind: ExprKind, method: string, left: Expr<BooleanValue | LogicalValue>, right: Expr<BooleanValue | LogicalValue>);
+    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftOperand: BooleanValue | LogicalValue, rightOperand: BooleanValue | LogicalValue): ExprEvalError | BooleanValue | LogicalValue;
+    getType(): ExprType;
+}

package/dist/expression/boolean/LogicalLiteralExpr.d.ts

@@ -0,0 +1,12 @@
+import { LiteralExpr } from "../LiteralExpr.js";
+import { ExprEvalError } from "../ExprEvalResult.js";
+import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
+import { ExprType } from "../../type/ExprType.js";
+import { ExprStringBuilder } from "../ExprStringBuilder.js";
+import { Logical, LogicalValue } from "../../value/LogicalValue.js";
+export declare class LogicalLiteralExpr extends LiteralExpr<Logical, LogicalValue> {
+    constructor(value: Logical);
+    protected calculateResult(ctx: IfcExpressionContext): ExprEvalError | LogicalValue;
+    protected buildExprString(builder: ExprStringBuilder): void;
+    getType(): ExprType;
+}

package/dist/expression/boolean/NotExpr.d.ts

@@ -5,9 +5,10 @@ import { ExprEvalError } from "../ExprEvalResult.js";
 import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
 import { ExprType } from "../../type/ExprType.js";
 import { ExprStringBuilder } from "../ExprStringBuilder.js";
-export declare class NotExpr extends Expr1<BooleanValue, BooleanValue> {
-    constructor(sub: Expr<BooleanValue>);
-    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, subExpressionResult: BooleanValue): ExprEvalError | BooleanValue;
+import { LogicalValue } from "../../value/LogicalValue.js";
+export declare class NotExpr extends Expr1<BooleanValue | LogicalValue, BooleanValue | LogicalValue> {
+    constructor(sub: Expr<BooleanValue | LogicalValue>);
+    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, subExpressionResult: BooleanValue | LogicalValue): ExprEvalError | BooleanValue | LogicalValue;
     protected buildExprString(builder: ExprStringBuilder): void;
     getType(): ExprType;
 }

package/dist/expression/boolean/OrExpr.d.ts

@@ -1,13 +1,9 @@
+import { BinaryBooleanOpExpr } from "./BinaryBooleanOpExpr.js";
 import { BooleanValue } from "../../value/BooleanValue.js";
-import { Expr2 } from "../Expr2.js";
+import { LogicalValue } from "../../value/LogicalValue.js";
 import { Expr } from "../Expr.js";
-import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
-import { ExprEvalError } from "../ExprEvalResult.js";
-import { ExprType } from "../../type/ExprType.js";
 import { ExprStringBuilder } from "../ExprStringBuilder.js";
-export declare class OrExpr extends Expr2<BooleanValue, BooleanValue, BooleanValue> {
-    constructor(left: Expr<BooleanValue>, right: Expr<BooleanValue>);
-    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftOperand: BooleanValue, rightOperand: BooleanValue): ExprEvalError | BooleanValue;
+export declare class OrExpr extends BinaryBooleanOpExpr {
+    constructor(left: Expr<BooleanValue | LogicalValue>, right: Expr<BooleanValue | LogicalValue>);
     protected buildExprString(builder: ExprStringBuilder): void;
-    getType(): ExprType;
 }

package/dist/expression/boolean/XorExpr.d.ts

@@ -1,13 +1,9 @@
+import { BinaryBooleanOpExpr } from "./BinaryBooleanOpExpr.js";
 import { BooleanValue } from "../../value/BooleanValue.js";
-import { Expr2 } from "../Expr2.js";
+import { LogicalValue } from "../../value/LogicalValue.js";
 import { Expr } from "../Expr.js";
-import { IfcExpressionContext } from "../../context/IfcExpressionContext.js";
-import { ExprEvalError } from "../ExprEvalResult.js";
-import { ExprType } from "../../type/ExprType.js";
 import { ExprStringBuilder } from "../ExprStringBuilder.js";
-export declare class XorExpr extends Expr2<BooleanValue, BooleanValue, BooleanValue> {
-    constructor(left: Expr<BooleanValue>, right: Expr<BooleanValue>);
-    protected calculateResult(ctx: IfcExpressionContext, localCtx: Map<string, any>, leftOperand: BooleanValue, rightOperand: BooleanValue): ExprEvalError | BooleanValue;
+export declare class XorExpr extends BinaryBooleanOpExpr {
+    constructor(left: Expr<BooleanValue | LogicalValue>, right: Expr<BooleanValue | LogicalValue>);
     protected buildExprString(builder: ExprStringBuilder): void;
-    getType(): ExprType;
 }

package/dist/expression/function/Func.d.ts

@@ -4,6 +4,7 @@ import { ExprEvalError, ExprEvalResult } from "../ExprEvalResult.js";
 import { ExprType } from "../../type/ExprType.js";
 import { ParserRuleContext } from "antlr4";
 import { FunctionExpr } from "./FunctionExpr.js";
+import { Expr } from "../Expr.js";
 export declare abstract class Func {
     protected name: string;
     protected formalArguments: Array<FuncArg<unknown>>;
@@ -25,7 +26,7 @@ export declare abstract class Func {
      * @param evaluatedArguments
      * @protected
      */
-    protected transformArguments(evaluatedArguments: Map<string, ExprEvalResult<ExpressionValue>>): Map<string, ExprEvalResult<ExpressionValue>>;
+    protected transformArguments(callingExpr: Expr<any>, evaluatedArguments: Map<string, ExprEvalResult<ExpressionValue>>): void;
     /**
      * Gets the argument values from the list of provided arguments in the form of 'name' -> ExprEvalResult (which may contain errors).
      * Generates an error if a required value is missing.

package/dist/expression/function/arg/FuncArgLogicalOrBoolean.d.ts

@@ -0,0 +1,12 @@
+import { FuncArgBase } from "./FuncArgBase.js";
+import { ExpressionValue } from "../../../value/ExpressionValue.js";
+import { ExprEvalResult, ExprEvalSuccess } from "../../ExprEvalResult.js";
+import { BooleanValue } from "../../../value/BooleanValue.js";
+import { ExprType } from "../../../type/ExprType.js";
+import { FunctionExpr } from "../FunctionExpr.js";
+import { LogicalValue } from "../../../value/LogicalValue.js";
+export declare class FuncArgLogicalOrBoolean extends FuncArgBase<BooleanValue | LogicalValue> {
+    constructor(required: boolean, name: string, defaultValue?: BooleanValue | LogicalValue);
+    getType(): ExprType;
+    protected transformForTypeCheck(callingExpr: FunctionExpr, invocationValue: ExprEvalSuccess<ExpressionValue>): ExprEvalResult<ExpressionValue>;
+}