@itwin/ecschema-editing 4.7.0-dev.8 → 4.8.0-dev.0

package/lib/cjs/Merging/EntityClassMerger.js

@@ -20,10 +20,7 @@ exports.entityClassMerger = {
         if (change.difference.mixins !== undefined) {
             for (const mixin of change.difference.mixins) {
                 const mixinKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, mixin);
-                const result = await context.editor.entities.addMixin(itemKey, mixinKey);
-                if (result.errorMessage) {
-                    return result;
-                }
+                await context.editor.entities.addMixin(itemKey, mixinKey);
             }
         }
         return (0, ClassMerger_1.modifyClass)(context, change, itemKey, item);
@@ -38,15 +35,11 @@ async function mergeClassMixins(context, change) {
         for (const mixinFullName of change.difference) {
             const mixinKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, mixinFullName);
             const entityKey = new ecschema_metadata_1.SchemaItemKey(change.itemName, context.targetSchemaKey);
-            const result = await context.editor.entities.addMixin(entityKey, mixinKey);
-            if (result.errorMessage) {
-                throw new Error(result.errorMessage);
-            }
+            await context.editor.entities.addMixin(entityKey, mixinKey);
         }
-        return {};
     }
     else {
-        return { errorMessage: `Changing the entity class '${change.itemName}' mixins is not supported.` };
+        throw new Error(`Changing the entity class '${change.itemName}' mixins is not supported.`);
     }
 }
 exports.mergeClassMixins = mergeClassMixins;

package/lib/cjs/Merging/EntityClassMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;;AAKA,yDAAuF;AAEvF,+CAA4C;AAC5C,gEAAyD;AAIzD;;;GAGG;AACU,QAAA,iBAAiB,GAAmD;IAC/E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACtE,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YAEjC,GAAG,MAAM,CAAC,UAAU;SACrB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAwB;QAC7D,IAAG,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1C,KAAI,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBACzE,IAAG,MAAM,CAAC,YAAY,EAAE,CAAC;oBACvB,OAAO,MAAM,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAC;AAEF;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAAkC;IACpG,IAAG,MAAM,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC/B,KAAI,MAAM,aAAa,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACnE,MAAM,SAAS,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;YAC9E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC3E,IAAG,MAAM,CAAC,YAAY,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,YAAY,EAAE,8BAA8B,MAAM,CAAC,QAAQ,4BAA4B,EAAC,CAAC;IACpG,CAAC;AACH,CAAC;AAdD,4CAcC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { type EntityClassDifference, EntityClassMixinDifference } from \"../Differencing/SchemaDifference\";\nimport { type SchemaItemMergerHandler, updateSchemaItemKey } from \"./SchemaItemMerger\";\nimport { type MutableEntityClass } from \"../Editing/Mutable/MutableEntityClass\";\nimport { modifyClass } from \"./ClassMerger\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\n\n/**\n * Defines a merge handler to merge Entity Class schema items.\n * @internal\n */\nexport const entityClassMerger: SchemaItemMergerHandler<EntityClassDifference> = {\n  async add(context, change) {\n    return context.editor.entities.createFromProps(context.targetSchemaKey, {\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n\n      ...change.difference,\n    });\n  },\n  async modify(context, change, itemKey, item: MutableEntityClass) {\n    if(change.difference.mixins !== undefined) {\n      for(const mixin of change.difference.mixins) {\n        const mixinKey = await updateSchemaItemKey(context, mixin);\n        const result = await context.editor.entities.addMixin(itemKey, mixinKey);\n        if(result.errorMessage) {\n          return result;\n        }\n      }\n    }\n\n    return modifyClass(context, change, itemKey, item);\n  },\n};\n\n/**\n * Merges Mixins to Entity Class schema items.\n * @internal\n */\nexport async function mergeClassMixins(context: SchemaMergeContext, change: EntityClassMixinDifference): Promise<SchemaItemEditResults> {\n  if(change.changeType === \"add\") {\n    for(const mixinFullName of change.difference) {\n      const mixinKey = await updateSchemaItemKey(context, mixinFullName);\n      const entityKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n      const result = await context.editor.entities.addMixin(entityKey, mixinKey);\n      if(result.errorMessage) {\n        throw new Error(result.errorMessage);\n      }\n    }\n    return {};\n  } else {\n    return { errorMessage: `Changing the entity class '${change.itemName}' mixins is not supported.`};\n  }\n}\n"]}
+{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;;AAKA,yDAAuF;AAEvF,+CAA4C;AAC5C,gEAAyD;AAGzD;;;GAGG;AACU,QAAA,iBAAiB,GAAmD;IAC/E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACtE,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YAEjC,GAAG,MAAM,CAAC,UAAU;SACrB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAwB;QAC7D,IAAG,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1C,KAAI,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC3D,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAC;AAEF;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAAkC;IACpG,IAAG,MAAM,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC/B,KAAI,MAAM,aAAa,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACnE,MAAM,SAAS,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;YAC9E,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,QAAQ,4BAA4B,CAAC,CAAC;IAC7F,CAAC;AACH,CAAC;AAVD,4CAUC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type EntityClassDifference, EntityClassMixinDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler, updateSchemaItemKey } from \"./SchemaItemMerger\";\r\nimport { type MutableEntityClass } from \"../Editing/Mutable/MutableEntityClass\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge Entity Class schema items.\r\n * @internal\r\n */\r\nexport const entityClassMerger: SchemaItemMergerHandler<EntityClassDifference> = {\r\n  async add(context, change) {\r\n    return context.editor.entities.createFromProps(context.targetSchemaKey, {\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n\r\n      ...change.difference,\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutableEntityClass) {\r\n    if(change.difference.mixins !== undefined) {\r\n      for(const mixin of change.difference.mixins) {\r\n        const mixinKey = await updateSchemaItemKey(context, mixin);\r\n        await context.editor.entities.addMixin(itemKey, mixinKey);\r\n      }\r\n    }\r\n\r\n    return modifyClass(context, change, itemKey, item);\r\n  },\r\n};\r\n\r\n/**\r\n * Merges Mixins to Entity Class schema items.\r\n * @internal\r\n */\r\nexport async function mergeClassMixins(context: SchemaMergeContext, change: EntityClassMixinDifference): Promise<void> {\r\n  if(change.changeType === \"add\") {\r\n    for(const mixinFullName of change.difference) {\r\n      const mixinKey = await updateSchemaItemKey(context, mixinFullName);\r\n      const entityKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\r\n      await context.editor.entities.addMixin(entityKey, mixinKey);\r\n    }\r\n  } else {\r\n    throw new Error(`Changing the entity class '${change.itemName}' mixins is not supported.`);\r\n  }\r\n}\r\n"]}

