@itwin/ecschema-editing 4.4.0-dev.3 → 4.4.0-dev.31

package/lib/cjs/Merging/AnyPropertyMerger.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AnyPropertyMerger = void 0;
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+/**
+ * @internal
+ */
+class AnyPropertyMerger {
+    constructor(context) {
+        this.context = context;
+    }
+    async createFromProps(_classKey, property) {
+        return { errorMessage: `Property Type ${(0, ecschema_metadata_1.propertyTypeToString)(property.propertyType)} is not implemented.` };
+    }
+    isPropertyEditResults(obj) {
+        return typeof obj === "object" && "errorMessage" in obj;
+    }
+    async getPropertyProps(property) {
+        let props = {};
+        if (property.category !== undefined) {
+            const sourceCategory = await property.category;
+            const itemKey = new ecschema_metadata_1.SchemaItemKey(sourceCategory.name, this.context.sourceSchema.schemaKey.matches(sourceCategory.schema.schemaKey)
+                ? this.context.targetSchema.schemaKey
+                : sourceCategory.schema.schemaKey);
+            const targetCategory = await this.context.targetSchema.lookupItem(itemKey);
+            if (targetCategory === undefined) {
+                return { errorMessage: `Unable to locate the property category class ${sourceCategory.name} in the merged schema.` };
+            }
+            props = { ...props, category: targetCategory.fullName };
+        }
+        if (property.kindOfQuantity !== undefined) {
+            const sourceKoq = await property.kindOfQuantity;
+            const itemKey = new ecschema_metadata_1.SchemaItemKey(sourceKoq.name, this.context.sourceSchema.schemaKey.matches(sourceKoq.schema.schemaKey)
+                ? this.context.targetSchema.schemaKey
+                : sourceKoq.schema.schemaKey);
+            const targetKoq = await this.context.targetSchema.lookupItem(itemKey);
+            if (targetKoq === undefined) {
+                return { errorMessage: `Unable to locate the property kind of quantity ${sourceKoq.name} in the merged schema.` };
+            }
+            props = { ...props, kindOfQuantity: targetKoq.fullName };
+        }
+        return props;
+    }
+    async mergeAttributes(property, attributeName, attributeNewValue, _attributeOldValue) {
+        const mutableProperty = property;
+        switch (attributeName) {
+            case "description":
+                mutableProperty.setDescription(attributeNewValue);
+                return true;
+            case "label":
+                mutableProperty.setLabel(attributeNewValue);
+                return true;
+            case "isReadOnly":
+                mutableProperty.setIsReadOnly(attributeNewValue);
+                return true;
+            case "priority":
+                mutableProperty.setPriority(attributeNewValue);
+                return true;
+            case "type":
+            case "primitiveType":
+                return { errorMessage: `Changing the property '${property.name}' ${attributeName} is not supported.` };
+        }
+        return false;
+    }
+}
+exports.AnyPropertyMerger = AnyPropertyMerger;
+//# sourceMappingURL=AnyPropertyMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AnyPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/AnyPropertyMerger.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAA0I;AAK1I;;GAEG;AACH,MAAa,iBAAiB;IAG5B,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,SAAwB,EAAE,QAAmB;QACxE,OAAO,EAAE,YAAY,EAAE,iBAAiB,IAAA,wCAAoB,EAAC,QAAQ,CAAC,YAAY,CAAC,sBAAsB,EAAE,CAAC;IAC9G,CAAC;IAES,qBAAqB,CAAC,GAAQ;QACtC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,cAAc,IAAI,GAAG,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,QAAmB;QAClD,IAAI,KAAK,GAAG,EAAoB,CAAC;QAEjC,IAAI,QAAQ,CAAC,QAAQ,KAAK,SAAS,EAAE;YACnC,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,iCAAa,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBACjI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;gBACrC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAClC,CAAC;YACF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAmB,OAAO,CAAC,CAAC;YAC7F,IAAI,cAAc,KAAK,SAAS,EAAE;gBAChC,OAAO,EAAE,YAAY,EAAE,gDAAgD,cAAc,CAAC,IAAI,wBAAwB,EAAE,CAAC;aACtH;YACD,KAAK,GAAG,EAAC,GAAG,KAAK,EAAE,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAC,CAAC;SACvD;QAED,IAAI,QAAQ,CAAC,cAAc,KAAK,SAAS,EAAE;YACzC,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,iCAAa,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;gBACvH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;gBACrC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAC7B,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAiB,OAAO,CAAC,CAAC;YACtF,IAAI,SAAS,KAAK,SAAS,EAAE;gBAC3B,OAAO,EAAE,YAAY,EAAE,kDAAkD,SAAS,CAAC,IAAI,wBAAwB,EAAE,CAAC;aACnH;YACD,KAAK,GAAG,EAAC,GAAG,KAAK,EAAE,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAC,CAAC;SACxD;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,QAAmB,EAAE,aAAqB,EAAE,iBAAsB,EAAE,kBAAuB;QACtH,MAAM,eAAe,GAAG,QAAsC,CAAC;QAC/D,QAAO,aAAa,EAAE;YACpB,KAAK,aAAa;gBAChB,eAAe,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,KAAK,OAAO;gBACV,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;gBAC5C,OAAO,IAAI,CAAC;YACd,KAAK,YAAY;gBACf,eAAe,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,KAAK,UAAU;gBACb,eAAe,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;gBAC/C,OAAO,IAAI,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,eAAe;gBAClB,OAAO,EAAE,YAAY,EAAE,0BAA0B,QAAQ,CAAC,IAAI,KAAK,aAAa,oBAAoB,EAAE,CAAC;SAC1G;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAnED,8CAmEC","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 { KindOfQuantity, Property, PropertyCategory, PropertyProps, propertyTypeToString, SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { PropertyEditResults } from \"../Editing/Editor\";\nimport { MutableProperty } from \"../Editing/Mutable/MutableProperty\";\n\n/**\n * @internal\n */\nexport class AnyPropertyMerger<TProperty extends Property> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  public async createFromProps(_classKey: SchemaItemKey, property: TProperty): Promise<PropertyEditResults> {\n    return { errorMessage: `Property Type ${propertyTypeToString(property.propertyType)} is not implemented.` };\n  }\n\n  protected isPropertyEditResults(obj: any): obj is PropertyEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  protected async getPropertyProps(property: TProperty): Promise<PropertyEditResults | PropertyProps> {\n    let props = {} as  PropertyProps;\n\n    if (property.category !== undefined) {\n      const sourceCategory = await property.category;\n      const itemKey = new SchemaItemKey(sourceCategory.name, this.context.sourceSchema.schemaKey.matches(sourceCategory.schema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceCategory.schema.schemaKey,\n      );\n      const targetCategory = await this.context.targetSchema.lookupItem<PropertyCategory>(itemKey);\n      if (targetCategory === undefined) {\n        return { errorMessage: `Unable to locate the property category class ${sourceCategory.name} in the merged schema.` };\n      }\n      props = {...props, category: targetCategory.fullName};\n    }\n\n    if (property.kindOfQuantity !== undefined) {\n      const sourceKoq = await property.kindOfQuantity;\n      const itemKey = new SchemaItemKey(sourceKoq.name, this.context.sourceSchema.schemaKey.matches(sourceKoq.schema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceKoq.schema.schemaKey,\n      );\n      const targetKoq = await this.context.targetSchema.lookupItem<KindOfQuantity>(itemKey);\n      if (targetKoq === undefined) {\n        return { errorMessage: `Unable to locate the property kind of quantity ${sourceKoq.name} in the merged schema.` };\n      }\n      props = {...props, kindOfQuantity: targetKoq.fullName};\n    }\n    return props;\n  }\n\n  public async mergeAttributes(property: TProperty, attributeName: string, attributeNewValue: any, _attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const mutableProperty = property as unknown as MutableProperty;\n    switch(attributeName) {\n      case \"description\":\n        mutableProperty.setDescription(attributeNewValue);\n        return true;\n      case \"label\":\n        mutableProperty.setLabel(attributeNewValue);\n        return true;\n      case \"isReadOnly\":\n        mutableProperty.setIsReadOnly(attributeNewValue);\n        return true;\n      case \"priority\":\n        mutableProperty.setPriority(attributeNewValue);\n        return true;\n      case \"type\":\n      case \"primitiveType\":\n        return { errorMessage: `Changing the property '${property.name}' ${attributeName} is not supported.` };\n    }\n    return false;\n  }\n}\n"]}

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

