@itwin/ecschema-editing 4.8.0-dev.9 → 4.9.0-dev.1

package/lib/cjs/Validation/SchemaComparer.js

@@ -99,15 +99,17 @@ class SchemaComparer {
         }
         if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
-        if (schemaItemA.description !== schemaItemB.description)
-            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "description", schemaItemA.description, schemaItemB.description, this._compareDirection));
-        if (!labelsMatch(schemaItemA.label, schemaItemB.label))
-            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "label", schemaItemA.label, schemaItemB.label, this._compareDirection));
         if (schemaItemA.schemaItemType !== schemaItemB.schemaItemType) {
             const aType = schemaItemA.schemaItemType;
             const bType = schemaItemB.schemaItemType;
             promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "schemaItemType", aType, bType, this._compareDirection));
+            await Promise.all(promises);
+            return;
         }
+        if (schemaItemA.description !== schemaItemB.description)
+            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "description", schemaItemA.description, schemaItemB.description, this._compareDirection));
+        if (!labelsMatch(schemaItemA.label, schemaItemB.label))
+            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "label", schemaItemA.label, schemaItemB.label, this._compareDirection));
         await Promise.all(promises);
     }
     /**
@@ -116,7 +118,7 @@ class SchemaComparer {
      * @param classB The second ECClass.
      */
     async compareClasses(classA, classB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !classB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         const promises = [];
         if (classA.modifier !== classB.modifier) {
@@ -152,6 +154,13 @@ class SchemaComparer {
         }
         if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
+        const propertyTypeA = (0, ecschema_metadata_1.propertyTypeToString)(propertyA.propertyType);
+        const propertyTypeB = (0, ecschema_metadata_1.propertyTypeToString)(propertyB.propertyType);
+        if (propertyTypeA !== propertyTypeB) {
+            promises.push(this._reporter.reportPropertyDelta(propertyA, "type", propertyTypeA, propertyTypeB, this._compareDirection));
+            await Promise.all(promises);
+            return;
+        }
         if (!labelsMatch(propertyA.label, propertyB.label))
             promises.push(this._reporter.reportPropertyDelta(propertyA, "label", propertyA.label, propertyB.label, this._compareDirection));
         if (propertyA.description !== propertyB.description)
@@ -188,11 +197,9 @@ class SchemaComparer {
      */
     async compareEntityClasses(entityA, entityB) {
         const promises = [];
-        if (entityB) {
-            for (const mixinA of entityA.mixins) {
-                if (-1 === entityB.mixins.findIndex((mixinB) => this.areItemsSameByName(mixinA, mixinB, entityA.schema.name, entityB.schema.name)))
-                    promises.push(this._reporter.reportEntityMixinMissing(entityA, await mixinA, this._compareDirection));
-            }
+        for (const mixinA of entityA.mixins) {
+            if (-1 === entityB.mixins.findIndex((mixinB) => this.areItemsSameByName(mixinA, mixinB, entityA.schema.name, entityB.schema.name)))
+                promises.push(this._reporter.reportEntityMixinMissing(entityA, await mixinA, this._compareDirection));
         }
         await Promise.all(promises);
     }
@@ -202,7 +209,7 @@ class SchemaComparer {
      * @param mixinB
      */
     async compareMixins(mixinA, mixinB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !mixinB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         if (mixinA.appliesTo || mixinB.appliesTo) {
             const appliesToA = mixinA.appliesTo?.fullName;
@@ -220,7 +227,7 @@ class SchemaComparer {
      * @param relationshipB
      */
     async compareRelationshipClasses(relationshipA, relationshipB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !relationshipB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         const promises = [];
         if (relationshipA.strength !== relationshipB.strength) {
@@ -242,13 +249,13 @@ class SchemaComparer {
      */
     async compareRelationshipConstraints(constraintA, constraintB) {
         const promises = [];
-        if (constraintB && constraintA.constraintClasses) {
+        if (constraintA.constraintClasses) {
             for (const classA of constraintA.constraintClasses) {
                 if (!constraintB.constraintClasses || -1 === constraintB.constraintClasses.findIndex((classB) => this.areItemsSameByName(classA, classB, constraintA.schema.name, constraintB.schema.name)))
                     promises.push(this._reporter.reportRelationshipConstraintClassMissing(constraintA, await classA, this._compareDirection));
             }
         }
-        if (this._compareDirection === SchemaCompareDirection.Backward || !constraintB) {
+        if (this._compareDirection === SchemaCompareDirection.Backward) {
             await Promise.all(promises);
             return;
         }
@@ -280,11 +287,11 @@ class SchemaComparer {
      * @param customAttributeClassB
      */
     async compareCustomAttributeClasses(customAttributeClassA, customAttributeClassB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !customAttributeClassB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
-        if (customAttributeClassA.containerType !== customAttributeClassB.containerType) {
-            const typeA = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassA.containerType);
-            const typeB = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassB.containerType);
+        if (customAttributeClassA.appliesTo !== customAttributeClassB.appliesTo) {
+            const typeA = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassA.appliesTo);
+            const typeB = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassB.appliesTo);
             await this._reporter.reportCustomAttributeClassDelta(customAttributeClassA, "appliesTo", typeA, typeB, this._compareDirection);
         }
     }
@@ -295,7 +302,7 @@ class SchemaComparer {
      */
     async compareCustomAttributeContainers(containerA, containerB) {
         const promises = [];
-        if (containerB && containerA.customAttributes) {
+        if (containerA.customAttributes) {
             for (const ca of containerA.customAttributes) {
                 if (!containerB.customAttributes || !this.containerHasClass(ca[1], containerA, containerB))
                     promises.push(this._reporter.reportCustomAttributeInstanceClassMissing(containerA, ca[1], this._compareDirection));
@@ -310,18 +317,16 @@ class SchemaComparer {
      */
     async compareEnumerations(enumA, enumB) {
         const promises = [];
-        if (enumB) {
-            for (const enumeratorA of enumA.enumerators) {
-                const enumeratorB = enumB.enumerators.find((e) => e.name === enumeratorA.name);
-                if (!enumeratorB) {
-                    promises.push(this._reporter.reportEnumeratorMissing(enumA, enumeratorA, this._compareDirection));
-                }
-                else if (this._compareDirection === SchemaCompareDirection.Forward) {
-                    promises.push(this.compareEnumerators(enumeratorA, enumeratorB, enumA, enumB));
-                }
+        for (const enumeratorA of enumA.enumerators) {
+            const enumeratorB = enumB.enumerators.find((e) => e.name === enumeratorA.name);
+            if (!enumeratorB) {
+                promises.push(this._reporter.reportEnumeratorMissing(enumA, enumeratorA, this._compareDirection));
+            }
+            else if (this._compareDirection === SchemaCompareDirection.Forward) {
+                promises.push(this.compareEnumerators(enumeratorA, enumeratorB, enumA, enumB));
             }
         }
-        if (this._compareDirection === SchemaCompareDirection.Backward || !enumB) {
+        if (this._compareDirection === SchemaCompareDirection.Backward) {
             await Promise.all(promises);
             return;
         }
@@ -341,13 +346,13 @@ class SchemaComparer {
      */
     async compareKindOfQuantities(koqA, koqB) {
         const promises = [];
-        if (koqB && koqA.presentationFormats) {
+        if (koqA.presentationFormats) {
             for (const unitA of koqA.presentationFormats) {
                 if (-1 === koqB.presentationFormats.findIndex((unitB) => this.areOverrideFormatsSameByName(unitA, unitB, koqA.schema.name, koqB.schema.name)))
                     promises.push(this._reporter.reportPresentationUnitMissing(koqA, unitA, this._compareDirection));
             }
         }
-        if (this._compareDirection === SchemaCompareDirection.Backward || !koqB) {
+        if (this._compareDirection === SchemaCompareDirection.Backward) {
             await Promise.all(promises);
             return;
         }
@@ -371,7 +376,7 @@ class SchemaComparer {
      * @param categoryB
      */
     async comparePropertyCategories(categoryA, categoryB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !categoryB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         if (categoryA.priority !== categoryB.priority)
             await this._reporter.reportPropertyCategoryDelta(categoryA, "priority", categoryA.priority, categoryB.priority, this._compareDirection);
@@ -384,7 +389,7 @@ class SchemaComparer {
     async compareFormats(formatA, formatB) {
         const promises = [];
         promises.push(this.compareFormatUnits(formatA, formatB));
-        if (this._compareDirection === SchemaCompareDirection.Backward || !formatB) {
+        if (this._compareDirection === SchemaCompareDirection.Backward) {
             await Promise.all(promises);
             return;
         }
@@ -436,7 +441,7 @@ class SchemaComparer {
      * @param unitB
      */
     async compareUnits(unitA, unitB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !unitB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         const promises = [];
         if (unitA.phenomenon || unitB.phenomenon) {
@@ -473,7 +478,7 @@ class SchemaComparer {
      * @param invertedUnitB
      */
     async compareInvertedUnits(invertedUnitA, invertedUnitB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !invertedUnitB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         const promises = [];
         if (invertedUnitA.invertsUnit || invertedUnitB.invertsUnit) {
@@ -502,7 +507,7 @@ class SchemaComparer {
      * @param phenomenonB
      */
     async comparePhenomenons(phenomenonA, phenomenonB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !phenomenonB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         if (phenomenonA.definition !== phenomenonB.definition)
             await this._reporter.reportPhenomenonDelta(phenomenonA, "definition", phenomenonA.definition, phenomenonB.definition, this._compareDirection);
@@ -513,7 +518,7 @@ class SchemaComparer {
      * @param constantB
      */
     async compareConstants(constantA, constantB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward || !constantB)
+        if (this._compareDirection === SchemaCompareDirection.Backward)
             return;
         const promises = [];
         if (constantA.phenomenon || constantB.phenomenon) {
@@ -535,11 +540,6 @@ class SchemaComparer {
     }
     async comparePropertyType(propertyA, propertyB) {
         const promises = [];
-        const propertyTypeA = (0, ecschema_metadata_1.propertyTypeToString)(propertyA.propertyType);
-        const propertyTypeB = (0, ecschema_metadata_1.propertyTypeToString)(propertyB.propertyType);
-        if (propertyTypeA !== propertyTypeB) {
-            promises.push(this._reporter.reportPropertyDelta(propertyA, "type", propertyTypeA, propertyTypeB, this._compareDirection));
-        }
         if (propertyA.isArray()) {
             const minOccursB = propertyB.isArray() ? propertyB.minOccurs : undefined;
             if (propertyA.minOccurs !== minOccursB) {
@@ -638,7 +638,7 @@ class SchemaComparer {
         await Promise.all(promises);
     }
     async compareFormatUnits(formatA, formatB) {
-        if (!formatA.units || !formatB)
+        if (!formatA.units)
             return;
         const promises = [];
         for (const unitA of formatA.units) {
@@ -679,8 +679,8 @@ class SchemaComparer {
      * @returns true if both names are the same and they come from their respective top level schema.
      */
     areItemsSameByName(itemKeyA, itemKeyB, topLevelSchemaNameA, topLevelSchemaNameB) {
-        const nameA = itemKeyA ? itemKeyA.name : undefined;
-        const nameB = itemKeyB ? itemKeyB.name : undefined;
+        const nameA = itemKeyA ? itemKeyA.name.toUpperCase() : undefined;
+        const nameB = itemKeyB ? itemKeyB.name.toUpperCase() : undefined;
         const schemaNameA = itemKeyA
             ? ecschema_metadata_1.SchemaItem.isSchemaItem(itemKeyA)
                 ? itemKeyA.schema.name