@itwin/ecschema-editing 4.6.0-dev.9 → 4.7.0-dev.0

package/lib/cjs/Validation/SchemaComparer.js

@@ -22,7 +22,7 @@ var SchemaCompareDirection;
 (function (SchemaCompareDirection) {
     SchemaCompareDirection[SchemaCompareDirection["Forward"] = 0] = "Forward";
     SchemaCompareDirection[SchemaCompareDirection["Backward"] = 1] = "Backward";
-})(SchemaCompareDirection = exports.SchemaCompareDirection || (exports.SchemaCompareDirection = {}));
+})(SchemaCompareDirection || (exports.SchemaCompareDirection = SchemaCompareDirection = {}));
 function labelsMatch(label1, label2) {
     label1 = label1 === undefined ? "" : label1;
     label2 = label2 === undefined ? "" : label2;
@@ -94,9 +94,6 @@ class SchemaComparer {
         const promises = [];
         if (!schemaItemB) {
             promises.push(this._reporter.reportSchemaItemMissing(schemaItemA, this._compareDirection));
-            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "description", schemaItemA.description, undefined, this._compareDirection));
-            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "label", schemaItemA.label, undefined, this._compareDirection));
-            promises.push(this._reporter.reportSchemaItemDelta(schemaItemA, "schemaItemType", schemaItemA.schemaItemType, undefined, this._compareDirection));
             await Promise.all(promises);
             return;
         }
