@itwin/ecschema-editing 4.5.0-dev.8 → 4.6.0-dev.0

package/lib/cjs/Merging/ClassMerger.js

@@ -7,8 +7,8 @@ exports.ClassMerger = void 0;
 *--------------------------------------------------------------------------------------------*/
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const SchemaChanges_1 = require("../Validation/SchemaChanges");
-const ClassPropertyMerger_1 = require("./ClassPropertyMerger");
 const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
+const PropertyMerger_1 = require("./PropertyMerger");
 /**
  * @internal
  */
@@ -19,8 +19,8 @@ class ClassMerger {
     async create(_schemaKey, ecClass) {
         return { errorMessage: `${(0, ecschema_metadata_1.schemaItemTypeToString)(ecClass.schemaItemType)} class type is not implemented.` };
     }
-    async addMixin(itemKey, mixin) {
-        return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };
+    async merge(itemKey, _change) {
+        return { itemKey };
     }
     async mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue) {
         const mutableClass = ecClass;
@@ -83,38 +83,59 @@ class ClassMerger {
         }
         return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.` };
     }
-    async addMixins(itemKey, entityMixinChanges, changeType) {
-        if (changeType === SchemaChanges_1.ChangeType.Missing) {
-            for (const entityMixinChange of entityMixinChanges) {
-                for (const change of entityMixinChange.entityMixinChange) {
-                    const mixins = change.diagnostic.messageArgs;
-                    for (const mixin of mixins) {
-                        const result = await this.addMixin(itemKey, mixin);
-                        if (result.errorMessage !== undefined) {
-                            return result;
-                        }
-                    }
+    async mergeAttributeValueChanges(itemKey, propertyValueChanges) {
+        if (propertyValueChanges.length > 0) {
+            const targetItem = await this.context.targetSchema.lookupItem(itemKey);
+            if (targetItem === undefined) {
+                return { errorMessage: `'${itemKey.name}' class could not be located in the merged schema.` };
+            }
+            for (const change of propertyValueChanges) {
+                const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs;
+                const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);
+                if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {
+                    return results;
                 }
             }
-            return {};
         }
-        return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.` };
+        return { itemKey };
     }
-    async mergeAttributeValueChanges(itemKey, propertyValueChanges) {
-        if (propertyValueChanges.length === 0) {
-            return;
+    async handleError(callback) {
+        const result = await callback;
+        if (result.errorMessage) {
+            throw new Error(result.errorMessage);
         }
+    }
+    async mergePropertyChanges(itemKey, propertyChanges) {
         const targetItem = await this.context.targetSchema.lookupItem(itemKey);
         if (targetItem === undefined) {
-            throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);
+            return { itemKey, errorMessage: `'${itemKey.name}' class could not be located in the merged schema.` };
         }
-        for (const change of propertyValueChanges) {
-            const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs;
-            const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);
-            if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {
-                throw new Error(results.errorMessage);
+        for (const change of propertyChanges) {
+            if (change.propertyMissing?.changeType === SchemaChanges_1.ChangeType.Missing) {
+                if (await targetItem.getProperty(change.ecTypeName) !== undefined) {
+                    return { itemKey, errorMessage: `Merged schema already contains a class '${itemKey.name}' property '${change.ecTypeName}'.` };
+                }
+                const sourceProperty = change.propertyMissing.diagnostic.ecDefinition;
+                const results = await (0, PropertyMerger_1.createPropertyFromProps)(this.context, itemKey, sourceProperty);
+                if (results.errorMessage !== undefined) {
+                    return { itemKey, errorMessage: results.errorMessage };
+                }
+            }
+            else {
+                const targetProperty = (await targetItem.getProperty(change.ecTypeName));
+                const results = await (0, PropertyMerger_1.mergePropertyAttributeValueChanges)(this.context, targetProperty, change.propertyValueChanges);
+                if (results.errorMessage !== undefined) {
+                    return { itemKey, errorMessage: results.errorMessage };
+                }
+            }
+            const mergeResults = await (0, CustomAttributeMerger_1.mergeCustomAttributes)(this.context, change.customAttributeChanges.values(), async (ca) => {
+                return this.context.editor.entities.addCustomAttributeToProperty(itemKey, change.ecTypeName, ca);
+            });
+            if (mergeResults.errorMessage !== undefined) {
+                return { itemKey, errorMessage: mergeResults.errorMessage };
             }
         }
+        return { itemKey };
     }
     // First pass to create missing changes
     static async mergeItemStubChanges(context, classChanges) {
@@ -127,44 +148,31 @@ class ClassMerger {
                 if (await context.targetSchema.lookupItem(targetItemKey) !== undefined) {
                     throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);
                 }
-                const results = await merger.create(context.targetSchema.schemaKey, sourceItem);
-                if (results.errorMessage !== undefined) {
-                    throw new Error(results.errorMessage);
-                }
+                await merger.handleError(merger.create(context.targetSchema.schemaKey, sourceItem));
             }
         }
     }
     // 2nd pass to merge baseClass, properties, mixins and CA.
     static async mergeItemContentChanges(context, classChanges) {
         const merger = new this(context);
-        let mergeResults;
         for (const change of classChanges) {
             const targetItemKey = new ecschema_metadata_1.SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);
             const changeType = change.schemaItemMissing?.changeType;
             if (change.baseClassDelta !== undefined) {
-                const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);
-                if (results.errorMessage !== undefined) {
-                    throw new Error(results.errorMessage);
-                }
-            }
-            if (change.entityMixinChanges.size > 0) {
-                const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);
-                if (results.errorMessage !== undefined) {
-                    throw new Error(results.errorMessage);
-                }
+                await merger.handleError(merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType));
             }