@@ -0,0 +1,32 @@
+import { ArrayProperty, EnumerationArrayProperty, PrimitiveArrayProperty, SchemaItemKey, StructArrayProperty } from "@itwin/ecschema-metadata";
+import { AnyPropertyMerger } from "./AnyPropertyMerger";
+import { PropertyEditResults } from "../Editing/Editor";
+/**
+ * @internal
+ */
+declare class ArrayPropertyMerger<TArrayProperty extends ArrayProperty> extends AnyPropertyMerger<TArrayProperty> {
+    mergeAttributes(property: TArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean>;
+}
+/**
+ * @internal
+ */
+export declare class StructArrayPropertyMerger extends ArrayPropertyMerger<StructArrayProperty> {
+    mergeAttributes(property: StructArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean>;
+    createFromProps(classKey: SchemaItemKey, property: StructArrayProperty): Promise<PropertyEditResults>;
+}
+/**
+ * @internal
+ */
+export declare class EnumerationArrayPropertyMerger extends ArrayPropertyMerger<EnumerationArrayProperty> {
+    mergeAttributes(property: EnumerationArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean>;
+    createFromProps(classKey: SchemaItemKey, property: EnumerationArrayProperty): Promise<PropertyEditResults>;
+}
+/**
+ * @internal
+ */
+export declare class PrimitiveArraPropertyMerger extends ArrayPropertyMerger<PrimitiveArrayProperty> {
+    mergeAttributes(property: PrimitiveArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean>;
+    createFromProps(classKey: SchemaItemKey, property: PrimitiveArrayProperty): Promise<PropertyEditResults>;
+}
+export {};
+//# sourceMappingURL=ArrayPropertyMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ArrayPropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ArrayPropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAe,wBAAwB,EAAE,sBAAsB,EAAE,aAAa,EAAE,mBAAmB,EAAyC,MAAM,0BAA0B,CAAC;AAEnM,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD;;GAEG;AACH,cAAM,mBAAmB,CAAC,cAAc,SAAS,aAAa,CAAG,SAAQ,iBAAiB,CAAE,cAAc,CAAC;IACnF,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;CAmB/K;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAE,mBAAmB,CAAC;IAChE,eAAe,CAAC,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;IAiB7J,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsB5H;AAED;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,mBAAmB,CAAE,wBAAwB,CAAC;IAC1E,eAAe,CAAC,QAAQ,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;IAiBlK,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,wBAAwB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA0BjI;AAED;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,mBAAmB,CAAE,sBAAsB,CAAC;IACrE,eAAe,CAAC,QAAQ,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;IAchK,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAY/H"}

package/lib/cjs/Merging/ArrayPropertyMerger.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrimitiveArraPropertyMerger = exports.EnumerationArrayPropertyMerger = exports.StructArrayPropertyMerger = void 0;
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const AnyPropertyMerger_1 = require("./AnyPropertyMerger");
+/**
+ * @internal
+ */
+class ArrayPropertyMerger extends AnyPropertyMerger_1.AnyPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const mutableProperty = property;
+        switch (attributeName) {
+            case "minOccurs":
+                mutableProperty.setMinOccurs(attributeNewValue);
+                return true;
+            case "maxOccurs":
+                mutableProperty.setMaxOccurs(attributeNewValue);
+                return true;
+        }
+        return false;
+    }
+}
+/**
+ * @internal
+ */
+class StructArrayPropertyMerger extends ArrayPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "structClass": {
+                if (attributeOldValue !== undefined) {
+                    return { errorMessage: `Changing the property '${property.name}' structClass is not supported.` };
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const itemKey = new ecschema_metadata_1.SchemaItemKey(property.structClass.name, this.context.sourceSchema.schemaKey.matches(property.structClass.schema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : property.structClass.schema.schemaKey);
+        const type = await this.context.targetSchema.lookupItem(itemKey);
+        if (type === undefined) {
+            return { errorMessage: `Unable to locate the struct class ${property.structClass.name} in the merged schema.` };
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+            typeName: type.fullName,
+        };
+        return this.context.editor.entities.createStructArrayPropertyFromProps(classKey, property.name, type, props);
+    }
+}
+exports.StructArrayPropertyMerger = StructArrayPropertyMerger;
+/**
+ * @internal
+ */
+class EnumerationArrayPropertyMerger extends ArrayPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "enumeration": {
+                if (attributeOldValue !== undefined) {
+                    return { errorMessage: `Changing the property '${property.name}' enumeration is not supported.` };
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        if (property.enumeration === undefined) {
+            return { errorMessage: `Property '${property.fullName}' is missing the required 'enumeration' attribute.` };
+        }
+        const enumeration = await property.enumeration;
+        const itemKey = new ecschema_metadata_1.SchemaItemKey(enumeration.name, this.context.sourceSchema.schemaKey.matches(enumeration.schema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : enumeration.schema.schemaKey);
+        const type = await this.context.targetSchema.lookupItem(itemKey);
+        if (type === undefined) {
+            return { errorMessage: `Unable to locate the enumeration class ${enumeration.name} in the merged schema.` };
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+        };
+        return this.context.editor.entities.createEnumerationArrayPropertyFromProps(classKey, property.name, type, props);
+    }
+}
+exports.EnumerationArrayPropertyMerger = EnumerationArrayPropertyMerger;
+/**
+ * @internal
+ */
+class PrimitiveArraPropertyMerger extends ArrayPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "primitiveType": {
+                return { errorMessage: `Changing the property '${property.name}' typeName is not supported.` };
+            }
+        }
+        return false;
+    }
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+        };
+        return this.context.editor.entities.createPrimitiveArrayPropertyFromProps(classKey, property.name, property.primitiveType, props);
+    }
+}
+exports.PrimitiveArraPropertyMerger = PrimitiveArraPropertyMerger;
+//# sourceMappingURL=ArrayPropertyMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ArrayPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/ArrayPropertyMerger.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 { ArrayProperty, Enumeration, EnumerationArrayProperty, PrimitiveArrayProperty, SchemaItemKey, StructArrayProperty, StructArrayPropertyProps, StructClass } from \"@itwin/ecschema-metadata\";\nimport { PrimitiveArrayPropertyProps } from \"@itwin/ecschema-metadata/src/Deserialization/JsonProps\";\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\nimport { PropertyEditResults } from \"../Editing/Editor\";\nimport { MutableArrayProperty } from \"../Editing/Mutable/MutableArrayProperty\";\n\n/**\n * @internal\n */\nclass ArrayPropertyMerger<TArrayProperty extends ArrayProperty>  extends AnyPropertyMerger <TArrayProperty> {\n  public override async mergeAttributes(property: TArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const mutableProperty = property as unknown as MutableArrayProperty;\n    switch (attributeName) {\n      case \"minOccurs\":\n        mutableProperty.setMinOccurs(attributeNewValue);\n        return true;\n\n      case \"maxOccurs\":\n        mutableProperty.setMaxOccurs(attributeNewValue);\n        return true;\n\n    }\n    return false;\n  }\n}\n\n/**\n * @internal\n */\nexport class StructArrayPropertyMerger extends ArrayPropertyMerger <StructArrayProperty> {\n  public override async mergeAttributes(property: StructArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch (attributeName) {\n      case \"structClass\": {\n        if (attributeOldValue !== undefined) {\n          return { errorMessage: `Changing the property '${property.name}' structClass is not supported.` };\n        }\n        return true;\n      }\n    }\n    return false;\n  }\n\n  public override async createFromProps(classKey: SchemaItemKey, property: StructArrayProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const itemKey = new SchemaItemKey(property.structClass.name, this.context.sourceSchema.schemaKey.matches(property.structClass.schema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : property.structClass.schema.schemaKey,\n    );\n    const type = await this.context.targetSchema.lookupItem<StructClass>(itemKey);\n    if (type === undefined) {\n      return { errorMessage: `Unable to locate the struct class ${property.structClass.name} in the merged schema.` };\n    }\n\n    const props: StructArrayPropertyProps = {\n      ...property.toJSON(),\n      ...results,\n      typeName: type.fullName,\n    };\n    return this.context.editor.entities.createStructArrayPropertyFromProps(classKey, property.name, type, props);\n  }\n}\n\n/**\n * @internal\n */\nexport class EnumerationArrayPropertyMerger extends ArrayPropertyMerger <EnumerationArrayProperty> {\n  public override async mergeAttributes(property: EnumerationArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch (attributeName) {\n      case \"enumeration\": {\n        if (attributeOldValue !== undefined) {\n          return { errorMessage: `Changing the property '${property.name}' enumeration is not supported.` };\n        }\n        return true;\n      }\n    }\n    return false;\n  }\n\n  public override async createFromProps(classKey: SchemaItemKey, property: EnumerationArrayProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    if (property.enumeration === undefined) {\n      return { errorMessage: `Property '${property.fullName}' is missing the required 'enumeration' attribute.` };\n    }\n\n    const enumeration = await property.enumeration;\n    const itemKey = new SchemaItemKey(enumeration.name, this.context.sourceSchema.schemaKey.matches(enumeration.schema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : enumeration.schema.schemaKey,\n    );\n    const type = await this.context.targetSchema.lookupItem<Enumeration>(itemKey);\n    if (type === undefined) {\n      return { errorMessage: `Unable to locate the enumeration class ${enumeration.name} in the merged schema.` };\n    }\n\n    const props: PrimitiveArrayPropertyProps = {\n      ...property.toJSON(),\n      ...results,\n    };\n    return this.context.editor.entities.createEnumerationArrayPropertyFromProps(classKey, property.name, type, props);\n  }\n}\n\n/**\n * @internal\n */\nexport class PrimitiveArraPropertyMerger extends ArrayPropertyMerger <PrimitiveArrayProperty> {\n  public override async mergeAttributes(property: PrimitiveArrayProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch (attributeName) {\n      case \"primitiveType\": {\n        return { errorMessage: `Changing the property '${property.name}' typeName is not supported.`};\n      }\n    }\n    return false;\n  }\n\n  public override async createFromProps(classKey: SchemaItemKey, property: PrimitiveArrayProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const props: PrimitiveArrayPropertyProps = {\n      ...property.toJSON(),\n      ...results,\n    };\n    return this.context.editor.entities.createPrimitiveArrayPropertyFromProps(classKey, property.name, property.primitiveType, props);\n  }\n}\n"]}

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

