@itwin/ecschema-metadata 5.0.0-dev.11 → 5.0.0-dev.111

package/lib/cjs/Deserialization/XmlParser.js

@@ -8,6 +8,7 @@ exports.XmlParser = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
 const ECObjects_1 = require("../ECObjects");
 const Exception_1 = require("../Exception");
+const Enumeration_1 = require("../Metadata/Enumeration");
 const ECName_1 = require("../ECName");
 const AbstractParser_1 = require("./AbstractParser");
 const Helper_1 = require("./Helper");
@@ -15,6 +16,15 @@ const NON_ITEM_SCHEMA_ELEMENTS = ["ECSchemaReference", "ECCustomAttributes"];
 const ECXML_URI = "http://www\\.bentley\\.com/schemas/Bentley\\.ECXML";
 /** @internal */
 class XmlParser extends AbstractParser_1.AbstractParser {
+    _rawSchema;
+    _schemaName;
+    _schemaReferenceNames;
+    _schemaAlias;
+    _schemaVersion;
+    _xmlNamespace;
+    _currentItemFullName;
+    _schemaItems;
+    _mapIsPopulated;
     constructor(rawSchema) {
         super();
         this._rawSchema = rawSchema;
@@ -42,18 +52,18 @@ class XmlParser extends AbstractParser_1.AbstractParser {
     parseSchema() {
         const schemaMetadata = this._rawSchema.documentElement;
         if ("ECSchema" !== schemaMetadata.nodeName)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, "An ECSchema is missing the required metadata.");
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, "An ECSchema is missing the required metadata.");
         const schemaDefDuplicates = this.getElementChildrenByTagName(schemaMetadata, "ECSchema");
         if (schemaDefDuplicates.length > 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, "An ECSchema has more than one ECSchema definition. Only one is allowed.");
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, "An ECSchema has more than one ECSchema definition. Only one is allowed.");
         if (this._schemaName === undefined)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `An ECSchema is missing a required 'schemaName' attribute`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `An ECSchema is missing a required 'schemaName' attribute`);
         if (this._schemaVersion === undefined)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} is missing a required 'version' attribute`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} is missing a required 'version' attribute`);
         if (this._xmlNamespace === undefined)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} is missing a required 'xmlns' attribute`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} is missing a required 'xmlns' attribute`);
         if (this._ecSpecVersion === undefined)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} has an invalid 'xmlns' attribute`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECSchema ${this._schemaName} has an invalid 'xmlns' attribute`);
         const alias = this.getRequiredAttribute(schemaMetadata, "alias", `The ECSchema ${this._schemaName} is missing a required 'alias' attribute`);
         const description = this.getOptionalAttribute(schemaMetadata, "description");
         const displayLabel = this.getOptionalAttribute(schemaMetadata, "displayLabel");
@@ -94,11 +104,11 @@ class XmlParser extends AbstractParser_1.AbstractParser {
                 if (itemType === undefined) {
                     if (Helper_1.SchemaReadHelper.isECSpecVersionNewer(this._ecSpecVersion))
                         continue;
-                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `A SchemaItem in ${this._schemaName} has an invalid type. '${rawItemType}' is not a valid SchemaItem type.`);
+                    throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `A SchemaItem in ${this._schemaName} has an invalid type. '${rawItemType}' is not a valid SchemaItem type.`);
                 }
                 const itemName = this.getRequiredAttribute(item, "typeName", `A SchemaItem in ${this._schemaName} is missing the required 'typeName' attribute.`);
                 if (!ECName_1.ECName.validate(itemName))
-                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidECName, `A SchemaItem in ${this._schemaName} has an invalid 'typeName' attribute. '${itemName}' is not a valid ECName.`);
+                    throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidECName, `A SchemaItem in ${this._schemaName} has an invalid 'typeName' attribute. '${itemName}' is not a valid ECName.`);
                 this._currentItemFullName = `${this._schemaName}.${itemName}`;
                 this._schemaItems.set(itemName, [itemType, item]);
                 yield [itemName, itemType, item];
