feat: Adds option to not skip other tests if one fails

Author: paguilarve-cai

packages/core/src/openbim/IDSSpecifications/src/Specification.ts

@@ -52,7 +52,10 @@ export class IDSSpecification implements IDSSpecificationData {
    * @returns An array representing the test results.
    * If no requirements are defined for the specification, an empty array is returned.
    */
-  async test(modelIds: RegExp[]) {
+  async test(
+    modelIds: RegExp[],
+    config: { skipIfFails: boolean } = { skipIfFails: true },
+  ) {
     const result: IDSCheckResult = new FRAGS.DataMap();
 
     if (this.requirements.size === 0) return result;
@@ -69,7 +72,7 @@ export class IDSSpecification implements IDSSpecificationData {
     // Test applicable elements against requirements
     const requirementPromises = [];
     for (const requirement of this.requirements) {
-      requirementPromises.push(requirement.test(entities, result));
+      requirementPromises.push(requirement.test(entities, result, config));
     }
 
     await Promise.all(requirementPromises);

packages/core/src/openbim/IDSSpecifications/src/facets/Attribute.ts

@@ -73,14 +73,23 @@ export class IDSAttribute extends IDSFacet {
   // Test cases from buildingSMART repo have been tested and they all match with the expected result
   // All invalid cases have been treated as failures
   // FragmentsGroup do not hold some of the entities used in the tests
-  async test(items: ModelIdMap, collector: ModelIdDataMap<IDSItemCheckResult>) {
+  async test(
+    items: ModelIdMap,
+    collector: ModelIdDataMap<IDSItemCheckResult>,
+    config: { skipIfFails: boolean } = { skipIfFails: true },
+  ) {
     const fragments = this._components.get(FragmentsManager);
     for (const [modelId, localIds] of Object.entries(items)) {
       const model = fragments.list.get(modelId);
       if (!model) continue;
       const data = await model.getItemsData([...localIds]);
       for (const item of data) {
-        const checks = this.getItemChecks(collector, modelId, item);
+        const checks = this.getItemChecks(
+          collector,
+          modelId,
+          item,
+          config.skipIfFails,
+        );
         if (!checks) continue;
 
         const attrNames = Object.keys(item);

packages/core/src/openbim/IDSSpecifications/src/facets/Entity.ts

@@ -102,7 +102,11 @@ export class IDSEntity extends IDSFacet {
     }
   }
 
-  async test(items: ModelIdMap, collector: ModelIdDataMap<IDSItemCheckResult>) {
+  async test(
+    items: ModelIdMap,
+    collector: ModelIdDataMap<IDSItemCheckResult>,
+    config: { skipIfFails: boolean },
+  ) {
     const fragments = this._components.get(FragmentsManager);
     for (const [modelId, localIds] of Object.entries(items)) {
       const model = fragments.list.get(modelId);
@@ -111,7 +115,12 @@ export class IDSEntity extends IDSFacet {
       const data = await model.getItemsData([...localIds]);
       for (const item of data) {
         if (!("value" in item._category)) continue;
-        const checks = this.getItemChecks(collector, modelId, item);
+        const checks = this.getItemChecks(
+          collector,
+          modelId,
+          item,
+          config.skipIfFails,
+        );
         if (!checks) continue;
         await this.evalName(item._category.value, checks);
         await this.evalPredefinedType(modelId, item, checks);

packages/core/src/openbim/IDSSpecifications/src/facets/Facet.ts

@@ -107,6 +107,7 @@ export abstract class IDSFacet {
     collector: ModelIdDataMap<IDSItemCheckResult>,
     modelId: string,
     item: FRAGS.ItemData,
+    skipIfFails: boolean,
   ) {
     if (
       !("value" in item._localId && typeof item._localId.value === "number")
@@ -121,7 +122,7 @@ export abstract class IDSFacet {
     }
 
     let result = modelItemResults.get(item._localId.value);
-    if (result) {
+    if (result && skipIfFails) {
       // If there are results already and the item didn't pass
       // return null to skip further checks
       if (!result.pass) return null;
@@ -176,6 +177,7 @@ export abstract class IDSFacet {
   abstract test(
     items: ModelIdMap,
     collector: ModelIdDataMap<IDSItemCheckResult>,
+    config: { skipIfFails: boolean },
   ): Promise<void>;
 
   abstract serialize(type: "applicability" | "requirement"): string;

packages/core/src/openbim/IDSSpecifications/src/facets/Material.ts

@@ -89,7 +89,11 @@ export class IDSMaterial extends IDSFacet {
     }
   }
 
-  async test(items: ModelIdMap, collector: ModelIdDataMap<IDSItemCheckResult>) {
+  async test(
+    items: ModelIdMap,
+    collector: ModelIdDataMap<IDSItemCheckResult>,
+    config: { skipIfFails: boolean } = { skipIfFails: true },
+  ) {
     const fragments = this._components.get(FragmentsManager);
     for (const [modelId, localIds] of Object.entries(items)) {
       const model = fragments.list.get(modelId);
@@ -107,7 +111,12 @@ export class IDSMaterial extends IDSFacet {
       });
 
       for (const item of data) {
-        const checks = this.getItemChecks(collector, modelId, item);
+        const checks = this.getItemChecks(
+          collector,
+          modelId,
+          item,
+          config.skipIfFails,
+        );
         if (!checks) continue;
 
         // If it doesn't have associations

packages/core/src/openbim/IDSSpecifications/src/facets/Property.ts

@@ -153,7 +153,11 @@ export class IDSProperty extends IDSFacet {
     }
   }
 
-  async test(items: ModelIdMap, collector: ModelIdDataMap<IDSItemCheckResult>) {
+  async test(
+    items: ModelIdMap,
+    collector: ModelIdDataMap<IDSItemCheckResult>,
+    config: { skipIfFails: boolean } = { skipIfFails: true },
+  ) {
     const fragments = this._components.get(FragmentsManager);
     for (const [modelId, localIds] of Object.entries(items)) {
       const model = fragments.list.get(modelId);
@@ -168,7 +172,12 @@ export class IDSProperty extends IDSFacet {
       });
 
       for (const item of data) {
-        const checks = this.getItemChecks(collector, modelId, item);
+        const checks = this.getItemChecks(
+          collector,
+          modelId,
+          item,
+          config.skipIfFails,
+        );
         if (!checks) continue;
 
         const sets = await this.getPsets(item);