@itwin/ecschema-editing 5.0.0-dev.7 → 5.0.0-dev.70

package/lib/cjs/Merging/Edits/RenameEditHandler.js

@@ -9,7 +9,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyRenamePropertyEdit = applyRenamePropertyEdit;
 exports.applyRenameSchemaItemEdit = applyRenameSchemaItemEdit;
-const SchemaDifference_1 = require("../../Differencing/SchemaDifference");
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const Utils = require("../../Differencing/Utils");
 /**
@@ -38,7 +37,7 @@ function applyRenamePropertyEdit(result, edit) {
 /**
  * @internal
  */
-function applyRenameSchemaItemEdit(result, edit, postProcessing) {
+function applyRenameSchemaItemEdit(result, edit) {
     const [schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(edit.key);
     if (!result.sourceSchemaName.startsWith(schemaName)) {
         return;
@@ -57,57 +56,6 @@ function applyRenameSchemaItemEdit(result, edit, postProcessing) {
             result.conflicts.splice(conflictIndex, 1);
         }
     }
-    postProcessing(() => {
-        renameSchemaItem(result, edit, itemDifference.schemaType);
-    });
-}
-function renameSchemaItem(result, edit, schemaType) {
-    const schemaKey = ecschema_metadata_1.SchemaKey.parseString(result.sourceSchemaName);
-    const [_schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(edit.key);
-    const oldKey = new ecschema_metadata_1.SchemaItemKey(itemName, schemaKey);
-    const newKey = new ecschema_metadata_1.SchemaItemKey(edit.value, schemaKey);
-    switch (schemaType) {
-        case ecschema_metadata_1.SchemaItemType.CustomAttributeClass:
-            renameCustomAttributeClassName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.EntityClass:
-            renameEntityClassName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.Enumeration:
-            renameEnumerationName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.Format:
-            break;
-        case ecschema_metadata_1.SchemaItemType.InvertedUnit:
-            break;
-        case ecschema_metadata_1.SchemaItemType.KindOfQuantity:
-            renameKindOfQuantityName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.Mixin:
-            renameMixinName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.Phenomenon:
-            renamePhenomenonName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.PropertyCategory:
-            renamePropertyCategoryName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.RelationshipClass:
-            renameRelationshipClassName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.StructClass:
-            renameStructClassName(result, oldKey, newKey);
-            break;
-        case ecschema_metadata_1.SchemaItemType.Unit:
-            break;
-        case ecschema_metadata_1.SchemaItemType.UnitSystem:
-            break;
-    }
-}
-function renameBaseClass(difference, oldKey, newKey) {
-    if (difference.baseClass && oldKey.matchesFullName(difference.baseClass)) {
-        difference.baseClass = newKey.fullName;
-    }
 }
 function renameName(change, oldName, newName) {
     if (change.itemName === oldName) {
@@ -115,211 +63,4 @@ function renameName(change, oldName, newName) {
         schemaItemDifference.itemName = newName;
     }
 }
-function renameRelationshipConstraint(change, oldKey, newKey) {
-    if (change.schemaType === ecschema_metadata_1.SchemaItemType.RelationshipClass) {
-        const constraintProps = [change.difference.source, change.difference.target];
-        for (const props of constraintProps) {
-            if (props) {
-                if (props.abstractConstraint && oldKey.matchesFullName(props.abstractConstraint)) {
-                    props.abstractConstraint = newKey.fullName;
-                }
-                if (props.constraintClasses !== undefined) {
-                    for (let i = 0; i < props.constraintClasses.length; i++) {
-                        if (oldKey.matchesFullName(props.constraintClasses[i]))
-                            props.constraintClasses[i] = newKey.fullName;
-                    }
-                }
-            }
-        }
-    }
-    else {
-        for (let i = 0; i < change.difference.length; i++) {
-            if (oldKey.matchesFullName(change.difference[i]))
-                change.difference[i] = newKey.fullName;
-        }
-    }
-}
-function renamePropertyCategoryName({ differences }, oldKey, newKey) {
-    for (const entry of differences) {
-        if (entry.schemaType === ecschema_metadata_1.SchemaItemType.PropertyCategory) {
-            renameName(entry, oldKey.name, newKey.name);
-        }
-        if (Utils.isClassDifference(entry) && entry.difference.properties) {
-            for (const property of entry.difference.properties) {
-                if (property.category && oldKey.matchesFullName(property.category)) {
-                    const props = property;
-                    props.category = newKey.fullName;
-                }
-            }
-        }
-        if (entry.schemaType === SchemaDifference_1.SchemaOtherTypes.Property) {
-            if (entry.difference.category && oldKey.matchesFullName(entry.difference.category)) {
-                entry.difference.category = newKey.fullName;
-            }
-        }
-    }
-}
-function renameKindOfQuantityName({ differences }, oldKey, newKey) {
-    for (const entry of differences) {
-        if (Utils.isClassDifference(entry) && entry.difference.properties) {
-            for (const property of entry.difference.properties) {
-                if (property.kindOfQuantity && oldKey.matchesFullName(property.kindOfQuantity)) {
-                    const props = property;
-                    props.kindOfQuantity = newKey.fullName;
-                }
-            }
-        }
-        if (entry.schemaType === SchemaDifference_1.SchemaOtherTypes.Property) {
-            if (entry.difference.kindOfQuantity && oldKey.matchesFullName(entry.difference.kindOfQuantity)) {
-                entry.difference.kindOfQuantity = newKey.fullName;
-            }
-        }
-    }
-}
-function renameEnumerationName({ differences }, oldKey, newKey) {
-    for (const change of differences) {
-        if (Utils.isClassDifference(change) && change.difference.properties) {
-            for (const property of change.difference.properties) {
-                if (property.type === "PrimitiveProperty" || property.type === "PrimitiveArrayProperty") {
-                    const props = property;
-                    if (props.typeName && oldKey.matchesFullName(props.typeName))
-                        props.typeName = newKey.fullName;
-                }
-            }
-        }
-        if (change.schemaType === SchemaDifference_1.SchemaOtherTypes.Property && (change.difference.type === "PrimitiveProperty" || change.difference.type === "PrimitiveArrayProperty")) {
-            const props = change.difference;
-            if (props.typeName && oldKey.matchesFullName(props.typeName))
-                props.typeName = newKey.fullName;
-        }
-    }
-}
-function renamePhenomenonName({ differences }, oldKey, newKey) {
-    for (const entry of differences) {
-        if (entry.schemaType === ecschema_metadata_1.SchemaItemType.Constant || entry.schemaType === ecschema_metadata_1.SchemaItemType.Unit) {
-            if (entry.difference.phenomenon && oldKey.matchesFullName(entry.difference.phenomenon))
-                entry.difference.phenomenon = newKey.fullName;
-        }
-    }
-}
-function renameStructClassName({ differences }, oldKey, newKey) {
-    for (const change of differences) {
-        if (change.schemaType === ecschema_metadata_1.SchemaItemType.StructClass) {
-            renameBaseClass(change.difference, oldKey, newKey);
-        }
-        if (Utils.isClassDifference(change) && change.difference.properties) {
-            for (const property of change.difference.properties) {
-                if (property.type === "StructProperty" || property.type === "StructArrayProperty") {
-                    const props = property;
-                    ;
-                    if (props.typeName && oldKey.matchesFullName(props.typeName))
-                        props.typeName = newKey.fullName;
-                }
-            }
-        }
-        if (change.schemaType === SchemaDifference_1.SchemaOtherTypes.Property && (change.difference.type === "StructProperty" || change.difference.type === "StructArrayProperty")) {
-            const props = change.difference;
-            if (props.typeName && oldKey.matchesFullName(props.typeName))
-                props.typeName = newKey.fullName;
-        }
-    }
-}
-function renameCustomAttributeClassName({ differences }, oldKey, newKey) {
-    for (const change of differences) {
-        if (change.schemaType === ecschema_metadata_1.SchemaItemType.CustomAttributeClass) {
-            renameBaseClass(change.difference, oldKey, newKey);
-        }
-        if (change.schemaType === SchemaDifference_1.SchemaOtherTypes.CustomAttributeInstance) {
-            if (change.difference.className && oldKey.matchesFullName(change.difference.className)) {
-                change.difference.className = newKey.fullName;
-            }
-        }
-        if (change.schemaType === SchemaDifference_1.SchemaOtherTypes.Property || Utils.isClassDifference(change)) {
-            if (change.difference.customAttributes) {
-                for (const customAttribute of change.difference.customAttributes) {
-                    if (oldKey.matchesFullName(customAttribute.className))
-                        customAttribute.className = newKey.fullName;
-                }
-            }
-        }
-        if (Utils.isClassDifference(change) && change.difference.properties) {
-            for (const property of change.difference.properties) {
-                if (property.customAttributes) {
-                    for (const customAttribute of property.customAttributes) {
-                        if (oldKey.matchesFullName(customAttribute.className))
-                            customAttribute.className = newKey.fullName;
-                    }
-                }
-            }
-        }
-        // https://github.com/iTwin/itwinjs-core/issues/7020
-        /* if (change.schemaType === SchemaItemType.RelationshipClass) {
-          const constraintProps = [change.difference.source, change.difference.target] as Editable<RelationshipConstraintProps>[];
-          for (const props of constraintProps) {
-            if (props.customAttributes !== undefined) {
-              for (const customAttribute of props.customAttributes) {
-                if (oldKey.matchesFullName(customAttribute.className))
-                  customAttribute.className = newKey.fullName;
-              }
-            }
-          }
-        } */
-    }
-}
-function renameRelationshipClassName({ differences }, oldKey, newKey) {
-    for (const change of differences) {
-        if (change.schemaType === ecschema_metadata_1.SchemaItemType.RelationshipClass) {
-            renameBaseClass(change.difference, oldKey, newKey);
-        }
-        if (change.schemaType === SchemaDifference_1.SchemaOtherTypes.Property && change.difference.type === "NavigationProperty") {
-            const props = change.difference;
-            if (props.relationshipName && oldKey.matchesFullName(props.relationshipName))
-                props.relationshipName = newKey.fullName;
-        }
-        if (Utils.isClassDifference(change) && change.difference.properties) {
-            for (const property of change.difference.properties) {
-                if (property.type === "NavigationProperty") {
-                    const props = property;
-                    if (props.relationshipName && oldKey.matchesFullName(props.relationshipName))
-                        props.relationshipName = newKey.fullName;
-                }
-            }
-        }
-        if (change.schemaType === ecschema_metadata_1.SchemaItemType.RelationshipClass || change.schemaType === SchemaDifference_1.SchemaOtherTypes.RelationshipConstraintClass) {
-            renameRelationshipConstraint(change, oldKey, newKey);
-        }
-    }
-}
-function renameEntityClassName({ differences }, oldKey, newKey) {
-    for (const entry of differences) {
-        if (entry.schemaType === ecschema_metadata_1.SchemaItemType.EntityClass) {
-            renameName(entry, oldKey.name, newKey.name);
-            renameBaseClass(entry.difference, oldKey, newKey);
-        }
-        if (entry.schemaType === ecschema_metadata_1.SchemaItemType.Mixin) {
-            if (entry.difference.appliesTo && oldKey.matchesFullName(entry.difference.appliesTo))
-                entry.difference.appliesTo = newKey.fullName;
-        }
-        if (Utils.isRelationshipClassDifference(entry) || Utils.isRelationshipConstraintClassDifference(entry)) {
-            renameRelationshipConstraint(entry, oldKey, newKey);
-        }
-    }
-}
-function renameMixinName({ differences }, oldKey, newKey) {
-    for (const entry of differences) {
-        if (entry.schemaType === ecschema_metadata_1.SchemaItemType.Mixin) {
-            renameBaseClass(entry.difference, oldKey, newKey);
-        }
-        if (entry.schemaType === SchemaDifference_1.SchemaOtherTypes.EntityClassMixin) {
-            for (let i = 0; i < entry.difference.length; i++) {
-                if (oldKey.matchesFullName(entry.difference[i])) {
-                    entry.difference[i] = newKey.fullName;
-                }
-            }
-        }
-        if (Utils.isRelationshipClassDifference(entry) || Utils.isRelationshipConstraintClassDifference(entry)) {
-            renameRelationshipConstraint(entry, oldKey, newKey);
-        }
-    }
-}
 //# sourceMappingURL=RenameEditHandler.js.map

package/lib/cjs/Merging/Edits/RenameEditHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenameEditHandler.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/RenameEditHandler.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\n/** @packageDocumentation\r\n * @module Merging\r\n */\r\n\r\nimport type { RenamePropertyEdit, RenameSchemaItemEdit } from \"./SchemaEdits\";\r\nimport { AnyClassItemDifference, AnySchemaItemDifference, ClassPropertyDifference, RelationshipClassDifference, RelationshipConstraintClassDifference, SchemaDifferenceResult, SchemaOtherTypes, SchemaType } from \"../../Differencing/SchemaDifference\";\r\nimport { NavigationPropertyProps, PrimitiveArrayPropertyProps, PrimitivePropertyProps, RelationshipConstraintProps, SchemaItem, SchemaItemKey, SchemaItemType, SchemaKey, StructArrayPropertyProps, StructPropertyProps } from \"@itwin/ecschema-metadata\";\r\nimport * as Utils from \"../../Differencing/Utils\";\r\n\r\ntype Editable<T extends object> = {\r\n  -readonly [P in keyof T]: T[P];\r\n};\r\n\r\n/**\r\n * @internal\r\n */\r\nexport function applyRenamePropertyEdit(result: SchemaDifferenceResult, edit: RenamePropertyEdit) {\r\n  const [schemaName, itemName, path] = edit.key.split(\".\") as [string, string, string];\r\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\r\n    return;\r\n  }\r\n\r\n  const difference = result.differences.find((entry) => {\r\n    return Utils.isClassPropertyDifference(entry) && entry.changeType === \"add\" && entry.itemName === itemName && entry.path === path;\r\n  });\r\n\r\n  const propertyDifference = difference as Editable<ClassPropertyDifference>;\r\n  if (propertyDifference === undefined) {\r\n    return;\r\n  }\r\n\r\n  propertyDifference.path = edit.value;\r\n\r\n  if (result.conflicts) {\r\n    const conflictIndex = result.conflicts.findIndex((entry) => entry.difference === propertyDifference);\r\n    if (conflictIndex > -1) {\r\n      result.conflicts.splice(conflictIndex, 1);\r\n    }\r\n  }\r\n}\r\n\r\n/**\r\n * @internal\r\n */\r\nexport function applyRenameSchemaItemEdit(result: SchemaDifferenceResult, edit: RenameSchemaItemEdit, postProcessing: (cb: () => void) => void) {\r\n  const [schemaName, itemName] = SchemaItem.parseFullName(edit.key);\r\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\r\n    return;\r\n  }\r\n\r\n  const difference = result.differences.find((entry) => {\r\n    return Utils.isSchemaItemDifference(entry) && entry.changeType === \"add\" && entry.itemName === itemName;\r\n  });\r\n\r\n  const itemDifference = difference as AnySchemaItemDifference;\r\n  if (itemDifference === undefined) {\r\n    return;\r\n  }\r\n\r\n  renameName(itemDifference, itemName, edit.value);\r\n\r\n  if (result.conflicts) {\r\n    const conflictIndex = result.conflicts.findIndex((entry) => entry.difference === itemDifference);\r\n    if (conflictIndex > -1) {\r\n      result.conflicts.splice(conflictIndex, 1);\r\n    }\r\n  }\r\n\r\n  postProcessing(() => {\r\n    renameSchemaItem(result, edit, itemDifference.schemaType);\r\n  });\r\n}\r\n\r\nfunction renameSchemaItem(result: SchemaDifferenceResult, edit: RenameSchemaItemEdit, schemaType: SchemaType) {\r\n  const schemaKey = SchemaKey.parseString(result.sourceSchemaName);\r\n  const [_schemaName, itemName] = SchemaItem.parseFullName(edit.key);\r\n  const oldKey = new SchemaItemKey(itemName, schemaKey);\r\n  const newKey = new SchemaItemKey(edit.value, schemaKey);\r\n\r\n  switch (schemaType) {\r\n    case SchemaItemType.CustomAttributeClass:\r\n      renameCustomAttributeClassName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.EntityClass:\r\n      renameEntityClassName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.Enumeration:\r\n      renameEnumerationName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.Format:\r\n      break;\r\n    case SchemaItemType.InvertedUnit:\r\n      break;\r\n    case SchemaItemType.KindOfQuantity:\r\n      renameKindOfQuantityName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.Mixin:\r\n      renameMixinName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.Phenomenon:\r\n      renamePhenomenonName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.PropertyCategory:\r\n      renamePropertyCategoryName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.RelationshipClass:\r\n      renameRelationshipClassName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.StructClass:\r\n      renameStructClassName(result, oldKey, newKey);\r\n      break;\r\n    case SchemaItemType.Unit:\r\n      break;\r\n    case SchemaItemType.UnitSystem:\r\n      break;\r\n  }\r\n}\r\n\r\nfunction renameBaseClass(difference: AnyClassItemDifference[\"difference\"], oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  if (difference.baseClass && oldKey.matchesFullName(difference.baseClass)) {\r\n    difference.baseClass = newKey.fullName;\r\n  }\r\n}\r\n\r\nfunction renameName(change: AnySchemaItemDifference, oldName: string, newName: string) {\r\n  if (change.itemName === oldName) {\r\n    const schemaItemDifference = change as Editable<AnySchemaItemDifference>;\r\n    schemaItemDifference.itemName = newName;\r\n  }\r\n}\r\n\r\nfunction renameRelationshipConstraint(change: RelationshipClassDifference | RelationshipConstraintClassDifference, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  if (change.schemaType === SchemaItemType.RelationshipClass) {\r\n    const constraintProps = [change.difference.source, change.difference.target] as Editable<RelationshipConstraintProps>[];\r\n    for (const props of constraintProps) {\r\n      if (props) {\r\n        if (props.abstractConstraint && oldKey.matchesFullName(props.abstractConstraint)) {\r\n          props.abstractConstraint = newKey.fullName;\r\n        }\r\n        if (props.constraintClasses !== undefined) {\r\n          for (let i = 0; i < props.constraintClasses.length; i++) {\r\n            if (oldKey.matchesFullName(props.constraintClasses[i]))\r\n              props.constraintClasses[i] = newKey.fullName;\r\n          }\r\n        }\r\n      }\r\n    }\r\n  } else {\r\n    for (let i = 0; i < change.difference.length; i++) {\r\n      if (oldKey.matchesFullName(change.difference[i]))\r\n        change.difference[i] = newKey.fullName;\r\n    }\r\n  }\r\n}\r\n\r\nfunction renamePropertyCategoryName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const entry of differences) {\r\n    if (entry.schemaType === SchemaItemType.PropertyCategory) {\r\n      renameName(entry, oldKey.name, newKey.name);\r\n    }\r\n\r\n    if (Utils.isClassDifference(entry) && entry.difference.properties) {\r\n      for (const property of entry.difference.properties) {\r\n        if (property.category && oldKey.matchesFullName(property.category)) {\r\n          const props = property as Editable<typeof property>;\r\n          props.category = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (entry.schemaType === SchemaOtherTypes.Property) {\r\n      if (entry.difference.category && oldKey.matchesFullName(entry.difference.category)) {\r\n        entry.difference.category = newKey.fullName;\r\n      }\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameKindOfQuantityName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const entry of differences) {\r\n    if (Utils.isClassDifference(entry) && entry.difference.properties) {\r\n      for (const property of entry.difference.properties) {\r\n        if (property.kindOfQuantity && oldKey.matchesFullName(property.kindOfQuantity)) {\r\n          const props = property as Editable<typeof property>;\r\n          props.kindOfQuantity = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (entry.schemaType === SchemaOtherTypes.Property) {\r\n      if (entry.difference.kindOfQuantity && oldKey.matchesFullName(entry.difference.kindOfQuantity)) {\r\n        entry.difference.kindOfQuantity = newKey.fullName;\r\n      }\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameEnumerationName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const change of differences) {\r\n    if (Utils.isClassDifference(change) && change.difference.properties) {\r\n      for (const property of change.difference.properties) {\r\n        if (property.type === \"PrimitiveProperty\" || property.type === \"PrimitiveArrayProperty\") {\r\n          const props = property as Editable<PrimitivePropertyProps | PrimitiveArrayPropertyProps>;\r\n          if (props.typeName && oldKey.matchesFullName(props.typeName))\r\n            props.typeName = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (change.schemaType === SchemaOtherTypes.Property && (\r\n      change.difference.type === \"PrimitiveProperty\" || change.difference.type === \"PrimitiveArrayProperty\"\r\n    )) {\r\n      const props = change.difference as Editable<PrimitivePropertyProps | PrimitiveArrayPropertyProps>;\r\n      if (props.typeName && oldKey.matchesFullName(props.typeName))\r\n        props.typeName = newKey.fullName;\r\n    }\r\n  }\r\n}\r\n\r\nfunction renamePhenomenonName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const entry of differences) {\r\n    if (entry.schemaType === SchemaItemType.Constant || entry.schemaType === SchemaItemType.Unit) {\r\n      if (entry.difference.phenomenon && oldKey.matchesFullName(entry.difference.phenomenon))\r\n        entry.difference.phenomenon = newKey.fullName;\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameStructClassName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const change of differences) {\r\n    if (change.schemaType === SchemaItemType.StructClass) {\r\n      renameBaseClass(change.difference, oldKey, newKey);\r\n    }\r\n\r\n    if (Utils.isClassDifference(change) && change.difference.properties) {\r\n      for (const property of change.difference.properties) {\r\n        if (property.type === \"StructProperty\" || property.type === \"StructArrayProperty\") {\r\n          const props = property as Editable<StructPropertyProps | StructArrayPropertyProps>;;\r\n          if (props.typeName && oldKey.matchesFullName(props.typeName))\r\n            props.typeName = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (change.schemaType === SchemaOtherTypes.Property && (\r\n      change.difference.type === \"StructProperty\" || change.difference.type === \"StructArrayProperty\"\r\n    )) {\r\n      const props = change.difference as Editable<StructPropertyProps | StructArrayPropertyProps>;\r\n      if (props.typeName && oldKey.matchesFullName(props.typeName))\r\n        props.typeName = newKey.fullName;\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameCustomAttributeClassName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const change of differences) {\r\n    if (change.schemaType === SchemaItemType.CustomAttributeClass) {\r\n      renameBaseClass(change.difference, oldKey, newKey);\r\n    }\r\n\r\n    if (change.schemaType === SchemaOtherTypes.CustomAttributeInstance) {\r\n      if (change.difference.className && oldKey.matchesFullName(change.difference.className)) {\r\n        change.difference.className = newKey.fullName;\r\n      }\r\n    }\r\n\r\n    if (change.schemaType === SchemaOtherTypes.Property || Utils.isClassDifference(change)) {\r\n      if (change.difference.customAttributes) {\r\n        for (const customAttribute of change.difference.customAttributes) {\r\n          if (oldKey.matchesFullName(customAttribute.className))\r\n            customAttribute.className = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (Utils.isClassDifference(change) && change.difference.properties) {\r\n      for (const property of change.difference.properties) {\r\n        if (property.customAttributes) {\r\n          for (const customAttribute of property.customAttributes) {\r\n            if (oldKey.matchesFullName(customAttribute.className))\r\n              customAttribute.className = newKey.fullName;\r\n          }\r\n        }\r\n      }\r\n    }\r\n    // https://github.com/iTwin/itwinjs-core/issues/7020\r\n    /* if (change.schemaType === SchemaItemType.RelationshipClass) {\r\n      const constraintProps = [change.difference.source, change.difference.target] as Editable<RelationshipConstraintProps>[];\r\n      for (const props of constraintProps) {\r\n        if (props.customAttributes !== undefined) {\r\n          for (const customAttribute of props.customAttributes) {\r\n            if (oldKey.matchesFullName(customAttribute.className))\r\n              customAttribute.className = newKey.fullName;\r\n          }\r\n        }\r\n      }\r\n    } */\r\n  }\r\n}\r\n\r\nfunction renameRelationshipClassName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const change of differences) {\r\n    if (change.schemaType === SchemaItemType.RelationshipClass) {\r\n      renameBaseClass(change.difference, oldKey, newKey);\r\n    }\r\n\r\n    if (change.schemaType === SchemaOtherTypes.Property && change.difference.type === \"NavigationProperty\") {\r\n      const props = change.difference as Editable<NavigationPropertyProps>;\r\n      if (props.relationshipName && oldKey.matchesFullName(props.relationshipName))\r\n        props.relationshipName = newKey.fullName;\r\n    }\r\n\r\n    if (Utils.isClassDifference(change) && change.difference.properties) {\r\n      for (const property of change.difference.properties) {\r\n        if (property.type === \"NavigationProperty\") {\r\n          const props = property as Editable<NavigationPropertyProps>;\r\n          if (props.relationshipName && oldKey.matchesFullName(props.relationshipName))\r\n            props.relationshipName = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (change.schemaType === SchemaItemType.RelationshipClass || change.schemaType === SchemaOtherTypes.RelationshipConstraintClass) {\r\n      renameRelationshipConstraint(change, oldKey, newKey);\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameEntityClassName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const entry of differences) {\r\n    if (entry.schemaType === SchemaItemType.EntityClass) {\r\n      renameName(entry, oldKey.name, newKey.name);\r\n      renameBaseClass(entry.difference, oldKey, newKey);\r\n    }\r\n\r\n    if (entry.schemaType === SchemaItemType.Mixin) {\r\n      if (entry.difference.appliesTo && oldKey.matchesFullName(entry.difference.appliesTo))\r\n        entry.difference.appliesTo = newKey.fullName;\r\n    }\r\n\r\n    if (Utils.isRelationshipClassDifference(entry) || Utils.isRelationshipConstraintClassDifference(entry)) {\r\n      renameRelationshipConstraint(entry, oldKey, newKey);\r\n    }\r\n  }\r\n}\r\n\r\nfunction renameMixinName({ differences }: SchemaDifferenceResult, oldKey: SchemaItemKey, newKey: SchemaItemKey) {\r\n  for (const entry of differences) {\r\n    if (entry.schemaType === SchemaItemType.Mixin) {\r\n      renameBaseClass(entry.difference, oldKey, newKey);\r\n    }\r\n\r\n    if (entry.schemaType === SchemaOtherTypes.EntityClassMixin) {\r\n      for (let i = 0; i < entry.difference.length; i++) {\r\n        if (oldKey.matchesFullName(entry.difference[i])) {\r\n          entry.difference[i] = newKey.fullName;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (Utils.isRelationshipClassDifference(entry) || Utils.isRelationshipConstraintClassDifference(entry)) {\r\n      renameRelationshipConstraint(entry, oldKey, newKey);\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"RenameEditHandler.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/RenameEditHandler.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*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Merging\n */\n\nimport type { RenamePropertyEdit, RenameSchemaItemEdit } from \"./SchemaEdits\";\nimport { AnySchemaItemDifference, ClassPropertyDifference,SchemaDifferenceResult } from \"../../Differencing/SchemaDifference\";\nimport { SchemaItem } from \"@itwin/ecschema-metadata\";\nimport * as Utils from \"../../Differencing/Utils\";\n\ntype Editable<T extends object> = {\n  -readonly [P in keyof T]: T[P];\n};\n\n/**\n * @internal\n */\nexport function applyRenamePropertyEdit(result: SchemaDifferenceResult, edit: RenamePropertyEdit) {\n  const [schemaName, itemName, path] = edit.key.split(\".\") as [string, string, string];\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\n    return;\n  }\n\n  const difference = result.differences.find((entry) => {\n    return Utils.isClassPropertyDifference(entry) && entry.changeType === \"add\" && entry.itemName === itemName && entry.path === path;\n  });\n\n  const propertyDifference = difference as Editable<ClassPropertyDifference>;\n  if (propertyDifference === undefined) {\n    return;\n  }\n\n  propertyDifference.path = edit.value;\n\n  if (result.conflicts) {\n    const conflictIndex = result.conflicts.findIndex((entry) => entry.difference === propertyDifference);\n    if (conflictIndex > -1) {\n      result.conflicts.splice(conflictIndex, 1);\n    }\n  }\n}\n\n/**\n * @internal\n */\nexport function applyRenameSchemaItemEdit(result: SchemaDifferenceResult, edit: RenameSchemaItemEdit) {\n  const [schemaName, itemName] = SchemaItem.parseFullName(edit.key);\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\n    return;\n  }\n\n  const difference = result.differences.find((entry) => {\n    return Utils.isSchemaItemDifference(entry) && entry.changeType === \"add\" && entry.itemName === itemName;\n  });\n\n  const itemDifference = difference as AnySchemaItemDifference;\n  if (itemDifference === undefined) {\n    return;\n  }\n\n  renameName(itemDifference, itemName, edit.value);\n\n  if (result.conflicts) {\n    const conflictIndex = result.conflicts.findIndex((entry) => entry.difference === itemDifference);\n    if (conflictIndex > -1) {\n      result.conflicts.splice(conflictIndex, 1);\n    }\n  }\n}\n\nfunction renameName(change: AnySchemaItemDifference, oldName: string, newName: string) {\n  if (change.itemName === oldName) {\n    const schemaItemDifference = change as Editable<AnySchemaItemDifference>;\n    schemaItemDifference.itemName = newName;\n  }\n}\n"]}

package/lib/cjs/Merging/Edits/SchemaEdits.d.ts

@@ -1,7 +1,9 @@
 /** @packageDocumentation
  * @module Merging
  */
+import type { ECClass, SchemaItem } from "@itwin/ecschema-metadata";
 import type { SchemaDifferenceResult } from "../../Differencing/SchemaDifference";
+import { NameMapping } from "./NameMapping";
 /**
  * An enumeration that has all the schema edit names.
  * @alpha
@@ -48,19 +50,19 @@ declare abstract class Editor {
     protected add(edit: AnySchemaEdits): void;
 }
 declare class PropertyEditor extends Editor {
-    rename(schemaName: string, className: string, propertyName: string, newName: string): void;
-    skip(schemaName: string, className: string, propertyName: string): void;
+    rename(ecClass: ECClass, propertyName: string, newName: string): void;
+    skip(ecClass: ECClass, propertyName: string): void;
 }
 declare class ItemEditor extends Editor {
-    rename(schemaName: string, itemName: string, newName: string): void;
-    skip(schemaName: string, itemName: string): void;
+    rename(schemaItem: SchemaItem, newName: string): void;
+    skip(schemaItem: SchemaItem): void;
 }
 /**
  * Defines a set of edits of a schema that can be applied to a schema during merging. The intention of this class
  * is to support saving of edits and load them again if needed.
  * @alpha
  */
-export declare class SchemaEdits {
+export declare class SchemaEdits implements Iterable<AnySchemaEdits> {
     private readonly _edits;
     readonly properties: PropertyEditor;
     readonly items: ItemEditor;
@@ -71,8 +73,9 @@ export declare class SchemaEdits {
     /**
      * @internal
      */
-    applyTo(differenceResult: SchemaDifferenceResult): Promise<void>;
+    applyTo(differenceResult: SchemaDifferenceResult, nameMapping: NameMapping): Promise<void>;
     toJSON(): ReadonlyArray<AnySchemaEdits>;
+    [Symbol.iterator](): Iterator<AnySchemaEdits>;
 }
 export {};
 //# sourceMappingURL=SchemaEdits.d.ts.map

package/lib/cjs/Merging/Edits/SchemaEdits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaEdits.d.ts","sourceRoot":"","sources":["../../../../src/Merging/Edits/SchemaEdits.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAIlF;;;GAGG;AACH,oBAAY,cAAc;IACxB,gBAAgB,qBAAqB;IACrC,cAAc,mBAAmB;IACjC,IAAI,SAAS;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,cAAc,CAAC,gBAAgB,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,CAAC,cAAc,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,GACxB,QAAQ,GACR,oBAAoB,GACpB,kBAAkB,CAAC;AAErB,uBAAe,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;gBAEnC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC;IAIxC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc;CAWnC;AAED,cAAM,cAAe,SAAQ,MAAM;IAE1B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQnF,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAMxE;AAED,cAAM,UAAW,SAAQ,MAAM;IACtB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ5D,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAMjD;AAED;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAE/C,SAAgB,UAAU,EAAE,cAAc,CAAC;IAC3C,SAAgB,KAAK,EAAE,UAAU,CAAC;IAElC;;OAEG;gBACS,UAAU,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC;IAWtD;;OAEG;IACU,OAAO,CAAC,gBAAgB,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBtE,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC;CAG/C"}
+{"version":3,"file":"SchemaEdits.d.ts","sourceRoot":"","sources":["../../../../src/Merging/Edits/SchemaEdits.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C;;;GAGG;AACH,oBAAY,cAAc;IACxB,gBAAgB,qBAAqB;IACrC,cAAc,mBAAmB;IACjC,IAAI,SAAS;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,cAAc,CAAC,gBAAgB,CAAC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,CAAC,cAAc,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,GACxB,QAAQ,GACR,oBAAoB,GACpB,kBAAkB,CAAC;AAErB,uBAAe,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;gBAEnC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC;IAIxC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc;CAWnC;AAED,cAAM,cAAe,SAAQ,MAAM;IAE1B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ9D,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM;CAMnD;AAED,cAAM,UAAW,SAAQ,MAAM;IACtB,MAAM,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM;IAQ9C,IAAI,CAAC,UAAU,EAAE,UAAU;CAMnC;AAED;;;;GAIG;AACH,qBAAa,WAAY,YAAW,QAAQ,CAAC,cAAc,CAAC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAE/C,SAAgB,UAAU,EAAE,cAAc,CAAC;IAC3C,SAAgB,KAAK,EAAE,UAAU,CAAC;IAElC;;OAEG;gBACS,UAAU,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC;IAWtD;;OAEG;IACU,OAAO,CAAC,gBAAgB,EAAE,sBAAsB,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBhG,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC;IAIvC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,cAAc,CAAC;CAGrD"}

package/lib/cjs/Merging/Edits/SchemaEdits.js

@@ -21,6 +21,7 @@ var SchemaEditType;
     SchemaEditType["Skip"] = "Skip";
 })(SchemaEditType || (exports.SchemaEditType = SchemaEditType = {}));
 class Editor {
+    _edits;
     constructor(edits) {
         this._edits = edits;
     }
@@ -37,32 +38,32 @@ class Editor {
     }
 }
 class PropertyEditor extends Editor {
-    rename(schemaName, className, propertyName, newName) {
+    rename(ecClass, propertyName, newName) {
         this.add({
             type: SchemaEditType.RenameProperty,
-            key: `${schemaName}.${className}.${propertyName}`,
+            key: `${ecClass.fullName}.${propertyName}`,
             value: newName,
         });
     }
-    skip(schemaName, className, propertyName) {
+    skip(ecClass, propertyName) {
         this.add({
             type: SchemaEditType.Skip,
-            key: `${schemaName}.${className}.${propertyName}`,
+            key: `${ecClass.fullName}.${propertyName}`,
         });
     }
 }
 class ItemEditor extends Editor {
-    rename(schemaName, itemName, newName) {
+    rename(schemaItem, newName) {
         this.add({
             type: SchemaEditType.RenameSchemaItem,
-            key: `${schemaName}.${itemName}`,
+            key: schemaItem.key.fullName,
             value: newName,
         });
     }
-    skip(schemaName, itemName) {
+    skip(schemaItem) {
         this.add({
             type: SchemaEditType.Skip,
-            key: `${schemaName}.${itemName}`,
+            key: schemaItem.fullName,
         });
     }
 }
@@ -72,6 +73,9 @@ class ItemEditor extends Editor {
  * @alpha
  */
 class SchemaEdits {
+    _edits;
+    properties;
+    items;
     /**
      * @alpha
      */
@@ -86,26 +90,27 @@ class SchemaEdits {
     /**
      * @internal
      */
-    async applyTo(differenceResult) {
-        const postProcessing = [];
+    async applyTo(differenceResult, nameMapping) {
         for (const schemaEdit of this._edits) {
             if (schemaEdit.type === SchemaEditType.RenameSchemaItem) {
-                (0, RenameEditHandler_1.applyRenameSchemaItemEdit)(differenceResult, schemaEdit, postProcessing.push.bind(postProcessing));
+                (0, RenameEditHandler_1.applyRenameSchemaItemEdit)(differenceResult, schemaEdit);
+                nameMapping.addItemMapping(schemaEdit.key, schemaEdit.value);
             }
             if (schemaEdit.type === SchemaEditType.RenameProperty) {
                 (0, RenameEditHandler_1.applyRenamePropertyEdit)(differenceResult, schemaEdit);
+                nameMapping.addPropertyMapping(schemaEdit.key, schemaEdit.value);
             }
             if (schemaEdit.type === SchemaEditType.Skip) {
                 (0, SkipEditHandler_1.applySkipEdit)(differenceResult, schemaEdit);
             }
         }
-        for (const callback of postProcessing) {
-            callback();
-        }
     }
     toJSON() {
         return this._edits;
     }
+    [Symbol.iterator]() {
+        return this._edits[Symbol.iterator]();
+    }
 }
 exports.SchemaEdits = SchemaEdits;
 //# sourceMappingURL=SchemaEdits.js.map

package/lib/cjs/Merging/Edits/SchemaEdits.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaEdits.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/SchemaEdits.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\n/** @packageDocumentation\r\n * @module Merging\r\n */\r\n\r\nimport type { SchemaDifferenceResult } from \"../../Differencing/SchemaDifference\";\r\nimport { applyRenamePropertyEdit, applyRenameSchemaItemEdit } from \"./RenameEditHandler\";\r\nimport { applySkipEdit } from \"./SkipEditHandler\";\r\n\r\n/**\r\n * An enumeration that has all the schema edit names.\r\n * @alpha\r\n */\r\nexport enum SchemaEditType {\r\n  RenameSchemaItem = \"RenameSchemaItem\",\r\n  RenameProperty = \"RenameProperty\",\r\n  Skip = \"Skip\",\r\n}\r\n\r\n/**\r\n * Schema edit entry to rename a schema item.\r\n * @alpha\r\n */\r\nexport interface RenameSchemaItemEdit {\r\n  type: SchemaEditType.RenameSchemaItem;\r\n  key: string;\r\n  value: string;\r\n}\r\n\r\n/**\r\n * Schema edit entry to rename a property of a class.\r\n * @alpha\r\n */\r\nexport interface RenamePropertyEdit {\r\n  type: SchemaEditType.RenameProperty;\r\n  key: string;\r\n  value: string;\r\n}\r\n\r\n/**\r\n * Schema edit entry to skip a certain schema element matching the given key.\r\n * @alpha\r\n */\r\nexport interface SkipEdit {\r\n  type: SchemaEditType.Skip;\r\n  key: string;\r\n}\r\n\r\n/**\r\n * Union for all supported edits that can be applied to a schema.\r\n * @alpha\r\n */\r\nexport type AnySchemaEdits =\r\n  SkipEdit |\r\n  RenameSchemaItemEdit |\r\n  RenamePropertyEdit;\r\n\r\nabstract class Editor {\r\n  private readonly _edits: Array<AnySchemaEdits>;\r\n\r\n  constructor(edits: Array<AnySchemaEdits>) {\r\n    this._edits = edits;\r\n  }\r\n\r\n  protected add(edit: AnySchemaEdits) {\r\n    const overrideEntry = this._edits.findIndex((entry) => {\r\n      return entry.type === edit.type && entry.key === edit.key;\r\n    });\r\n\r\n    if (overrideEntry > -1) {\r\n      this._edits[overrideEntry] = edit;\r\n    } else {\r\n      this._edits.push(edit);\r\n    }\r\n  }\r\n}\r\n\r\nclass PropertyEditor extends Editor {\r\n\r\n  public rename(schemaName: string, className: string, propertyName: string, newName: string) {\r\n    this.add({\r\n      type: SchemaEditType.RenameProperty,\r\n      key: `${schemaName}.${className}.${propertyName}`,\r\n      value: newName,\r\n    });\r\n  }\r\n\r\n  public skip(schemaName: string, className: string, propertyName: string) {\r\n    this.add({\r\n      type: SchemaEditType.Skip,\r\n      key: `${schemaName}.${className}.${propertyName}`,\r\n    });\r\n  }\r\n}\r\n\r\nclass ItemEditor extends Editor {\r\n  public rename(schemaName: string, itemName: string, newName: string) {\r\n    this.add({\r\n      type: SchemaEditType.RenameSchemaItem,\r\n      key: `${schemaName}.${itemName}`,\r\n      value: newName,\r\n    });\r\n  }\r\n\r\n  public skip(schemaName: string, itemName: string) {\r\n    this.add({\r\n      type: SchemaEditType.Skip,\r\n      key: `${schemaName}.${itemName}`,\r\n    });\r\n  }\r\n}\r\n\r\n/**\r\n * Defines a set of edits of a schema that can be applied to a schema during merging. The intention of this class\r\n * is to support saving of edits and load them again if needed.\r\n * @alpha\r\n */\r\nexport class SchemaEdits {\r\n  private readonly _edits: Array<AnySchemaEdits>;\r\n\r\n  public readonly properties: PropertyEditor;\r\n  public readonly items: ItemEditor;\r\n\r\n  /**\r\n   * @alpha\r\n   */\r\n  constructor(initialize?: ReadonlyArray<AnySchemaEdits>) {\r\n    this._edits = [];\r\n\r\n    if (initialize) {\r\n      this._edits.push(...initialize);\r\n    }\r\n\r\n    this.items = new ItemEditor(this._edits);\r\n    this.properties = new PropertyEditor(this._edits);\r\n  }\r\n\r\n  /**\r\n   * @internal\r\n   */\r\n  public async applyTo(differenceResult: SchemaDifferenceResult): Promise<void> {\r\n    const postProcessing: Array<() => void> = [];\r\n    for (const schemaEdit of this._edits) {\r\n      if (schemaEdit.type === SchemaEditType.RenameSchemaItem) {\r\n        applyRenameSchemaItemEdit(differenceResult, schemaEdit, postProcessing.push.bind(postProcessing));\r\n      }\r\n      if (schemaEdit.type === SchemaEditType.RenameProperty) {\r\n        applyRenamePropertyEdit(differenceResult, schemaEdit);\r\n      }\r\n      if (schemaEdit.type === SchemaEditType.Skip) {\r\n        applySkipEdit(differenceResult, schemaEdit);\r\n      }\r\n    }\r\n\r\n    for (const callback of postProcessing) {\r\n      callback();\r\n    }\r\n  }\r\n\r\n  public toJSON(): ReadonlyArray<AnySchemaEdits> {\r\n    return this._edits;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"SchemaEdits.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/SchemaEdits.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*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Merging\n */\n\nimport type { ECClass, SchemaItem } from \"@itwin/ecschema-metadata\";\nimport type { SchemaDifferenceResult } from \"../../Differencing/SchemaDifference\";\nimport { NameMapping } from \"./NameMapping\";\nimport { applyRenamePropertyEdit, applyRenameSchemaItemEdit } from \"./RenameEditHandler\";\nimport { applySkipEdit } from \"./SkipEditHandler\";\n\n/**\n * An enumeration that has all the schema edit names.\n * @alpha\n */\nexport enum SchemaEditType {\n  RenameSchemaItem = \"RenameSchemaItem\",\n  RenameProperty = \"RenameProperty\",\n  Skip = \"Skip\",\n}\n\n/**\n * Schema edit entry to rename a schema item.\n * @alpha\n */\nexport interface RenameSchemaItemEdit {\n  type: SchemaEditType.RenameSchemaItem;\n  key: string;\n  value: string;\n}\n\n/**\n * Schema edit entry to rename a property of a class.\n * @alpha\n */\nexport interface RenamePropertyEdit {\n  type: SchemaEditType.RenameProperty;\n  key: string;\n  value: string;\n}\n\n/**\n * Schema edit entry to skip a certain schema element matching the given key.\n * @alpha\n */\nexport interface SkipEdit {\n  type: SchemaEditType.Skip;\n  key: string;\n}\n\n/**\n * Union for all supported edits that can be applied to a schema.\n * @alpha\n */\nexport type AnySchemaEdits =\n  SkipEdit |\n  RenameSchemaItemEdit |\n  RenamePropertyEdit;\n\nabstract class Editor {\n  private readonly _edits: Array<AnySchemaEdits>;\n\n  constructor(edits: Array<AnySchemaEdits>) {\n    this._edits = edits;\n  }\n\n  protected add(edit: AnySchemaEdits) {\n    const overrideEntry = this._edits.findIndex((entry) => {\n      return entry.type === edit.type && entry.key === edit.key;\n    });\n\n    if (overrideEntry > -1) {\n      this._edits[overrideEntry] = edit;\n    } else {\n      this._edits.push(edit);\n    }\n  }\n}\n\nclass PropertyEditor extends Editor {\n\n  public rename(ecClass: ECClass, propertyName: string, newName: string) {\n    this.add({\n      type: SchemaEditType.RenameProperty,\n      key: `${ecClass.fullName}.${propertyName}`,\n      value: newName,\n    });\n  }\n\n  public skip(ecClass: ECClass, propertyName: string) {\n    this.add({\n      type: SchemaEditType.Skip,\n      key: `${ecClass.fullName}.${propertyName}`,\n    });\n  }\n}\n\nclass ItemEditor extends Editor {\n  public rename(schemaItem: SchemaItem, newName: string) {\n    this.add({\n      type: SchemaEditType.RenameSchemaItem,\n      key: schemaItem.key.fullName,\n      value: newName,\n    });\n  }\n\n  public skip(schemaItem: SchemaItem) {\n    this.add({\n      type: SchemaEditType.Skip,\n      key: schemaItem.fullName,\n    });\n  }\n}\n\n/**\n * Defines a set of edits of a schema that can be applied to a schema during merging. The intention of this class\n * is to support saving of edits and load them again if needed.\n * @alpha\n */\nexport class SchemaEdits implements Iterable<AnySchemaEdits> {\n  private readonly _edits: Array<AnySchemaEdits>;\n\n  public readonly properties: PropertyEditor;\n  public readonly items: ItemEditor;\n\n  /**\n   * @alpha\n   */\n  constructor(initialize?: ReadonlyArray<AnySchemaEdits>) {\n    this._edits = [];\n\n    if (initialize) {\n      this._edits.push(...initialize);\n    }\n\n    this.items = new ItemEditor(this._edits);\n    this.properties = new PropertyEditor(this._edits);\n  }\n\n  /**\n   * @internal\n   */\n  public async applyTo(differenceResult: SchemaDifferenceResult, nameMapping: NameMapping): Promise<void> {\n    for (const schemaEdit of this._edits) {\n      if (schemaEdit.type === SchemaEditType.RenameSchemaItem) {\n        applyRenameSchemaItemEdit(differenceResult, schemaEdit);\n        nameMapping.addItemMapping(schemaEdit.key, schemaEdit.value);\n      }\n      if (schemaEdit.type === SchemaEditType.RenameProperty) {\n        applyRenamePropertyEdit(differenceResult, schemaEdit);\n        nameMapping.addPropertyMapping(schemaEdit.key, schemaEdit.value);\n      }\n      if (schemaEdit.type === SchemaEditType.Skip) {\n        applySkipEdit(differenceResult, schemaEdit);\n      }\n    }\n  }\n\n  public toJSON(): ReadonlyArray<AnySchemaEdits> {\n    return this._edits;\n  }\n\n  public [Symbol.iterator](): Iterator<AnySchemaEdits> {\n    return this._edits[Symbol.iterator]();\n  }\n}\n"]}

package/lib/cjs/Merging/Edits/SkipEditHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"SkipEditHandler.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/SkipEditHandler.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;AAaH,sCAkBC;AAzBD;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,MAA8B,EAAE,IAAc;IAC1E,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAyC,CAAC;IACrG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,QAAQ,KAAK,SAAS;QACzC,CAAC,CAAC,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;QACpD,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAA0B,EAAE,CAAC;IACrD,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3C,kBAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAwC,EAAE,kBAAyC;IACjH,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACpC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,EAAE,WAAW,EAA0B,EAAE,QAAgB;IAChF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,sBAAsB,CAAC,EAAE,WAAW,EAA0B,EAAE,QAAgB,EAAE,QAAgB;IACzG,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Merging\r\n */\r\n\r\nimport type { AnySchemaDifference, SchemaDifferenceResult } from \"../../Differencing/SchemaDifference\";\r\nimport type { AnySchemaDifferenceConflict } from \"../../Differencing/SchemaConflicts\";\r\nimport type { SkipEdit } from \"./SchemaEdits\";\r\n\r\n/**\r\n * Applies a skip edit to the schema differences. It basically removes all entries that\r\n * that are associated with the item to skip.\r\n * @param result  The result of a schema differencing run\r\n * @param edit    The skip edit to be applied.\r\n * @internal\r\n */\r\nexport function applySkipEdit(result: SchemaDifferenceResult, edit: SkipEdit) {\r\n  const [schemaName, itemName, pathName] = edit.key.split(\".\") as [string, string, string | undefined];\r\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\r\n    return;\r\n  }\r\n\r\n  const foundIndices = pathName !== undefined\r\n    ? findRelatedItemEntries(result, itemName, pathName)\r\n    : findItemEntries(result, itemName);\r\n\r\n  const skippedDifferences: AnySchemaDifference[] = [];\r\n  for (const index of foundIndices.reverse()) {\r\n    skippedDifferences.push(...result.differences.splice(index, 1));\r\n  }\r\n\r\n  if (result.conflicts) {\r\n    removeRelatedConflicts(result.conflicts, skippedDifferences);\r\n  }\r\n}\r\n\r\nfunction removeRelatedConflicts(conflicts: AnySchemaDifferenceConflict[], skippedDifferences: AnySchemaDifference[]) {\r\n  const indices: number[] = [];\r\n  conflicts.forEach((conflict, index) => {\r\n    if (skippedDifferences.includes(conflict.difference)) {\r\n      indices.push(index);\r\n    }\r\n  });\r\n\r\n  for (const index of indices.reverse()) {\r\n    conflicts.splice(index, 1);\r\n  }\r\n}\r\n\r\nfunction findItemEntries({ differences }: SchemaDifferenceResult, itemName: string): number[] {\r\n  const found: number[] = [];\r\n  differences.forEach((difference, index) => {\r\n    if (\"itemName\" in difference && difference.itemName === itemName) {\r\n      found.push(index);\r\n    }\r\n  });\r\n  return found;\r\n}\r\n\r\nfunction findRelatedItemEntries({ differences }: SchemaDifferenceResult, itemName: string, pathName: string): number[] {\r\n  const found: number[] = [];\r\n  differences.forEach((difference, index) => {\r\n    if (\"itemName\" in difference && difference.itemName === itemName && \"path\" in difference && difference.path === pathName) {\r\n      found.push(index);\r\n    }\r\n  });\r\n  return found;\r\n}\r\n\r\n"]}
+{"version":3,"file":"SkipEditHandler.js","sourceRoot":"","sources":["../../../../src/Merging/Edits/SkipEditHandler.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;AAaH,sCAkBC;AAzBD;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,MAA8B,EAAE,IAAc;IAC1E,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAyC,CAAC;IACrG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,QAAQ,KAAK,SAAS;QACzC,CAAC,CAAC,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;QACpD,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAA0B,EAAE,CAAC;IACrD,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3C,kBAAkB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAwC,EAAE,kBAAyC;IACjH,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACpC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,EAAE,WAAW,EAA0B,EAAE,QAAgB;IAChF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,sBAAsB,CAAC,EAAE,WAAW,EAA0B,EAAE,QAAgB,EAAE,QAAgB;IACzG,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Merging\n */\n\nimport type { AnySchemaDifference, SchemaDifferenceResult } from \"../../Differencing/SchemaDifference\";\nimport type { AnySchemaDifferenceConflict } from \"../../Differencing/SchemaConflicts\";\nimport type { SkipEdit } from \"./SchemaEdits\";\n\n/**\n * Applies a skip edit to the schema differences. It basically removes all entries that\n * that are associated with the item to skip.\n * @param result  The result of a schema differencing run\n * @param edit    The skip edit to be applied.\n * @internal\n */\nexport function applySkipEdit(result: SchemaDifferenceResult, edit: SkipEdit) {\n  const [schemaName, itemName, pathName] = edit.key.split(\".\") as [string, string, string | undefined];\n  if (!result.sourceSchemaName.startsWith(schemaName)) {\n    return;\n  }\n\n  const foundIndices = pathName !== undefined\n    ? findRelatedItemEntries(result, itemName, pathName)\n    : findItemEntries(result, itemName);\n\n  const skippedDifferences: AnySchemaDifference[] = [];\n  for (const index of foundIndices.reverse()) {\n    skippedDifferences.push(...result.differences.splice(index, 1));\n  }\n\n  if (result.conflicts) {\n    removeRelatedConflicts(result.conflicts, skippedDifferences);\n  }\n}\n\nfunction removeRelatedConflicts(conflicts: AnySchemaDifferenceConflict[], skippedDifferences: AnySchemaDifference[]) {\n  const indices: number[] = [];\n  conflicts.forEach((conflict, index) => {\n    if (skippedDifferences.includes(conflict.difference)) {\n      indices.push(index);\n    }\n  });\n\n  for (const index of indices.reverse()) {\n    conflicts.splice(index, 1);\n  }\n}\n\nfunction findItemEntries({ differences }: SchemaDifferenceResult, itemName: string): number[] {\n  const found: number[] = [];\n  differences.forEach((difference, index) => {\n    if (\"itemName\" in difference && difference.itemName === itemName) {\n      found.push(index);\n    }\n  });\n  return found;\n}\n\nfunction findRelatedItemEntries({ differences }: SchemaDifferenceResult, itemName: string, pathName: string): number[] {\n  const found: number[] = [];\n  differences.forEach((difference, index) => {\n    if (\"itemName\" in difference && difference.itemName === itemName && \"path\" in difference && difference.path === pathName) {\n      found.push(index);\n    }\n  });\n  return found;\n}\n\n"]}

package/lib/cjs/Merging/EntityClassMerger.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addEntityClass = addEntityClass;
 exports.modifyEntityClass = modifyEntityClass;
 exports.addClassMixins = addClassMixins;
-const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const ClassMerger_1 = require("./ClassMerger");
 const Utils_1 = require("./Utils");
 /**
@@ -38,7 +37,7 @@ async function modifyEntityClass(context, change, itemKey) {
 async function addClassMixins(context, change) {
     for (const mixinFullName of change.difference) {
         const mixinKey = await (0, Utils_1.updateSchemaItemKey)(context, mixinFullName);
-        const entityKey = new ecschema_metadata_1.SchemaItemKey(change.itemName, context.targetSchemaKey);
+        const entityKey = (0, Utils_1.toItemKey)(context, change.itemName);
         await context.editor.entities.addMixin(entityKey, mixinKey);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAeA,wCAOC;AAMD,8CAUC;AAMD,wCAMC;AA3CD,gEAAyD;AACzD,+CAA4C;AAC5C,mCAA8C;AAE9C;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAA6B;IAC7F,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACrE,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QAEjC,GAAG,MAAM,CAAC,UAAU;KACrB,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAA6B,EAAE,OAAsB;IACxH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAuB,CAAC;IAClF,IAAG,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1C,KAAI,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3D,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAAkC;IAClG,KAAI,MAAM,aAAa,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC9E,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { EntityClassDifference, EntityClassMixinDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { MutableEntityClass } from \"../Editing/Mutable/MutableEntityClass\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\nimport { updateSchemaItemKey } from \"./Utils\";\r\n\r\n/**\r\n * Merges a new EntityClass into the target schema.\r\n * @internal\r\n */\r\nexport async function addEntityClass(context: SchemaMergeContext, change: EntityClassDifference) {\r\n  await context.editor.entities.createFromProps(context.targetSchemaKey, {\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n\r\n    ...change.difference,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing EntityClass in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyEntityClass(context: SchemaMergeContext, change: EntityClassDifference, itemKey: SchemaItemKey) {\r\n  const item = await context.targetSchema.lookupItem(itemKey) as MutableEntityClass;\r\n  if(change.difference.mixins !== undefined) {\r\n    for(const mixin of change.difference.mixins) {\r\n      const mixinKey = await updateSchemaItemKey(context, mixin);\r\n      await context.editor.entities.addMixin(itemKey, mixinKey);\r\n    }\r\n  }\r\n\r\n  return modifyClass(context, change, itemKey, item);\r\n}\r\n\r\n/**\r\n * Merges Mixins to Entity Class schema items.\r\n * @internal\r\n */\r\nexport async function addClassMixins(context: SchemaMergeContext, change: EntityClassMixinDifference): Promise<void> {\r\n  for(const mixinFullName of change.difference) {\r\n    const mixinKey = await updateSchemaItemKey(context, mixinFullName);\r\n    const entityKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\r\n    await context.editor.entities.addMixin(entityKey, mixinKey);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAeA,wCAOC;AAMD,8CAUC;AAMD,wCAMC;AA1CD,+CAA4C;AAC5C,mCAAyD;AAEzD;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAA6B;IAC7F,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACrE,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QAEjC,GAAG,MAAM,CAAC,UAAU;KACrB,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAA6B,EAAE,OAAsB;IACxH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAuB,CAAC;IAClF,IAAG,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1C,KAAI,MAAM,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3D,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAAkC;IAClG,KAAI,MAAM,aAAa,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { EntityClassDifference, EntityClassMixinDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableEntityClass } from \"../Editing/Mutable/MutableEntityClass\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { modifyClass } from \"./ClassMerger\";\nimport { toItemKey, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new EntityClass into the target schema.\n * @internal\n */\nexport async function addEntityClass(context: SchemaMergeContext, change: EntityClassDifference) {\n  await context.editor.entities.createFromProps(context.targetSchemaKey, {\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n\n    ...change.difference,\n  });\n}\n\n/**\n * Merges differences to an existing EntityClass in the target schema.\n * @internal\n */\nexport async function modifyEntityClass(context: SchemaMergeContext, change: EntityClassDifference, itemKey: SchemaItemKey) {\n  const item = await context.targetSchema.lookupItem(itemKey) as MutableEntityClass;\n  if(change.difference.mixins !== undefined) {\n    for(const mixin of change.difference.mixins) {\n      const mixinKey = await updateSchemaItemKey(context, mixin);\n      await context.editor.entities.addMixin(itemKey, mixinKey);\n    }\n  }\n\n  return modifyClass(context, change, itemKey, item);\n}\n\n/**\n * Merges Mixins to Entity Class schema items.\n * @internal\n */\nexport async function addClassMixins(context: SchemaMergeContext, change: EntityClassMixinDifference): Promise<void> {\n  for(const mixinFullName of change.difference) {\n    const mixinKey = await updateSchemaItemKey(context, mixinFullName);\n    const entityKey = toItemKey(context, change.itemName);\n    await context.editor.entities.addMixin(entityKey, mixinKey);\n  }\n}\n"]}

package/lib/cjs/Merging/EnumerationMerger.js

@@ -19,7 +19,7 @@ async function addEnumeration(context, change) {
         throw new Error("Enumerations must define whether enumeration is strict.");
     }
     if (change.difference.enumerators === undefined) {
-        throw new Error("Enumerations must define at least ine enumerator.");
+        throw new Error("Enumerations must define at least one enumerator.");
     }
     await context.editor.enumerations.createFromProps(context.targetSchemaKey, {
         ...change.difference,