@@ -1,13 +1,11 @@
-import { CustomAttributeClass } from "@itwin/ecschema-metadata";
-import { PropertyValueResolver } from "./SchemaItemMerger";
-import ClassMerger from "./ClassMerger";
+import { CustomAttributeClass, SchemaKey } from "@itwin/ecschema-metadata";
+import { ClassMerger } from "./ClassMerger";
+import { SchemaItemEditResults } from "../Editing/Editor";
 /**
  * @internal
  */
-export default class CAClassMerger extends ClassMerger {
-    /**
-     * Creates the property value resolver for [[CustomAttributeClass]] items.
-     */
-    protected createPropertyValueResolver(): Promise<PropertyValueResolver<CustomAttributeClass>>;
+export default class CAClassMerger extends ClassMerger<CustomAttributeClass> {
+    protected create(schemaKey: SchemaKey, ecClass: CustomAttributeClass): Promise<SchemaItemEditResults>;
+    protected mergeAttributes(ecClass: CustomAttributeClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean>;
 }
 //# sourceMappingURL=CAClassMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"CAClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW;IACpD;;OAEG;cACsB,2BAA2B,IAAI,OAAO,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC;CAO7G"}
+{"version":3,"file":"CAClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAqC,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,WAAW,CAAC,oBAAoB,CAAC;cAEjD,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI3F,eAAe,CAAC,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;CAoBzL"}

package/lib/cjs/Merging/CAClassMerger.js

@@ -1,19 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const ClassMerger_1 = require("./ClassMerger");
 /**
  * @internal
  */
-class CAClassMerger extends ClassMerger_1.default {
-    /**
-     * Creates the property value resolver for [[CustomAttributeClass]] items.
-     */
-    async createPropertyValueResolver() {
-        return {
-            // TODO: The other container types should be added instead of overriding the existing flags.
-            //       See issue: https://github.com/iTwin/itwinjs-core/issues/6014
-            appliesTo: (value) => value,
-        };
+class CAClassMerger extends ClassMerger_1.ClassMerger {
+    async create(schemaKey, ecClass) {
+        return this.context.editor.customAttributes.create(schemaKey, ecClass.name, ecClass.containerType);
+    }
+    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;
+        }
+        const mutableCAClass = ecClass;
+        switch (attributeName) {
+            case "appliesTo":
+                if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {
+                    const containerType = (0, ecschema_metadata_1.parseCustomAttributeContainerType)(`${attributeOldValue}, ${attributeNewValue}`);
+                    if (containerType === undefined) {
+                        return { errorMessage: "An invalid custom attribute class containerType has been provided." };
+                    }
+                    mutableCAClass.setContainerType(containerType);
+                }
+                return true;
+        }
+        return false;
     }
 }
 exports.default = CAClassMerger;

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

@@ -1 +1 @@
-{"version":3,"file":"CAClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":";;AAMA,+CAAwC;AAExC;;GAEG;AACH,MAAqB,aAAc,SAAQ,qBAAW;IACpD;;OAEG;IACgB,KAAK,CAAC,2BAA2B;QAClD,OAAO;YACL,4FAA4F;YAC5F,qEAAqE;YACrE,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;SACpC,CAAC;IACJ,CAAC;CACF;AAXD,gCAWC","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 { CustomAttributeClass } from \"@itwin/ecschema-metadata\";\r\nimport { PropertyValueResolver } from \"./SchemaItemMerger\";\r\nimport ClassMerger from \"./ClassMerger\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport default class CAClassMerger extends ClassMerger {\r\n  /**\r\n   * Creates the property value resolver for [[CustomAttributeClass]] items.\r\n   */\r\n  protected override async createPropertyValueResolver(): Promise<PropertyValueResolver<CustomAttributeClass>> {\r\n    return {\r\n      // TODO: The other container types should be added instead of overriding the existing flags.\r\n      //       See issue: https://github.com/iTwin/itwinjs-core/issues/6014\r\n      appliesTo: (value: number) => value,\r\n    };\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"CAClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/CAClassMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAA8G;AAC9G,+CAA4C;AAI5C;;GAEG;AACH,MAAqB,aAAc,SAAQ,yBAAiC;IAEvD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAA6B;QACjF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACrG,CAAC;IAEkB,KAAK,CAAC,eAAe,CAAC,OAA6B,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QAC3I,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,MAAM,cAAc,GAAG,OAAoC,CAAC;QAC5D,QAAO,aAAa,EAAE;YACpB,KAAK,WAAW;gBACd,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,iBAAiB,EAAE;oBAC9E,MAAM,aAAa,GAAG,IAAA,qDAAiC,EAAC,GAAG,iBAAiB,KAAK,iBAAiB,EAAE,CAAC,CAAC;oBACtG,IAAI,aAAa,KAAK,SAAS,EAAE;wBAC/B,OAAO,EAAE,YAAY,EAAE,oEAAoE,EAAC,CAAC;qBAC9F;oBACD,cAAc,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;iBAChD;gBACD,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA1BD,gCA0BC","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 { CustomAttributeClass, parseCustomAttributeContainerType, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { ClassMerger } from \"./ClassMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableCAClass } from \"../Editing/Mutable/MutableCAClass\";\n\n/**\n * @internal\n */\nexport default class CAClassMerger extends ClassMerger<CustomAttributeClass> {\n\n  protected override async create(schemaKey: SchemaKey, ecClass: CustomAttributeClass): Promise<SchemaItemEditResults> {\n    return this.context.editor.customAttributes.create(schemaKey, ecClass.name, ecClass.containerType);\n  }\n\n  protected override async mergeAttributes(ecClass: CustomAttributeClass, 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    const mutableCAClass = ecClass as unknown as MutableCAClass;\n    switch(attributeName) {\n      case \"appliesTo\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          const containerType = parseCustomAttributeContainerType(`${attributeOldValue}, ${attributeNewValue}`);\n          if (containerType === undefined) {\n            return { errorMessage: \"An invalid custom attribute class containerType has been provided.\"};\n          }\n          mutableCAClass.setContainerType(containerType);\n        }\n        return true;\n    }\n    return false;\n  }\n}\n"]}

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

@@ -1,12 +1,20 @@
-import { ECClass, SchemaItemKey } from "@itwin/ecschema-metadata";
+import { ECClass, Mixin, SchemaItemKey, SchemaKey } from "@itwin/ecschema-metadata";
+import { SchemaItemEditResults } from "../Editing/Editor";
+import { SchemaMergeContext } from "./SchemaMerger";
 import { ClassChanges } from "../Validation/SchemaChanges";
-import { SchemaItemMerger } from "./SchemaItemMerger";
 /**
  * @internal
  */
-export default class ClassMerger extends SchemaItemMerger<ECClass> {
-    protected merge(itemKey: SchemaItemKey, source: ECClass, change: ClassChanges): Promise<void>;
-    private mergeBaseClasses;
-    private mergeProperties;
+export declare class ClassMerger<TClass extends ECClass> {
+    protected readonly context: SchemaMergeContext;
+    constructor(context: SchemaMergeContext);
+    protected create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults>;
+    protected addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults>;
+    protected mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean>;
+    protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults;
+    private setBaseClass;
+    private addMixins;
+    private mergeAttributeValueChanges;
+    static mergeChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>): Promise<void>;
 }
 //# sourceMappingURL=ClassMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAA8B,YAAY,EAAmB,MAAM,6BAA6B,CAAC;AACxG,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;cAEvC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY;YAU9E,gBAAgB;YAgBhB,eAAe;CAmB9B"}
+{"version":3,"file":"ClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAmB,KAAK,EAAsB,aAAa,EAA0B,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACjJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAA8B,YAAY,EAA2C,MAAM,6BAA6B,CAAC;AAIhI;;GAEG;AACH,qBAAa,WAAW,CAAC,MAAM,SAAS,OAAO;IAC7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEnC,OAAO,EAAE,kBAAkB;cAIvB,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAgCjK,SAAS,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,qBAAqB;YAI3D,YAAY;YAwBZ,SAAS;YAkBT,0BAA0B;WAmBpB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;CAmDnG"}

package/lib/cjs/Merging/ClassMerger.js

@@ -1,55 +1,153 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// /*---------------------------------------------------------------------------------------------
-// * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-// * See LICENSE.md in the project root for license terms and full copyright notice.
-// *--------------------------------------------------------------------------------------------*/
+exports.ClassMerger = void 0;
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const SchemaChanges_1 = require("../Validation/SchemaChanges");
-const SchemaItemMerger_1 = require("./SchemaItemMerger");
+const ClassPropertyMerger_1 = require("./ClassPropertyMerger");
+const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
 /**
  * @internal
  */
-class ClassMerger extends SchemaItemMerger_1.SchemaItemMerger {
-    async merge(itemKey, source, change) {
-        // This applies to all type of classes regardless if they are Entities, Structs, Mixins,...
-        // all can have properties that required to get merged.
-        await this.mergeBaseClasses(itemKey, source, change.baseClassDelta);
-        for (const propertyChange of change.propertyChanges.values()) {
-            await this.mergeProperties(itemKey, source, propertyChange);
+class ClassMerger {
+    constructor(context) {
+        this.context = context;
+    }
+    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 mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue) {
+        const mutableClass = ecClass;
+        switch (attributeName) {
+            case "schemaItemType":
+                if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {
+                    return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };
+                }
+                return true;
+            case "label":
+                mutableClass.setDisplayLabel(attributeNewValue);
+                return true;
+            case "description":
+                mutableClass.setDescription(attributeNewValue);
+                return true;
+            case "modifier":
+                const modifier = (0, ecschema_metadata_1.parseClassModifier)(attributeNewValue);
+                if (modifier === undefined) {
+                    return { errorMessage: "An invalid class modifier has been provided." };
+                }
+                if (attributeOldValue === undefined || modifier === ecschema_metadata_1.ECClassModifier.None) {
+                    mutableClass.setModifier(modifier);
+                    return true;
+                }
+                return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };
+        }
+        return false;
+    }
+    isSchemaItemEditResults(obj) {
+        return typeof obj === "object" && "errorMessage" in obj;
+    }
+    async setBaseClass(itemKey, baseClassDelta, changeType) {
+        const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs;
+        if (sourceBaseClass !== undefined) {
+            const baseClassKey = new ecschema_metadata_1.SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)
+                ? this.context.targetSchema.schemaKey
+                : sourceBaseClass.schema.schemaKey);
+            if (changeType === SchemaChanges_1.ChangeType.Missing && targetBaseClass === undefined) {
+                return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);
+            }
+            if (targetBaseClass !== undefined) {
+                const baseClass = await this.context.targetSchema.lookupItem(baseClassKey);
+                if (baseClass === undefined) {
+                    return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.` };
+                }
+                if (await baseClass.is(targetBaseClass)) {
+                    return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);
+                }
+            }
         }
+        return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.` };
     }
-    async mergeBaseClasses(itemKey, source, baseClassChange) {
-        if (baseClassChange !== undefined) {
-            const [sourceBaseClass, targetBaseClass] = baseClassChange.diagnostic.messageArgs;
-            if (targetBaseClass === undefined) {
-                const baseClassKey = sourceBaseClass.schema.schemaKey.matches(source.schema.schemaKey)
-                    ? new ecschema_metadata_1.SchemaItemKey(sourceBaseClass.name, itemKey.schemaKey)
-                    : sourceBaseClass.key;
-                await this.context.editor.entities.setBaseClass(itemKey, baseClassKey);
+    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;
+                        }
+                    }
+                }
             }
-            else {
-                throw new Error(`Failed to merge base class '${sourceBaseClass.name}': not supported case`);
+            return {};
+        }
+        return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.` };
+    }
+    async mergeAttributeValueChanges(itemKey, propertyValueChanges) {
+        if (propertyValueChanges.length === 0) {
+            return;
+        }
+        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.`);
+        }
+        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);
             }
         }
     }