-            await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);
-            mergeResults = await ClassPropertyMerger_1.ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());
-            if (mergeResults.errorMessage !== undefined) {
-                throw new Error(mergeResults.errorMessage);
+            // merge class attributes
+            await merger.handleError(merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges));
+            // merge class mixins/constraints/etc
+            await merger.handleError(merger.merge(targetItemKey, change));
+            // merge class property attribute values
+            if (change.propertyChanges.size > 0) {
+                await merger.handleError(merger.mergePropertyChanges(targetItemKey, change.propertyChanges.values()));
             }
             // merge custom attributes
-            mergeResults = await (0, CustomAttributeMerger_1.mergeCustomAttributes)(merger.context, change.customAttributeChanges.values(), async (ca) => {
+            await merger.handleError((0, CustomAttributeMerger_1.mergeCustomAttributes)(merger.context, change.customAttributeChanges.values(), async (ca) => {
                 return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);
-            });
-            if (mergeResults.errorMessage !== undefined) {
-                throw new Error(mergeResults.errorMessage);
-            }
+            }));
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAAiK;AAIjK,+DAAgI;AAChI,+DAA4D;AAC5D,mEAAgE;AAEhE;;GAEG;AACH,MAAa,WAAW;IAGtB,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,MAAM,CAAC,UAAqB,EAAE,OAAe;QAC3D,OAAO,EAAE,YAAY,EAAE,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,cAAc,CAAC,iCAAiC,EAAC,CAAC;IAC7G,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,KAAY;QAC3D,OAAO,EAAE,YAAY,EAAE,iBAAiB,KAAK,CAAC,IAAI,SAAS,OAAO,CAAC,IAAI,6BAA6B,EAAE,CAAC;IACzG,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAe,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QACpH,MAAM,YAAY,GAAG,OAAkC,CAAC;QACxD,QAAO,aAAa,EAAE;YACpB,KAAK,gBAAgB;gBACnB,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,iBAAiB,EAAE;oBAC9E,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,0BAA0B,EAAE,CAAC;iBACxF;gBACD,OAAO,IAAI,CAAC;YAEd,KAAK,OAAO;gBACV,YAAY,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;YAEd,KAAK,aAAa;gBAChB,YAAY,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;gBAC/C,OAAO,IAAI,CAAC;YAEd,KAAK,UAAU;gBACb,MAAM,QAAQ,GAAG,IAAA,sCAAkB,EAAC,iBAAiB,CAAC,CAAC;gBACvD,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,OAAO,EAAE,YAAY,EAAE,8CAA8C,EAAE,CAAC;iBACzE;gBAED,IAAI,iBAAiB,KAAK,SAAS,IAAI,QAAQ,KAAK,mCAAe,CAAC,IAAI,EAAE;oBACxE,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACnC,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,8BAA8B,EAAE,CAAC;SAC9F;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,uBAAuB,CAAC,GAAQ;QACxC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,cAAc,IAAI,GAAG,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,cAA8B,EAAE,UAAuB;QACxG,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,WAAkC,CAAC;QACxG,IAAI,eAAe,KAAK,SAAS,EAAE;YACjC,MAAM,YAAY,GAAG,IAAI,iCAAa,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;gBACxI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;gBACrC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAEtC,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,IAAI,eAAe,KAAK,SAAS,EAAE;gBACtE,IAAI,eAAe,CAAC,cAAc,KAAK,kCAAc,CAAC,WAAW,EAAE;oBACjE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;iBACzE;qBAAM,IAAI,eAAe,CAAC,cAAc,KAAK,kCAAc,CAAC,KAAK,EAAE;oBAClE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;iBAC5E;aACF;YAED,IAAI,eAAe,KAAK,SAAS,EAAE;gBACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAU,YAAY,CAAC,CAAC;gBACpF,IAAI,SAAS,KAAK,SAAS,EAAE;oBAC3B,OAAO,EAAE,YAAY,EAAE,IAAI,YAAY,CAAC,IAAI,oDAAoD,EAAC,CAAC;iBACnG;gBACD,IAAI,MAAM,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;oBACvC,IAAI,SAAS,CAAC,cAAc,KAAK,kCAAc,CAAC,WAAW,EAAE;wBAC3D,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;qBACzE;yBAAM,IAAI,SAAS,CAAC,cAAc,KAAK,kCAAc,CAAC,KAAK,EAAE;wBAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;qBAC5E;iBACF;aACF;SACF;QACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,EAAC,CAAC;IAC7F,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,OAAsB,EAAE,kBAAgD,EAAE,UAAuB;QACvH,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;YACrC,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE;gBAClD,KAAK,MAAM,MAAM,IAAI,iBAAiB,CAAC,iBAAiB,EAAE;oBACxD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,WAAkC,CAAC;oBACpE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;wBAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;wBACnD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE;4BACrC,OAAO,MAAM,CAAC;yBACf;qBACF;iBACF;aACF;YACD,OAAO,EAAE,CAAC;SACX;QACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,4BAA4B,EAAC,CAAC;IAC1F,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,OAAsB,EAAE,oBAA2C;QAC1G,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE;YACrC,OAAO;SACR;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAS,OAAO,CAAC,CAAC;QAC/E,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,oDAAoD,CAAC,CAAC;SACvF;QAED,KAAK,MAAM,MAAM,IAAI,oBAAoB,EAAE;YACzC,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAAY,CAAC;YAC7F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAC5G,IAAI,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC/E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAED,uCAAuC;IAChC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,OAA2B,EAAE,YAAoC;QACxG,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE;YACjC,MAAM,UAAU,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAU,MAAM,CAAC,UAAU,CAAC,CAAE,CAAC;YAC9E,MAAM,aAAa,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;YAExD,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAErC,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAU,aAAa,CAAC,KAAK,SAAS,EAAE;oBAC/E,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;iBACnF;gBAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAChF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;aACF;SACF;IACH,CAAC;IAED,0DAA0D;IACnD,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAA2B,EAAE,YAAoC;QAC3G,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,YAAmC,CAAC;QAExC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE;YACjC,MAAM,aAAa,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC3F,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;YAExD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE;gBACvC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAC5F,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;aACF;YAED,IAAI,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC;gBACtG,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;aACF;YAED,MAAM,MAAM,CAAC,0BAA0B,CAAC,aAAa,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACpF,YAAY,GAAI,MAAM,yCAAmB,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YAChH,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aAC5C;YAED,0BAA0B;YAC1B,YAAY,GAAG,MAAM,IAAA,6CAAqB,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC9G,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YAEH,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aAC5C;SACF;IACH,CAAC;CACF;AAtLD,kCAsLC","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 { ECClass, ECClassModifier, Mixin, parseClassModifier, SchemaItemKey, SchemaItemType, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { BaseClassDelta, ChangeType, ClassChanges, EntityMixinChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { ClassPropertyMerger } from \"./ClassPropertyMerger\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\n\n/**\n * @internal\n */\nexport class ClassMerger<TClass extends ECClass> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\n  }\n\n  protected async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };\n  }\n\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const mutableClass = ecClass as unknown as MutableClass;\n    switch(attributeName) {\n      case \"schemaItemType\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\n        }\n        return true;\n\n      case \"label\":\n        mutableClass.setDisplayLabel(attributeNewValue);\n        return true;\n\n      case \"description\":\n        mutableClass.setDescription(attributeNewValue);\n        return true;\n\n      case \"modifier\":\n        const modifier = parseClassModifier(attributeNewValue);\n        if (modifier === undefined) {\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\n        }\n\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\n          mutableClass.setModifier(modifier);\n          return true;\n        }\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\n    }\n    return false;\n  }\n\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\n    if (sourceBaseClass !== undefined) {\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceBaseClass.schema.schemaKey);\n\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\n        if (sourceBaseClass.schemaItemType === SchemaItemType.EntityClass) {\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n        } else if (sourceBaseClass.schemaItemType === SchemaItemType.Mixin) {\n          return this.context.editor.mixins.setMixinBaseClass(itemKey, baseClassKey);\n        }\n      }\n\n      if (targetBaseClass !== undefined) {\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\n        if (baseClass === undefined) {\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\n        }\n        if (await baseClass.is(targetBaseClass)) {\n          if (baseClass.schemaItemType === SchemaItemType.EntityClass) {\n            return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n          } else if (baseClass.schemaItemType === SchemaItemType.Mixin) {\n            return this.context.editor.mixins.setMixinBaseClass(itemKey, baseClassKey);\n          }\n        }\n      }\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\n  }\n\n  private async addMixins(itemKey: SchemaItemKey, entityMixinChanges: Iterable<EntityMixinChanges>, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    if (changeType === ChangeType.Missing) {\n      for (const entityMixinChange of entityMixinChanges) {\n        for (const change of entityMixinChange.entityMixinChange) {\n          const mixins = change.diagnostic.messageArgs! as unknown as [Mixin];\n          for (const mixin of mixins) {\n            const result = await this.addMixin(itemKey, mixin);\n            if (result.errorMessage !== undefined) {\n              return result;\n            }\n          }\n        }\n      }\n      return {};\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.`};\n  }\n\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]) {\n    if (propertyValueChanges.length === 0) {\n      return;\n    }\n\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n    if (targetItem === undefined) {\n      throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);\n    }\n\n    for (const change of propertyValueChanges) {\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n      const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\n      if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n        throw new Error(results.errorMessage);\n      }\n    }\n  }\n\n  // First pass to create missing changes\n  public static async mergeItemStubChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\n    const merger = new this(context);\n\n    for (const change of classChanges) {\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\n      const targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (changeType === ChangeType.Missing) {\n\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\n        }\n\n        const results = await merger.create(context.targetSchema.schemaKey, sourceItem);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n    }\n  }\n\n  // 2nd pass to merge baseClass, properties, mixins and CA.\n  public static async mergeItemContentChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>){\n    const merger = new this(context);\n    let mergeResults: SchemaItemEditResults;\n\n    for (const change of classChanges) {\n      const targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (change.baseClassDelta !== undefined) {\n        const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      if (change.entityMixinChanges.size > 0) {\n        const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);\n      mergeResults  = await ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n\n      // merge custom attributes\n      mergeResults = await mergeCustomAttributes(merger.context, change.customAttributeChanges.values(), async (ca) => {\n        return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);\n      });\n\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.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 { ECClass, ECClassModifier, parseClassModifier, Property, SchemaItemKey, SchemaItemType, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { BaseClassDelta, ChangeType, ClassChanges, PropertyChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\nimport { createPropertyFromProps, mergePropertyAttributeValueChanges } from \"./PropertyMerger\";\n\n/**\n * @internal\n */\nexport class ClassMerger<TClass extends ECClass> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\n  }\n\n  protected async merge(itemKey: SchemaItemKey, _change: ClassChanges): Promise<SchemaItemEditResults> {\n    return { itemKey };\n  }\n\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const mutableClass = ecClass as unknown as MutableClass;\n    switch(attributeName) {\n      case \"schemaItemType\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\n        }\n        return true;\n\n      case \"label\":\n        mutableClass.setDisplayLabel(attributeNewValue);\n        return true;\n\n      case \"description\":\n        mutableClass.setDescription(attributeNewValue);\n        return true;\n\n      case \"modifier\":\n        const modifier = parseClassModifier(attributeNewValue);\n        if (modifier === undefined) {\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\n        }\n\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\n          mutableClass.setModifier(modifier);\n          return true;\n        }\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\n    }\n    return false;\n  }\n\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\n    if (sourceBaseClass !== undefined) {\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceBaseClass.schema.schemaKey);\n\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\n        if (sourceBaseClass.schemaItemType === SchemaItemType.EntityClass) {\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n        } else if (sourceBaseClass.schemaItemType === SchemaItemType.Mixin) {\n          return this.context.editor.mixins.setMixinBaseClass(itemKey, baseClassKey);\n        }\n      }\n\n      if (targetBaseClass !== undefined) {\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\n        if (baseClass === undefined) {\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\n        }\n        if (await baseClass.is(targetBaseClass)) {\n          if (baseClass.schemaItemType === SchemaItemType.EntityClass) {\n            return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n          } else if (baseClass.schemaItemType === SchemaItemType.Mixin) {\n            return this.context.editor.mixins.setMixinBaseClass(itemKey, baseClassKey);\n          }\n        }\n      }\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\n  }\n\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]): Promise<SchemaItemEditResults> {\n    if (propertyValueChanges.length > 0) {\n\n      const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n      if (targetItem === undefined) {\n        return { errorMessage: `'${itemKey.name}' class could not be located in the merged schema.` };\n      }\n\n      for (const change of propertyValueChanges) {\n        const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n        const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\n        if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n          return results;\n        }\n      }\n    }\n\n    return { itemKey };\n  }\n\n  private async handleError(callback: Promise<SchemaItemEditResults>) {\n    const result = await callback;\n    if (result.errorMessage) {\n      throw new Error(result.errorMessage);\n    }\n  }\n\n  private async mergePropertyChanges(itemKey: SchemaItemKey, propertyChanges: Iterable<PropertyChanges>): Promise<SchemaItemEditResults> {\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n    if (targetItem === undefined) {\n      return { itemKey, errorMessage: `'${itemKey.name}' class could not be located in the merged schema.`};\n    }\n\n    for (const change of propertyChanges) {\n      if (change.propertyMissing?.changeType === ChangeType.Missing) {\n        if (await targetItem.getProperty(change.ecTypeName) !== undefined) {\n          return { itemKey, errorMessage: `Merged schema already contains a class '${itemKey.name}' property '${change.ecTypeName}'.`};\n        }\n\n        const sourceProperty = change.propertyMissing.diagnostic.ecDefinition as unknown as Property;\n        const results  = await createPropertyFromProps(this.context, itemKey, sourceProperty);\n        if (results.errorMessage !== undefined) {\n          return { itemKey, errorMessage:  results.errorMessage };\n        }\n      } else {\n        const targetProperty = (await targetItem.getProperty(change.ecTypeName))!;\n        const results = await mergePropertyAttributeValueChanges(this.context, targetProperty, change.propertyValueChanges);\n        if (results.errorMessage !== undefined) {\n          return { itemKey, errorMessage: results.errorMessage  };\n        }\n      }\n\n      const mergeResults = await mergeCustomAttributes(this.context, change.customAttributeChanges.values(), async (ca) => {\n        return this.context.editor.entities.addCustomAttributeToProperty(itemKey, change.ecTypeName, ca);\n      });\n\n      if (mergeResults.errorMessage !== undefined) {\n        return { itemKey, errorMessage: mergeResults.errorMessage};\n      }\n    }\n    return { itemKey };\n  }\n\n  // First pass to create missing changes\n  public static async mergeItemStubChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\n    const merger = new this(context);\n\n    for (const change of classChanges) {\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\n      const targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (changeType === ChangeType.Missing) {\n\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\n        }\n\n        await merger.handleError(merger.create(context.targetSchema.schemaKey, sourceItem));\n      }\n    }\n  }\n\n  // 2nd pass to merge baseClass, properties, mixins and CA.\n  public static async mergeItemContentChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>){\n    const merger = new this(context);\n    for (const change of classChanges) {\n      const targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (change.baseClassDelta !== undefined) {\n        await merger.handleError(merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType));\n      }\n\n      // merge class attributes\n      await merger.handleError(merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges));\n\n      // merge class mixins/constraints/etc\n      await merger.handleError(merger.merge(targetItemKey, change));\n\n      // merge class property attribute values\n      if (change.propertyChanges.size > 0) {\n        await merger.handleError(merger.mergePropertyChanges(targetItemKey, change.propertyChanges.values()));\n      }\n\n      // merge custom attributes\n      await merger.handleError(mergeCustomAttributes(merger.context, change.customAttributeChanges.values(), async (ca) => {\n        return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);\n      }));\n    }\n  }\n}\n"]}

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

