@thatopen/components 2.4.3 → 2.4.4

package/dist/index.mjs

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 import * as THREE$1 from "three";
-import { BufferAttribute, Vector3, Plane, Line3, Vector2, Triangle, Sphere, Matrix4, Box3, BackSide, DoubleSide, FrontSide, Ray, Mesh, Object3D, MeshBasicMaterial, LineBasicMaterial, CylinderGeometry, BoxGeometry, BufferGeometry, Float32BufferAttribute, OctahedronGeometry, Line, TorusGeometry, SphereGeometry, Quaternion, Euler, PlaneGeometry, Raycaster } from "three";
+import { BufferAttribute, Vector3, Vector2, Plane, Line3, Triangle, Sphere, Matrix4, Box3, BackSide, DoubleSide, FrontSide, Mesh, Ray, Raycaster, Quaternion, Object3D, Euler, MeshBasicMaterial, LineBasicMaterial, CylinderGeometry, BoxGeometry, BufferGeometry, Float32BufferAttribute, OctahedronGeometry, Line, SphereGeometry, TorusGeometry, PlaneGeometry } from "three";
 import * as FRAGS from "@thatopen/fragments";
 import { FragmentsGroup, Serializer } from "@thatopen/fragments";
 import * as WEBIFC from "web-ifc";