@@ -157,22 +167,22 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const baseClasses = this.getElementChildrenByTagName(xmlElement, "BaseClass");
         // Mixins can only have one base class
         if (baseClasses.length > 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} has more than one base class which is not allowed.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} has more than one base class which is not allowed.`);
         const customAttributesResult = this.getElementChildrenByTagName(xmlElement, "ECCustomAttributes");
         if (customAttributesResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'IsMixin' tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'IsMixin' tag.`);
         const customAttributes = customAttributesResult[0];
         const isMixinResult = this.getElementChildrenByTagName(customAttributes, "IsMixin");
         if (isMixinResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'IsMixin' tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'IsMixin' tag.`);
         const mixinAttributes = isMixinResult[0];
         const appliesToResult = this.getElementChildrenByTagName(mixinAttributes, "AppliesToEntityClass");
         if (appliesToResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'AppliesToEntityClass' tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'AppliesToEntityClass' tag.`);
         const appliesToElement = appliesToResult[0];
         let appliesTo = appliesToElement.textContent;
         if (appliesTo === null || appliesTo.length === 0)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'AppliesToEntityClass' tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Mixin ${this._currentItemFullName} is missing the required 'AppliesToEntityClass' tag.`);
         appliesTo = this.getQualifiedTypeName(appliesTo);
         const mixinProps = {
             ...classProps,
@@ -201,17 +211,17 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const sourceResult = this.getElementChildrenByTagName(xmlElement, "Source");
         if (sourceResult.length !== 1) {
             if (sourceResult.length === 0)
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Source constraint tag.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Source constraint tag.`);
             else
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} has more than one Source constraint tag. Only one is allowed.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} has more than one Source constraint tag. Only one is allowed.`);
         }
         const source = this.getRelationshipConstraintProps(sourceResult[0], true);
         const targetResult = this.getElementChildrenByTagName(xmlElement, "Target");
         if (targetResult.length !== 1) {
             if (targetResult.length === 0)
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Target constraint tag.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Target constraint tag.`);
             else
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} has more than one Target constraint tag. Only one is allowed.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} has more than one Target constraint tag. Only one is allowed.`);
         }
         const target = this.getRelationshipConstraintProps(targetResult[0], false);
         return {
@@ -238,7 +248,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             if (Helper_1.SchemaReadHelper.isECSpecVersionNewer(this._ecSpecVersion))
                 tempBackingType = ECObjects_1.PrimitiveType.String;
             else
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidECJson, `The Enumeration ${this._currentItemFullName} has an invalid 'backingTypeName' attribute. It should be either "int" or "string".`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidECJson, `The Enumeration ${this._currentItemFullName} has an invalid 'backingTypeName' attribute. It should be either "int" or "string".`);
         }
         let isStrictString = this.getOptionalAttribute(xmlElement, "isStrict");
         if (isStrictString === undefined)
@@ -253,7 +263,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             if (ECObjects_1.PrimitiveType.Integer === tempBackingType) {
                 const numericValue = parseInt(valueString, 10);
                 if (isNaN(numericValue))
-                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Enumeration ${this._currentItemFullName} of type "int" has an enumerator with a non-integer value.`);
+                    throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Enumeration ${this._currentItemFullName} of type "int" has an enumerator with a non-integer value.`);
                 value = numericValue;
             }
             const label = this.getOptionalAttribute(element, "displayLabel");
@@ -279,7 +289,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const relativeErrorString = this.getRequiredAttribute(xmlElement, "relativeError", `The KindOfQuantity ${this._currentItemFullName} is missing the required 'relativeError' attribute.`);
         const relativeError = parseFloat(relativeErrorString);
         if (isNaN(relativeError))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The KindOfQuantity ${this._currentItemFullName} has an invalid 'relativeError' attribute. It should be a numeric value.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The KindOfQuantity ${this._currentItemFullName} has an invalid 'relativeError' attribute. It should be a numeric value.`);
         const presentationUnitsString = this.getOptionalAttribute(xmlElement, "presentationUnits");
         let presentationUnits;
         if (presentationUnitsString)