@@ -1,11 +1,12 @@
-import { EntityClass, Mixin, SchemaItemKey, SchemaKey } from "@itwin/ecschema-metadata";
+import { EntityClass, SchemaItemKey, SchemaKey } from "@itwin/ecschema-metadata";
 import { ClassMerger } from "./ClassMerger";
 import { SchemaItemEditResults } from "../Editing/Editor";
+import { ClassChanges } from "../Validation/SchemaChanges";
 /**
  * @internal
  */
 export default class EntityClassMerger extends ClassMerger<EntityClass> {
     protected create(schemaKey: SchemaKey, ecClass: EntityClass): Promise<SchemaItemEditResults>;
-    protected addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults>;
+    protected merge(itemKey: SchemaItemKey, changes: ClassChanges): Promise<SchemaItemEditResults>;
 }
 //# sourceMappingURL=EntityClassMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EntityClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,WAAW,CAAC,WAAW,CAAC;cAC5C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAIlF,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;CASxG"}
+{"version":3,"file":"EntityClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAS,aAAa,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAc,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEvE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,WAAW,CAAC,WAAW,CAAC;cAC5C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAIlF,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAuB9G"}

package/lib/cjs/Merging/EntityClassMerger.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 *--------------------------------------------------------------------------------------------*/
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const ClassMerger_1 = require("./ClassMerger");
+const SchemaChanges_1 = require("../Validation/SchemaChanges");
 /**
  * @internal
  */