@@ -6293,7 +6293,7 @@ const _Components = class _Components {
 /**
  * The version of the @thatopen/components library.
  */
-__publicField(_Components, "release", "2.4.3");
+__publicField(_Components, "release", "2.4.4");
 let Components = _Components;
 class SimpleWorld extends Base {
   constructor() {
@@ -21087,10 +21087,8 @@ function readDocType$1(xmlData, i) {
           i += 8;
         else if (hasBody && isNotation(xmlData, i))
           i += 9;
-        else if (isComment)
-          comment = true;
         else
-          throw new Error("Invalid DOCTYPE");
+          comment = true;
         angleBracketsCount++;
         exp = "";
       } else if (xmlData[i] === ">") {
@@ -21134,11 +21132,6 @@ function readEntityExp(xmlData, i) {
   }
   return [entityName2, val2, i];
 }
-function isComment(xmlData, i) {
-  if (xmlData[i + 1] === "!" && xmlData[i + 2] === "-" && xmlData[i + 3] === "-")
-    return true;
-  return false;
-}
 function isEntity(xmlData, i) {
   if (xmlData[i + 1] === "!" && xmlData[i + 2] === "E" && xmlData[i + 3] === "N" && xmlData[i + 4] === "T" && xmlData[i + 5] === "I" && xmlData[i + 6] === "T" && xmlData[i + 7] === "Y")
     return true;
@@ -23179,7 +23172,7 @@ ${users}
       Comment: CommentText,
       Viewpoint: Viewpoint2
     } = markupComment;
-    if (!(Guid && CommentDate && Author && (Comment || Viewpoint2)))
+    if (!(Guid && CommentDate && Author && Comment))
       return null;
     const viewpoints = this.components.get(Viewpoints);
     const comment = new Comment(this.components, CommentText ?? "");
@@ -27229,10 +27222,10 @@ class IDSFacet {
         let minPass = true;
         let maxPass = true;
         if (min !== void 0) {
-          minPass = minInclusive ? value <= min : value < min;
+          minPass = minInclusive ? value >= min : value > min;
         }
         if (max !== void 0) {
-          maxPass = maxInclusive ? value >= max : value > max;
+          maxPass = maxInclusive ? value <= max : value < max;
         }
         pass = minPass && maxPass;
       }
@@ -27957,16 +27950,15 @@ class IDSProperty extends IDSFacet {
       this.testResult.push(result2);
       const sets = await this.getPsets(model, expressID);
       const matchingSets = sets.filter((set) => {
-        var _a2;
         const result3 = this.evalRequirement(
-          ((_a2 = set.Name) == null ? void 0 : _a2.value) ?? null,
+          set.Name ?? null,
           this.propertySet,
           "PropertySet"
         );
         if (!result3)
           return false;
         checks.push({
-          currentValue: set.Name.value,
+          currentValue: set.Name,
           parameter: "PropertySet",
           pass: true,
           requiredValue: this.propertySet.parameter
@@ -27983,8 +27975,7 @@ class IDSProperty extends IDSFacet {
         continue;
       }
       for (const set of matchingSets) {
-        const itemsAttrName = this.getItemsAttrName(set.type);
-        if (!itemsAttrName) {
+        if (!("Properties" in set)) {
           checks.push({
             currentValue: null,
             parameter: "BaseName",
@@ -27993,7 +27984,7 @@ class IDSProperty extends IDSFacet {
           });
           continue;
         }
-        const items = set[itemsAttrName];
+        const items = set.Properties;
         const matchingItems = items.filter((item) => {
           var _a2;
           if (this._unsupportedTypes.includes(item.type)) {
@@ -28048,18 +28039,22 @@ class IDSProperty extends IDSFacet {
       (name) => name.endsWith("Value") || name.endsWith("Values")
     );
   }
-  async getPsetProps(model, attrs, propsListName) {
-    const attrsClone = structuredClone(attrs);
+  async simplifyPset(model, attrs, propsListName) {
+    var _a;
     const props = [];
-    const list = attrsClone[propsListName];
+    const list = attrs[propsListName];
     if (!list)
-      return props;
+      return attrs;
     for (const { value } of list) {
       const propAttrs = await model.getProperties(value);
       if (propAttrs)
         props.push(propAttrs);
     }
-    attrsClone[propsListName] = props;
+    const attrsClone = {
+      Name: (_a = attrs.Name) == null ? void 0 : _a.value,
+      Properties: props,
+      type: attrs.type
+    };
     return attrsClone;
   }
   async getTypePsets(model, expressID) {
@@ -28077,13 +28072,14 @@ class IDSProperty extends IDSFacet {
       if (!(psetAttrs && "HasProperties" in psetAttrs && Array.isArray(psetAttrs.HasProperties))) {
         continue;
       }
-      const pset = await this.getPsetProps(model, psetAttrs, "HasProperties");
+      const pset = await this.simplifyPset(model, psetAttrs, "HasProperties");
       sets.push(pset);
     }
     return sets;
   }
   async getPsets(model, expressID) {
-    const sets = await this.getTypePsets(model, expressID);
+    var _a;
+    const typePsets = await this.getTypePsets(model, expressID);
     const indexer = this.components.get(IfcRelationsIndexer);
     const definitions = indexer.getEntityRelations(
       model,
@@ -28091,7 +28087,8 @@ class IDSProperty extends IDSFacet {
       "IsDefinedBy"
     );
     if (!definitions)
-      return sets;
+      return typePsets;
+    const sets = [];
     for (const definitionID of definitions) {
       const attrs = await model.getProperties(definitionID);
       if (!attrs)
@@ -28099,8 +28096,25 @@ class IDSProperty extends IDSFacet {
       const propsListName = this.getItemsAttrName(attrs.type);
       if (!propsListName)
         continue;
-      const pset = await this.getPsetProps(model, attrs, propsListName);
-      sets.push(pset);
+      const occurencePset = await this.simplifyPset(
+        model,
+        attrs,
+        propsListName
+      );
+      const typePset = typePsets.find(
+        ({ Name }) => Name === occurencePset.Name
+      );
+      if (typePset) {
+        for (const prop of typePset.Properties) {
+          const name = (_a = prop.Name) == null ? void 0 : _a.value;
+          const existingProp = occurencePset.Properties.find(
+            ({ Name }) => Name.value === name
+          );
+          if (!existingProp)
+            occurencePset.Properties.push(prop);
+        }
+      }
+      sets.push(occurencePset);
     }
     return sets;
   }