-    async mergeProperties(itemKey, source, propertyChange) {
-        if (propertyChange.propertyMissing?.changeType === SchemaChanges_1.ChangeType.Missing) {
-            const property = await source.getProperty(propertyChange.ecTypeName);
-            if (property === undefined) {
-                throw Error(`Property '${propertyChange.ecTypeName}' not found in class ${source.name}`);
+    static async mergeChanges(context, classChanges) {
+        const merger = new this(context);
+        for (const change of classChanges) {
+            const sourceItem = (await change.schema.getItem(change.ecTypeName));
+            let targetItemKey = new ecschema_metadata_1.SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);
+            const changeType = change.schemaItemMissing?.changeType;
+            if (changeType === SchemaChanges_1.ChangeType.Missing) {
+                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);
+                }
+                targetItemKey = results.itemKey;
+            }
+            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);
+                }
             }
-            if (property.isPrimitive()) {
-                const primitiveProps = property.toJSON();
-                property.isArray()
-                    ? await this.context.editor.entities.createPrimitiveArrayPropertyFromProps(itemKey, propertyChange.ecTypeName, property.primitiveType, primitiveProps)
-                    : await this.context.editor.entities.createPrimitivePropertyFromProps(itemKey, propertyChange.ecTypeName, property.primitiveType, primitiveProps);
+            await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);
+            let mergeResults = await ClassPropertyMerger_1.ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());
+            if (mergeResults.errorMessage !== undefined) {
+                throw new Error(mergeResults.errorMessage);
             }
-            else {
-                throw Error(`Failed to merge '${propertyChange.ecTypeName}' property: not supported type`);
+            // merge custom attributes
+            mergeResults = await (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);
             }
         }
     }
 }
-exports.default = ClassMerger;
+exports.ClassMerger = ClassMerger;
 //# sourceMappingURL=ClassMerger.js.map