@@ -13,13 +14,27 @@ class EntityClassMerger extends ClassMerger_1.ClassMerger {
     async create(schemaKey, ecClass) {
         return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);
     }
-    async addMixin(itemKey, mixin) {
-        const mixinKey = new ecschema_metadata_1.SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)
-            ? this.context.targetSchema.schemaKey
-            : mixin.schema.schemaKey);
-        // addMixin should return results instead of throwing exception
-        await this.context.editor.entities.addMixin(itemKey, mixinKey);
-        return {};
+    async merge(itemKey, changes) {
+        if (changes.entityMixinChanges.size > 0) {
+            if (changes.schemaItemMissing?.changeType !== SchemaChanges_1.ChangeType.Missing) {
+                return { errorMessage: `Changing the entity class '${itemKey.name}' mixins is not supported.` };
+            }
+            for (const change of changes.entityMixinChanges.values()) {
+                for (const entityMixinChange of change.entityMixinChange) {
+                    const mixins = entityMixinChange.diagnostic.messageArgs;
+                    for (const mixin of mixins) {
+                        const mixinKey = new ecschema_metadata_1.SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)
+                            ? this.context.targetSchema.schemaKey
+                            : mixin.schema.schemaKey);
+                        const result = await this.context.editor.entities.addMixin(itemKey, mixinKey);
+                        if (result.errorMessage !== undefined) {
+                            return result;
+                        }
+                    }
+                }
+            }
+        }
+        return { itemKey };
     }
 }
 exports.default = EntityClassMerger;

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

