@itwin/ecschema-editing 4.3.0-dev.2 → 4.3.0-dev.20

package/lib/cjs/Merging/ConstantMerger.js

@@ -1,56 +1,47 @@
 "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.
-*--------------------------------------------------------------------------------------------*/
+// /*---------------------------------------------------------------------------------------------
+// * 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 SchemaItemMerger_1 = require("./SchemaItemMerger");
 /**
  * @internal
- * @param target The constant the differences get merged into
- * @param source The constant to compare
- * @param changes Gets the @see SchemaItemChanges between the two constants.
- * For example, if source constant has an attribute/property that it missing in
- * target one, it would be listed in propertyValueChanges.
  */
-async function mergeConstant(target, source, changes) {
-    const mutableConstant = target;
-    // Get referenced higher level phenomenon
-    const [refSchema, itemName] = await (0, SchemaItemMerger_1.getItemNameAndSchemaRef)(source, source.phenomenon.fullName);
-    await (0, SchemaItemMerger_1.mergeSchemaItemProperties)(mutableConstant, changes.propertyValueChanges, (item, propertyName, propertyValue) => {
-        switch (propertyName) {
-            case "definition": {
-                if (item.definition === "")
-                    return item.setDefinition(propertyValue);
-                throw Error(`Failed to merged, constant definition conflict: ${propertyValue} -> ${item.definition}`);
-            }
-            case "numerator": {
-                if (!item.hasNumerator)
-                    return item.setNumerator(propertyValue);
-                throw Error(`Failed to merged, constant numerator conflict: ${propertyValue} -> ${item.numerator}`);
-            }
-            case "denominator": {
-                if (!item.hasDenominator)
-                    return item.setDenominator(propertyValue);
-                throw Error(`Failed to merged, constant denominator conflict: ${propertyValue} -> ${item.denominator}`);
-            }
-            case "phenomenon": {
-                if (item.phenomenon === undefined) {
-                    // A lazy loaded phenomenon with the correct reference schema is needed, if reference schema is undefined then item schema.
-                    const schemaItemKey = new ecschema_metadata_1.SchemaItemKey(itemName, refSchema ? refSchema.schemaKey : target.schema.schemaKey);
-                    const lazyTargetPhenomenon = new ecschema_metadata_1.DelayedPromiseWithProps(schemaItemKey, async () => {
-                        const phenomenon = (await target.schema.context.getSchemaItem(schemaItemKey));
-                        // At this point, higher level phenomenon item should not be undefined
-                        if (phenomenon === undefined)
-                            throw Error(`Unable to locate phenomenon item in schema ${schemaItemKey.schemaName}`);
-                        return phenomenon;
-                    });
-                    return item.setPhenomenon(lazyTargetPhenomenon);
+class ConstantsMerger extends SchemaItemMerger_1.SchemaItemMerger {
+    /**
+     * Creates the property value resolver for [[Constant]] items.
+     */
+    async createPropertyValueResolver() {
+        return {
+            phenomenon: (phenomenonFullName, targetItemKey) => {
+                // There are two options, either the phenomenon was referenced from another
+                // schema or it is defined in the same schema as the constant to be merged.
+                // In the latter case, the changes would report a different property value that
+                // refers to the source schema. So that needs to be changed here.
+                const [schemaName, phenomenonName] = ecschema_metadata_1.SchemaItem.parseFullName(phenomenonFullName);
+                if (this.context.targetSchema.getReferenceSync(schemaName) === undefined) {
+                    return `${targetItemKey.schemaName}.${phenomenonName}`;
                 }
-            }
-        }
-    });
+                return phenomenonFullName;
+            },
+            numerator: (value, targetItemKey) => {
+                const item = this.context.targetSchema.lookupItemSync(targetItemKey);
+                if (item !== undefined && item.hasNumerator && item.numerator !== value) {
+                    throw new Error(`Failed to merged, constant numerator conflict: ${value} -> ${item.numerator}`);
+                }
+                return value;
+            },
+            denominator: (value, targetItemKey) => {
+                const item = this.context.targetSchema.lookupItemSync(targetItemKey);
+                if (item !== undefined && item.hasDenominator && item.denominator !== value) {
+                    throw new Error(`Failed to merged, constant denominator conflict: ${value} -> ${item.denominator}`);
+                }
+                return value;
+            },
+        };
+    }
 }
-exports.default = mergeConstant;
+exports.default = ConstantsMerger;
 //# sourceMappingURL=ConstantMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConstantMerger.js","sourceRoot":"","sources":["../../../src/Merging/ConstantMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAA8H;AAE9H,yDAAwF;AAGxF;;;;;;;GAOG;AACY,KAAK,UAAU,aAAa,CAAC,MAAgB,EAAE,MAAgB,EAAE,OAA0B;IACxG,MAAM,eAAe,GAAG,MAAyB,CAAC;IAElD,yCAAyC;IACzC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,IAAA,0CAAuB,EAAC,MAAM,EAAE,MAAM,CAAC,UAAW,CAAC,QAAQ,CAAC,CAAC;IAEjG,MAAM,IAAA,4CAAyB,EAAC,eAAe,EAAE,OAAO,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE;QACnH,QAAQ,YAAY,EAAE;YACpB,KAAK,YAAY,CAAC,CAAC;gBACjB,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE;oBACxB,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBAC3C,MAAM,KAAK,CAAC,mDAAmD,aAAa,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;aACvG;YACD,KAAK,WAAW,CAAC,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,YAAY;oBACpB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC1C,MAAM,KAAK,CAAC,kDAAkD,aAAa,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;aACrG;YACD,KAAK,aAAa,CAAC,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,cAAc;oBACtB,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;gBAC5C,MAAM,KAAK,CAAC,oDAAoD,aAAa,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACzG;YACD,KAAK,YAAY,CAAC,CAAC;gBACjB,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;oBACjC,2HAA2H;oBAC3H,MAAM,aAAa,GAAG,IAAI,iCAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBAC7G,MAAM,oBAAoB,GAAyB,IAAI,2CAAuB,CAA4B,aAAa,EAAE,KAAK,IAAI,EAAE;wBAClI,MAAM,UAAU,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAa,aAAa,CAAC,CAAC,CAAC;wBAC1F,sEAAsE;wBACtE,IAAI,UAAU,KAAK,SAAS;4BAC1B,MAAM,KAAK,CAAC,8CAA8C,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC;wBACxF,OAAO,UAAU,CAAC;oBACpB,CAAC,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;iBACjD;aACF;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAvCD,gCAuCC","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 { Constant, DelayedPromiseWithProps, LazyLoadedPhenomenon, Phenomenon, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaItemChanges } from \"../Validation/SchemaChanges\";\r\nimport { getItemNameAndSchemaRef, mergeSchemaItemProperties } from \"./SchemaItemMerger\";\r\nimport { MutableConstant } from \"../Editing/Mutable/MutableConstant\";\r\n\r\n/**\r\n * @internal\r\n * @param target The constant the differences get merged into\r\n * @param source The constant to compare\r\n * @param changes Gets the @see SchemaItemChanges between the two constants.\r\n * For example, if source constant has an attribute/property that it missing in\r\n * target one, it would be listed in propertyValueChanges.\r\n */\r\nexport default async function mergeConstant(target: Constant, source: Constant, changes: SchemaItemChanges) {\r\n  const mutableConstant = target as MutableConstant;\r\n\r\n  // Get referenced higher level phenomenon\r\n  const [refSchema, itemName] = await getItemNameAndSchemaRef(source, source.phenomenon!.fullName);\r\n\r\n  await mergeSchemaItemProperties(mutableConstant, changes.propertyValueChanges, (item, propertyName, propertyValue) => {\r\n    switch (propertyName) {\r\n      case \"definition\": {\r\n        if (item.definition === \"\")\r\n          return item.setDefinition(propertyValue);\r\n        throw Error(`Failed to merged, constant definition conflict: ${propertyValue} -> ${item.definition}`);\r\n      }\r\n      case \"numerator\": {\r\n        if (!item.hasNumerator)\r\n          return item.setNumerator(propertyValue);\r\n        throw Error(`Failed to merged, constant numerator conflict: ${propertyValue} -> ${item.numerator}`);\r\n      }\r\n      case \"denominator\": {\r\n        if (!item.hasDenominator)\r\n          return item.setDenominator(propertyValue);\r\n        throw Error(`Failed to merged, constant denominator conflict: ${propertyValue} -> ${item.denominator}`);\r\n      }\r\n      case \"phenomenon\": {\r\n        if (item.phenomenon === undefined) {\r\n          // A lazy loaded phenomenon with the correct reference schema is needed, if reference schema is undefined then item schema.\r\n          const schemaItemKey = new SchemaItemKey(itemName, refSchema ? refSchema.schemaKey : target.schema.schemaKey);\r\n          const lazyTargetPhenomenon: LazyLoadedPhenomenon = new DelayedPromiseWithProps<SchemaItemKey, Phenomenon>(schemaItemKey, async () => {\r\n            const phenomenon = (await target.schema.context.getSchemaItem<Phenomenon>(schemaItemKey));\r\n            // At this point, higher level phenomenon item should not be undefined\r\n            if (phenomenon === undefined)\r\n              throw Error(`Unable to locate phenomenon item in schema ${schemaItemKey.schemaName}`);\r\n            return phenomenon;\r\n          });\r\n          return item.setPhenomenon(lazyTargetPhenomenon);\r\n        }\r\n      }\r\n    }\r\n  });\r\n}\r\n"]}
+{"version":3,"file":"ConstantMerger.js","sourceRoot":"","sources":["../../../src/Merging/ConstantMerger.ts"],"names":[],"mappings":";;AAAA,kGAAkG;AAClG,sEAAsE;AACtE,oFAAoF;AACpF,kGAAkG;AAClG,gEAAgE;AAChE,yDAA6E;AAE7E;;GAEG;AACH,MAAqB,eAAgB,SAAQ,mCAA0B;IACrE;;OAEG;IACgB,KAAK,CAAC,2BAA2B;QAClD,OAAO;YACL,UAAU,EAAE,CAAC,kBAAkB,EAAE,aAAa,EAAE,EAAE;gBAChD,2EAA2E;gBAC3E,2EAA2E;gBAC3E,+EAA+E;gBAC/E,iEAAiE;gBACjE,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,GAAG,8BAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;gBAClF,IAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;oBACvE,OAAO,GAAG,aAAa,CAAC,UAAU,IAAI,cAAc,EAAE,CAAC;iBACxD;gBACD,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YACD,SAAS,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAW,aAAa,CAAC,CAAC;gBAC/E,IAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE;oBACtE,MAAM,IAAI,KAAK,CAAC,kDAAkD,KAAK,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;iBACjG;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,WAAW,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;gBACpC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAW,aAAa,CAAC,CAAC;gBAC/E,IAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,EAAE;oBAC1E,MAAM,IAAI,KAAK,CAAC,oDAAoD,KAAK,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;iBACrG;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;IACJ,CAAC;CACF;AAjCD,kCAiCC","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 { Constant, SchemaItem } from \"@itwin/ecschema-metadata\";\r\nimport { PropertyValueResolver, SchemaItemMerger } from \"./SchemaItemMerger\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport default class ConstantsMerger extends SchemaItemMerger<Constant> {\r\n  /**\r\n   * Creates the property value resolver for [[Constant]] items.\r\n   */\r\n  protected override async createPropertyValueResolver(): Promise<PropertyValueResolver<Constant>> {\r\n    return {\r\n      phenomenon: (phenomenonFullName, targetItemKey) => {\r\n        // There are two options, either the phenomenon was referenced from another\r\n        // schema or it is defined in the same schema as the constant to be merged.\r\n        // In the latter case, the changes would report a different property value that\r\n        // refers to the source schema. So that needs to be changed here.\r\n        const [schemaName, phenomenonName] = SchemaItem.parseFullName(phenomenonFullName);\r\n        if(this.context.targetSchema.getReferenceSync(schemaName) === undefined) {\r\n          return `${targetItemKey.schemaName}.${phenomenonName}`;\r\n        }\r\n        return phenomenonFullName;\r\n      },\r\n      numerator: (value, targetItemKey) => {\r\n        const item = this.context.targetSchema.lookupItemSync<Constant>(targetItemKey);\r\n        if(item !== undefined && item.hasNumerator && item.numerator !== value) {\r\n          throw new Error(`Failed to merged, constant numerator conflict: ${value} -> ${item.numerator}`);\r\n        }\r\n        return value;\r\n      },\r\n      denominator: (value, targetItemKey) => {\r\n        const item = this.context.targetSchema.lookupItemSync<Constant>(targetItemKey);\r\n        if(item !== undefined && item.hasDenominator && item.denominator !== value) {\r\n          throw new Error(`Failed to merged, constant denominator conflict: ${value} -> ${item.denominator}`);\r\n        }\r\n        return value;\r\n      },\r\n    };\r\n  }\r\n}\r\n\r\n"]}

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

@@ -1,12 +1,13 @@
-import { Enumeration } from "@itwin/ecschema-metadata";
+import { Enumeration, SchemaItemKey } from "@itwin/ecschema-metadata";
 import { EnumerationChanges } from "../Validation/SchemaChanges";
+import { SchemaItemMerger } from "./SchemaItemMerger";
 /**
- * @param target The Enumeration the differences get merged into
- * @param source The Enumeration to compare
- * @param changes Gets the @see EnumerationChanges between the two Enumerations.
- * For example, if source Enumeration has an attribute that is undefined in
- * target one, it would be listed in propertyValueChanges.
  * @internal
  */
-export default function mergeEnumeration(target: Enumeration, source: Enumeration, changes: EnumerationChanges): Promise<void>;
+export default class EnumerationMerger extends SchemaItemMerger<Enumeration> {
+    /** Shorthand property to the enumerations editor. */
+    private get _editor();
+    protected merge(itemKey: SchemaItemKey, source: Enumeration, changes: EnumerationChanges): Promise<void>;
+    private mergeEnumeratorChanges;
+}
 //# sourceMappingURL=EnumerationMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EnumerationMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAA6C,MAAM,0BAA0B,CAAC;AACjH,OAAO,EAAc,kBAAkB,EAAmB,MAAM,6BAA6B,CAAC;AAsB9F;;;;;;;GAOG;AACH,wBAA8B,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,iBA8CnH"}
+{"version":3,"file":"EnumerationMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAc,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAItD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,gBAAgB,CAAC,WAAW,CAAC;IAE1E,qDAAqD;IACrD,OAAO,KAAK,OAAO,GAElB;cAEwB,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB;YA6BzF,sBAAsB;CAgBrC"}

package/lib/cjs/Merging/EnumerationMerger.js

@@ -1,83 +1,54 @@
 "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 SchemaChanges_1 = require("../Validation/SchemaChanges");
 const SchemaItemMerger_1 = require("./SchemaItemMerger");
 /**
- * @param target The Enumeration the differences get merged into
- * @param source The Enumeration to compare
- * @param changes Gets the @see EnumerationChanges between the two Enumerations.
- * For example, if source Enumeration has an attribute that is undefined in
- * target one, it would be listed in propertyValueChanges.
  * @internal
  */
-async function mergeEnumeration(target, source, changes) {
-    const mutableEnumeration = target;
-    await (0, SchemaItemMerger_1.mergeSchemaItemProperties)(mutableEnumeration, changes.propertyValueChanges, (item, propertyName, propertyValue) => {
-        switch (propertyName) {
-            case "isStrict": return item.setIsStrict(propertyValue);
-            case "type": {
-                const primitiveType = (0, ecschema_metadata_1.parsePrimitiveType)(propertyValue);
-                if (primitiveType && item.type !== primitiveType) {
-                    throw Error(`Merged enumeration ${item.name} types not equal: ${(0, ecschema_metadata_1.primitiveTypeToString)(item.type)} -> ${propertyValue}`);
+class EnumerationMerger extends SchemaItemMerger_1.SchemaItemMerger {
+    /** Shorthand property to the enumerations editor. */
+    get _editor() {
+        return this.context.editor.enumerations;
+    }
+    async merge(itemKey, source, changes) {
+        for (const enumeratorChange of changes.enumeratorChanges.values()) {
+            // In case the enumerator entry does not exist in the target enumeration the
+            // enumeratorMissing property is set and
+            if (enumeratorChange.enumeratorMissing?.changeType === SchemaChanges_1.ChangeType.Missing) {
+                const enumerator = source.getEnumeratorByName(enumeratorChange.ecTypeName);
+                if (enumerator === undefined) {
+                    throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in class ${source.fullName}`);
                 }
+                // Enumerators are plain javascript objects with out any references to other
+                // instances or a schema. That allows to simply copy them over.
+                await this._editor.addEnumerator(itemKey, enumerator);
+                // Since every missing enumerator has delta changes for ech property, the loop
+                // must call continue here to avoid having all properties checked and set again.
+                continue;
             }
-        }
-    });
-    for (const enumeratorChange of changes.enumeratorChanges.values()) {
-        if (enumeratorChange.enumeratorMissing?.changeType === SchemaChanges_1.ChangeType.Missing) {
-            const enumerator = source.getEnumeratorByName(enumeratorChange.ecTypeName);
-            if (enumerator === undefined) {
-                throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in Enumeration ${source.fullName}`);
-            }
-            const result = mutableEnumeration.createEnumerator(enumerator.name, enumerator.value, enumerator.label, enumerator.description);
-            mutableEnumeration.addEnumerator(result);
-        }
-        else {
-            const targetEnumerator = target.getEnumeratorByName(enumeratorChange.ecTypeName);
-            if (targetEnumerator === undefined) {
-                throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in Enumeration ${target.fullName}`);
+            // For changes where the enumerators differ, the enumeratorDeltas property is
+            // filled. This allows to change individual enumerator entries. This is only
+            // allowed for labels and descriptions, all other deltas would throw an error.
+            for (const enumeratorDelta of enumeratorChange.enumeratorDeltas) {
+                await this.mergeEnumeratorChanges(itemKey, enumeratorDelta.diagnostic.messageArgs);
             }
-            const mutableEnumerator = targetEnumerator;
-            await mergeEnumeratorAttributes(mutableEnumerator, enumeratorChange.enumeratorDeltas, (enumerator, attributeName, deltaChange, attributeValue) => {
-                switch (attributeName) {
-                    case "label": {
-                        enumerator.label = attributeValue;
-                        return;
-                    }
-                    case "description": {
-                        enumerator.description = attributeValue;
-                        return;
-                    }
-                    case "value": {
-                        throw Error(`Failed to merge enumerator attribute, ${deltaChange} in ${enumerator.name}`);
-                    }
-                }
-            });
         }
     }
-}
-exports.default = mergeEnumeration;
-/**
- * Similar logic to mergeSchemaItemProperties but for EnumeratorDelta, which has the differences starting at index 1,
- * hence the .slice(1), this is the main difference between mergeSchemaItemProperties.
- * @param targetEnumerator The enumerator the differences get merged into.
- * @param changes Gets the @see EnumeratorDelta, the Enumerator delta array holds information about changes between two Enumerators.
- * @param handler Defines the information needed to merge the attributes.
- * @internal
- */
-async function mergeEnumeratorAttributes(targetEnumerator, changes, handler) {
-    for (let index = 0, stepUp = true; index < changes.length; stepUp && index++, stepUp = true) {
-        const deltaChange = changes[index].toString(); // this will be useful for error message.
-        const [attributeName, attributeValue] = changes[index].diagnostic.messageArgs.slice(1); // messageArgs[0] seems to be an object, need to get to the next one, slice to start at index 1
-        if (handler(targetEnumerator, attributeName, deltaChange, attributeValue) === true) {
-            changes.splice(index, 1);
-            stepUp = false;
+    async mergeEnumeratorChanges(itemKey, [enumerator, propertyName, value]) {
+        // In case an enumerator has the same name but different value, the enumerator
+        // cannot be merged to keep integrity for the existing schema users.
+        if (propertyName === "value") {
+            throw new Error(`Failed to merge enumerator attribute, Enumerator "${enumerator.name}" has different values.`);
+        }
+        // For the other two properties they shall only be merged if the source value is
+        // set. In case they'd be undefined, the current enumerators value shall be kept.
+        if (propertyName === "label" && value !== undefined) {
+            await this._editor.setEnumeratorLabel(itemKey, enumerator.name, value);
+        }
+        if (propertyName === "description" && value !== undefined) {
+            await this._editor.setEnumeratorDescription(itemKey, enumerator.name, value);
         }
     }
 }
+exports.default = EnumerationMerger;
 //# sourceMappingURL=EnumerationMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\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 { AnyEnumerator, Enumeration, parsePrimitiveType, primitiveTypeToString } from \"@itwin/ecschema-metadata\";\r\nimport { ChangeType, EnumerationChanges, EnumeratorDelta } from \"../Validation/SchemaChanges\";\r\nimport { mergeSchemaItemProperties } from \"./SchemaItemMerger\";\r\nimport { MutableEnumeration } from \"../Editing/Mutable/MutableEnumeration\";\r\n\r\n/**\r\n * @internal\r\n * @param item Type Enumerator, the Enumerator the differences get merged into.\r\n * @param attributeName Name of the Enumerator attribute that changed.\r\n * @param deltaChange Provides information about the changes in Enumerator attributes.\r\n * @param attributeValue The value that gets merged into the Enumerator attribute.\r\n */\r\ntype EnumeratorAttributeChanged<TEnumerator extends AnyEnumerator> = (item: TEnumerator, attributeName: string, deltaChange: string, attributeValue: any) => void | boolean;\r\n\r\n/**\r\n * Simple interface to extend access Enumerator attributes\r\n * and allow editing.\r\n */\r\ninterface MutableEnumerator extends AnyEnumerator {\r\n  label?: string;\r\n  description?: string;\r\n}\r\n\r\n/**\r\n * @param target The Enumeration the differences get merged into\r\n * @param source The Enumeration to compare\r\n * @param changes Gets the @see EnumerationChanges between the two Enumerations.\r\n * For example, if source Enumeration has an attribute that is undefined in\r\n * target one, it would be listed in propertyValueChanges.\r\n * @internal\r\n */\r\nexport default async function mergeEnumeration(target: Enumeration, source: Enumeration, changes: EnumerationChanges) {\r\n  const mutableEnumeration = target as MutableEnumeration;\r\n\r\n  await mergeSchemaItemProperties(mutableEnumeration, changes.propertyValueChanges, (item, propertyName, propertyValue) => {\r\n    switch (propertyName) {\r\n      case \"isStrict\": return item.setIsStrict(propertyValue);\r\n      case \"type\": {\r\n        const primitiveType = parsePrimitiveType(propertyValue);\r\n        if (primitiveType && item.type !== primitiveType) {\r\n          throw Error(`Merged enumeration ${item.name} types not equal: ${primitiveTypeToString(item.type!)} -> ${propertyValue}`);\r\n        }\r\n      }\r\n    }\r\n  });\r\n\r\n  for (const enumeratorChange of changes.enumeratorChanges.values()) {\r\n    if (enumeratorChange.enumeratorMissing?.changeType === ChangeType.Missing) {\r\n      const enumerator = source.getEnumeratorByName(enumeratorChange.ecTypeName);\r\n      if (enumerator === undefined) {\r\n        throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in Enumeration ${source.fullName}`);\r\n      }\r\n      const result = mutableEnumeration.createEnumerator(enumerator.name, enumerator.value, enumerator.label, enumerator.description);\r\n      mutableEnumeration.addEnumerator(result);\r\n    } else {\r\n      const targetEnumerator = target.getEnumeratorByName(enumeratorChange.ecTypeName);\r\n      if (targetEnumerator === undefined) {\r\n        throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in Enumeration ${target.fullName}`);\r\n      }\r\n      const mutableEnumerator = targetEnumerator as MutableEnumerator;\r\n      await mergeEnumeratorAttributes(mutableEnumerator, enumeratorChange.enumeratorDeltas, (enumerator, attributeName, deltaChange, attributeValue) => {\r\n        switch (attributeName) {\r\n          case \"label\": {\r\n            enumerator.label = attributeValue;\r\n            return;\r\n          }\r\n          case \"description\": {\r\n            enumerator.description = attributeValue;\r\n            return;\r\n          }\r\n          case \"value\": {\r\n            throw Error(`Failed to merge enumerator attribute, ${deltaChange} in ${enumerator.name}`);\r\n          }\r\n        }\r\n      });\r\n    }\r\n  }\r\n}\r\n\r\n/**\r\n * Similar logic to mergeSchemaItemProperties but for EnumeratorDelta, which has the differences starting at index 1,\r\n * hence the .slice(1), this is the main difference between mergeSchemaItemProperties.\r\n * @param targetEnumerator The enumerator the differences get merged into.\r\n * @param changes Gets the @see EnumeratorDelta, the Enumerator delta array holds information about changes between two Enumerators.\r\n * @param handler Defines the information needed to merge the attributes.\r\n * @internal\r\n */\r\nasync function mergeEnumeratorAttributes<T extends AnyEnumerator>(targetEnumerator: T, changes: EnumeratorDelta[], handler: EnumeratorAttributeChanged<T>) {\r\n  for (let index = 0, stepUp = true; index < changes.length; stepUp && index++, stepUp = true) {\r\n    const deltaChange = changes[index].toString(); // this will be useful for error message.\r\n    const [attributeName, attributeValue] = changes[index].diagnostic.messageArgs!.slice(1); // messageArgs[0] seems to be an object, need to get to the next one, slice to start at index 1\r\n    if (handler(targetEnumerator, attributeName, deltaChange, attributeValue) === true) {\r\n      changes.splice(index, 1);\r\n      stepUp = false;\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":";;AAKA,+DAA6E;AAC7E,yDAAsD;AAItD;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,mCAA6B;IAE1E,qDAAqD;IACrD,IAAY,OAAO;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;IAC1C,CAAC;IAEkB,KAAK,CAAC,KAAK,CAAC,OAAsB,EAAE,MAAmB,EAAE,OAA2B;QACrG,KAAK,MAAM,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACjE,4EAA4E;YAC5E,wCAAwC;YACxC,IAAI,gBAAgB,CAAC,iBAAiB,EAAE,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAEzE,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;gBAC3E,IAAI,UAAU,KAAK,SAAS,EAAE;oBAC5B,MAAM,KAAK,CAAC,eAAe,gBAAgB,CAAC,UAAU,wBAAwB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;iBAClG;gBAED,4EAA4E;gBAC5E,+DAA+D;gBAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBAEtD,8EAA8E;gBAC9E,gFAAgF;gBAChF,SAAS;aACV;YAED,6EAA6E;YAC7E,4EAA4E;YAC5E,8EAA8E;YAC9E,KAAI,MAAM,eAAe,IAAI,gBAAgB,CAAC,gBAAgB,EAAE;gBAC9D,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,eAAe,CAAC,UAAU,CAAC,WAAmC,CAAC,CAAC;aAC5G;SACF;IACH,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,OAAsB,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,KAAK,CAAsB;QACjH,8EAA8E;QAC9E,oEAAoE;QACpE,IAAG,YAAY,KAAK,OAAO,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,qDAAqD,UAAU,CAAC,IAAI,yBAAyB,CAAC,CAAC;SAChH;QAED,gFAAgF;QAChF,iFAAiF;QACjF,IAAG,YAAY,KAAK,OAAO,IAAI,KAAK,KAAK,SAAS,EAAE;YAClD,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACxE;QACD,IAAG,YAAY,KAAK,aAAa,IAAI,KAAK,KAAK,SAAS,EAAE;YACxD,MAAM,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC9E;IACH,CAAC;CACF;AApDD,oCAoDC","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 { AnyEnumerator, Enumeration, SchemaItemKey} from \"@itwin/ecschema-metadata\";\r\nimport { ChangeType, EnumerationChanges } from \"../Validation/SchemaChanges\";\r\nimport { SchemaItemMerger } from \"./SchemaItemMerger\";\r\n\r\ntype EnumeratorDeltaArgs = [AnyEnumerator, keyof AnyEnumerator, string | undefined];\r\n\r\n/**\r\n * @internal\r\n */\r\nexport default class EnumerationMerger extends SchemaItemMerger<Enumeration> {\r\n\r\n  /** Shorthand property to the enumerations editor. */\r\n  private get _editor() {\r\n    return this.context.editor.enumerations;\r\n  }\r\n\r\n  protected override async merge(itemKey: SchemaItemKey, source: Enumeration, changes: EnumerationChanges) {\r\n    for (const enumeratorChange of changes.enumeratorChanges.values()) {\r\n      // In case the enumerator entry does not exist in the target enumeration the\r\n      // enumeratorMissing property is set and\r\n      if (enumeratorChange.enumeratorMissing?.changeType === ChangeType.Missing) {\r\n\r\n        const enumerator = source.getEnumeratorByName(enumeratorChange.ecTypeName);\r\n        if (enumerator === undefined) {\r\n          throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in class ${source.fullName}`);\r\n        }\r\n\r\n        // Enumerators are plain javascript objects with out any references to other\r\n        // instances or a schema. That allows to simply copy them over.\r\n        await this._editor.addEnumerator(itemKey, enumerator);\r\n\r\n        // Since every missing enumerator has delta changes for ech property, the loop\r\n        // must call continue here to avoid having all properties checked and set again.\r\n        continue;\r\n      }\r\n\r\n      // For changes where the enumerators differ, the enumeratorDeltas property is\r\n      // filled. This allows to change individual enumerator entries. This is only\r\n      // allowed for labels and descriptions, all other deltas would throw an error.\r\n      for(const enumeratorDelta of enumeratorChange.enumeratorDeltas) {\r\n        await this.mergeEnumeratorChanges(itemKey, enumeratorDelta.diagnostic.messageArgs! as EnumeratorDeltaArgs);\r\n      }\r\n    }\r\n  }\r\n\r\n  private async mergeEnumeratorChanges(itemKey: SchemaItemKey, [enumerator, propertyName, value]: EnumeratorDeltaArgs) {\r\n    // In case an enumerator has the same name but different value, the enumerator\r\n    // cannot be merged to keep integrity for the existing schema users.\r\n    if(propertyName === \"value\") {\r\n      throw new Error(`Failed to merge enumerator attribute, Enumerator \"${enumerator.name}\" has different values.`);\r\n    }\r\n\r\n    // For the other two properties they shall only be merged if the source value is\r\n    // set. In case they'd be undefined, the current enumerators value shall be kept.\r\n    if(propertyName === \"label\" && value !== undefined) {\r\n      await this._editor.setEnumeratorLabel(itemKey, enumerator.name, value);\r\n    }\r\n    if(propertyName === \"description\" && value !== undefined) {\r\n      await this._editor.setEnumeratorDescription(itemKey, enumerator.name, value);\r\n    }\r\n  }\r\n}\r\n"]}

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

@@ -1,8 +1,15 @@
-import { Schema, SchemaItem } from "@itwin/ecschema-metadata";
+import { SchemaItem, SchemaItemKey } from "@itwin/ecschema-metadata";
+import { SchemaMergeContext } from "./SchemaMerger";
 /**
  * @internal
  */
 export declare namespace SchemaItemFactory {
-    function create(targetSchema: Schema, template: SchemaItem): Promise<SchemaItem>;
+    /**
+     * Creates a new Schema Item based on the given template instance.
+     * @param context   The current merging context.
+     * @param template  The Schema Items Template
+     * @returns         The SchemaItemKey of the created item.
+     */
+    function create(context: SchemaMergeContext, template: SchemaItem): Promise<SchemaItemKey>;
 }
 //# sourceMappingURL=SchemaItemFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaItemFactory.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0F,MAAM,EAAE,UAAU,EAA2B,MAAM,0BAA0B,CAAC;AAE/K;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAEjC,SAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAoB5F;CAKF"}
+{"version":3,"file":"SchemaItemFactory.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyG,UAAU,EAAE,aAAa,EAAsC,MAAM,0BAA0B,CAAC;AAEhN,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAEjC;;;;;OAKG;IACH,SAAsB,MAAM,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAMtG;CAgDF"}

package/lib/cjs/Merging/SchemaItemFactory.js

@@ -11,26 +11,60 @@ const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
  */
 var SchemaItemFactory;
 (function (SchemaItemFactory) {
-    async function create(targetSchema, template) {
+    /**
+     * Creates a new Schema Item based on the given template instance.
+     * @param context   The current merging context.
+     * @param template  The Schema Items Template
+     * @returns         The SchemaItemKey of the created item.
+     */
+    async function create(context, template) {
+        const result = await createItem(context.editor, context.targetSchema.schemaKey, template);
+        if (result.errorMessage) {
+            throw new Error(result.errorMessage);
+        }
+        return result.itemKey;
+    }
+    SchemaItemFactory.create = create;
+    /**
+     * Creates a new Schema Item in the SchemaContextEditor.
+     * @param editor          The SchemaContextEditor
+     * @param targetSchemaKey The key of the target schema the item shall be created in.
+     * @param template        The Schema Items Template
+     * @returns               A SchemaItemEditResults with a schema key if the item could be created.
+     */
+    async function createItem(editor, targetSchemaKey, template) {
         if (is(template, ecschema_metadata_1.Enumeration))
-            return new ecschema_metadata_1.Enumeration(targetSchema, template.name, template.type);
+            return editor.enumerations.create(targetSchemaKey, template.name, template.isInt ? ecschema_metadata_1.PrimitiveType.Integer : ecschema_metadata_1.PrimitiveType.String, template.label, template.isStrict);
         if (is(template, ecschema_metadata_1.EntityClass))
-            return new ecschema_metadata_1.EntityClass(targetSchema, template.name, template.modifier);
+            return editor.entities.create(targetSchemaKey, template.name, template.modifier);
         if (is(template, ecschema_metadata_1.StructClass))
-            return new ecschema_metadata_1.StructClass(targetSchema, template.name, template.modifier);
+            return editor.structs.create(targetSchemaKey, template.name);
         if (is(template, ecschema_metadata_1.CustomAttributeClass))
-            return new ecschema_metadata_1.CustomAttributeClass(targetSchema, template.name, template.modifier);
+            return editor.customAttributes.create(targetSchemaKey, template.name, template.containerType);
         if (is(template, ecschema_metadata_1.PropertyCategory))
-            return new ecschema_metadata_1.PropertyCategory(targetSchema, template.name);
+            return editor.propertyCategories.create(targetSchemaKey, template.name, template.priority);
         if (is(template, ecschema_metadata_1.Phenomenon))
-            return new ecschema_metadata_1.Phenomenon(targetSchema, template.name);
-        if (is(template, ecschema_metadata_1.Constant))
-            return new ecschema_metadata_1.Constant(targetSchema, template.name);
+            return editor.phenomenons.create(targetSchemaKey, template.name, template.definition);
+        if (is(template, ecschema_metadata_1.Constant)) {
+            if (template.phenomenon === undefined) {
+                throw new Error(`Invalid Constant ${template.name} has no phenomenon defined`);
+            }
+            const phenomenon = await template.phenomenon;
+            const itemKey = phenomenon.key.schemaKey.matches(template.key.schemaKey)
+                ? new ecschema_metadata_1.SchemaItemKey(phenomenon.name, targetSchemaKey)
+                : phenomenon.key;
+            return editor.constants.create(targetSchemaKey, template.name, itemKey, template.definition);
+        }
         if (is(template, ecschema_metadata_1.UnitSystem))
-            return new ecschema_metadata_1.UnitSystem(targetSchema, template.name);
+            return editor.unitSystems.create(targetSchemaKey, template.name);
         throw new Error(`Unsupported Schema Item Type: ${template.constructor.name}`);
     }
-    SchemaItemFactory.create = create;
+    /**
+     * Type Guard to "cast" a given schema item into an implementation
+     * @param item  Item to be checked
+     * @param type  The desired implementation.
+     * @returns     true if the item could be casted, otherwise false.
+     */
     function is(item, type) {
         return item instanceof type;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaItemFactory.js","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAA+K;AAE/K;;GAEG;AACH,IAAiB,iBAAiB,CA2BjC;AA3BD,WAAiB,iBAAiB;IAEzB,KAAK,UAAU,MAAM,CAAC,YAAoB,EAAE,QAAoB;QACrE,IAAI,EAAE,CAAC,QAAQ,EAAE,+BAAW,CAAC;YAC3B,OAAO,IAAI,+BAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,IAAI,EAAE,CAAC,QAAQ,EAAE,+BAAW,CAAC;YAC3B,OAAO,IAAI,+BAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,EAAE,CAAC,QAAQ,EAAE,+BAAW,CAAC;YAC3B,OAAO,IAAI,+BAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,EAAE,CAAC,QAAQ,EAAE,wCAAoB,CAAC;YACpC,OAAO,IAAI,wCAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClF,IAAG,EAAE,CAAC,QAAQ,EAAE,oCAAgB,CAAC;YAC/B,OAAO,IAAI,oCAAgB,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,EAAE,CAAC,QAAQ,EAAE,8BAAU,CAAC;YAC1B,OAAO,IAAI,8BAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,EAAE,CAAC,QAAQ,EAAE,4BAAQ,CAAC;YACxB,OAAO,IAAI,4BAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,EAAE,CAAC,QAAQ,EAAE,8BAAU,CAAC;YAC1B,OAAO,IAAI,8BAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErD,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhF,CAAC;IApBqB,wBAAM,SAoB3B,CAAA;IAED,SAAS,EAAE,CAAuB,IAAgB,EAAE,IAA6B;QAC/E,OAAO,IAAI,YAAY,IAAI,CAAC;IAC9B,CAAC;AACH,CAAC,EA3BgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA2BjC","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 { Constant, CustomAttributeClass, EntityClass, Enumeration, Phenomenon, PropertyCategory, Schema, SchemaItem, StructClass, UnitSystem } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport namespace SchemaItemFactory {\r\n\r\n  export async function create(targetSchema: Schema, template: SchemaItem): Promise<SchemaItem> {\r\n    if (is(template, Enumeration))\r\n      return new Enumeration(targetSchema, template.name, template.type);\r\n    if (is(template, EntityClass))\r\n      return new EntityClass(targetSchema, template.name, template.modifier);\r\n    if (is(template, StructClass))\r\n      return new StructClass(targetSchema, template.name, template.modifier);\r\n    if (is(template, CustomAttributeClass))\r\n      return new CustomAttributeClass(targetSchema, template.name, template.modifier);\r\n    if(is(template, PropertyCategory))\r\n      return new PropertyCategory(targetSchema, template.name);\r\n    if (is(template, Phenomenon))\r\n      return new Phenomenon(targetSchema, template.name);\r\n    if (is(template, Constant))\r\n      return new Constant(targetSchema, template.name);\r\n    if (is(template, UnitSystem))\r\n      return new UnitSystem(targetSchema, template.name);\r\n\r\n    throw new Error(`Unsupported Schema Item Type: ${template.constructor.name}`);\r\n\r\n  }\r\n\r\n  function is<T extends SchemaItem>(item: SchemaItem, type: new (...args: any) => T ): item is T {\r\n    return item instanceof type;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"SchemaItemFactory.js","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { Constant, CustomAttributeClass, EntityClass, Enumeration, Phenomenon, PrimitiveType, PropertyCategory, SchemaItem, SchemaItemKey, SchemaKey, StructClass, UnitSystem } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaContextEditor, SchemaItemEditResults } from \"../Editing/Editor\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport namespace SchemaItemFactory {\r\n\r\n  /**\r\n   * Creates a new Schema Item based on the given template instance.\r\n   * @param context   The current merging context.\r\n   * @param template  The Schema Items Template\r\n   * @returns         The SchemaItemKey of the created item.\r\n   */\r\n  export async function create(context: SchemaMergeContext, template: SchemaItem): Promise<SchemaItemKey> {\r\n    const result = await createItem(context.editor, context.targetSchema.schemaKey, template);\r\n    if(result.errorMessage) {\r\n      throw new Error(result.errorMessage);\r\n    }\r\n    return result.itemKey!;\r\n  }\r\n\r\n  /**\r\n   * Creates a new Schema Item in the SchemaContextEditor.\r\n   * @param editor          The SchemaContextEditor\r\n   * @param targetSchemaKey The key of the target schema the item shall be created in.\r\n   * @param template        The Schema Items Template\r\n   * @returns               A SchemaItemEditResults with a schema key if the item could be created.\r\n   */\r\n  async function createItem(editor: SchemaContextEditor, targetSchemaKey: SchemaKey, template: SchemaItem): Promise<SchemaItemEditResults> {\r\n    if (is(template, Enumeration))\r\n      return editor.enumerations.create(targetSchemaKey, template.name, template.isInt ? PrimitiveType.Integer : PrimitiveType.String, template.label, template.isStrict);\r\n    if (is(template, EntityClass))\r\n      return editor.entities.create(targetSchemaKey, template.name, template.modifier);\r\n    if (is(template, StructClass))\r\n      return editor.structs.create(targetSchemaKey, template.name);\r\n    if (is(template, CustomAttributeClass))\r\n      return editor.customAttributes.create(targetSchemaKey, template.name, template.containerType);\r\n    if(is(template, PropertyCategory))\r\n      return editor.propertyCategories.create(targetSchemaKey, template.name, template.priority);\r\n    if (is(template, Phenomenon))\r\n      return editor.phenomenons.create(targetSchemaKey, template.name, template.definition);\r\n    if (is(template, Constant)) {\r\n      if(template.phenomenon === undefined) {\r\n        throw new Error(`Invalid Constant ${template.name} has no phenomenon defined`);\r\n      }\r\n      const phenomenon = await template.phenomenon;\r\n      const itemKey = phenomenon.key.schemaKey.matches(template.key.schemaKey)\r\n        ? new SchemaItemKey(phenomenon.name, targetSchemaKey)\r\n        : phenomenon.key;\r\n\r\n      return editor.constants.create(targetSchemaKey, template.name, itemKey, template.definition);\r\n    }\r\n    if (is(template, UnitSystem))\r\n      return editor.unitSystems.create(targetSchemaKey, template.name);\r\n\r\n    throw new Error(`Unsupported Schema Item Type: ${template.constructor.name}`);\r\n  }\r\n\r\n  /**\r\n   * Type Guard to \"cast\" a given schema item into an implementation\r\n   * @param item  Item to be checked\r\n   * @param type  The desired implementation.\r\n   * @returns     true if the item could be casted, otherwise false.\r\n   */\r\n  function is<T extends SchemaItem>(item: SchemaItem, type: new (...args: any) => T ): item is T {\r\n    return item instanceof type;\r\n  }\r\n}\r\n"]}

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

@@ -1,31 +1,60 @@
-import { Schema, SchemaItem } from "@itwin/ecschema-metadata";
-import { PropertyValueChange, SchemaItemChanges } from "../Validation/SchemaChanges";
+import { SchemaItem, SchemaItemKey } from "@itwin/ecschema-metadata";
+import { SchemaItemChanges } from "../Validation/SchemaChanges";
 import { SchemaMergeContext } from "./SchemaMerger";
-type SchemaItemMergeFn<TChange extends SchemaItemChanges, TItem extends SchemaItem> = (target: TItem, source: TItem, change: TChange, context: SchemaMergeContext) => Promise<void>;
-type PropertyChangedFn<TItem extends SchemaItem> = (item: TItem, propertyName: string, propertyValue: any) => void | boolean;
 /**
- * Merges schema items from the source in the target schema. This method applies for all schema items
- * and handles the basic processing such as create-if-not-exists or name collisions or base property setting.
- * @param context           The current merge context
- * @param schemaItemChanges The schema items to be merged
- * @param mergeFn           Merge function for complex merging.
+ * Defines a type-safe interface of Property Value resolver.
  * @internal
  */
-export default function mergeSchemaItems<TChange extends SchemaItemChanges, TItem extends SchemaItem>(context: SchemaMergeContext, schemaItemChanges: Iterable<TChange>, mergeFn?: SchemaItemMergeFn<TChange, TItem>): Promise<void>;
+export type PropertyValueResolver<T extends SchemaItem, TProps = MutableSchemaItemProps<T>> = {
+    [P in keyof TProps]?: (value: any, item: SchemaItemKey) => any;
+};
 /**
- * Performs the specified action for each property in the given PropertyValueChange array.
- * @param targetItem  The target item
- * @param changes     The array with PropertyValueChanges
- * @param handler     The callback that gets invoked vor every change.
- * @internal
+ * Defines a Mutable Schema Props interface.
  */
-export declare function mergeSchemaItemProperties<T extends SchemaItem>(targetItem: T, changes: PropertyValueChange[], handler: PropertyChangedFn<T>): Promise<void>;
+type MutableSchemaItemProps<T extends SchemaItem> = {
+    -readonly [key in keyof ReturnType<T["toJSON"]>]: ReturnType<T["toJSON"]>[key];
+};
 /**
- * @param source The schema item the reference gets copied from
- * @param itemFullName Parsing through item full name give us the schema reference name and the item name, these values are needed to create a new schema item key.
- * @returns Item referenced schema and item name.
+ * The SchemaItemMerger is an base class for several other mergers with the actual logic
+ * to perform merging for a certain schema item type. The class provides the shared logics
+ * that is shared for all schema item mergers and custom logic can be applied by overriding
+ * the protected class members.
  * @internal
  */
-export declare function getItemNameAndSchemaRef(source: SchemaItem, itemFullName: string): Promise<[Schema | undefined, string]>;
+export declare class SchemaItemMerger<TItem extends SchemaItem> {
+    protected readonly context: SchemaMergeContext;
+    /**
+     * Constructor of the SchemaItemMerger class. This should not be overriden or extended
+     * by sub-implementations.
+     * @param context   The current merging context.
+     */
+    constructor(context: SchemaMergeContext);
+    /**
+     * This overridable method allows to create a property value resolver that gets defines
+     * a handler function for every possible property change. This allows adding complex handing
+     * if a property value requires complicated merging.
+     * @returns   A resolver map with resolvers for the property.
+     */
+    protected createPropertyValueResolver(): Promise<PropertyValueResolver<TItem>>;
+    /**
+     * This overridable method gets called for more complex merging.
+     * @param _itemKey  The key of the current schema item.
+     * @param _source   The source item that shall gets merged into.
+     * @param _change   The schema item change to be applied.
+     */
+    protected merge(_itemKey: SchemaItemKey, _source: TItem, _change: SchemaItemChanges): Promise<void>;
+    /**
+     * Merges the given schema item changes in the current context.
+     * @param context             The merging context
+     * @param schemaItemChanges   An iterable of item changes.
+     */
+    static mergeChanges<TChange extends SchemaItemChanges>(context: SchemaMergeContext, schemaItemChanges: Iterable<TChange>): Promise<void>;
+    /**
+     * Merges the property values.
+     * @param targetItem  The current schema item
+     * @param changes     The property changes.
+     */
+    private mergeItemPropertyValues;
+}
 export {};
 //# sourceMappingURL=SchemaItemMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaItemMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAc,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,KAAK,iBAAiB,CAAC,OAAO,SAAS,iBAAiB,EAAE,KAAK,SAAS,UAAU,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACpL,KAAK,iBAAiB,CAAC,KAAK,SAAS,UAAU,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC;AAO7H;;;;;;;GAOG;AACH,wBAA8B,gBAAgB,CAAC,OAAO,SAAS,iBAAiB,EAAE,KAAK,SAAS,UAAU,EAAE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,iBA6CzN;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,iBAQjJ;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC,CAAC,CAI7H"}
+{"version":3,"file":"SchemaItemMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAmC,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,GAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI;KACzF,CAAC,IAAI,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,KAAK,GAAG;CAC/D,CAAC;AAEF;;GAEG;AACH,KAAK,sBAAsB,CAAC,CAAC,SAAS,UAAU,IAAI;IAClD,CAAC,UAAU,GAAG,IAAI,MAAM,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;CAC/E,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB,CAAC,KAAK,SAAS,UAAU;IAEpD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAE/C;;;;OAIG;gBACS,OAAO,EAAE,kBAAkB;IAIvC;;;;;OAKG;cACa,2BAA2B,IAAI,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAKpF;;;;;OAKG;cACa,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB;IAIzF;;;;OAIG;WACiB,YAAY,CAAC,OAAO,SAAS,iBAAiB,EAAE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC;IAyBrI;;;;OAIG;YACW,uBAAuB;CAmBtC"}