@@ -298,7 +308,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const priorityString = this.getRequiredAttribute(xmlElement, "priority", `The PropertyCategory ${this._currentItemFullName} is missing the required 'priority' attribute.`);
         const priority = parseInt(priorityString, 10);
         if (isNaN(priority))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The PropertyCategory ${this._currentItemFullName} has an invalid 'priority' attribute. It should be a numeric value.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The PropertyCategory ${this._currentItemFullName} has an invalid 'priority' attribute. It should be a numeric value.`);
         return {
             ...itemProps,
             priority,
@@ -387,11 +397,11 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             const units = new Array();
             const unitsResult = this.getElementChildrenByTagName(compositeElement, "Unit");
             if (unitsResult.length < 1)
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Format ${this._currentItemFullName} has an invalid 'Composite' element. It should have 1-4 Unit elements.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Format ${this._currentItemFullName} has an invalid 'Composite' element. It should have 1-4 Unit elements.`);
             for (const unit of unitsResult) {
                 let name = unit.textContent;
                 if (null === name || 0 === name.length)
-                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The Format ${this._currentItemFullName} has a Composite with an invalid Unit. One of the Units is missing the required 'name' attribute.`);
+                    throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The Format ${this._currentItemFullName} has a Composite with an invalid Unit. One of the Units is missing the required 'name' attribute.`);
                 const label = this.getOptionalAttribute(unit, "label");
                 name = this.getQualifiedTypeName(name);
                 units.push({ name, label });
@@ -431,7 +441,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             const propertyType = this.getPropertyType(childType);
             // This may not be needed, just a failsafe if the regex is faulty
             if (propertyType === undefined)
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECProperty ${itemName}.${propertyName} has an invalid type. ${childType} is not a valid ECProperty type.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECProperty ${itemName}.${propertyName} has an invalid type. ${childType} is not a valid ECProperty type.`);
             yield [propertyName, propertyType, child];
         }
     }
@@ -492,12 +502,12 @@ class XmlParser extends AbstractParser_1.AbstractParser {
     getRelationshipConstraintCustomAttributeProviders(xmlElement) {
         const sourceResult = this.getElementChildrenByTagName(xmlElement, "Source");
         if (sourceResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Source constraint tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Source constraint tag.`);
         const sourceElement = sourceResult[0];
         const sourceCustomAttributes = this.getCustomAttributeProviders(sourceElement, "Source Constraint of", this._currentItemFullName);
         const targetResult = this.getElementChildrenByTagName(xmlElement, "Target");
         if (targetResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Target constraint tag.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The RelationshipClass ${this._currentItemFullName} is missing the required Target constraint tag.`);
         const targetElement = targetResult[0];
         const targetCustomAttributes = this.getCustomAttributeProviders(targetElement, "Source Constraint of", this._currentItemFullName);
         return [sourceCustomAttributes, targetCustomAttributes];
@@ -546,7 +556,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         if (resultString) {
             result = parseFloat(resultString);
             if (isNaN(result))
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, parseErrorMsg);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, parseErrorMsg);
         }
         return result;
     }
@@ -556,7 +566,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         if (resultString) {
             result = parseInt(resultString, 10);
             if (isNaN(result))
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, parseErrorMsg);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, parseErrorMsg);
         }
         return result;
     }
@@ -567,14 +577,14 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         else if ("false" === textString)
             return false;
         else
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, parseErrorMsg);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, parseErrorMsg);
     }
     getRequiredAttribute(xmlElement, attributeName, errorMsg) {
         if (!xmlElement.hasAttribute(attributeName))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, errorMsg);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, errorMsg);
         const result = xmlElement.getAttribute(attributeName);
         if (result === null)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, errorMsg);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, errorMsg);
         return result;
     }
     getSchemaReference(xmlElement) {
@@ -650,11 +660,11 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const constraintClasses = new Array();
         const constraintClassesResult = this.getElementChildrenByTagName(xmlElement, "Class");
         if (constraintClassesResult.length < 1)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ${constraintName} is missing the required Class tags.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ${constraintName} is missing the required Class tags.`);
         for (const constraintClass of constraintClassesResult) {
             let constraintClassId = constraintClass.getAttribute("class");
             if (null === constraintClassId || 0 === constraintClassId.length)
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ${constraintName} has a Class that is missing the required 'class' attribute.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ${constraintName} has a Class that is missing the required 'class' attribute.`);
             constraintClassId = this.getQualifiedTypeName(constraintClassId);
             constraintClasses.push(constraintClassId);
         }
@@ -683,7 +693,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         const propName = this.getPropertyName(xmlElement);
         const propType = this.getPropertyType(xmlElement.nodeName);
         if (propType === undefined)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECProperty ${this._currentItemFullName}.${propName} has an invalid type. ${propType} is not a valid ECProperty type.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECProperty ${this._currentItemFullName}.${propName} has an invalid type. ${propType} is not a valid ECProperty type.`);
         const label = this.getOptionalAttribute(xmlElement, "displayLabel");
         const description = this.getOptionalAttribute(xmlElement, "description");
         const readOnlyString = this.getOptionalAttribute(xmlElement, "readOnly");