package/lib/cjs/Merging/EnumerationMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnumerationMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACpG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,uBAAuB,CAAC,qBAAqB,CAoC5E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CAgC1E,CAAC"}
+{"version":3,"file":"EnumerationMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACpG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAGlE;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,uBAAuB,CAAC,qBAAqB,CAmC5E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CA8B1E,CAAC"}

package/lib/cjs/Merging/EnumerationMerger.js

@@ -13,13 +13,13 @@ const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 exports.enumerationMerger = {
     async add(context, change) {
         if (change.difference.type === undefined) {
-            return { errorMessage: "Enumerations must define a type property" };
+            throw new Error("Enumerations must define a type property");
         }
         if (change.difference.isStrict === undefined) {
-            return { errorMessage: "Enumerations must define whether enumeration is strict." };
+            throw new Error("Enumerations must define whether enumeration is strict.");
         }
         if (change.difference.enumerators === undefined) {
-            return { errorMessage: "Enumerations must define at least ine enumerator." };
+            throw new Error("Enumerations must define at least ine enumerator.");
         }
         return context.editor.enumerations.createFromProps(context.targetSchemaKey, {
             ...change.difference,
@@ -32,7 +32,7 @@ exports.enumerationMerger = {
     },
     async modify(_context, change, itemKey, item) {
         if (change.difference.type !== undefined) {
-            return { errorMessage: `The Enumeration ${itemKey.name} has an incompatible type. It must be "${(0, ecschema_metadata_1.primitiveTypeToString)(item.type)}", not "${change.difference.type}".` };
+            throw new Error(`The Enumeration ${itemKey.name} has an incompatible type. It must be "${(0, ecschema_metadata_1.primitiveTypeToString)(item.type)}", not "${change.difference.type}".`);
         }
         if (change.difference.label !== undefined) {
             item.setDisplayLabel(change.difference.label);
@@ -43,7 +43,6 @@ exports.enumerationMerger = {
         if (change.difference.isStrict !== undefined) {
             item.setIsStrict(change.difference.isStrict);
         }
-        return { itemKey };
     },
 };
 /**
@@ -53,10 +52,10 @@ exports.enumerationMerger = {
 exports.enumeratorMerger = {
     async add(context, change) {
         if (change.difference.name === undefined) {
-            return { errorMessage: "Enumerators must define a name" };
+            throw new Error("Enumerators must define a name");
         }
         if (change.difference.value === undefined) {
-            return { errorMessage: "Enumerators must define a value" };
+            throw new Error("Enumerators must define a value");
         }
         const itemKey = new ecschema_metadata_1.SchemaItemKey(change.itemName, context.targetSchemaKey);
         await context.editor.enumerations.addEnumerator(itemKey, {
@@ -65,11 +64,11 @@ exports.enumeratorMerger = {
             label: change.difference.label,
             description: change.difference.description,
         });
-        return { itemKey };
+        return itemKey;
     },
     async modify(context, change, itemKey) {
         if (change.difference.value !== undefined) {
-            return { errorMessage: `Failed to merge enumerator attribute, Enumerator "${change.path}" has different values.` };
+            throw new Error(`Failed to merge enumerator attribute, Enumerator "${change.path}" has different values.`);
         }
         if (change.difference.description !== undefined) {
             await context.editor.enumerations.setEnumeratorDescription(itemKey, change.path, change.difference.description);
@@ -77,7 +76,6 @@ exports.enumeratorMerger = {
         if (change.difference.label !== undefined) {
             await context.editor.enumerations.setEnumeratorLabel(itemKey, change.path, change.difference.label);
         }
-        return { itemKey };
     },
 };
 //# sourceMappingURL=EnumerationMerger.js.map

package/lib/cjs/Merging/EnumerationMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { primitiveTypeToString, SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport type { EnumerationDifference, EnumeratorDifference } from \"../Differencing/SchemaDifference\";\nimport type { SchemaItemMergerHandler } from \"./SchemaItemMerger\";\nimport type { MutableEnumeration } from \"../Editing/Mutable/MutableEnumeration\";\n\n/**\n * Defines a merge handler to merge Enumeration schema items.\n * @internal\n */\nexport const enumerationMerger: SchemaItemMergerHandler<EnumerationDifference> = {\n  async add(context, change: EnumerationDifference) {\n    if (change.difference.type === undefined) {\n      return { errorMessage: \"Enumerations must define a type property\" };\n    }\n    if (change.difference.isStrict === undefined) {\n      return { errorMessage: \"Enumerations must define whether enumeration is strict.\" };\n    }\n    if (change.difference.enumerators === undefined) {\n      return { errorMessage: \"Enumerations must define at least ine enumerator.\" };\n    }\n\n    return context.editor.enumerations.createFromProps(context.targetSchemaKey, {\n      ...change.difference,\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n      type: change.difference.type,\n      isStrict: change.difference.isStrict,\n      enumerators: change.difference.enumerators,\n    });\n  },\n  async modify(_context, change, itemKey, item: MutableEnumeration) {\n    if(change.difference.type !== undefined) {\n      return { errorMessage: `The Enumeration ${itemKey.name} has an incompatible type. It must be \"${primitiveTypeToString(item.type!)}\", not \"${change.difference.type}\".` };\n    }\n    if(change.difference.label !== undefined) {\n      item.setDisplayLabel(change.difference.label);\n    }\n    if(change.difference.description !== undefined) {\n      item.setDescription(change.difference.description);\n    }\n    if(change.difference.isStrict !== undefined) {\n      item.setIsStrict(change.difference.isStrict);\n    }\n    return { itemKey};\n  },\n};\n\n/**\n * Defines a merge handler to merge Enumeration schema items.\n * @internal\n */\nexport const enumeratorMerger: SchemaItemMergerHandler<EnumeratorDifference> = {\n  async add(context, change) {\n    if (change.difference.name === undefined) {\n      return { errorMessage: \"Enumerators must define a name\" };\n    }\n    if (change.difference.value === undefined) {\n      return { errorMessage: \"Enumerators must define a value\" };\n    }\n\n    const itemKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n    await context.editor.enumerations.addEnumerator(itemKey, {\n      name: change.difference.name,\n      value: change.difference.value,\n      label: change.difference.label,\n      description: change.difference.description,\n    });\n\n    return { itemKey };\n  },\n  async modify(context, change, itemKey) {\n    if(change.difference.value !== undefined) {\n      return { errorMessage: `Failed to merge enumerator attribute, Enumerator \"${change.path}\" has different values.` };\n    }\n\n    if(change.difference.description !== undefined) {\n      await context.editor.enumerations.setEnumeratorDescription(itemKey, change.path, change.difference.description);\n    }\n    if(change.difference.label !== undefined) {\n      await context.editor.enumerations.setEnumeratorLabel(itemKey, change.path, change.difference.label);\n    }\n    return { itemKey };\n  },\n};\n"]}
+{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { primitiveTypeToString, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport type { EnumerationDifference, EnumeratorDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { SchemaItemMergerHandler } from \"./SchemaItemMerger\";\r\nimport type { MutableEnumeration } from \"../Editing/Mutable/MutableEnumeration\";\r\n\r\n/**\r\n * Defines a merge handler to merge Enumeration schema items.\r\n * @internal\r\n */\r\nexport const enumerationMerger: SchemaItemMergerHandler<EnumerationDifference> = {\r\n  async add(context, change: EnumerationDifference) {\r\n    if (change.difference.type === undefined) {\r\n      throw new Error(\"Enumerations must define a type property\");\r\n    }\r\n    if (change.difference.isStrict === undefined) {\r\n      throw new Error(\"Enumerations must define whether enumeration is strict.\");\r\n    }\r\n    if (change.difference.enumerators === undefined) {\r\n      throw new Error(\"Enumerations must define at least ine enumerator.\");\r\n    }\r\n\r\n    return context.editor.enumerations.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      type: change.difference.type,\r\n      isStrict: change.difference.isStrict,\r\n      enumerators: change.difference.enumerators,\r\n    });\r\n  },\r\n  async modify(_context, change, itemKey, item: MutableEnumeration) {\r\n    if(change.difference.type !== undefined) {\r\n      throw new Error(`The Enumeration ${itemKey.name} has an incompatible type. It must be \"${primitiveTypeToString(item.type!)}\", not \"${change.difference.type}\".`);\r\n    }\r\n    if(change.difference.label !== undefined) {\r\n      item.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      item.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.isStrict !== undefined) {\r\n      item.setIsStrict(change.difference.isStrict);\r\n    }\r\n  },\r\n};\r\n\r\n/**\r\n * Defines a merge handler to merge Enumeration schema items.\r\n * @internal\r\n */\r\nexport const enumeratorMerger: SchemaItemMergerHandler<EnumeratorDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.name === undefined) {\r\n      throw new Error(\"Enumerators must define a name\");\r\n    }\r\n    if (change.difference.value === undefined) {\r\n      throw new Error(\"Enumerators must define a value\");\r\n    }\r\n\r\n    const itemKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\r\n    await context.editor.enumerations.addEnumerator(itemKey, {\r\n      name: change.difference.name,\r\n      value: change.difference.value,\r\n      label: change.difference.label,\r\n      description: change.difference.description,\r\n    });\r\n    return itemKey;\r\n  },\r\n  async modify(context, change, itemKey) {\r\n    if(change.difference.value !== undefined) {\r\n      throw new Error(`Failed to merge enumerator attribute, Enumerator \"${change.path}\" has different values.`);\r\n    }\r\n\r\n    if(change.difference.description !== undefined) {\r\n      await context.editor.enumerations.setEnumeratorDescription(itemKey, change.path, change.difference.description);\r\n    }\r\n    if(change.difference.label !== undefined) {\r\n      await context.editor.enumerations.setEnumeratorLabel(itemKey, change.path, change.difference.label);\r\n    }\r\n  },\r\n};\r\n"]}

package/lib/cjs/Merging/KindOfQuantityMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KindOfQuantityMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,KAAK,uBAAuB,EAA4B,MAAM,oBAAoB,CAAC;AAI5F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,uBAAuB,CAAC,wBAAwB,CA4ClF,CAAC"}
+{"version":3,"file":"KindOfQuantityMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,KAAK,uBAAuB,EAA4B,MAAM,oBAAoB,CAAC;AAI5F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,uBAAuB,CAAC,wBAAwB,CA2ClF,CAAC"}

package/lib/cjs/Merging/KindOfQuantityMerger.js

@@ -9,10 +9,10 @@ const SchemaItemMerger_1 = require("./SchemaItemMerger");
 exports.kindOfQuantityMerger = {
     async add(context, change) {
         if (change.difference.persistenceUnit === undefined) {
-            return { errorMessage: "KindOfQuantity must define persistenceUnit" };
+            throw new Error("KindOfQuantity must define persistenceUnit");
         }
         if (change.difference.relativeError === undefined) {
-            return { errorMessage: "KindOfQuantity must define relativeError" };
+            throw new Error("KindOfQuantity must define relativeError");
         }
         change.difference.persistenceUnit = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, change.difference.persistenceUnit);
         if (change.difference.presentationUnits) {
@@ -48,7 +48,6 @@ exports.kindOfQuantityMerger = {
             // TODO: It should be checked if the unit is the same, but referring to the source schema.
             throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);
         }
-        return { itemKey };
     },
 };
 async function updateOverrideFormat(context, formatString) {

package/lib/cjs/Merging/KindOfQuantityMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { type KindOfQuantityDifference } from \"../Differencing/SchemaDifference\";\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName } from \"./SchemaItemMerger\";\nimport { type MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\n/**\n * Defines a merge handler to merge KindOfQuantity schema items.\n * @internal\n */\nexport const kindOfQuantityMerger: SchemaItemMergerHandler<KindOfQuantityDifference> = {\n  async add(context, change) {\n    if (change.difference.persistenceUnit === undefined) {\n      return { errorMessage: \"KindOfQuantity must define persistenceUnit\" };\n    }\n    if (change.difference.relativeError === undefined) {\n      return { errorMessage: \"KindOfQuantity must define relativeError\" };\n    }\n    change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\n    if(change.difference.presentationUnits) {\n      if(Array.isArray(change.difference.presentationUnits)) {\n        for(let index = 0; index < change.difference.presentationUnits.length; index++) {\n          change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\n        }\n      } else {\n        change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);\n      }\n    }\n\n    return context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\n      ...change.difference,\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n      persistenceUnit: change.difference.persistenceUnit,\n      presentationUnits: change.difference.presentationUnits,\n      relativeError: change.difference.relativeError,\n    });\n  },\n  async modify(_context, change, itemKey, item: MutableKindOfQuantity) {\n    if(change.difference.label !== undefined) {\n      item.setDisplayLabel(change.difference.label);\n    }\n    if(change.difference.description !== undefined) {\n      item.setDescription(change.difference.description);\n    }\n    if(change.difference.relativeError !== undefined) {\n      item.setRelativeError(change.difference.relativeError);\n    }\n    if(change.difference.persistenceUnit !== undefined) {\n      // TODO: It should be checked if the unit is the same, but referring to the source schema.\n      throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\n    }\n    return { itemKey };\n  },\n};\n\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string) {\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\n  const match = formatString.match(/^([^(]+)\\((\\d+)\\)\\[(.*)\\]$/);\n  if(match === null) {\n    return formatString;\n  }\n\n  const originalFormat = match[1];\n  const updatedFormat = await updateSchemaItemFullName(context, originalFormat);\n\n  const unitOverrides  = match[3].split(\"][\");\n  for(let index=0; index< unitOverrides.length; index++) {\n    const [unit, label] = unitOverrides[index].split(\"|\");\n    const updatedUnit = await updateSchemaItemFullName(context, unit);\n    unitOverrides[index] = `${updatedUnit}${label ? `|${label}` : \"\"}`;\n  }\n\n  return `${updatedFormat}(${match[2]})[${unitOverrides.join(\"][\")}]`;\n}\n"]}
+{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type KindOfQuantityDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName } from \"./SchemaItemMerger\";\r\nimport { type MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge KindOfQuantity schema items.\r\n * @internal\r\n */\r\nexport const kindOfQuantityMerger: SchemaItemMergerHandler<KindOfQuantityDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.persistenceUnit === undefined) {\r\n      throw new Error(\"KindOfQuantity must define persistenceUnit\");\r\n    }\r\n    if (change.difference.relativeError === undefined) {\r\n      throw new Error(\"KindOfQuantity must define relativeError\");\r\n    }\r\n    change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\r\n    if(change.difference.presentationUnits) {\r\n      if(Array.isArray(change.difference.presentationUnits)) {\r\n        for(let index = 0; index < change.difference.presentationUnits.length; index++) {\r\n          change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\r\n        }\r\n      } else {\r\n        change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);\r\n      }\r\n    }\r\n\r\n    return context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      persistenceUnit: change.difference.persistenceUnit,\r\n      presentationUnits: change.difference.presentationUnits,\r\n      relativeError: change.difference.relativeError,\r\n    });\r\n  },\r\n  async modify(_context, change, itemKey, item: MutableKindOfQuantity) {\r\n    if(change.difference.label !== undefined) {\r\n      item.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      item.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.relativeError !== undefined) {\r\n      item.setRelativeError(change.difference.relativeError);\r\n    }\r\n    if(change.difference.persistenceUnit !== undefined) {\r\n      // TODO: It should be checked if the unit is the same, but referring to the source schema.\r\n      throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\r\n    }\r\n  },\r\n};\r\n\r\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string) {\r\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\r\n  const match = formatString.match(/^([^(]+)\\((\\d+)\\)\\[(.*)\\]$/);\r\n  if(match === null) {\r\n    return formatString;\r\n  }\r\n\r\n  const originalFormat = match[1];\r\n  const updatedFormat = await updateSchemaItemFullName(context, originalFormat);\r\n\r\n  const unitOverrides  = match[3].split(\"][\");\r\n  for(let index=0; index< unitOverrides.length; index++) {\r\n    const [unit, label] = unitOverrides[index].split(\"|\");\r\n    const updatedUnit = await updateSchemaItemFullName(context, unit);\r\n    unitOverrides[index] = `${updatedUnit}${label ? `|${label}` : \"\"}`;\r\n  }\r\n\r\n  return `${updatedFormat}(${match[2]})[${unitOverrides.join(\"][\")}]`;\r\n}\r\n"]}

package/lib/cjs/Merging/MixinMerger.js

@@ -10,7 +10,7 @@ const ClassMerger_1 = require("./ClassMerger");
 exports.mixinClassMerger = {
     async add(context, change) {
         if (change.difference.appliesTo === undefined) {
-            return { errorMessage: "Mixin must define appliesTo" };
+            throw new Error("Mixin must define appliesTo");
         }
         return context.editor.mixins.createFromProps(context.targetSchemaKey, {
             ...change.difference,
@@ -24,7 +24,7 @@ exports.mixinClassMerger = {
             const appliesTo = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, change.difference.appliesTo);
             const currentValue = await item.appliesTo;
             if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {
-                return { errorMessage: `Changing the mixin '${itemKey.name}' appliesTo is not supported.` };
+                throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);
             }
         }
         return (0, ClassMerger_1.modifyClass)(context, change, itemKey, item);

package/lib/cjs/Merging/MixinMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;;AAKA,yDAAiH;AAEjH,+CAA4C;AAE5C;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9C,OAAO,EAAE,YAAY,EAAE,6BAA6B,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACpE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,SAAS,EAAE,MAAM,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;SAChF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAkB;QACvD,IAAG,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvE,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,EAAE,CAAC;YAC9F,CAAC;QACH,CAAC;QACD,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { type MixinClassDifference } from \"../Differencing/SchemaDifference\";\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName, updateSchemaItemKey } from \"./SchemaItemMerger\";\nimport { type MutableMixin } from \"../Editing/Mutable/MutableMixin\";\nimport { modifyClass } from \"./ClassMerger\";\n\n/**\n * Defines a merge handler to merge Mixin schema items.\n * @internal\n */\nexport const mixinClassMerger: SchemaItemMergerHandler<MixinClassDifference> = {\n  async add(context, change) {\n    if (change.difference.appliesTo === undefined) {\n      return { errorMessage: \"Mixin must define appliesTo\" };\n    }\n    return context.editor.mixins.createFromProps(context.targetSchemaKey, {\n      ...change.difference,\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n      appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\n    });\n  },\n  async modify(context, change, itemKey, item: MutableMixin) {\n    if(change.difference.appliesTo !== undefined) {\n      const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\n      const currentValue = await item.appliesTo;\n      if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\n        return { errorMessage: `Changing the mixin '${itemKey.name}' appliesTo is not supported.` };\n      }\n    }\n    return modifyClass(context, change, itemKey, item);\n  },\n};\n\n"]}
+{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;;AAKA,yDAAiH;AAEjH,+CAA4C;AAE5C;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACpE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,SAAS,EAAE,MAAM,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;SAChF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAkB;QACvD,IAAG,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvE,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;QACD,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type MixinClassDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName, updateSchemaItemKey } from \"./SchemaItemMerger\";\r\nimport { type MutableMixin } from \"../Editing/Mutable/MutableMixin\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge Mixin schema items.\r\n * @internal\r\n */\r\nexport const mixinClassMerger: SchemaItemMergerHandler<MixinClassDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.appliesTo === undefined) {\r\n      throw new Error(\"Mixin must define appliesTo\");\r\n    }\r\n    return context.editor.mixins.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutableMixin) {\r\n    if(change.difference.appliesTo !== undefined) {\r\n      const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\r\n      const currentValue = await item.appliesTo;\r\n      if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\r\n        throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);\r\n      }\r\n    }\r\n    return modifyClass(context, change, itemKey, item);\r\n  },\r\n};\r\n\r\n"]}

package/lib/cjs/Merging/PhenomenonMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PhenomenonMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,OAAO,EAAE,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAGjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CA6B1E,CAAC"}
+{"version":3,"file":"PhenomenonMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,OAAO,EAAE,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAGjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CA4B1E,CAAC"}

package/lib/cjs/Merging/PhenomenonMerger.js

@@ -9,7 +9,7 @@ const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 exports.phenomenonMerger = {
     add: async (context, change) => {
         if (change.difference.definition === undefined) {
-            return { errorMessage: "Phenomenon must define definition" };
+            throw new Error("Phenomenon must define definition");
         }
         return context.editor.phenomenons.createFromProps(context.targetSchemaKey, {
             ...change.difference,
@@ -31,7 +31,6 @@ exports.phenomenonMerger = {
                 throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);
             await phenomenon.setDefinition(change.difference.definition);
         }
-        return { itemKey };
     },
 };
 //# sourceMappingURL=PhenomenonMerger.js.map

package/lib/cjs/Merging/PhenomenonMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;;AAOA,gEAA2E;AAE3E;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7B,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC/C,OAAO,EAAE,YAAY,EAAE,mCAAmC,EAAE,CAAC;QAC/D,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACzE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;SACzC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAA6B,EAAE,EAAE;QACzE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC9C,kFAAkF;YAClF,IAAI,UAAU,CAAC,UAAU,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;gBACpH,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,kBAAkB,OAAO,CAAC,IAAI,yCAAyC,CAAC,CAAC;YAEnI,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { type PhenomenonDifference } from \"../Differencing/SchemaDifference\";\nimport { type MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\nimport { type SchemaItemMergerHandler} from \"./SchemaItemMerger\";\nimport { ECObjectsError, ECObjectsStatus } from \"@itwin/ecschema-metadata\";\n\n/**\n * Defines a merge handler to merge Phenomenon schema items.\n * @internal\n */\nexport const phenomenonMerger: SchemaItemMergerHandler<PhenomenonDifference> = {\n  add: async (context, change) => {\n    if (change.difference.definition === undefined) {\n      return { errorMessage: \"Phenomenon must define definition\" };\n    }\n\n    return context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\n      ...change.difference,\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n      definition: change.difference.definition,\n    });\n  },\n  modify: async (_context, change, itemKey, phenomenon: MutablePhenomenon) => {\n    if(change.difference.label !== undefined) {\n      phenomenon.setDisplayLabel(change.difference.label);\n    }\n    if(change.difference.description !== undefined) {\n      phenomenon.setDescription(change.difference.description);\n    }\n    if(change.difference.definition !== undefined) {\n      // It would be better if the validation would be part of phenomenon.setDefinition.\n      if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\n        throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);\n\n      await phenomenon.setDefinition(change.difference.definition);\n    }\n    return { itemKey };\n  },\n};\n"]}
+{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;;AAOA,gEAA2E;AAE3E;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7B,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACzE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;SACzC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAA6B,EAAE,EAAE;QACzE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC9C,kFAAkF;YAClF,IAAI,UAAU,CAAC,UAAU,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;gBACpH,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,kBAAkB,OAAO,CAAC,IAAI,yCAAyC,CAAC,CAAC;YAEnI,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type PhenomenonDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\r\nimport { type SchemaItemMergerHandler} from \"./SchemaItemMerger\";\r\nimport { ECObjectsError, ECObjectsStatus } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Defines a merge handler to merge Phenomenon schema items.\r\n * @internal\r\n */\r\nexport const phenomenonMerger: SchemaItemMergerHandler<PhenomenonDifference> = {\r\n  add: async (context, change) => {\r\n    if (change.difference.definition === undefined) {\r\n      throw new Error(\"Phenomenon must define definition\");\r\n    }\r\n\r\n    return context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      definition: change.difference.definition,\r\n    });\r\n  },\r\n  modify: async (_context, change, itemKey, phenomenon: MutablePhenomenon) => {\r\n    if(change.difference.label !== undefined) {\r\n      phenomenon.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      phenomenon.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.definition !== undefined) {\r\n      // It would be better if the validation would be part of phenomenon.setDefinition.\r\n      if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\r\n        throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);\r\n\r\n      await phenomenon.setDefinition(change.difference.definition);\r\n    }\r\n  },\r\n};\r\n"]}