@@ -1 +1 @@
-{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAwF;AACxF,+CAA4C;AAG5C;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,yBAAwB;IAClD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAoB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEkB,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,KAAY;QACpE,MAAM,QAAQ,GAAG,IAAI,iCAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;YAChH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5B,+DAA+D;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAdD,oCAcC","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 { EntityClass, Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { ClassMerger } from \"./ClassMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\n\n/**\n * @internal\n */\nexport default class EntityClassMerger extends ClassMerger<EntityClass> {\n  protected override async create(schemaKey: SchemaKey, ecClass: EntityClass): Promise<SchemaItemEditResults> {\n    return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);\n  }\n\n  protected override async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    const mixinKey = new SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : mixin.schema.schemaKey);\n\n    // addMixin should return results instead of throwing exception\n    await this.context.editor.entities.addMixin(itemKey, mixinKey);\n    return {};\n  }\n}\n"]}
+{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAwF;AACxF,+CAA4C;AAE5C,+DAAuE;AAEvE;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,yBAAwB;IAClD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAoB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEkB,KAAK,CAAC,KAAK,CAAC,OAAsB,EAAE,OAAqB;QAC1E,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE;YACvC,IAAI,OAAO,CAAC,iBAAiB,EAAE,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAChE,OAAO,EAAE,YAAY,EAAE,8BAA8B,OAAO,CAAC,IAAI,4BAA4B,EAAC,CAAC;aAChG;YAED,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE;gBACxD,KAAK,MAAM,iBAAiB,IAAI,MAAM,CAAC,iBAAiB,EAAE;oBACxD,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC,WAAkC,CAAC;oBAC/E,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;wBAC1B,MAAM,QAAQ,GAAG,IAAI,iCAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;4BAChH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;4BACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;wBAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC9E,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE;4BACrC,OAAO,MAAM,CAAC;yBACf;qBACF;iBACF;aACF;SACF;QACD,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;CACF;AA5BD,oCA4BC","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 { EntityClass, Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { ClassMerger } from \"./ClassMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { ChangeType, ClassChanges } from \"../Validation/SchemaChanges\";\n\n/**\n * @internal\n */\nexport default class EntityClassMerger extends ClassMerger<EntityClass> {\n  protected override async create(schemaKey: SchemaKey, ecClass: EntityClass): Promise<SchemaItemEditResults> {\n    return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);\n  }\n\n  protected override async merge(itemKey: SchemaItemKey, changes: ClassChanges): Promise<SchemaItemEditResults> {\n    if (changes.entityMixinChanges.size > 0) {\n      if (changes.schemaItemMissing?.changeType !== ChangeType.Missing) {\n        return { errorMessage: `Changing the entity class '${itemKey.name}' mixins is not supported.`};\n      }\n\n      for (const change of changes.entityMixinChanges.values()) {\n        for (const entityMixinChange of change.entityMixinChange) {\n          const mixins = entityMixinChange.diagnostic.messageArgs! as unknown as [Mixin];\n          for (const mixin of mixins) {\n            const mixinKey = new SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n              ? this.context.targetSchema.schemaKey\n              : mixin.schema.schemaKey);\n            const result = await this.context.editor.entities.addMixin(itemKey, mixinKey);\n            if (result.errorMessage !== undefined) {\n              return result;\n            }\n          }\n        }\n      }\n    }\n    return { itemKey };\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAiB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,KAAK,CAAC;cAEhC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAW5E,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;CAe1K"}
+{"version":3,"file":"MixinMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAiB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,KAAK,CAAC;cAEhC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAW5E,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;CAU1K"}

package/lib/cjs/Merging/MixinMerger.js

@@ -20,10 +20,6 @@ class MixinMerger extends ClassMerger_1.ClassMerger {
         return this.context.editor.mixins.create(schemaKey, ecClass.name, appliesTo);
     }
     async mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue) {
-        const results = await super.mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue);
-        if (results === true || this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {
-            return results;
-        }
         switch (attributeName) {
             case "appliesTo":
                 if (attributeOldValue !== undefined) {
@@ -31,7 +27,7 @@ class MixinMerger extends ClassMerger_1.ClassMerger {
                 }
                 return true;
         }
-        return false;
+        return super.mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue);
     }
 }
 exports.default = MixinMerger;

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

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAA2E;AAE3E,+CAA4C;AAE5C;;GAEG;AACH,MAAqB,WAAY,SAAQ,yBAAkB;IAEtC,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAc;QAClE,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;YACnC,OAAO,EAAE,YAAY,EAAE,aAAa,OAAO,CAAC,QAAQ,iDAAiD,EAAE,CAAC;SACzG;QAED,MAAM,SAAS,GAAG,IAAI,iCAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC;YAClI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/E,CAAC;IAEkB,KAAK,CAAC,eAAe,CAAC,OAAc,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QAC5H,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;QAC1G,IAAI,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;YACnG,OAAO,OAAO,CAAC;SAChB;QAED,QAAO,aAAa,EAAE;YACpB,KAAK,WAAW;gBACd,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACnC,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,EAAE,CAAC;iBAC7F;gBACD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA5BD,8BA4BC","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 { Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { ClassMerger } from \"./ClassMerger\";\n\n/**\n * @internal\n */\nexport default class MixinMerger extends ClassMerger<Mixin> {\n\n  protected override async create(schemaKey: SchemaKey, ecClass: Mixin): Promise<SchemaItemEditResults> {\n    if (ecClass.appliesTo === undefined) {\n      return { errorMessage: `The Mixin ${ecClass.fullName} is missing the required 'appliesTo' attribute.` };\n    }\n\n    const appliesTo = new SchemaItemKey(ecClass.appliesTo.name, this.context.sourceSchema.schemaKey.matches(ecClass.appliesTo.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : ecClass.appliesTo.schemaKey);\n    return this.context.editor.mixins.create(schemaKey, ecClass.name, appliesTo);\n  }\n\n  protected override async mergeAttributes(ecClass: Mixin, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const results = await super.mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch(attributeName) {\n      case \"appliesTo\":\n        if (attributeOldValue !== undefined) {\n          return { errorMessage: `Changing the mixin '${ecClass.name}' appliesTo is not supported.` };\n        }\n        return true;\n    }\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAA2E;AAE3E,+CAA4C;AAE5C;;GAEG;AACH,MAAqB,WAAY,SAAQ,yBAAkB;IAEtC,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAc;QAClE,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;YACnC,OAAO,EAAE,YAAY,EAAE,aAAa,OAAO,CAAC,QAAQ,iDAAiD,EAAE,CAAC;SACzG;QAED,MAAM,SAAS,GAAG,IAAI,iCAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC;YAClI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC/E,CAAC;IAEkB,KAAK,CAAC,eAAe,CAAC,OAAc,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QAC5H,QAAO,aAAa,EAAE;YACpB,KAAK,WAAW;gBACd,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACnC,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,EAAE,CAAC;iBAC7F;gBACD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;IAC7F,CAAC;CACF;AAvBD,8BAuBC","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 { Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { ClassMerger } from \"./ClassMerger\";\n\n/**\n * @internal\n */\nexport default class MixinMerger extends ClassMerger<Mixin> {\n\n  protected override async create(schemaKey: SchemaKey, ecClass: Mixin): Promise<SchemaItemEditResults> {\n    if (ecClass.appliesTo === undefined) {\n      return { errorMessage: `The Mixin ${ecClass.fullName} is missing the required 'appliesTo' attribute.` };\n    }\n\n    const appliesTo = new SchemaItemKey(ecClass.appliesTo.name, this.context.sourceSchema.schemaKey.matches(ecClass.appliesTo.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : ecClass.appliesTo.schemaKey);\n    return this.context.editor.mixins.create(schemaKey, ecClass.name, appliesTo);\n  }\n\n  protected override async mergeAttributes(ecClass: Mixin, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    switch(attributeName) {\n      case \"appliesTo\":\n        if (attributeOldValue !== undefined) {\n          return { errorMessage: `Changing the mixin '${ecClass.name}' appliesTo is not supported.` };\n        }\n        return true;\n    }\n    return super.mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue);\n  }\n}\n"]}

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