@@ -751,7 +761,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         else if (undefined !== maxOccursStr) {
             maxOccurs = parseInt(maxOccursStr, 10);
             if (isNaN(maxOccurs))
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `The ECProperty ${this._currentItemFullName}.${propName} has an invalid 'maxOccurs' attribute. It should be a numeric value.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `The ECProperty ${this._currentItemFullName}.${propName} has an invalid 'maxOccurs' attribute. It should be a numeric value.`);
         }
         return { minOccurs, maxOccurs };
     }
@@ -775,7 +785,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             ns = `${this._schemaName}.${this._schemaVersion}`;
         }
         if (null === ns || !this.isSchemaFullNameValidForVersion(ns, this._ecSpecVersion))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Custom attribute namespaces must contain a valid 3.2 full schema name in the form <schemaName>.RR.ww.mm.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Custom attribute namespaces must contain a valid 3.2 full schema name in the form <schemaName>.RR.ww.mm.`);
         const schemaNameParts = ns.split(".");
         const className = `${schemaNameParts[0]}.${xmlCustomAttribute.tagName}`;
         const properties = this.getElementChildren(xmlCustomAttribute);
@@ -786,8 +796,6 @@ class XmlParser extends AbstractParser_1.AbstractParser {
     }
     addCAPropertyValues(caClass, propertyElements) {
         const instance = { className: caClass.fullName };
-        if (!caClass.properties)
-            return instance;
         for (const propertyElement of propertyElements) {
             const value = this.readPropertyValue(propertyElement, caClass);
             if (value !== undefined)
@@ -804,9 +812,9 @@ class XmlParser extends AbstractParser_1.AbstractParser {
         let enumeration;
         if (propertyClass.isPrimitive()) {
             if (propertyClass.isEnumeration() && propertyClass.enumeration) {
-                enumeration = propertyClass.schema.lookupItemSync(propertyClass.enumeration.fullName);
+                enumeration = propertyClass.schema.lookupItemSync(propertyClass.enumeration.fullName, Enumeration_1.Enumeration);
                 if (!enumeration)
-                    throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.ClassNotFound, `The Enumeration class '${propertyClass.enumeration.fullName}' could not be found.`);
+                    throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.ClassNotFound, `The Enumeration class '${propertyClass.enumeration.fullName}' could not be found.`);
             }
             const primitiveType = enumeration && enumeration.type ? enumeration.type : (propertyClass).primitiveType;
             return this.readPrimitivePropertyValue(propElement, primitiveType);
@@ -853,9 +861,9 @@ class XmlParser extends AbstractParser_1.AbstractParser {
     }
     readPrimitivePropertyValue(propElement, primitiveType) {
         if (undefined === propElement.textContent || null === propElement.textContent)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid property value.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid property value.`);
         if (propElement.textContent === "" && primitiveType !== ECObjects_1.PrimitiveType.String)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid property value.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid property value.`);
         // TODO: Mapping all primitive types to string, number and boolean
         // for now.  Need to review with IModelJs.
         switch (primitiveType) {
@@ -877,7 +885,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             case ECObjects_1.PrimitiveType.Double:
                 return this.getDoublePropertyValue(propElement.textContent, propElement.tagName);
             default:
-                throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid primitive type.`);
+                throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Primitive property '${propElement.tagName}' has an invalid primitive type.`);
         }
     }
     getBooleanPropertyValue(propValue, propName) {
@@ -889,47 +897,47 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             Number.parseInt(propValue, 10) === 0) {
             return false;
         }