package/lib/cjs/Merging/PropertyCategoryMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyCategoryMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,uBAAuB,CAAC,0BAA0B,CA0BtF,CAAC"}
+{"version":3,"file":"PropertyCategoryMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,uBAAuB,CAAC,0BAA0B,CAyBtF,CAAC"}

package/lib/cjs/Merging/PropertyCategoryMerger.js

@@ -8,7 +8,7 @@ exports.propertyCategoryMerger = void 0;
 exports.propertyCategoryMerger = {
     async add(context, change) {
         if (change.difference.priority === undefined) {
-            return { errorMessage: "PropertyCategory must define priority" };
+            throw new Error("PropertyCategory must define priority");
         }
         return context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {
             ...change.difference,
@@ -28,7 +28,6 @@ exports.propertyCategoryMerger = {
             // TODO: inconsistency: setPriority does not return a result whether the priority was set successfully.
             await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);
         }
-        return { itemKey };
     },
 };
 //# sourceMappingURL=PropertyCategoryMerger.js.map

package/lib/cjs/Merging/PropertyCategoryMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyCategoryMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACU,QAAA,sBAAsB,GAAwD;IACzF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC7C,OAAO,EAAE,YAAY,EAAE,uCAAuC,EAAE,CAAC;QACnE,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YAChF,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;SACrC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAA6B;QAClE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5C,uGAAuG;YACvG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { type MutablePropertyCategory } from \"../Editing/Mutable/MutablePropertyCategory\";\nimport { type PropertyCategoryDifference } from \"../Differencing/SchemaDifference\";\nimport { type SchemaItemMergerHandler } from \"./SchemaItemMerger\";\n\n/**\n * Defines a merge handler to merge PropertyCategory schema items.\n * @internal\n */\nexport const propertyCategoryMerger: SchemaItemMergerHandler<PropertyCategoryDifference> = {\n  async add(context, change) {\n    if (change.difference.priority === undefined) {\n      return { errorMessage: \"PropertyCategory must define priority\" };\n    }\n\n    return context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {\n      ...change.difference,\n      name: change.itemName,\n      schemaItemType: change.schemaType,\n      priority: change.difference.priority,\n    });\n  },\n  async modify(context, change, itemKey, item: MutablePropertyCategory) {\n    if(change.difference.label !== undefined) {\n      item.setDisplayLabel(change.difference.label);\n    }\n    if(change.difference.description !== undefined) {\n      item.setDescription(change.difference.description);\n    }\n    if(change.difference.priority !== undefined) {\n      // TODO: inconsistency: setPriority does not return a result whether the priority was set successfully.\n      await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);\n    }\n    return { itemKey };\n  },\n};\n"]}
+{"version":3,"file":"PropertyCategoryMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACU,QAAA,sBAAsB,GAAwD;IACzF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YAChF,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;SACrC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAA6B;QAClE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5C,uGAAuG;YACvG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type MutablePropertyCategory } from \"../Editing/Mutable/MutablePropertyCategory\";\r\nimport { type PropertyCategoryDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler } from \"./SchemaItemMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge PropertyCategory schema items.\r\n * @internal\r\n */\r\nexport const propertyCategoryMerger: SchemaItemMergerHandler<PropertyCategoryDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.priority === undefined) {\r\n      throw new Error(\"PropertyCategory must define priority\");\r\n    }\r\n\r\n    return context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      priority: change.difference.priority,\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutablePropertyCategory) {\r\n    if(change.difference.label !== undefined) {\r\n      item.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      item.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.priority !== undefined) {\r\n      // TODO: inconsistency: setPriority does not return a result whether the priority was set successfully.\r\n      await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);\r\n    }\r\n  },\r\n};\r\n"]}

