@thatopen/components 3.1.6 → 3.2.1

package/dist/index.mjs

@@ -105,6 +105,10 @@ class Base {
     __publicField(this, "isConfigurable", () => {
       return "setup" in this && "config" in this && "onSetup" in this;
     });
+    /** Whether is component is {@link Serializable}. */
+    __publicField(this, "isSerializable", () => {
+      return "import" in this && "export" in this;
+    });
     this.components = components;
   }
 }
@@ -3157,6 +3161,7 @@ const _FragmentsManager = class _FragmentsManager extends Component {
     super(components);
     /** {@link Disposable.onDisposed} */
     __publicField(this, "onDisposed", new Event());
+    __publicField(this, "onBeforeDispose", new Event());
     /**
      * Event triggered when fragments are loaded.
      */
@@ -3165,10 +3170,12 @@ const _FragmentsManager = class _FragmentsManager extends Component {
     __publicField(this, "baseCoordinationMatrix", new THREE$1.Matrix4());
     /** {@link Component.enabled} */
     __publicField(this, "enabled", true);
-    __publicField(this, "initialized", false);
     __publicField(this, "_core");
     this.components.add(_FragmentsManager.uuid, this);
   }
+  get initialized() {
+    return !!this._core;
+  }
   /**
    * Map containing all loaded fragment models.
    * The key is the group's unique identifier, and the value is the model itself.
@@ -3182,8 +3189,12 @@ const _FragmentsManager = class _FragmentsManager extends Component {
     }
     return this._core;
   }
+  get _hasCoordinationModel() {
+    return this.baseCoordinationModel !== "";
+  }
   /** {@link Disposable.dispose} */
   dispose() {
+    this.onBeforeDispose.trigger();
     if (this._core) {
       this.core.dispose();
       this._core = void 0;
@@ -3195,12 +3206,14 @@ const _FragmentsManager = class _FragmentsManager extends Component {
   }
   init(workerURL) {
     this._core = new FragmentsModels(workerURL);
-    this.initialized = true;
-    this.core.onModelLoaded.add(async (model) => {
-      if (this.list.size !== 1)
+    this.core.onModelLoaded.add(async () => {
+      if (this._hasCoordinationModel)
         return;
-      this.baseCoordinationModel = model.modelId;
-      this.baseCoordinationMatrix = await model.getCoordinationMatrix();
+      const firstModel = [...this.list.values()][0];
+      if (!firstModel)
+        return;
+      this.baseCoordinationModel = firstModel.modelId;
+      this.baseCoordinationMatrix = await firstModel.getCoordinationMatrix();
     });
     this.list.onItemDeleted.add(() => {
       if (this.list.size > 0)
@@ -3875,7 +3888,7 @@ __publicField(_BoundingBoxer, "uuid", "d1444724-dba6-4cdd-a0c7-68ee1450d166");
 let BoundingBoxer = _BoundingBoxer;
 class FinderQuery {
   constructor(components, queries) {
-    __publicField(this, "description");
+    __publicField(this, "customData", {});
     __publicField(this, "_components");
     __publicField(this, "_queries", []);
     __publicField(this, "_aggregation", "exclusive");
@@ -3998,9 +4011,11 @@ class FinderQuery {
    * @returns A `SerializedFinderQuery` object representing the serialized query.
    */
   toJSON() {
+    const manager = this._components.get(ItemsFinder);
+    const name = manager.list.getKey(this) ?? "Finder Query";
     const result = {
-      name: "Finder Query",
-      description: this.description,
+      name,
+      customData: this.customData,
       queries: this.queries.map(this.serializeQueryParameters),
       aggregation: this.aggregation,
       cache: this.cache
@@ -4032,7 +4047,7 @@ class FinderQuery {
    * @returns A `FinderQuery` instance.
    */
   fromJSON(data) {
-    this.description = data.description;
+    this.customData = data.customData;
     this.aggregation = data.aggregation;
     this.cache = data.cache;
     this.queries = data.queries.map(this.deserializeQueryParameters);
@@ -4132,9 +4147,9 @@ const _ItemsFinder = class _ItemsFinder extends Component {
     if (!data)
       return instances;
     for (const value of data) {
-      const { name, description, queries, aggregation, cache } = value;
+      const { name, customData, queries, aggregation, cache } = value;
       const finderQuery = this.create(name, []);
-      finderQuery.fromJSON({ description, queries, aggregation, cache });
+      finderQuery.fromJSON({ customData, queries, aggregation, cache });
       instances.push(finderQuery);
     }
     return instances;
@@ -15876,21 +15891,6 @@ ${users}
       const viewpoint = new Viewpoint(this.components, bcfViewpoint);
       createdViewpoints.push(viewpoint);
     }
-    const getNameWithoutExtension = (name) => {
-      const partsBySlash = name.split("/");
-      const partsByDot = partsBySlash[partsBySlash.length - 1].split(".");
-      partsByDot.pop();
-      return partsByDot.join(".");
-    };
-    const snapshotFiles = files.filter(
-      (file) => file.name.endsWith(".png") || file.name.endsWith(".jpeg")
-    );
-    for (const file of snapshotFiles) {
-      const name = getNameWithoutExtension(file.name);
-      const buffer = await file.async("arraybuffer");
-      const bytes = new Uint8Array(buffer);
-      viewpoints.snapshots.set(name, bytes);
-    }
     const topicRelations = {};
     const topics = [];
     const markupFiles = files.filter((file) => file.name.endsWith(".bcf"));
@@ -15939,12 +15939,16 @@ ${users}
         if (!(markupViewpoint && markupViewpoint.Guid))
           continue;
         const viewpoint = viewpoints.list.get(markupViewpoint.Guid);
-        if (viewpoint) {
-          topic.viewpoints.add(viewpoint.guid);
-          const snapshotName = getNameWithoutExtension(
-            markupViewpoint.Snapshot
-          );
-          viewpoint.snapshot = snapshotName ?? null;
+        if (!viewpoint)
+          continue;
+        topic.viewpoints.add(viewpoint.guid);
+        const snapshotName = `${topic.guid}/${markupViewpoint.Snapshot}`;
+        const snapshotFile = files.find(({ name }) => name === snapshotName);
+        if (snapshotFile) {
+          const buffer = await snapshotFile.async("arraybuffer");
+          const bytes = new Uint8Array(buffer);
+          viewpoints.snapshots.set(viewpoint.guid, bytes);
+          viewpoint.snapshot = viewpoint.guid ?? null;
         }
       }
       const markupDocReferences = this.getMarkupDocumentReferences(
@@ -18477,21 +18481,21 @@ ${colorTags}
     </CameraUpVector>`;
     const cameraRatioXML = `<AspectRatio>${this.camera.aspect_ratio}</AspectRatio>`;
     let cameraXML = "";
-    if ("viewToWorld" in this.camera) {
+    if ("view_to_world_scale" in this.camera) {
       cameraXML = `<OrthogonalCamera>
         ${cameraViewpointXML}
         ${cameraDirectionXML}
         ${cameraUpVectorXML}
         ${cameraRatioXML}
-        <ViewToWorldScale>${this.camera.viewToWorld}</ViewToWorldScale>
+        <ViewToWorldScale>${this.camera.view_to_world_scale}</ViewToWorldScale>
       </OrthogonalCamera>`;
-    } else if ("fov" in this.camera) {
+    } else if ("field_of_view" in this.camera) {
       cameraXML = `<PerspectiveCamera>
         ${cameraViewpointXML}
         ${cameraDirectionXML}
         ${cameraUpVectorXML}
         ${cameraRatioXML}
-        <FieldOfView>${this.camera.fov}</FieldOfView>
+        <FieldOfView>${this.camera.field_of_view}</FieldOfView>
       </PerspectiveCamera>`;
     }
     const viewSetupHints = `<ViewSetupHints SpacesVisible="${this.spacesVisible ?? false}" SpaceBoundariesVisible="${this.spaceBoundariesVisible ?? false}" OpeningsVisible="${this.openingsVisible ?? false}" />`;
@@ -20777,7 +20781,7 @@ class IDSSpecification {
     return xml;
   }
 }
-const getParameterValue = (property) => {
+const getParameterValue = (property, parseNumericString = true) => {
   if (!property)
     return void 0;
   const result = {};
@@ -20795,7 +20799,7 @@ const getParameterValue = (property) => {
     if ("enumeration" in restriction) {
       result.type = "enumeration";
       const enumeration = restriction.enumeration.map(
-        ({ value }) => value
+        ({ value }) => parseNumericString ? value : String(value)
       );
       result.parameter = enumeration;
     }
@@ -20889,19 +20893,19 @@ const createMaterialFacets = (components, elements) => {
   }
   return facets;
 };
-const createPropertyFacets = (components, elements) => {
+const createPropertyFacets = (components, elements, parseNumericString) => {
   const facets = [];
   for (const element of elements) {
     const psetParameter = element.propertySet;
     const baseNameParameter = element.baseName;
-    const pset = getParameterValue(psetParameter);
-    const baseName = getParameterValue(baseNameParameter);
+    const pset = getParameterValue(psetParameter, parseNumericString);
+    const baseName = getParameterValue(baseNameParameter, parseNumericString);
     if (!(baseName && pset))
       continue;
     const facet = new IDSProperty(components, pset, baseName);
     if (element.cardinality)
       facet.cardinality = element.cardinality;
-    const value = getParameterValue(element.value);
+    const value = getParameterValue(element.value, parseNumericString);
     facet.value = value;
     facet.dataType = element.dataType;
     facet.uri = element.uri;
@@ -21011,7 +21015,7 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
    *
    * @returns An array of IDSSpecification instances created from the parsed data.
    */
-  load(data) {
+  load(data, config = { parseNumericString: true }) {
     const result = [];
     const ids = _IDSSpecifications.xmlParser.parse(data).ids;
     const { specifications } = ids;
@@ -21050,7 +21054,11 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
                 applicabilities.push(...facets2);
               }
               if (facetName === "property") {
-                const facets2 = createPropertyFacets(this.components, elements);
+                const facets2 = createPropertyFacets(
+                  this.components,
+                  elements,
+                  config.parseNumericString
+                );
                 applicabilities.push(...facets2);
               }
               if (facetName === "partOf") {
@@ -21088,7 +21096,11 @@ const _IDSSpecifications = class _IDSSpecifications extends Component {
                 reqs.push(...facets2);
               }
               if (facetName === "property") {
-                const facets2 = createPropertyFacets(this.components, elements);
+                const facets2 = createPropertyFacets(
+                  this.components,
+                  elements,
+                  config.parseNumericString
+                );
                 reqs.push(...facets2);
               }
               if (facetName === "partOf") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components",
   "description": "Collection of core functionalities to author BIM apps.",
-  "version": "3.1.6",
+  "version": "3.2.1",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",
@@ -37,13 +37,13 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thatopen/fragments": "~3.1.0",
-    "@thatopen/ui": "~3.1.0",
+    "@thatopen/fragments": "~3.2.0",
+    "@thatopen/ui": "~3.2.0",
     "@types/convert-units": "2.3.11",
     "@types/three": "0.175.0",
     "stats.js": "^0.17.0",
     "three": "^0.175.0",
-    "web-ifc": "0.0.71"
+    "web-ifc": "0.0.72"
   },
   "dependencies": {
     "camera-controls": "^2.9.0",
@@ -52,8 +52,8 @@
     "three-mesh-bvh": "0.7.0"
   },
   "peerDependencies": {
-    "@thatopen/fragments": "~3.1.0",
+    "@thatopen/fragments": "~3.2.0",
     "three": ">=0.175.0",
-    "web-ifc": ">=0.0.71"
+    "web-ifc": ">=0.0.72"
   }
 }