@@ -0,0 +1,21 @@
+import { Property, SchemaItemKey } from "@itwin/ecschema-metadata";
+import { SchemaMergeContext } from "./SchemaMerger";
+import { PropertyEditResults } from "../Editing/Editor";
+import { PropertyValueChange } from "../Validation/SchemaChanges";
+/**
+ * Updates property with attribute value changes.
+ * @param context The current merging context.
+ * @param property The Property object to be changed.
+ * @param propertyValueChanges The changes to be applied to the property.
+ * @internal
+ */
+export declare function mergePropertyAttributeValueChanges(context: SchemaMergeContext, property: Property, propertyValueChanges: PropertyValueChange[]): Promise<PropertyEditResults>;
+/**
+ * Creates a Property through a PropertyProps.
+ * @param context The current merging context.
+ * @param classKey The SchemaItemKey of the class.
+ * @param property The Property object to be cloned.
+ * @internal
+ */
+export declare function createPropertyFromProps(context: SchemaMergeContext, classKey: SchemaItemKey, property: Property): Promise<PropertyEditResults>;
+//# sourceMappingURL=PropertyMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuI,QAAQ,EAAwF,aAAa,EAAkE,MAAM,0BAA0B,CAAC;AAC9V,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAkBlE;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAYnL;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsCpJ"}