-        throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. An boolean value was expected.`);
+        throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. An boolean value was expected.`);
     }
     getIntegerPropertyValue(propValue, propName) {
         const result = Number.parseFloat(propValue);
         if (isNaN(result) || result % 1 !== 0)
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. An integer value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. An integer value was expected.`);
         return result;
     }
     getDatePropertyValue(propValue, propName) {
         const result = Number.parseInt(propValue, 10);
         if (isNaN(result))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A date in milliseconds was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A date in milliseconds was expected.`);
         return new Date(result);
     }
     getDoublePropertyValue(propValue, propName) {
         const result = Number.parseFloat(propValue);
         if (isNaN(result))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A double value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A double value was expected.`);
         return result;
     }
     getPoint2DPropertyValue(propValue, propName) {
         const result = propValue.split(",");
         if (result.length !== 2) {
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 2D value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 2D value was expected.`);
         }
         const x = Number.parseFloat(result[0]);
         const y = Number.parseFloat(result[1]);
         if (isNaN(x) || isNaN(y))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 2D value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 2D value was expected.`);
         return { x, y };
     }
     getPoint3DPropertyValue(propValue, propName) {
         const result = propValue.split(",");
         if (result.length !== 3) {
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 3D value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 3D value was expected.`);
         }
         const x = Number.parseFloat(result[0]);
         const y = Number.parseFloat(result[1]);
         const z = Number.parseFloat(result[2]);
         if (isNaN(x) || isNaN(y) || isNaN(z))
-            throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 3D value was expected.`);
+            throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `Property '${propName}' has an invalid property value. A Point 3D value was expected.`);
         return { x, y, z };
     }
     isSchemaFullNameValidForVersion(schemaFullName, ecSpecVersion) {
@@ -961,7 +969,7 @@ class XmlParser extends AbstractParser_1.AbstractParser {
             return `${this._schemaName}.${nameParts[1]}`;
         if (this._schemaReferenceNames.has(nameParts[0].toLowerCase()))
             return `${this._schemaReferenceNames.get(nameParts[0].toLowerCase())}.${nameParts[1]}`;
-        throw new Exception_1.ECObjectsError(Exception_1.ECObjectsStatus.InvalidSchemaXML, `No valid schema found for alias ${nameParts[0]}`);
+        throw new Exception_1.ECSchemaError(Exception_1.ECSchemaStatus.InvalidSchemaXML, `No valid schema found for alias ${nameParts[0]}`);
     }
     /** The rest of the API uses the full name format of `{SchemaName}.{SchemaItemName}`,
      * meaning all of the references in the format string need to be changed.