package/lib/cjs/Merging/PropertyMerger.d.ts

@@ -1,13 +1,12 @@
-import type { SchemaEditResults } from "../ecschema-editing";
 import type { SchemaMergeContext } from "./SchemaMerger";
 import type { ClassItemDifference, ClassPropertyDifference } from "../Differencing/SchemaDifference";
 import { SchemaItemKey } from "@itwin/ecschema-metadata";
 /**
  * @internal
  */
-export declare function mergePropertyDifference(context: SchemaMergeContext, change: ClassPropertyDifference): Promise<SchemaEditResults>;
+export declare function mergePropertyDifference(context: SchemaMergeContext, change: ClassPropertyDifference): Promise<void>;
 /**
  * @internal
  */
-export declare function mergeClassProperties(context: SchemaMergeContext, change: ClassItemDifference, itemKey: SchemaItemKey): Promise<SchemaEditResults>;
+export declare function mergeClassProperties(context: SchemaMergeContext, change: ClassItemDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=PropertyMerger.d.ts.map

package/lib/cjs/Merging/PropertyMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAkB,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAA8M,aAAa,EAAoD,MAAM,0BAA0B,CAAC;AAgBvT;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAMtI;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAQvJ"}
+{"version":3,"file":"PropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAkB,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAA8M,aAAa,EAAoD,MAAM,0BAA0B,CAAC;AAgBvT;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1I"}

package/lib/cjs/Merging/PropertyMerger.js

@@ -20,12 +20,8 @@ exports.mergePropertyDifference = mergePropertyDifference;
  */
 async function mergeClassProperties(context, change, itemKey) {
     for (const property of change.difference.properties || []) {
-        const result = await mergeClassProperty(context, change, itemKey, property);
-        if (result.errorMessage) {
-            return result;
-        }
+        await mergeClassProperty(context, change, itemKey, property);
     }
-    return {};
 }
 exports.mergeClassProperties = mergeClassProperties;
 async function mergeClassProperty(context, change, itemKey, property) {
@@ -40,26 +36,13 @@ async function addClassProperty(context, itemKey, property) {
     if (property.kindOfQuantity !== undefined) {
         property.kindOfQuantity = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, property.kindOfQuantity);
     }
-    const createResult = await createProperty(context, itemKey, property);
-    if (createResult.errorMessage) {
-        return createResult;
-    }
+    await createProperty(context, itemKey, property);
     if (property.customAttributes !== undefined) {
-        const result = await (0, CustomAttributeMerger_1.applyCustomAttributes)(context, property.customAttributes, async (ca) => {
-            try {
-                const classEditor = await getClassEditor(context, itemKey);
-                await classEditor.properties.addCustomAttribute(itemKey, property.name, ca);
-                return {};
-            }
-            catch (e) {
-                return { errorMessage: e.message };
-            }
+        await (0, CustomAttributeMerger_1.applyCustomAttributes)(context, property.customAttributes, async (ca) => {
+            const classEditor = await getClassEditor(context, itemKey);
+            await classEditor.properties.addCustomAttribute(itemKey, property.name, ca);
         });
-        if (result.errorMessage) {
-            return result;
-        }
     }
-    return {};
 }
 async function createProperty(context, itemKey, property) {
     if (enumerationProperty.is(property)) {
@@ -80,13 +63,13 @@ async function modifyClassProperty(context, itemKey, propertyProps) {
     const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey);
     const property = await ecClass.getProperty(propertyProps.name);
     if (property === undefined) {
-        return { errorMessage: `Couldn't find property ${propertyProps.name} on class ${itemKey.name}` };
+        throw new Error(`Couldn't find property ${propertyProps.name} on class ${itemKey.name}`);
     }
     if (propertyProps.type !== undefined) {
-        return { errorMessage: `Changing the property '${property.fullName}' type is not supported.` };
+        throw new Error(`Changing the property '${property.fullName}' type is not supported.`);
     }
     if (propertyProps.kindOfQuantity !== undefined) {
-        return { errorMessage: `Changing the property '${property.fullName}' kind of quantity is not supported.` };
+        throw new Error(`Changing the property '${property.fullName}' kind of quantity is not supported.`);
     }
     const classEditor = await getClassEditor(context, ecClass);
     if (propertyProps.description !== undefined) {
@@ -120,7 +103,6 @@ async function modifyClassProperty(context, itemKey, propertyProps) {
     if (property.isStruct()) {
         return structProperty.merge(context, itemKey, property, propertyProps);
     }
-    return {};
 }
 async function getClassEditor(context, ecClass) {
     const schemaItemType = ecschema_metadata_1.ECClass.isECClass(ecClass)
@@ -163,17 +145,17 @@ const enumerationProperty = {
         const enumerationKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.typeName);
         const enumerationType = await context.editor.schemaContext.getSchemaItem(enumerationKey);
         if (enumerationType === undefined) {
-            return { errorMessage: `Unable to locate the enumeration class ${enumerationKey.name} in the context schema.` };
+            throw new Error(`Unable to locate the enumeration class ${enumerationKey.name} in the context schema.`);
         }
         property.typeName = enumerationKey.fullName;
         const classEditor = await getClassEditor(context, itemKey);
-        return arrayProperty.is(property)
-            ? classEditor.createEnumerationArrayPropertyFromProps(itemKey, property.name, enumerationType, property)
-            : classEditor.createEnumerationPropertyFromProps(itemKey, property.name, enumerationType, property);
+        arrayProperty.is(property)
+            ? await classEditor.createEnumerationArrayPropertyFromProps(itemKey, property.name, enumerationType, property)
+            : await classEditor.createEnumerationPropertyFromProps(itemKey, property.name, enumerationType, property);
     },
     async merge(context, itemKey, property, props) {
         if ("enumeration" in props && props.enumeration !== undefined) {
-            return { errorMessage: `Changing the property '${property.fullName}' enumeration is not supported.` };
+            throw new Error(`Changing the property '${property.fullName}' enumeration is not supported.`);
         }
         return primitiveProperty.merge(context, itemKey, property, props);
     },
@@ -186,7 +168,7 @@ const navigationProperty = {
         const relationshipKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.relationshipName);
         const relationshipType = await context.editor.schemaContext.getSchemaItem(relationshipKey);
         if (relationshipType === undefined) {
-            return { errorMessage: `Unable to locate the relationship class ${relationshipKey.name} in the context schema.` };
+            throw new Error(`Unable to locate the relationship class ${relationshipKey.name} in the context schema.`);
         }
         property.relationshipName = relationshipKey.fullName;
         const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey);
@@ -196,16 +178,15 @@ const navigationProperty = {
             return context.editor.mixins.createNavigationPropertyFromProps(itemKey, property);
         if (ecClass.schemaItemType === ecschema_metadata_1.SchemaItemType.RelationshipClass)
             return context.editor.relationships.createNavigationPropertyFromProps(itemKey, property);
-        return { errorMessage: `Navigation property can't be added to ${ecClass.schemaItemType}.` };
+        throw new Error(`Navigation property can't be added to ${ecClass.schemaItemType}.`);
     },
     async merge(_context, _itemKey, property, props) {
         if (props.direction !== undefined) {
-            return { errorMessage: `Changing the property '${property.fullName}' direction is not supported.` };
+            throw new Error(`Changing the property '${property.fullName}' direction is not supported.`);
         }
         if ("relationshipClass" in props && props.relationshipClass !== undefined) {
-            return { errorMessage: `Changing the property '${property.fullName}' relationship class is not supported.` };
+            throw new Error(`Changing the property '${property.fullName}' relationship class is not supported.`);
         }
-        return {};
     },
 };
 const primitiveProperty = {
@@ -215,7 +196,7 @@ const primitiveProperty = {
     async add(context, itemKey, property) {
         const propertyType = (0, ecschema_metadata_1.parsePrimitiveType)(property.typeName);
         if (propertyType === undefined) {
-            return { errorMessage: `Invalid property type ${property.typeName} on property ${property.name}` };
+            throw new Error(`Invalid property type ${property.typeName} on property ${property.name}`);
         }
         const classEditor = await getClassEditor(context, itemKey);
         return arrayProperty.is(property)
@@ -224,7 +205,7 @@ const primitiveProperty = {
     },
     async merge(context, itemKey, property, props) {
         if (props.typeName) {
-            return { errorMessage: `Changing the property '${property.fullName}' primitiveType is not supported.` };
+            throw new Error(`Changing the property '${property.fullName}' primitiveType is not supported.`);
         }
         const classEditor = await getClassEditor(context, itemKey);
         if (props.extendedTypeName !== undefined) {
@@ -242,7 +223,6 @@ const primitiveProperty = {
         if (props.maxValue !== undefined) {
             await classEditor.primitiveProperties.setMaxValue(itemKey, property.name, props.maxValue);
         }
-        return {};
     },
 };
 const structProperty = {
@@ -253,7 +233,7 @@ const structProperty = {
         const structKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.typeName);
         const structType = await context.editor.schemaContext.getSchemaItem(structKey);
         if (structType === undefined) {
-            return { errorMessage: `Unable to locate the struct ${structKey.name} in the context schema.` };
+            throw new Error(`Unable to locate the struct ${structKey.name} in the context schema.`);
         }
         property.typeName = structKey.fullName;
         const classEditor = await getClassEditor(context, itemKey);
@@ -263,9 +243,8 @@ const structProperty = {
     },
     async merge(_context, _itemKey, property, props) {
         if ("structClass" in props && props.structClass !== undefined) {
-            return { errorMessage: `Changing the property '${property.fullName}' structClass is not supported.` };
+            throw new Error(`Changing the property '${property.fullName}' structClass is not supported.`);
         }
-        return {};
     },
 };
 //# sourceMappingURL=PropertyMerger.js.map