@@ -119,25 +116,22 @@ class SchemaComparer {
      * @param classB The second ECClass.
      */
     async compareClasses(classA, classB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && classB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !classB)
             return;
         const promises = [];
-        const modifierB = classB ? classB.modifier : undefined;
-        if (classA.modifier !== modifierB) {
+        if (classA.modifier !== classB.modifier) {
             const aMod = (0, ecschema_metadata_1.classModifierToString)(classA.modifier);
-            const bMod = modifierB !== undefined ? (0, ecschema_metadata_1.classModifierToString)(modifierB) : undefined;
+            const bMod = (0, ecschema_metadata_1.classModifierToString)(classB.modifier);
             promises.push(this._reporter.reportClassDelta(classA, "modifier", aMod, bMod, this._compareDirection));
         }
-        const baseClassA = classA.baseClass;
-        const baseClassB = classB ? classB.baseClass : undefined;
-        if (baseClassA || baseClassB) {
-            const fullNameA = baseClassA ? baseClassA.fullName : undefined;
-            const fullNameB = baseClassB ? baseClassB.fullName : undefined;
+        if (classA.baseClass || classB.baseClass) {
+            const fullNameA = classA.baseClass?.fullName;
+            const fullNameB = classB.baseClass?.fullName;
             if (fullNameA !== fullNameB) {
-                const areSameByName = this.areItemsSameByName(baseClassA, baseClassB, classA.schema.name, classB?.schema.name);
+                const areSameByName = this.areItemsSameByName(classA.baseClass, classB.baseClass, classA.schema.name, classB.schema.name);
                 if (!areSameByName) {
-                    const baseA = await baseClassA;
-                    const baseB = baseClassB ? await baseClassB : undefined;
+                    const baseA = await classA.baseClass;
+                    const baseB = await classB.baseClass;
                     promises.push(this._reporter.reportBaseClassDelta(classA, baseA, baseB, this._compareDirection));
                 }
             }
@@ -153,21 +147,6 @@ class SchemaComparer {
         const promises = [];
         if (!propertyB) {
             promises.push(this._reporter.reportPropertyMissing(propertyA, this._compareDirection));
-            if (undefined !== propertyA.label)
-                promises.push(this._reporter.reportPropertyDelta(propertyA, "label", propertyA.label, undefined, this._compareDirection));
-            if (undefined !== propertyA.description)
-                promises.push(this._reporter.reportPropertyDelta(propertyA, "description", propertyA.description, undefined, this._compareDirection));
-            promises.push(this._reporter.reportPropertyDelta(propertyA, "priority", propertyA.priority, undefined, this._compareDirection));
-            promises.push(this._reporter.reportPropertyDelta(propertyA, "isReadOnly", propertyA.isReadOnly, undefined, this._compareDirection));
-            const catKeyA = propertyA.category ? (await propertyA.category).key : undefined;
-            const catKeyAText = catKeyA ? catKeyA.fullName : undefined;
-            if (undefined !== catKeyAText)
-                promises.push(this._reporter.reportPropertyDelta(propertyA, "category", catKeyAText, undefined, this._compareDirection));
-            const koqKeyA = propertyA.kindOfQuantity ? (await propertyA.kindOfQuantity).key : undefined;
-            const koqKeyAText = koqKeyA ? koqKeyA.fullName : undefined;
-            if (undefined !== koqKeyAText)
-                promises.push(this._reporter.reportPropertyDelta(propertyA, "kindOfQuantity", koqKeyAText, undefined, this._compareDirection));
-            await this.comparePropertyType(propertyA, undefined);
             await Promise.all(promises);
             return;
         }
@@ -182,25 +161,21 @@ class SchemaComparer {
         if (propertyA.priority !== propertyB.priority)
             promises.push(this._reporter.reportPropertyDelta(propertyA, "priority", propertyA.priority, propertyB.priority, this._compareDirection));
         if (propertyA.category || propertyB.category) {
-            const catKeyA = propertyA.category ? (await propertyA.category).key : undefined;
-            const catKeyB = propertyB.category ? (await propertyB.category).key : undefined;
-            const catKeyAText = catKeyA ? catKeyA.fullName : undefined;
-            const catKeyBText = catKeyB ? catKeyB.fullName : undefined;
-            if (catKeyAText !== catKeyBText) {
+            const catKeyA = propertyA.category?.fullName;
+            const catKeyB = propertyB.category?.fullName;
+            if (catKeyA !== catKeyB) {
                 const areSameByName = this.areItemsSameByName(propertyA.category, propertyB.category, propertyA.schema.name, propertyB.schema.name);
                 if (!areSameByName)
-                    promises.push(this._reporter.reportPropertyDelta(propertyA, "category", catKeyAText, catKeyBText, this._compareDirection));
+                    promises.push(this._reporter.reportPropertyDelta(propertyA, "category", catKeyA, catKeyB, this._compareDirection));
             }
         }
         if (propertyA.kindOfQuantity || propertyB.kindOfQuantity) {
-            const koqKeyA = propertyA.kindOfQuantity ? (await propertyA.kindOfQuantity).key : undefined;
-            const koqKeyB = propertyB.kindOfQuantity ? (await propertyB.kindOfQuantity).key : undefined;
-            const koqKeyAText = koqKeyA ? koqKeyA.fullName : undefined;
-            const koqKeyBText = koqKeyB ? koqKeyB.fullName : undefined;
-            if (koqKeyAText !== koqKeyBText) {
+            const koqKeyA = propertyA.kindOfQuantity?.fullName;
+            const koqKeyB = propertyB.kindOfQuantity?.fullName;
+            if (koqKeyA !== koqKeyB) {
                 const areSameByName = this.areItemsSameByName(propertyA.kindOfQuantity, propertyB.kindOfQuantity, propertyA.schema.name, propertyB.schema.name);
                 if (!areSameByName)
-                    promises.push(this._reporter.reportPropertyDelta(propertyA, "kindOfQuantity", koqKeyAText, koqKeyBText, this._compareDirection));
+                    promises.push(this._reporter.reportPropertyDelta(propertyA, "kindOfQuantity", koqKeyA, koqKeyB, this._compareDirection));
             }
         }
         promises.push(this.comparePropertyType(propertyA, propertyB));
@@ -213,9 +188,11 @@ class SchemaComparer {
      */
     async compareEntityClasses(entityA, entityB) {
         const promises = [];
-        for (const mixinA of entityA.mixins) {
-            if (!entityB || -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));
+        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));
+            }
         }
         await Promise.all(promises);
     }
@@ -225,13 +202,13 @@ class SchemaComparer {
      * @param mixinB
      */
     async compareMixins(mixinA, mixinB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && mixinB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !mixinB)
             return;
-        if (mixinA.appliesTo) {
-            const appliesToA = mixinA.appliesTo.fullName;
-            const appliesToB = mixinB ? mixinB.appliesTo ? mixinB.appliesTo.fullName : undefined : undefined;
+        if (mixinA.appliesTo || mixinB.appliesTo) {
+            const appliesToA = mixinA.appliesTo?.fullName;
+            const appliesToB = mixinB.appliesTo?.fullName;
             if (appliesToA !== appliesToB) {
-                const areSameByName = this.areItemsSameByName(mixinA.appliesTo, mixinB?.appliesTo, mixinA.schema.name, mixinB?.schema.name);
+                const areSameByName = this.areItemsSameByName(mixinA.appliesTo, mixinB.appliesTo, mixinA.schema.name, mixinB.schema.name);
                 if (!areSameByName)
                     await this._reporter.reportMixinDelta(mixinA, "appliesTo", appliesToA, appliesToB, this._compareDirection);
             }
@@ -243,19 +220,17 @@ class SchemaComparer {
      * @param relationshipB
      */
     async compareRelationshipClasses(relationshipA, relationshipB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && relationshipB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !relationshipB)
             return;
         const promises = [];
-        const strengthB = relationshipB ? relationshipB.strength : undefined;
-        if (relationshipA.strength !== strengthB) {
+        if (relationshipA.strength !== relationshipB.strength) {
             const strengthAString = (0, ecschema_metadata_1.strengthToString)(relationshipA.strength);
-            const strengthBString = strengthB !== undefined ? (0, ecschema_metadata_1.strengthToString)(strengthB) : undefined;
+            const strengthBString = (0, ecschema_metadata_1.strengthToString)(relationshipB.strength);
             promises.push(this._reporter.reportRelationshipClassDelta(relationshipA, "strength", strengthAString, strengthBString, this._compareDirection));
         }
-        const directionB = relationshipB ? relationshipB.strengthDirection : undefined;
-        if (relationshipA.strengthDirection !== directionB) {
+        if (relationshipA.strengthDirection !== relationshipB.strengthDirection) {
             const directionAString = (0, ecschema_metadata_1.strengthDirectionToString)(relationshipA.strengthDirection);
-            const directionBString = directionB !== undefined ? (0, ecschema_metadata_1.strengthDirectionToString)(directionB) : undefined;
+            const directionBString = (0, ecschema_metadata_1.strengthDirectionToString)(relationshipB.strengthDirection);
             promises.push(this._reporter.reportRelationshipClassDelta(relationshipA, "strengthDirection", directionAString, directionBString, this._compareDirection));
         }
         await Promise.all(promises);
@@ -267,36 +242,31 @@ class SchemaComparer {
      */
     async compareRelationshipConstraints(constraintA, constraintB) {
         const promises = [];
-        if (constraintA.constraintClasses) {
+        if (constraintB && constraintA.constraintClasses) {
             for (const classA of constraintA.constraintClasses) {
-                if (!constraintB || !constraintB.constraintClasses ||
-                    -1 === constraintB.constraintClasses.findIndex((classB) => this.areItemsSameByName(classA, classB, constraintA.schema.name, constraintB.schema.name)))
+                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 || !constraintB) {
             await Promise.all(promises);
             return;
         }
-        const constraintBMultiplicity = constraintB ? constraintB.multiplicity : undefined;
-        if (constraintA.multiplicity || constraintBMultiplicity) {
-            const multiplicityA = constraintA.multiplicity ? constraintA.multiplicity.toString() : undefined;
-            const multiplicityB = constraintBMultiplicity ? constraintBMultiplicity.toString() : undefined;
+        if (constraintA.multiplicity || constraintB.multiplicity) {
+            const multiplicityA = constraintA.multiplicity.toString();
+            const multiplicityB = constraintB.multiplicity.toString();
             if (multiplicityA !== multiplicityB)
                 promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "multiplicity", multiplicityA, multiplicityB, this._compareDirection));
         }
-        const constraintBRoleLabel = constraintB ? constraintB.roleLabel : undefined;
-        if (constraintA.roleLabel !== constraintBRoleLabel)
-            promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "roleLabel", constraintA.roleLabel, constraintBRoleLabel, this._compareDirection));
-        const constraintBPolymorphic = constraintB ? constraintB.polymorphic : undefined;
-        if (constraintA.polymorphic !== constraintBPolymorphic)
-            promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "polymorphic", constraintA.polymorphic, constraintBPolymorphic, this._compareDirection));
-        const constraintBAbstractConstraint = constraintB ? constraintB.abstractConstraint : undefined;
-        if (constraintA.abstractConstraint || constraintBAbstractConstraint) {
-            const abstractA = constraintA.abstractConstraint ? constraintA.abstractConstraint.fullName : undefined;
-            const abstractB = constraintBAbstractConstraint ? constraintBAbstractConstraint.fullName : undefined;
+        if (constraintA.roleLabel !== constraintB.roleLabel)
+            promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "roleLabel", constraintA.roleLabel, constraintB.roleLabel, this._compareDirection));
+        if (constraintA.polymorphic !== constraintB.polymorphic)
+            promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "polymorphic", constraintA.polymorphic, constraintB.polymorphic, this._compareDirection));
+        if (constraintA.abstractConstraint || constraintB.abstractConstraint) {
+            const abstractA = constraintA.abstractConstraint?.fullName;
+            const abstractB = constraintB.abstractConstraint?.fullName;
             if (abstractA !== abstractB) {
-                const areSameByName = this.areItemsSameByName(constraintA.abstractConstraint, constraintBAbstractConstraint, constraintA.schema.name, constraintB?.schema.name);
+                const areSameByName = this.areItemsSameByName(constraintA.abstractConstraint, constraintB.abstractConstraint, constraintA.schema.name, constraintB.schema.name);
                 if (!areSameByName) {
                     promises.push(this._reporter.reportRelationshipConstraintDelta(constraintA, "abstractConstraint", abstractA, abstractB, this._compareDirection));
                 }
@@ -310,12 +280,11 @@ class SchemaComparer {
      * @param customAttributeClassB
      */
     async compareCustomAttributeClasses(customAttributeClassA, customAttributeClassB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && customAttributeClassB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !customAttributeClassB)
             return;
-        const containerTypeB = customAttributeClassB ? customAttributeClassB.containerType : undefined;
-        if (customAttributeClassA.containerType !== containerTypeB) {
+        if (customAttributeClassA.containerType !== customAttributeClassB.containerType) {
             const typeA = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassA.containerType);
-            const typeB = containerTypeB !== undefined ? (0, ecschema_metadata_1.containerTypeToString)(containerTypeB) : undefined;
+            const typeB = (0, ecschema_metadata_1.containerTypeToString)(customAttributeClassB.containerType);
             await this._reporter.reportCustomAttributeClassDelta(customAttributeClassA, "appliesTo", typeA, typeB, this._compareDirection);
         }
     }
@@ -326,10 +295,9 @@ class SchemaComparer {
      */
     async compareCustomAttributeContainers(containerA, containerB) {
         const promises = [];
-        if (containerA.customAttributes) {
+        if (containerB && containerA.customAttributes) {
             for (const ca of containerA.customAttributes) {
-                const caClassName = ca[0];
-                if (!containerB || !containerB.customAttributes || !this.containerHasClass(caClassName, containerA, containerB))
+                if (!containerB.customAttributes || !this.containerHasClass(ca[1], containerA, containerB))
                     promises.push(this._reporter.reportCustomAttributeInstanceClassMissing(containerA, ca[1], this._compareDirection));
             }
         }
@@ -342,29 +310,28 @@ class SchemaComparer {
      */
     async compareEnumerations(enumA, enumB) {
         const promises = [];
-        for (const enumeratorA of enumA.enumerators) {
-            const enumeratorB = enumB ? enumB.enumerators.find((e) => e.name === enumeratorA.name) : undefined;
-            if (!enumeratorB) {
-                promises.push(this._reporter.reportEnumeratorMissing(enumA, enumeratorA, this._compareDirection));
-                promises.push(this.compareEnumerators(enumeratorA, enumeratorB, enumA, enumB));
-            }
-            else if (this._compareDirection === SchemaCompareDirection.Forward) {
-                promises.push(this.compareEnumerators(enumeratorA, enumeratorB, enumA, enumB));
+        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));
+                }
             }
         }
-        if (this._compareDirection === SchemaCompareDirection.Backward && enumB) {
+        if (this._compareDirection === SchemaCompareDirection.Backward || !enumB) {
             await Promise.all(promises);
             return;
         }
-        const typeB = enumB ? enumB.type : undefined;
-        if (enumA.type !== typeB) {
+        if (enumA.type !== enumB.type) {
             const typeAString = enumA.type ? (0, ecschema_metadata_1.primitiveTypeToString)(enumA.type) : undefined;
-            const typeBString = typeB !== undefined ? (0, ecschema_metadata_1.primitiveTypeToString)(typeB) : undefined;
+            const typeBString = enumB.type ? (0, ecschema_metadata_1.primitiveTypeToString)(enumB.type) : undefined;
             promises.push(this._reporter.reportEnumerationDelta(enumA, "type", typeAString, typeBString, this._compareDirection));
         }
-        const isStrictB = enumB ? enumB.isStrict : undefined;
-        if (enumA.isStrict !== isStrictB)
-            promises.push(this._reporter.reportEnumerationDelta(enumA, "isStrict", enumA.isStrict, isStrictB, this._compareDirection));
+        if (enumA.isStrict !== enumB.isStrict)
+            promises.push(this._reporter.reportEnumerationDelta(enumA, "isStrict", enumA.isStrict, enumB.isStrict, this._compareDirection));
         await Promise.all(promises);
     }
     /**
@@ -374,26 +341,26 @@ class SchemaComparer {
      */
     async compareKindOfQuantities(koqA, koqB) {
         const promises = [];
-        if (koqA.presentationFormats) {
-            for (const unit of koqA.presentationFormats) {
-                if (!koqB || !koqB.presentationFormats || -1 === koqB.presentationFormats.findIndex((u) => u.fullName === unit.fullName))
-                    promises.push(this._reporter.reportPresentationUnitMissing(koqA, unit, this._compareDirection));
+        if (koqB && 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 || !koqB) {
             await Promise.all(promises);
             return;
         }
-        const errorB = koqB ? koqB.relativeError : undefined;
-        if (koqA.relativeError !== errorB) {
-            promises.push(this._reporter.reportKoqDelta(koqA, "relativeError", koqA.relativeError, errorB, this._compareDirection));
+        if (koqA.relativeError !== koqB.relativeError) {
+            promises.push(this._reporter.reportKoqDelta(koqA, "relativeError", koqA.relativeError, koqB.relativeError, this._compareDirection));
         }
-        const unitB = koqB ? koqB.persistenceUnit : undefined;
-        if (koqA.persistenceUnit || unitB) {
-            const unitNameA = koqA.persistenceUnit ? koqA.persistenceUnit.fullName : undefined;
-            const unitNameB = unitB ? unitB.fullName : undefined;
+        if (koqA.persistenceUnit || koqB.persistenceUnit) {
+            const unitNameA = koqA.persistenceUnit?.fullName;
+            const unitNameB = koqB.persistenceUnit?.fullName;
             if (unitNameA !== unitNameB) {
-                promises.push(this._reporter.reportKoqDelta(koqA, "persistenceUnit", unitNameA, unitNameB, this._compareDirection));
+                const eqByName = this.areItemsSameByName(koqA.persistenceUnit, koqB.persistenceUnit, koqA.schema.name, koqB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportKoqDelta(koqA, "persistenceUnit", unitNameA, unitNameB, this._compareDirection));
             }
         }
         await Promise.all(promises);
@@ -404,11 +371,10 @@ class SchemaComparer {
      * @param categoryB
      */
     async comparePropertyCategories(categoryA, categoryB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && categoryB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !categoryB)
             return;
-        const priorityB = categoryB ? categoryB.priority : undefined;
-        if (categoryA.priority !== priorityB)
-            await this._reporter.reportPropertyCategoryDelta(categoryA, "priority", categoryA.priority, priorityB, this._compareDirection);
+        if (categoryA.priority !== categoryB.priority)
+            await this._reporter.reportPropertyCategoryDelta(categoryA, "priority", categoryA.priority, categoryB.priority, this._compareDirection);
     }
     /**
      * Compares two Format objects to identify differences between property values.
@@ -418,64 +384,50 @@ 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 || !formatB) {
             await Promise.all(promises);
             return;
         }
-        const roundFactorB = formatB ? formatB.roundFactor : undefined;
-        if (formatA.roundFactor !== roundFactorB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "roundFactor", formatA.roundFactor, roundFactorB, this._compareDirection));
-        const typeB = formatB ? formatB.type : undefined;
-        if (formatA.type !== typeB) {
+        if (formatA.roundFactor !== formatB.roundFactor)
+            promises.push(this._reporter.reportFormatDelta(formatA, "roundFactor", formatA.roundFactor, formatB.roundFactor, this._compareDirection));
+        if (formatA.type !== formatB.type) {
             const typeAString = (0, core_quantity_1.formatTypeToString)(formatA.type);
-            const typeBString = typeB !== undefined ? (0, core_quantity_1.formatTypeToString)(typeB) : undefined;
+            const typeBString = (0, core_quantity_1.formatTypeToString)(formatB.type);
             promises.push(this._reporter.reportFormatDelta(formatA, "type", typeAString, typeBString, this._compareDirection));
         }
-        const precisionB = formatB ? formatB.precision : undefined;
-        if (formatA.precision !== precisionB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "precision", formatA.precision, precisionB, this._compareDirection));
-        const minWidthB = formatB ? formatB.minWidth : undefined;
-        if (formatA.minWidth !== minWidthB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "minWidth", formatA.minWidth, minWidthB, this._compareDirection));
-        const scientificTypeB = formatB ? formatB.scientificType : undefined;
-        if (formatA.scientificType !== scientificTypeB) {
+        if (formatA.precision !== formatB.precision)
+            promises.push(this._reporter.reportFormatDelta(formatA, "precision", formatA.precision, formatB.precision, this._compareDirection));
+        if (formatA.minWidth !== formatB.minWidth)
+            promises.push(this._reporter.reportFormatDelta(formatA, "minWidth", formatA.minWidth, formatB.minWidth, this._compareDirection));
+        if (formatA.scientificType !== formatB.scientificType) {
             const typeAString = formatA.scientificType !== undefined ? (0, core_quantity_1.scientificTypeToString)(formatA.scientificType) : undefined;
-            const typeBString = scientificTypeB !== undefined ? (0, core_quantity_1.scientificTypeToString)(scientificTypeB) : undefined;
+            const typeBString = formatB.scientificType !== undefined ? (0, core_quantity_1.scientificTypeToString)(formatB.scientificType) : undefined;
             promises.push(this._reporter.reportFormatDelta(formatA, "scientificType", typeAString, typeBString, this._compareDirection));
         }
-        const showSignOptionB = formatB ? formatB.showSignOption : undefined;
-        if (formatA.showSignOption !== showSignOptionB) {
+        if (formatA.showSignOption !== formatB.showSignOption) {
             const optionA = (0, core_quantity_1.showSignOptionToString)(formatA.showSignOption);
-            const optionB = showSignOptionB !== undefined ? (0, core_quantity_1.showSignOptionToString)(showSignOptionB) : undefined;
+            const optionB = (0, core_quantity_1.showSignOptionToString)(formatB.showSignOption);
             promises.push(this._reporter.reportFormatDelta(formatA, "showSignOption", optionA, optionB, this._compareDirection));
         }
-        const decimalSeparatorB = formatB ? formatB.decimalSeparator : undefined;
-        if (formatA.decimalSeparator !== decimalSeparatorB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "decimalSeparator", formatA.decimalSeparator, decimalSeparatorB, this._compareDirection));
-        const thousandSeparatorB = formatB ? formatB.thousandSeparator : undefined;
-        if (formatA.thousandSeparator !== thousandSeparatorB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "thousandSeparator", formatA.thousandSeparator, thousandSeparatorB, this._compareDirection));
-        const uomSeparatorB = formatB ? formatB.uomSeparator : undefined;
-        if (formatA.uomSeparator !== uomSeparatorB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "uomSeparator", formatA.uomSeparator, uomSeparatorB, this._compareDirection));
-        const stationSeparatorB = formatB ? formatB.stationSeparator : undefined;
-        if (formatA.stationSeparator !== stationSeparatorB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "stationSeparator", formatA.stationSeparator, stationSeparatorB, this._compareDirection));
-        const stationOffsetSizeB = formatB ? formatB.stationOffsetSize : undefined;
-        if (formatA.stationOffsetSize !== stationOffsetSizeB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "stationOffsetSize", formatA.stationOffsetSize, stationOffsetSizeB, this._compareDirection));
-        const formatTraitsB = formatB ? formatB.formatTraits : undefined;
-        if (formatA.formatTraits !== formatTraitsB) {
+        if (formatA.decimalSeparator !== formatB.decimalSeparator)
+            promises.push(this._reporter.reportFormatDelta(formatA, "decimalSeparator", formatA.decimalSeparator, formatB.decimalSeparator, this._compareDirection));
+        if (formatA.thousandSeparator !== formatB.thousandSeparator)
+            promises.push(this._reporter.reportFormatDelta(formatA, "thousandSeparator", formatA.thousandSeparator, formatB.thousandSeparator, this._compareDirection));
+        if (formatA.uomSeparator !== formatB.uomSeparator)
+            promises.push(this._reporter.reportFormatDelta(formatA, "uomSeparator", formatA.uomSeparator, formatB.uomSeparator, this._compareDirection));
+        if (formatA.stationSeparator !== formatB.stationSeparator)
+            promises.push(this._reporter.reportFormatDelta(formatA, "stationSeparator", formatA.stationSeparator, formatB.stationSeparator, this._compareDirection));
+        if (formatA.stationOffsetSize !== formatB.stationOffsetSize)
+            promises.push(this._reporter.reportFormatDelta(formatA, "stationOffsetSize", formatA.stationOffsetSize, formatB.stationOffsetSize, this._compareDirection));
+        if (formatA.formatTraits !== formatB.formatTraits) {
             const traitsA = (0, core_quantity_1.formatTraitsToArray)(formatA.formatTraits);
-            const traitsB = formatTraitsB !== undefined ? (0, core_quantity_1.formatTraitsToArray)(formatTraitsB) : undefined;
-            promises.push(this._reporter.reportFormatDelta(formatA, "formatTraits", traitsA.toString(), traitsB ? traitsB.toString() : undefined, this._compareDirection));
-        }
-        const spacerB = formatB ? formatB.spacer : undefined;
-        if (formatA.spacer !== spacerB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "spacer", formatA.spacer, spacerB, this._compareDirection));
-        const includeZeroB = formatB ? formatB.includeZero : undefined;
-        if (formatA.includeZero !== includeZeroB)
-            promises.push(this._reporter.reportFormatDelta(formatA, "includeZero", formatA.includeZero, includeZeroB, this._compareDirection));
+            const traitsB = (0, core_quantity_1.formatTraitsToArray)(formatB.formatTraits);
+            promises.push(this._reporter.reportFormatDelta(formatA, "formatTraits", traitsA.toString(), traitsB.toString(), this._compareDirection));
+        }
+        if (formatA.spacer !== formatB.spacer)
+            promises.push(this._reporter.reportFormatDelta(formatA, "spacer", formatA.spacer, formatB.spacer, this._compareDirection));
+        if (formatA.includeZero !== formatB.includeZero)
+            promises.push(this._reporter.reportFormatDelta(formatA, "includeZero", formatA.includeZero, formatB.includeZero, this._compareDirection));
         await Promise.all(promises);
     }
     /**
@@ -484,35 +436,35 @@ class SchemaComparer {
      * @param unitB
      */
     async compareUnits(unitA, unitB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && unitB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !unitB)
             return;
         const promises = [];
-        const phenomenonB = unitB ? unitB.phenomenon : undefined;
-        if (unitA.phenomenon || phenomenonB) {
-            const fullNameA = unitA.phenomenon ? unitA.phenomenon.fullName : undefined;
-            const fullNameB = phenomenonB ? phenomenonB.fullName : undefined;
-            if (fullNameA !== fullNameB)
-                promises.push(this._reporter.reportUnitDelta(unitA, "phenomenon", fullNameA, fullNameB, this._compareDirection));
-        }
-        const unitSystemB = unitB ? unitB.unitSystem : undefined;
-        if (unitA.unitSystem || unitSystemB) {
-            const fullNameA = unitA.unitSystem ? unitA.unitSystem.fullName : undefined;
-            const fullNameB = unitSystemB ? unitSystemB.fullName : undefined;
-            if (fullNameA !== fullNameB)
-                promises.push(this._reporter.reportUnitDelta(unitA, "unitSystem", fullNameA, fullNameB, this._compareDirection));
-        }
-        const definitionB = unitB ? unitB.definition : undefined;
-        if (unitA.definition !== definitionB)
-            promises.push(this._reporter.reportUnitDelta(unitA, "definition", unitA.definition, definitionB, this._compareDirection));
-        const numeratorB = unitB ? unitB.numerator : undefined;
-        if (unitA.numerator !== numeratorB)
-            promises.push(this._reporter.reportUnitDelta(unitA, "numerator", unitA.numerator, numeratorB, this._compareDirection));
-        const denominatorB = unitB ? unitB.denominator : undefined;
-        if (unitA.denominator !== denominatorB)
-            promises.push(this._reporter.reportUnitDelta(unitA, "denominator", unitA.denominator, denominatorB, this._compareDirection));
-        const offsetB = unitB ? unitB.offset : undefined;
-        if (unitA.offset !== offsetB)
-            promises.push(this._reporter.reportUnitDelta(unitA, "offset", unitA.offset, offsetB, this._compareDirection));
+        if (unitA.phenomenon || unitB.phenomenon) {
+            const fullNameA = unitA.phenomenon?.fullName;
+            const fullNameB = unitB.phenomenon?.fullName;
+            if (fullNameA !== fullNameB) {
+                const eqByName = this.areItemsSameByName(unitA.phenomenon, unitB.phenomenon, unitA.schema.name, unitB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportUnitDelta(unitA, "phenomenon", fullNameA, fullNameB, this._compareDirection));
+            }
+        }
+        if (unitA.unitSystem || unitB.unitSystem) {
+            const fullNameA = unitA.unitSystem?.fullName;
+            const fullNameB = unitB.unitSystem?.fullName;
+            if (fullNameA !== fullNameB) {
+                const eqByName = this.areItemsSameByName(unitA.unitSystem, unitB.unitSystem, unitA.schema.name, unitB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportUnitDelta(unitA, "unitSystem", fullNameA, fullNameB, this._compareDirection));
+            }
+        }
+        if (unitA.definition !== unitB.definition)
+            promises.push(this._reporter.reportUnitDelta(unitA, "definition", unitA.definition, unitB.definition, this._compareDirection));
+        if (unitA.numerator !== unitB.numerator)
+            promises.push(this._reporter.reportUnitDelta(unitA, "numerator", unitA.numerator, unitB.numerator, this._compareDirection));
+        if (unitA.denominator !== unitB.denominator)
+            promises.push(this._reporter.reportUnitDelta(unitA, "denominator", unitA.denominator, unitB.denominator, this._compareDirection));
+        if (unitA.offset !== unitB.offset)
+            promises.push(this._reporter.reportUnitDelta(unitA, "offset", unitA.offset, unitB.offset, this._compareDirection));
         await Promise.all(promises);
     }
     /**
@@ -521,22 +473,26 @@ class SchemaComparer {
      * @param invertedUnitB
      */
     async compareInvertedUnits(invertedUnitA, invertedUnitB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && invertedUnitB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !invertedUnitB)
             return;
         const promises = [];
-        const invertsUnitB = invertedUnitB ? invertedUnitB.invertsUnit : undefined;
-        if (invertedUnitA.invertsUnit || invertsUnitB) {
-            const fullNameA = invertedUnitA.invertsUnit ? invertedUnitA.invertsUnit.fullName : undefined;
-            const fullNameB = invertsUnitB ? invertsUnitB.fullName : undefined;
-            if (fullNameA !== fullNameB)
-                promises.push(this._reporter.reportInvertedUnitDelta(invertedUnitA, "invertsUnit", fullNameA, fullNameB, this._compareDirection));
-        }
-        const unitSystemB = invertedUnitB ? invertedUnitB.unitSystem : undefined;
-        if (invertedUnitA.unitSystem || unitSystemB) {
-            const fullNameA = invertedUnitA.unitSystem ? invertedUnitA.unitSystem.fullName : undefined;
-            const fullNameB = unitSystemB ? unitSystemB.fullName : undefined;
-            if (fullNameA !== fullNameB)
-                promises.push(this._reporter.reportInvertedUnitDelta(invertedUnitA, "unitSystem", fullNameA, fullNameB, this._compareDirection));
+        if (invertedUnitA.invertsUnit || invertedUnitB.invertsUnit) {
+            const fullNameA = invertedUnitA.invertsUnit?.fullName;
+            const fullNameB = invertedUnitB.invertsUnit?.fullName;
+            if (fullNameA !== fullNameB) {
+                const eqByName = this.areItemsSameByName(invertedUnitA.invertsUnit, invertedUnitB.invertsUnit, invertedUnitA.schema.name, invertedUnitB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportInvertedUnitDelta(invertedUnitA, "invertsUnit", fullNameA, fullNameB, this._compareDirection));
+            }
+        }
+        if (invertedUnitA.unitSystem || invertedUnitB.unitSystem) {
+            const fullNameA = invertedUnitA.unitSystem?.fullName;
+            const fullNameB = invertedUnitB.unitSystem?.fullName;
+            if (fullNameA !== fullNameB) {
+                const eqByName = this.areItemsSameByName(invertedUnitA.unitSystem, invertedUnitB.unitSystem, invertedUnitA.schema.name, invertedUnitB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportInvertedUnitDelta(invertedUnitA, "unitSystem", fullNameA, fullNameB, this._compareDirection));
+            }
         }
         await Promise.all(promises);
     }
@@ -546,11 +502,10 @@ class SchemaComparer {
      * @param phenomenonB
      */
     async comparePhenomenons(phenomenonA, phenomenonB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && phenomenonB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !phenomenonB)
             return;
-        const definitionB = phenomenonB ? phenomenonB.definition : undefined;
-        if (phenomenonA.definition !== definitionB)
-            await this._reporter.reportPhenomenonDelta(phenomenonA, "definition", phenomenonA.definition, definitionB, this._compareDirection);
+        if (phenomenonA.definition !== phenomenonB.definition)
+            await this._reporter.reportPhenomenonDelta(phenomenonA, "definition", phenomenonA.definition, phenomenonB.definition, this._compareDirection);
     }
     /**
      * Compares two Constant objects to identify differences between property values.
@@ -558,51 +513,50 @@ class SchemaComparer {
      * @param constantB
      */
     async compareConstants(constantA, constantB) {
-        if (this._compareDirection === SchemaCompareDirection.Backward && constantB)
+        if (this._compareDirection === SchemaCompareDirection.Backward || !constantB)
             return;
         const promises = [];
-        const phenomenonB = constantB ? constantB.phenomenon : undefined;
-        if (constantA.phenomenon || phenomenonB) {
-            const fullNameA = constantA.phenomenon ? constantA.phenomenon.fullName : undefined;
-            const fullNameB = phenomenonB ? phenomenonB.fullName : undefined;
-            if (fullNameA !== fullNameB)
-                promises.push(this._reporter.reportConstantDelta(constantA, "phenomenon", fullNameA, fullNameB, this._compareDirection));
-        }
-        const definitionB = constantB ? constantB.definition : undefined;
-        if (constantA.definition !== definitionB)
-            promises.push(this._reporter.reportConstantDelta(constantA, "definition", constantA.definition, definitionB, this._compareDirection));
-        const numeratorB = constantB ? constantB.numerator : undefined;
-        if (constantA.numerator !== numeratorB)
-            promises.push(this._reporter.reportConstantDelta(constantA, "numerator", constantA.numerator, numeratorB, this._compareDirection));
-        const denominatorB = constantB ? constantB.denominator : undefined;
-        if (constantA.denominator !== denominatorB)
-            promises.push(this._reporter.reportConstantDelta(constantA, "denominator", constantA.denominator, denominatorB, this._compareDirection));
+        if (constantA.phenomenon || constantB.phenomenon) {
+            const fullNameA = constantA.phenomenon?.fullName;
+            const fullNameB = constantB.phenomenon?.fullName;
+            if (fullNameA !== fullNameB) {
+                const eqByName = this.areItemsSameByName(constantA.phenomenon, constantB.phenomenon, constantA.schema.name, constantB.schema.name);
+                if (!eqByName)
+                    promises.push(this._reporter.reportConstantDelta(constantA, "phenomenon", fullNameA, fullNameB, this._compareDirection));
+            }
+        }
+        if (constantA.definition !== constantB.definition)
+            promises.push(this._reporter.reportConstantDelta(constantA, "definition", constantA.definition, constantB.definition, this._compareDirection));
+        if (constantA.numerator !== constantB.numerator)
+            promises.push(this._reporter.reportConstantDelta(constantA, "numerator", constantA.numerator, constantB.numerator, this._compareDirection));
+        if (constantA.denominator !== constantB.denominator)
+            promises.push(this._reporter.reportConstantDelta(constantA, "denominator", constantA.denominator, constantB.denominator, this._compareDirection));
         await Promise.all(promises);
     }
     async comparePropertyType(propertyA, propertyB) {
         const promises = [];
         const propertyTypeA = (0, ecschema_metadata_1.propertyTypeToString)(propertyA.propertyType);
-        const propertyTypeB = propertyB !== undefined ? (0, ecschema_metadata_1.propertyTypeToString)(propertyB.propertyType) : undefined;
+        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 && propertyB.isArray() ? propertyB.minOccurs : undefined;
+            const minOccursB = propertyB.isArray() ? propertyB.minOccurs : undefined;
             if (propertyA.minOccurs !== minOccursB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "minOccurs", propertyA.minOccurs, minOccursB, this._compareDirection));
             }
-            const maxOccursB = propertyB && propertyB.isArray() ? propertyB.maxOccurs : undefined;
+            const maxOccursB = propertyB.isArray() ? propertyB.maxOccurs : undefined;
             if (propertyA.maxOccurs !== maxOccursB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "maxOccurs", propertyA.maxOccurs, maxOccursB, this._compareDirection));
             }
         }
         if (propertyA.isEnumeration()) {
-            const enumerationB = propertyB && propertyB.isEnumeration() ? propertyB.enumeration : undefined;
+            const enumerationB = propertyB.isEnumeration() ? propertyB.enumeration : undefined;
             if (propertyA.enumeration || enumerationB) {
-                const enumA = propertyA.enumeration ? propertyA.enumeration.fullName : undefined;
-                const enumB = enumerationB ? enumerationB.fullName : undefined;
+                const enumA = propertyA.enumeration?.fullName;
+                const enumB = enumerationB?.fullName;
                 if (enumA !== enumB) {
-                    const areSameByName = this.areItemsSameByName(propertyA.enumeration, enumerationB, propertyA.schema.name, propertyB?.schema.name);
+                    const areSameByName = this.areItemsSameByName(propertyA.enumeration, enumerationB, propertyA.schema.name, propertyB.schema.name);
                     if (!areSameByName) {
                         promises.push(this._reporter.reportPropertyDelta(propertyA, "enumeration", enumA, enumB, this._compareDirection));
                     }
@@ -610,60 +564,60 @@ class SchemaComparer {
             }
         }
         if (propertyA.isNavigation()) {
-            const strengthDirectionB = propertyB && propertyB.isNavigation() ? propertyB.direction : undefined;
+            const strengthDirectionB = propertyB.isNavigation() ? propertyB.direction : undefined;
             if (propertyA.direction !== strengthDirectionB) {
                 const dirA = (0, ecschema_metadata_1.strengthDirectionToString)(propertyA.direction);
                 const dirB = strengthDirectionB !== undefined ? (0, ecschema_metadata_1.strengthDirectionToString)(strengthDirectionB) : undefined;
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "direction", dirA, dirB, this._compareDirection));
             }
             if (propertyA.relationshipClass) { // eslint-disable-line @typescript-eslint/no-misused-promises
-                const relationshipClassB = propertyB && propertyB.isNavigation() ? propertyB.relationshipClass : undefined;
+                const relationshipClassB = propertyB.isNavigation() ? propertyB.relationshipClass : undefined;
                 const relA = propertyA.relationshipClass.fullName;
                 const relB = relationshipClassB ? relationshipClassB.fullName : undefined;
                 if (relA !== relB) {
-                    const areSameByName = this.areItemsSameByName(propertyA.relationshipClass, relationshipClassB, propertyA.schema.name, propertyB?.schema.name);
+                    const areSameByName = this.areItemsSameByName(propertyA.relationshipClass, relationshipClassB, propertyA.schema.name, propertyB.schema.name);
                     if (!areSameByName)
                         promises.push(this._reporter.reportPropertyDelta(propertyA, "relationshipClass", relA, relB, this._compareDirection));
                 }
             }
         }
         if (propertyA.isPrimitive()) {
-            const primitiveTypeB = propertyB && propertyB.isPrimitive() ? propertyB.primitiveType : undefined;
+            const primitiveTypeB = propertyB.isPrimitive() ? propertyB.primitiveType : undefined;
             if (propertyA.primitiveType !== primitiveTypeB) {
                 const aType = (0, ecschema_metadata_1.primitiveTypeToString)(propertyA.primitiveType);
                 const bType = primitiveTypeB !== undefined ? (0, ecschema_metadata_1.primitiveTypeToString)(primitiveTypeB) : undefined;
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "primitiveType", aType, bType, this._compareDirection));
             }
-            const minLengthB = propertyB && propertyB.isPrimitive() ? propertyB.minLength : undefined;
+            const minLengthB = propertyB.isPrimitive() ? propertyB.minLength : undefined;
             if (propertyA.minLength !== minLengthB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "minLength", propertyA.minLength, minLengthB, this._compareDirection));
             }
             // valid for primitive and enumeration properties
-            const maxLengthB = propertyB && propertyB.isPrimitive() ? propertyB.maxLength : undefined;
+            const maxLengthB = propertyB.isPrimitive() ? propertyB.maxLength : undefined;
             if (propertyA.maxLength !== maxLengthB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "maxLength", propertyA.maxLength, maxLengthB, this._compareDirection));
             }
-            const minValueB = propertyB && propertyB.isPrimitive() ? propertyB.minValue : undefined;
+            const minValueB = propertyB.isPrimitive() ? propertyB.minValue : undefined;
             if (propertyA.minValue !== minValueB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "minValue", propertyA.minValue, minValueB, this._compareDirection));
             }
-            const maxValueB = propertyB && propertyB.isPrimitive() ? propertyB.maxValue : undefined;
+            const maxValueB = propertyB.isPrimitive() ? propertyB.maxValue : undefined;
             if (propertyA.maxValue !== maxValueB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "maxValue", propertyA.maxValue, maxValueB, this._compareDirection));
             }
-            const extendedTypeNameB = propertyB && propertyB.isPrimitive() ? propertyB.extendedTypeName : undefined;
+            const extendedTypeNameB = propertyB.isPrimitive() ? propertyB.extendedTypeName : undefined;
             if (propertyA.extendedTypeName !== extendedTypeNameB) {
                 promises.push(this._reporter.reportPropertyDelta(propertyA, "extendedTypeName", propertyA.extendedTypeName, extendedTypeNameB, this._compareDirection));
             }
         }
         if (propertyA.isStruct()) {
             const structA = propertyA.structClass;
-            const structB = propertyB && propertyB.isStruct() ? propertyB.structClass : undefined;
+            const structB = propertyB.isStruct() ? propertyB.structClass : undefined;
             if (structA || structB) {
-                const structNameA = structA ? structA.fullName : undefined;
-                const structNameB = structB ? structB.fullName : undefined;
+                const structNameA = structA.fullName;
+                const structNameB = structB?.fullName;
                 if (structNameA !== structNameB) {
-                    const areSameByName = this.areItemsSameByName(structA.key, structB?.key, propertyA.schema.name, propertyB?.schema.name);
+                    const areSameByName = this.areItemsSameByName(structA.key, structB?.key, propertyA.schema.name, propertyB.schema.name);
                     if (!areSameByName) {
                         promises.push(this._reporter.reportPropertyDelta(propertyA, "structClass", structNameA, structNameB, this._compareDirection));
                     }
@@ -674,13 +628,6 @@ class SchemaComparer {
     }
     async compareEnumerators(enumeratorA, enumeratorB, enumA, enumB) {
         const promises = [];
-        if (!enumB || !enumeratorB) {
-            promises.push(this._reporter.reportEnumeratorDelta(enumA, enumeratorA, "description", enumeratorA.description, undefined, this._compareDirection));
-            promises.push(this._reporter.reportEnumeratorDelta(enumA, enumeratorA, "label", enumeratorA.label, undefined, this._compareDirection));
-            promises.push(this._reporter.reportEnumeratorDelta(enumA, enumeratorA, "value", enumeratorA.value, undefined, this._compareDirection));
-            await Promise.all(promises);
-            return;
-        }
         if (enumeratorA.description !== enumeratorB.description)
             promises.push(this._reporter.reportEnumeratorDelta(enumA, enumeratorA, "description", enumeratorA.description, enumeratorB.description, this._compareDirection));
         if (!labelsMatch(enumeratorA.label, enumeratorB.label))
@@ -691,16 +638,16 @@ class SchemaComparer {
         await Promise.all(promises);
     }
     async compareFormatUnits(formatA, formatB) {
-        if (!formatA.units)
+        if (!formatA.units || !formatB)
             return;
         const promises = [];
         for (const unitA of formatA.units) {
-            const unitB = formatB && formatB.units ? formatB.units.find((u) => u[0].fullName === unitA[0].fullName) : undefined;
+            const unitB = formatB.units ? formatB.units.find((u) => this.areItemsSameByName(unitA[0], u[0], formatA.schema.name, formatB.schema.name)) : undefined;
             if (!unitB) {
                 promises.push(this._reporter.reportFormatUnitMissing(formatA, unitA[0], this._compareDirection));
                 continue;
             }
-            if (this._compareDirection === SchemaCompareDirection.Backward && formatB)
+            if (this._compareDirection === SchemaCompareDirection.Backward)
                 continue;
             if (unitA[1] !== unitB[1]) {
                 const labelA = unitA[1];
@@ -710,6 +657,19 @@ class SchemaComparer {
         }
         await Promise.all(promises);
     }
+    areOverrideFormatsSameByName(itemKeyA, itemKeyB, topLevelSchemaNameA, topLevelSchemaNameB) {
+        if (itemKeyA.units) {
+            for (const unitA of itemKeyA.units) {
+                if (!itemKeyB.units
+                    || -1 === itemKeyB.units.findIndex((unitB) => this.areItemsSameByName(unitA[0], unitB[0], topLevelSchemaNameA, topLevelSchemaNameB)
+                        && unitA[1] === unitB[1]))
+                    return false;
+            }
+        }
+        const itemA = ecschema_metadata_1.OverrideFormat.isOverrideFormat(itemKeyA) ? itemKeyA.parent : itemKeyA;
+        const itemB = ecschema_metadata_1.OverrideFormat.isOverrideFormat(itemKeyB) ? itemKeyB.parent : itemKeyB;
+        return itemKeyA.precision === itemKeyB.precision && this.areItemsSameByName(itemA, itemB, topLevelSchemaNameA, topLevelSchemaNameB);
+    }
     /**
      * Compares two item keys.
      * @param itemKeyA item key A to compare to.
@@ -721,8 +681,16 @@ class SchemaComparer {
     areItemsSameByName(itemKeyA, itemKeyB, topLevelSchemaNameA, topLevelSchemaNameB) {
         const nameA = itemKeyA ? itemKeyA.name : undefined;
         const nameB = itemKeyB ? itemKeyB.name : undefined;
-        const schemaNameA = itemKeyA ? itemKeyA.schemaName : undefined;
-        const schemaNameB = itemKeyB ? itemKeyB.schemaName : undefined;
+        const schemaNameA = itemKeyA
+            ? ecschema_metadata_1.SchemaItem.isSchemaItem(itemKeyA)
+                ? itemKeyA.schema.name
+                : itemKeyA.schemaName
+            : undefined;
+        const schemaNameB = itemKeyB
+            ? ecschema_metadata_1.SchemaItem.isSchemaItem(itemKeyB)
+                ? itemKeyB.schema.name
+                : itemKeyB.schemaName
+            : undefined;
         return (nameA === nameB && schemaNameA === topLevelSchemaNameA && schemaNameB === topLevelSchemaNameB) || (nameA === nameB && schemaNameA === schemaNameB);
     }
     /**
@@ -732,13 +700,23 @@ class SchemaComparer {
      * @param containerB container in which to look for classNameA.
      * @returns true if a same classA is in containerB, otherwise false.
      */
-    containerHasClass(classNameA, containerA, containerB) {
+    containerHasClass(attributeA, containerA, containerB) {
         if (containerB && containerB.customAttributes) {
             for (const caB of containerB.customAttributes) {
-                const classNameB = caB[0];
-                const classItemKeyA = containerA.schema.getSchemaItemKey(classNameA);
-                const classItemKeyB = containerB.schema.getSchemaItemKey(classNameB);
-                return this.areItemsSameByName(classItemKeyA, classItemKeyB, containerA.schema.name, containerB.schema.name);
+                const attributeB = caB[1];
+                const classItemKeyA = containerA.schema.getSchemaItemKey(attributeA.className);
+                const classItemKeyB = containerB.schema.getSchemaItemKey(attributeB.className);
+                if (this.areItemsSameByName(classItemKeyA, classItemKeyB, containerA.schema.name, containerB.schema.name)) {
+                    return Object.keys(attributeA).every((property) => {
+                        const propertyName = property.toString();
+                        const valueA = attributeA[propertyName];
+                        const valueB = attributeB[propertyName];
+                        return propertyName === "className"
+                            || valueA === valueB
+                            || Array.isArray(valueA) && Array.isArray(valueB) && valueA.length === valueB.length
+                                && valueA.every((val, idx) => val === valueB[idx]);
+                    });
+                }
             }
         }
         return false;