@itwin/ecschema-editing 4.4.0-dev.9 → 4.5.0-dev.2

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.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 { ECClass, ECClassModifier, Mixin, parseClassModifier, SchemaItemKey, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\r\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { BaseClassDelta, ChangeType, ClassChanges, EntityMixinChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\r\nimport { ClassPropertyMerger } from \"./ClassPropertyMerger\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport class ClassMerger<TClass extends ECClass> {\r\n  protected readonly context: SchemaMergeContext;\r\n\r\n  constructor(context: SchemaMergeContext) {\r\n    this.context = context;\r\n  }\r\n\r\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\r\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\r\n  }\r\n\r\n  protected async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\r\n    return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };\r\n  }\r\n\r\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\r\n    const mutableClass = ecClass as unknown as MutableClass;\r\n    switch(attributeName) {\r\n      case \"schemaItemType\":\r\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\r\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\r\n        }\r\n        return true;\r\n\r\n      case \"label\":\r\n        mutableClass.setDisplayLabel(attributeNewValue);\r\n        return true;\r\n\r\n      case \"description\":\r\n        mutableClass.setDescription(attributeNewValue);\r\n        return true;\r\n\r\n      case \"modifier\":\r\n        const modifier = parseClassModifier(attributeNewValue);\r\n        if (modifier === undefined) {\r\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\r\n        }\r\n\r\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\r\n          mutableClass.setModifier(modifier);\r\n          return true;\r\n        }\r\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\r\n    }\r\n    return false;\r\n  }\r\n\r\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\r\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\r\n  }\r\n\r\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\r\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\r\n    if (sourceBaseClass !== undefined) {\r\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\r\n        ? this.context.targetSchema.schemaKey\r\n        : sourceBaseClass.schema.schemaKey);\r\n\r\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\r\n        return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\r\n      }\r\n\r\n      if (targetBaseClass !== undefined) {\r\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\r\n        if (baseClass === undefined) {\r\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\r\n        }\r\n        if (await baseClass.is(targetBaseClass)) {\r\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\r\n        }\r\n      }\r\n    }\r\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\r\n  }\r\n\r\n  private async addMixins(itemKey: SchemaItemKey, entityMixinChanges: Iterable<EntityMixinChanges>, changeType?: ChangeType): Promise<SchemaItemEditResults> {\r\n    if (changeType === ChangeType.Missing) {\r\n      for (const entityMixinChange of entityMixinChanges) {\r\n        for (const change of entityMixinChange.entityMixinChange) {\r\n          const mixins = change.diagnostic.messageArgs! as unknown as [Mixin];\r\n          for (const mixin of mixins) {\r\n            const result = await this.addMixin(itemKey, mixin);\r\n            if (result.errorMessage !== undefined) {\r\n              return result;\r\n            }\r\n          }\r\n        }\r\n      }\r\n      return {};\r\n    }\r\n    return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.`};\r\n  }\r\n\r\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]) {\r\n    if (propertyValueChanges.length === 0) {\r\n      return;\r\n    }\r\n\r\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\r\n    if (targetItem === undefined) {\r\n      throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);\r\n    }\r\n\r\n    for (const change of propertyValueChanges) {\r\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\r\n      const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\r\n      if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\r\n        throw new Error(results.errorMessage);\r\n      }\r\n    }\r\n  }\r\n\r\n  public static async mergeChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\r\n    const merger = new this(context);\r\n\r\n    for (const change of classChanges) {\r\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\r\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\r\n      const changeType = change.schemaItemMissing?.changeType;\r\n\r\n      if (changeType === ChangeType.Missing) {\r\n\r\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\r\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\r\n        }\r\n\r\n        const results = await merger.create(context.targetSchema.schemaKey, sourceItem);\r\n        if (results.errorMessage !== undefined) {\r\n          throw new Error(results.errorMessage);\r\n        }\r\n        targetItemKey = results.itemKey!;\r\n      }\r\n\r\n      if (change.baseClassDelta !== undefined) {\r\n        const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);\r\n        if (results.errorMessage !== undefined) {\r\n          throw new Error(results.errorMessage);\r\n        }\r\n      }\r\n\r\n      if (change.entityMixinChanges.size > 0) {\r\n        const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);\r\n        if (results.errorMessage !== undefined) {\r\n          throw new Error(results.errorMessage);\r\n        }\r\n      }\r\n\r\n      await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);\r\n      const mergeResults  = await ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());\r\n      if (mergeResults.errorMessage !== undefined) {\r\n        throw new Error(mergeResults.errorMessage);\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { ECClass, ECClassModifier, Mixin, parseClassModifier, SchemaItemKey, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { BaseClassDelta, ChangeType, ClassChanges, EntityMixinChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { ClassPropertyMerger } from \"./ClassPropertyMerger\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\n\n/**\n * @internal\n */\nexport class ClassMerger<TClass extends ECClass> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\n  }\n\n  protected async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };\n  }\n\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const mutableClass = ecClass as unknown as MutableClass;\n    switch(attributeName) {\n      case \"schemaItemType\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\n        }\n        return true;\n\n      case \"label\":\n        mutableClass.setDisplayLabel(attributeNewValue);\n        return true;\n\n      case \"description\":\n        mutableClass.setDescription(attributeNewValue);\n        return true;\n\n      case \"modifier\":\n        const modifier = parseClassModifier(attributeNewValue);\n        if (modifier === undefined) {\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\n        }\n\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\n          mutableClass.setModifier(modifier);\n          return true;\n        }\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\n    }\n    return false;\n  }\n\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\n    if (sourceBaseClass !== undefined) {\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceBaseClass.schema.schemaKey);\n\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\n        return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n      }\n\n      if (targetBaseClass !== undefined) {\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\n        if (baseClass === undefined) {\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\n        }\n        if (await baseClass.is(targetBaseClass)) {\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n        }\n      }\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\n  }\n\n  private async addMixins(itemKey: SchemaItemKey, entityMixinChanges: Iterable<EntityMixinChanges>, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    if (changeType === ChangeType.Missing) {\n      for (const entityMixinChange of entityMixinChanges) {\n        for (const change of entityMixinChange.entityMixinChange) {\n          const mixins = change.diagnostic.messageArgs! as unknown as [Mixin];\n          for (const mixin of mixins) {\n            const result = await this.addMixin(itemKey, mixin);\n            if (result.errorMessage !== undefined) {\n              return result;\n            }\n          }\n        }\n      }\n      return {};\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.`};\n  }\n\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]) {\n    if (propertyValueChanges.length === 0) {\n      return;\n    }\n\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n    if (targetItem === undefined) {\n      throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);\n    }\n\n    for (const change of propertyValueChanges) {\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n      const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\n      if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n        throw new Error(results.errorMessage);\n      }\n    }\n  }\n\n  public static async mergeChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\n    const merger = new this(context);\n\n    for (const change of classChanges) {\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (changeType === ChangeType.Missing) {\n\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\n        }\n\n        const results = await merger.create(context.targetSchema.schemaKey, sourceItem);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n        targetItemKey = results.itemKey!;\n      }\n\n      if (change.baseClassDelta !== undefined) {\n        const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      if (change.entityMixinChanges.size > 0) {\n        const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);\n      let mergeResults  = await ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n\n      // merge custom attributes\n      mergeResults = await mergeCustomAttributes(merger.context, change.customAttributeChanges.values(), async (ca) => {\n        return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);\n      });\n\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n    }\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"ClassPropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassPropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2C,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAc,eAAe,EAAuB,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMpD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEnC,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,iBAAiB;IAsBzB,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,mBAAmB;YAIvD,0BAA0B;WAepB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA2BnK"}
+{"version":3,"file":"ClassPropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassPropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2C,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAc,eAAe,EAAuB,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOpD;;GAEG;AACH,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEnC,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,iBAAiB;IAsBzB,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,mBAAmB;YAIvD,0BAA0B;WAepB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAmCnK"}

package/lib/cjs/Merging/ClassPropertyMerger.js

@@ -10,6 +10,7 @@ const SchemaChanges_1 = require("../Validation/SchemaChanges");
 const StructPropertyMerger_1 = require("./StructPropertyMerger");
 const ArrayPropertyMerger_1 = require("./ArrayPropertyMerger");
 const PrimitiveOrEnumPropertyMerger_1 = require("./PrimitiveOrEnumPropertyMerger");
+const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
 /**
  * @internal
  */
@@ -75,8 +76,14 @@ class ClassPropertyMerger {
                 const targetProperty = (await targetItem.getProperty(change.ecTypeName));
                 await merger.mergeAttributeValueChanges(targetProperty, change.propertyValueChanges);
             }
+            const mergeResults = await (0, CustomAttributeMerger_1.mergeCustomAttributes)(merger.context, change.customAttributeChanges.values(), async (ca) => {
+                return merger.context.editor.entities.addCustomAttributeToProperty(classKey, change.ecTypeName, ca);
+            });
+            if (mergeResults.errorMessage !== undefined) {
+                return { errorMessage: mergeResults.errorMessage };
+            }
         }
-        return {};
+        return { itemKey: classKey };
     }
 }
 exports.ClassPropertyMerger = ClassPropertyMerger;

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

@@ -1 +1 @@
-{"version":3,"file":"ClassPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassPropertyMerger.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 { ECClass, Property, propertyTypeToString, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { PropertyEditResults, SchemaItemEditResults } from \"../Editing/Editor\";\r\nimport { ChangeType, PropertyChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { StructPropertyMerger } from \"./StructPropertyMerger\";\r\nimport { EnumerationArrayPropertyMerger, PrimitiveArraPropertyMerger, StructArrayPropertyMerger } from \"./ArrayPropertyMerger\";\r\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\r\nimport { EnumerationPropertyMerger, PrimitivePropertyMerger } from \"./PrimitiveOrEnumPropertyMerger\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport class ClassPropertyMerger {\r\n  protected readonly context: SchemaMergeContext;\r\n\r\n  constructor(context: SchemaMergeContext) {\r\n    this.context = context;\r\n  }\r\n\r\n  private getPropertyMerger(property: Property): AnyPropertyMerger<Property> {\r\n    if (property.isEnumeration()) {\r\n      if (property.isArray()) {\r\n        return new EnumerationArrayPropertyMerger(this.context);\r\n      }\r\n      return new EnumerationPropertyMerger(this.context);\r\n    }\r\n    if (property.isPrimitive()) {\r\n      if (property.isArray()) {\r\n        return new PrimitiveArraPropertyMerger(this.context);\r\n      }\r\n      return new PrimitivePropertyMerger(this.context);\r\n    }\r\n    if (property.isStruct()) {\r\n      if (property.isArray()) {\r\n        return new StructArrayPropertyMerger(this.context);\r\n      }\r\n      return new StructPropertyMerger(this.context);\r\n    }\r\n    throw new Error(`Unsupported Property Type: ${propertyTypeToString(property.propertyType)}`);\r\n  }\r\n\r\n  protected isPropertyEditResults(obj: any): obj is PropertyEditResults {\r\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\r\n  }\r\n\r\n  private async mergeAttributeValueChanges(targetProperty: Property, propertyValueChanges: PropertyValueChange[]) {\r\n    if (propertyValueChanges.length === 0)\r\n      return;\r\n\r\n    const merger = this.getPropertyMerger(targetProperty);\r\n\r\n    for (const change of propertyValueChanges) {\r\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\r\n      const results = await merger.mergeAttributes(targetProperty, attributeName, attributeNewValue, attributeOldValue);\r\n      if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\r\n        throw new Error(results.errorMessage);\r\n      }\r\n    }\r\n  }\r\n\r\n  public static async mergeChanges(context: SchemaMergeContext, classKey: SchemaItemKey, propertyChanges: Iterable<PropertyChanges>): Promise<SchemaItemEditResults> {\r\n    const merger = new this(context);\r\n\r\n    for (const change of propertyChanges) {\r\n      const targetItem = await context.targetSchema.lookupItem<ECClass>(classKey);\r\n      if (targetItem === undefined) {\r\n        return { errorMessage: `'${classKey.name}' class could not be located in the merged schema.`};\r\n      }\r\n\r\n      if (change.propertyMissing?.changeType === ChangeType.Missing) {\r\n        const sourceProperty = change.propertyMissing.diagnostic.ecDefinition as unknown as Property;\r\n        if (await targetItem.getProperty(change.ecTypeName) !== undefined) {\r\n          return { errorMessage: `Merged schema already contains a class '${classKey.name}' property '${change.ecTypeName}'.`};\r\n        }\r\n\r\n        const propertyMerger =  merger.getPropertyMerger(sourceProperty);\r\n        const results  = await propertyMerger.createFromProps(classKey, sourceProperty);\r\n        if (results.errorMessage !== undefined) {\r\n          return { errorMessage: results.errorMessage};\r\n        }\r\n      } else {\r\n        const targetProperty = (await targetItem.getProperty(change.ecTypeName))!;\r\n        await merger.mergeAttributeValueChanges(targetProperty, change.propertyValueChanges);\r\n      }\r\n    }\r\n    return {};\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ClassPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassPropertyMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { ECClass, Property, propertyTypeToString, SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { PropertyEditResults, SchemaItemEditResults } from \"../Editing/Editor\";\nimport { ChangeType, PropertyChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { StructPropertyMerger } from \"./StructPropertyMerger\";\nimport { EnumerationArrayPropertyMerger, PrimitiveArraPropertyMerger, StructArrayPropertyMerger } from \"./ArrayPropertyMerger\";\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\nimport { EnumerationPropertyMerger, PrimitivePropertyMerger } from \"./PrimitiveOrEnumPropertyMerger\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\n\n/**\n * @internal\n */\nexport class ClassPropertyMerger {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  private getPropertyMerger(property: Property): AnyPropertyMerger<Property> {\n    if (property.isEnumeration()) {\n      if (property.isArray()) {\n        return new EnumerationArrayPropertyMerger(this.context);\n      }\n      return new EnumerationPropertyMerger(this.context);\n    }\n    if (property.isPrimitive()) {\n      if (property.isArray()) {\n        return new PrimitiveArraPropertyMerger(this.context);\n      }\n      return new PrimitivePropertyMerger(this.context);\n    }\n    if (property.isStruct()) {\n      if (property.isArray()) {\n        return new StructArrayPropertyMerger(this.context);\n      }\n      return new StructPropertyMerger(this.context);\n    }\n    throw new Error(`Unsupported Property Type: ${propertyTypeToString(property.propertyType)}`);\n  }\n\n  protected isPropertyEditResults(obj: any): obj is PropertyEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async mergeAttributeValueChanges(targetProperty: Property, propertyValueChanges: PropertyValueChange[]) {\n    if (propertyValueChanges.length === 0)\n      return;\n\n    const merger = this.getPropertyMerger(targetProperty);\n\n    for (const change of propertyValueChanges) {\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n      const results = await merger.mergeAttributes(targetProperty, attributeName, attributeNewValue, attributeOldValue);\n      if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n        throw new Error(results.errorMessage);\n      }\n    }\n  }\n\n  public static async mergeChanges(context: SchemaMergeContext, classKey: SchemaItemKey, propertyChanges: Iterable<PropertyChanges>): Promise<SchemaItemEditResults> {\n    const merger = new this(context);\n\n    for (const change of propertyChanges) {\n      const targetItem = await context.targetSchema.lookupItem<ECClass>(classKey);\n      if (targetItem === undefined) {\n        return { errorMessage: `'${classKey.name}' class could not be located in the merged schema.`};\n      }\n\n      if (change.propertyMissing?.changeType === ChangeType.Missing) {\n        const sourceProperty = change.propertyMissing.diagnostic.ecDefinition as unknown as Property;\n        if (await targetItem.getProperty(change.ecTypeName) !== undefined) {\n          return { errorMessage: `Merged schema already contains a class '${classKey.name}' property '${change.ecTypeName}'.`};\n        }\n\n        const propertyMerger =  merger.getPropertyMerger(sourceProperty);\n        const results  = await propertyMerger.createFromProps(classKey, sourceProperty);\n        if (results.errorMessage !== undefined) {\n          return { errorMessage: results.errorMessage};\n        }\n      } else {\n        const targetProperty = (await targetItem.getProperty(change.ecTypeName))!;\n        await merger.mergeAttributeValueChanges(targetProperty, change.propertyValueChanges);\n      }\n\n      const mergeResults = await mergeCustomAttributes(merger.context, change.customAttributeChanges.values(), async (ca) => {\n        return merger.context.editor.entities.addCustomAttributeToProperty(classKey, change.ecTypeName, ca);\n      });\n\n      if (mergeResults.errorMessage !== undefined) {\n        return { errorMessage: mergeResults.errorMessage};\n      }\n    }\n    return { itemKey: classKey };\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"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"]}
+{"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":["// /*---------------------------------------------------------------------------------------------\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 { Constant, SchemaItem } from \"@itwin/ecschema-metadata\";\nimport { PropertyValueResolver, SchemaItemMerger } from \"./SchemaItemMerger\";\n\n/**\n * @internal\n */\nexport default class ConstantsMerger extends SchemaItemMerger<Constant> {\n  /**\n   * Creates the property value resolver for [[Constant]] items.\n   */\n  protected override async createPropertyValueResolver(): Promise<PropertyValueResolver<Constant>> {\n    return {\n      phenomenon: (phenomenonFullName, targetItemKey) => {\n        // There are two options, either the phenomenon was referenced from another\n        // schema or it is defined in the same schema as the constant to be merged.\n        // In the latter case, the changes would report a different property value that\n        // refers to the source schema. So that needs to be changed here.\n        const [schemaName, phenomenonName] = SchemaItem.parseFullName(phenomenonFullName);\n        if(this.context.targetSchema.getReferenceSync(schemaName) === undefined) {\n          return `${targetItemKey.schemaName}.${phenomenonName}`;\n        }\n        return phenomenonFullName;\n      },\n      numerator: (value, targetItemKey) => {\n        const item = this.context.targetSchema.lookupItemSync<Constant>(targetItemKey);\n        if(item !== undefined && item.hasNumerator && item.numerator !== value) {\n          throw new Error(`Failed to merged, constant numerator conflict: ${value} -> ${item.numerator}`);\n        }\n        return value;\n      },\n      denominator: (value, targetItemKey) => {\n        const item = this.context.targetSchema.lookupItemSync<Constant>(targetItemKey);\n        if(item !== undefined && item.hasDenominator && item.denominator !== value) {\n          throw new Error(`Failed to merged, constant denominator conflict: ${value} -> ${item.denominator}`);\n        }\n        return value;\n      },\n    };\n  }\n}\n\n"]}

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

@@ -0,0 +1,21 @@
+/** @packageDocumentation
+ * @module Merging
+ */
+import { CustomAttribute } from "@itwin/ecschema-metadata";
+import { CustomAttributeContainerChanges } from "../Validation/SchemaChanges";
+import { SchemaMergeContext } from "./SchemaMerger";
+interface EditResults {
+    errorMessage?: string;
+}
+/**
+ * Merges the custom attributes of the given changes iterable. The third parameter is a callback to pass
+ * a scope (Class, Property, Schema) specific handler.
+ * @param mergeContext  The current schema merging context.
+ * @param changes       An iterable with custom attribute changes.
+ * @param callback      The callback to add the custom attribute with a scope specific editor.
+ * @returns             A EditResults object.
+ * @internal
+ */
+export declare function mergeCustomAttributes(mergeContext: SchemaMergeContext, changes: Iterable<CustomAttributeContainerChanges>, callback: (customAttribute: CustomAttribute) => Promise<EditResults>): Promise<EditResults>;
+export {};
+//# sourceMappingURL=CustomAttributeMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CustomAttributeMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/CustomAttributeMerger.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAA8D,MAAM,0BAA0B,CAAC;AACvH,OAAO,EAAc,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,UAAU,WAAW;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,kBAAkB,EAAE,OAAO,EAAE,QAAQ,CAAC,+BAA+B,CAAC,EAAE,QAAQ,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CA6B5N"}

package/lib/cjs/Merging/CustomAttributeMerger.js

@@ -0,0 +1,51 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Merging
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeCustomAttributes = void 0;
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const SchemaChanges_1 = require("../Validation/SchemaChanges");
+/**
+ * Merges the custom attributes of the given changes iterable. The third parameter is a callback to pass
+ * a scope (Class, Property, Schema) specific handler.
+ * @param mergeContext  The current schema merging context.
+ * @param changes       An iterable with custom attribute changes.
+ * @param callback      The callback to add the custom attribute with a scope specific editor.
+ * @returns             A EditResults object.
+ * @internal
+ */
+async function mergeCustomAttributes(mergeContext, changes, callback) {
+    for (const customAttributeContainerChange of changes) {
+        for (const change of customAttributeContainerChange.customAttributeChanges) {
+            if (change.changeType === SchemaChanges_1.ChangeType.Missing) {
+                const [sourceCustomAttribute] = change.diagnostic.messageArgs;
+                const [schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(sourceCustomAttribute.className);
+                const schemaItemKey = new ecschema_metadata_1.SchemaItemKey(itemName, mergeContext.sourceSchema.schemaKey.compareByName(schemaName)
+                    ? mergeContext.targetSchema.schemaKey
+                    : new ecschema_metadata_1.SchemaKey(schemaName));
+                const targetCustomAttribute = await mergeContext.targetSchema.lookupItem(schemaItemKey);
+                if (targetCustomAttribute === undefined) {
+                    return { errorMessage: `Unable to locate the custom attribute class ${schemaItemKey.name} in the merged schema.` };
+                }
+                const results = await callback({
+                    ...sourceCustomAttribute,
+                    className: targetCustomAttribute.fullName,
+                });
+                if (results.errorMessage !== undefined) {
+                    return { errorMessage: results.errorMessage };
+                }
+            }
+            else {
+                return { errorMessage: `Changes of Custom Attribute ${customAttributeContainerChange.ecTypeName} on ${mergeContext.targetSchema.name} merge is not implemented.` };
+            }
+        }
+    }
+    return {};
+}
+exports.mergeCustomAttributes = mergeCustomAttributes;
+//# sourceMappingURL=CustomAttributeMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CustomAttributeMerger.js","sourceRoot":"","sources":["../../../src/Merging/CustomAttributeMerger.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,gEAAuH;AACvH,+DAA0F;AAO1F;;;;;;;;GAQG;AACI,KAAK,UAAU,qBAAqB,CAAC,YAAgC,EAAE,OAAkD,EAAE,QAAoE;IACpM,KAAK,MAAM,8BAA8B,IAAI,OAAO,EAAE;QACpD,KAAK,MAAM,MAAM,IAAI,8BAA8B,CAAC,sBAAsB,EAAE;YAC1E,IAAI,MAAM,CAAC,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAC5C,MAAM,CAAC,qBAAqB,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAAgC,CAAC;gBACnF,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAI,8BAAU,CAAC,aAAa,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;gBAC1F,MAAM,aAAa,GAAG,IAAI,iCAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC;oBAC7G,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS;oBACrC,CAAC,CAAC,IAAI,6BAAS,CAAC,UAAU,CAAC,CAC5B,CAAC;gBACF,MAAM,qBAAqB,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,UAAU,CAAuB,aAAa,CAAC,CAAC;gBAC9G,IAAI,qBAAqB,KAAK,SAAS,EAAE;oBACvC,OAAO,EAAE,YAAY,EAAE,+CAA+C,aAAa,CAAC,IAAI,wBAAwB,EAAC,CAAC;iBACnH;gBAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC;oBAC7B,GAAG,qBAAqB;oBACxB,SAAS,EAAE,qBAAqB,CAAC,QAAQ;iBAC1C,CAAC,CAAC;gBAEH,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,OAAO,EAAG,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;iBAChD;aACF;iBAAM;gBACL,OAAO,EAAE,YAAY,EAAE,+BAA+B,8BAA8B,CAAC,UAAU,OAAO,YAAY,CAAC,YAAY,CAAC,IAAI,4BAA4B,EAAC,CAAC;aACnK;SACF;KACF;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AA7BD,sDA6BC","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 { CustomAttribute, CustomAttributeClass, SchemaItem, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { ChangeType, CustomAttributeContainerChanges } from \"../Validation/SchemaChanges\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\ninterface EditResults {\n  errorMessage?: string;\n}\n\n/**\n * Merges the custom attributes of the given changes iterable. The third parameter is a callback to pass\n * a scope (Class, Property, Schema) specific handler.\n * @param mergeContext  The current schema merging context.\n * @param changes       An iterable with custom attribute changes.\n * @param callback      The callback to add the custom attribute with a scope specific editor.\n * @returns             A EditResults object.\n * @internal\n */\nexport async function mergeCustomAttributes(mergeContext: SchemaMergeContext, changes: Iterable<CustomAttributeContainerChanges>, callback: (customAttribute: CustomAttribute) => Promise<EditResults>): Promise<EditResults> {\n  for (const customAttributeContainerChange of changes) {\n    for (const change of customAttributeContainerChange.customAttributeChanges) {\n      if (change.changeType === ChangeType.Missing) {\n        const [sourceCustomAttribute] = change.diagnostic.messageArgs as [CustomAttribute];\n        const [schemaName, itemName]  = SchemaItem.parseFullName(sourceCustomAttribute.className);\n        const schemaItemKey = new SchemaItemKey(itemName, mergeContext.sourceSchema.schemaKey.compareByName(schemaName)\n          ? mergeContext.targetSchema.schemaKey\n          : new SchemaKey(schemaName),\n        );\n        const targetCustomAttribute = await mergeContext.targetSchema.lookupItem<CustomAttributeClass>(schemaItemKey);\n        if (targetCustomAttribute === undefined) {\n          return { errorMessage: `Unable to locate the custom attribute class ${schemaItemKey.name} in the merged schema.`};\n        }\n\n        const results = await callback({\n          ...sourceCustomAttribute,\n          className: targetCustomAttribute.fullName,\n        });\n\n        if (results.errorMessage !== undefined) {\n          return {  errorMessage: results.errorMessage };\n        }\n      } else {\n        return { errorMessage: `Changes of Custom Attribute ${customAttributeContainerChange.ecTypeName} on ${mergeContext.targetSchema.name} merge is not implemented.`};\n      }\n    }\n  }\n  return {};\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAwF;AACxF,+CAA4C;AAG5C;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,yBAAwB;IAClD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAoB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEkB,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,KAAY;QACpE,MAAM,QAAQ,GAAG,IAAI,iCAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;YAChH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5B,+DAA+D;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAdD,oCAcC","sourcesContent":["/*---------------------------------------------------------------------------------------------\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 { EntityClass, Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\r\nimport { ClassMerger } from \"./ClassMerger\";\r\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\r\n\r\n/**\r\n * @internal\r\n */\r\nexport default class EntityClassMerger extends ClassMerger<EntityClass> {\r\n  protected override async create(schemaKey: SchemaKey, ecClass: EntityClass): Promise<SchemaItemEditResults> {\r\n    return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);\r\n  }\r\n\r\n  protected override async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\r\n    const mixinKey = new SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\r\n      ? this.context.targetSchema.schemaKey\r\n      : mixin.schema.schemaKey);\r\n\r\n    // addMixin should return results instead of throwing exception\r\n    await this.context.editor.entities.addMixin(itemKey, mixinKey);\r\n    return {};\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"EntityClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAwF;AACxF,+CAA4C;AAG5C;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,yBAAwB;IAClD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAoB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAEkB,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,KAAY;QACpE,MAAM,QAAQ,GAAG,IAAI,iCAAa,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;YAChH,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5B,+DAA+D;QAC/D,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/D,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAdD,oCAcC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { EntityClass, Mixin, SchemaItemKey, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { ClassMerger } from \"./ClassMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\n\n/**\n * @internal\n */\nexport default class EntityClassMerger extends ClassMerger<EntityClass> {\n  protected override async create(schemaKey: SchemaKey, ecClass: EntityClass): Promise<SchemaItemEditResults> {\n    return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);\n  }\n\n  protected override async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    const mixinKey = new SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : mixin.schema.schemaKey);\n\n    // addMixin should return results instead of throwing exception\n    await this.context.editor.entities.addMixin(itemKey, mixinKey);\n    return {};\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"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"]}
+{"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":["/*---------------------------------------------------------------------------------------------\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 { AnyEnumerator, Enumeration, SchemaItemKey} from \"@itwin/ecschema-metadata\";\nimport { ChangeType, EnumerationChanges } from \"../Validation/SchemaChanges\";\nimport { SchemaItemMerger } from \"./SchemaItemMerger\";\n\ntype EnumeratorDeltaArgs = [AnyEnumerator, keyof AnyEnumerator, string | undefined];\n\n/**\n * @internal\n */\nexport default class EnumerationMerger extends SchemaItemMerger<Enumeration> {\n\n  /** Shorthand property to the enumerations editor. */\n  private get _editor() {\n    return this.context.editor.enumerations;\n  }\n\n  protected override async merge(itemKey: SchemaItemKey, source: Enumeration, changes: EnumerationChanges) {\n    for (const enumeratorChange of changes.enumeratorChanges.values()) {\n      // In case the enumerator entry does not exist in the target enumeration the\n      // enumeratorMissing property is set and\n      if (enumeratorChange.enumeratorMissing?.changeType === ChangeType.Missing) {\n\n        const enumerator = source.getEnumeratorByName(enumeratorChange.ecTypeName);\n        if (enumerator === undefined) {\n          throw Error(`Enumerator '${enumeratorChange.ecTypeName}' not found in class ${source.fullName}`);\n        }\n\n        // Enumerators are plain javascript objects with out any references to other\n        // instances or a schema. That allows to simply copy them over.\n        await this._editor.addEnumerator(itemKey, enumerator);\n\n        // Since every missing enumerator has delta changes for ech property, the loop\n        // must call continue here to avoid having all properties checked and set again.\n        continue;\n      }\n\n      // For changes where the enumerators differ, the enumeratorDeltas property is\n      // filled. This allows to change individual enumerator entries. This is only\n      // allowed for labels and descriptions, all other deltas would throw an error.\n      for(const enumeratorDelta of enumeratorChange.enumeratorDeltas) {\n        await this.mergeEnumeratorChanges(itemKey, enumeratorDelta.diagnostic.messageArgs! as EnumeratorDeltaArgs);\n      }\n    }\n  }\n\n  private async mergeEnumeratorChanges(itemKey: SchemaItemKey, [enumerator, propertyName, value]: EnumeratorDeltaArgs) {\n    // In case an enumerator has the same name but different value, the enumerator\n    // cannot be merged to keep integrity for the existing schema users.\n    if(propertyName === \"value\") {\n      throw new Error(`Failed to merge enumerator attribute, Enumerator \"${enumerator.name}\" has different values.`);\n    }\n\n    // For the other two properties they shall only be merged if the source value is\n    // set. In case they'd be undefined, the current enumerators value shall be kept.\n    if(propertyName === \"label\" && value !== undefined) {\n      await this._editor.setEnumeratorLabel(itemKey, enumerator.name, value);\n    }\n    if(propertyName === \"description\" && value !== undefined) {\n      await this._editor.setEnumeratorDescription(itemKey, enumerator.name, value);\n    }\n  }\n}\n"]}

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

@@ -0,0 +1,15 @@
+import { KindOfQuantity, SchemaItemKey } from "@itwin/ecschema-metadata";
+import { PropertyValueResolver, SchemaItemMerger } from "./SchemaItemMerger";
+import { KindOfQuantityChanges } from "../Validation/SchemaChanges";
+/**
+ * @internal
+ */
+export default class KindOfQuantityMerger extends SchemaItemMerger<KindOfQuantity> {
+    protected merge(itemKey: SchemaItemKey, source: KindOfQuantity, changes: KindOfQuantityChanges): Promise<void>;
+    /**
+     *
+     * Creates the property value resolver for [[KindOfQuantity]] items.
+     */
+    protected createPropertyValueResolver(): Promise<PropertyValueResolver<KindOfQuantity>>;
+}
+//# sourceMappingURL=KindOfQuantityMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KindOfQuantityMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,cAAc,EAA8B,aAAa,EAAQ,MAAM,0BAA0B,CAAC;AACjI,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,gBAAgB,CAAC,cAAc,CAAC;cAEvD,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,qBAAqB;IAmC7G;;;OAGG;cACsB,2BAA2B,IAAI,OAAO,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAcvG"}

package/lib/cjs/Merging/KindOfQuantityMerger.js

@@ -0,0 +1,66 @@
+"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 SchemaItemMerger_1 = require("./SchemaItemMerger");
+/**
+ * @internal
+ */
+class KindOfQuantityMerger extends SchemaItemMerger_1.SchemaItemMerger {
+    async merge(itemKey, source, changes) {
+        for (const presentationUnitChange of changes.presentationUnitChanges.values()) {
+            for (const change of presentationUnitChange.presentationUnitChange) {
+                const format = change.diagnostic.messageArgs[0];
+                const isDefault = source.defaultPresentationFormat === format;
+                if (ecschema_metadata_1.OverrideFormat.isOverrideFormat(format)) {
+                    const parentFormat = await this.lookup(format.parent);
+                    if (parentFormat === undefined) {
+                        throw new Error(`Unable to locate the format class ${format.parent.name} in the merged schema.`);
+                    }
+                    const unitAndLabels = [];
+                    if (format.units !== undefined) {
+                        for (const [unit, label] of format.units) {
+                            const targetUnit = await this.lookup(unit);
+                            if (targetUnit === undefined) {
+                                throw new Error(`Unable to locate the unit class ${unit.name} in the merged schema.`);
+                            }
+                            unitAndLabels.push([targetUnit, label]);
+                        }
+                    }
+                    const overrideFormat = await this.context.editor.kindOfQuantities.createFormatOverride(itemKey, parentFormat.key, format.precision, unitAndLabels);
+                    await this.context.editor.kindOfQuantities.addPresentationOverrideFormat(itemKey, overrideFormat, isDefault);
+                }
+                else {
+                    const targetFormat = await this.lookup(format);
+                    if (targetFormat === undefined) {
+                        throw new Error(`Unable to locate the format class ${format.name} in the merged schema.`);
+                    }
+                    await this.context.editor.kindOfQuantities.addPresentationFormat(itemKey, targetFormat.key, isDefault);
+                }
+            }
+        }
+    }
+    /**
+     *
+     * Creates the property value resolver for [[KindOfQuantity]] items.
+     */
+    async createPropertyValueResolver() {
+        return {
+            persistenceUnit: (newValue, targetItemKey, oldValue) => {
+                if (oldValue !== undefined && oldValue !== newValue) {
+                    throw new Error(`Changing the kind of quantity '${targetItemKey.name}' persistenceUnit is not supported.`);
+                }
+                const [schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(newValue);
+                if (this.context.targetSchema.getReferenceSync(schemaName) === undefined) {
+                    return `${targetItemKey.schemaName}.${itemName}`;
+                }
+                return newValue;
+            },
+        };
+    }
+}
+exports.default = KindOfQuantityMerger;
+//# sourceMappingURL=KindOfQuantityMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAiI;AACjI,yDAA6E;AAG7E;;GAEG;AACH,MAAqB,oBAAqB,SAAQ,mCAAgC;IAE7D,KAAK,CAAC,KAAK,CAAC,OAAsB,EAAE,MAAsB,EAAE,OAA8B;QAC3G,KAAK,MAAM,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE;YAC7E,KAAK,MAAM,MAAM,IAAI,sBAAsB,CAAC,sBAAsB,EAAE;gBAClE,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,WAAY,CAAC,CAAC,CAAC,CAAC;gBACjD,MAAM,SAAS,GAAG,MAAM,CAAC,yBAAyB,KAAK,MAAM,CAAC;gBAE9D,IAAI,kCAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE;oBAC3C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAS,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC9D,IAAI,YAAY,KAAK,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,MAAM,CAAC,IAAI,wBAAwB,CAAC,CAAC;qBAClG;oBAED,MAAM,aAAa,GAAiE,EAAE,CAAC;oBACvF,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE;4BACxC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAsB,IAAI,CAAC,CAAC;4BAChE,IAAI,UAAU,KAAK,SAAS,EAAE;gCAC5B,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,IAAI,wBAAwB,CAAC,CAAC;6BACvF;4BACD,aAAa,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;yBACzC;qBACF;oBACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;oBACnJ,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;iBAC9G;qBAAM;oBACL,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAS,MAAM,CAAC,CAAC;oBACvD,IAAI,YAAY,KAAK,SAAS,EAAE;wBAC9B,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,wBAAwB,CAAC,CAAC;qBAC3F;oBACD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;iBACxG;aACF;SACF;IACH,CAAC;IAED;;;OAGG;IACgB,KAAK,CAAC,2BAA2B;QAClD,OAAO;YACL,eAAe,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE;gBACrD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,QAAQ,EAAE;oBACnD,MAAM,IAAI,KAAK,CAAC,kCAAkC,aAAa,CAAC,IAAI,qCAAqC,CAAC,CAAC;iBAC5G;gBACD,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,8BAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAClE,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;oBACxE,OAAO,GAAG,aAAa,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;iBAClD;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;SACF,CAAC;IACJ,CAAC;CACF;AAvDD,uCAuDC","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 { Format, InvertedUnit, KindOfQuantity, OverrideFormat, SchemaItem, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { PropertyValueResolver, SchemaItemMerger } from \"./SchemaItemMerger\";\nimport { KindOfQuantityChanges } from \"../Validation/SchemaChanges\";\n\n/**\n * @internal\n */\nexport default class KindOfQuantityMerger extends SchemaItemMerger<KindOfQuantity> {\n\n  protected override async merge(itemKey: SchemaItemKey, source: KindOfQuantity, changes: KindOfQuantityChanges) {\n    for (const presentationUnitChange of changes.presentationUnitChanges.values()) {\n      for (const change of presentationUnitChange.presentationUnitChange) {\n        const format = change.diagnostic.messageArgs![0];\n        const isDefault = source.defaultPresentationFormat === format;\n\n        if (OverrideFormat.isOverrideFormat(format)) {\n          const parentFormat = await this.lookup<Format>(format.parent);\n          if (parentFormat === undefined) {\n            throw new Error(`Unable to locate the format class ${format.parent.name} in the merged schema.`);\n          }\n\n          const unitAndLabels: Array<[Unit | InvertedUnit, string | undefined]> | undefined = [];\n          if (format.units !== undefined) {\n            for (const [unit, label] of format.units) {\n              const targetUnit = await this.lookup<Unit | InvertedUnit>(unit);\n              if (targetUnit === undefined) {\n                throw new Error(`Unable to locate the unit class ${unit.name} in the merged schema.`);\n              }\n              unitAndLabels.push([targetUnit, label]);\n            }\n          }\n          const overrideFormat = await this.context.editor.kindOfQuantities.createFormatOverride(itemKey, parentFormat.key, format.precision, unitAndLabels);\n          await this.context.editor.kindOfQuantities.addPresentationOverrideFormat(itemKey, overrideFormat, isDefault);\n        } else {\n          const targetFormat = await this.lookup<Format>(format);\n          if (targetFormat === undefined) {\n            throw new Error(`Unable to locate the format class ${format.name} in the merged schema.`);\n          }\n          await this.context.editor.kindOfQuantities.addPresentationFormat(itemKey, targetFormat.key, isDefault);\n        }\n      }\n    }\n  }\n\n  /**\n   *\n   * Creates the property value resolver for [[KindOfQuantity]] items.\n   */\n  protected override async createPropertyValueResolver(): Promise<PropertyValueResolver<KindOfQuantity>> {\n    return {\n      persistenceUnit: (newValue, targetItemKey, oldValue) => {\n        if (oldValue !== undefined && oldValue !== newValue) {\n          throw new Error(`Changing the kind of quantity '${targetItemKey.name}' persistenceUnit is not supported.`);\n        }\n        const [schemaName, itemName] = SchemaItem.parseFullName(newValue);\n        if (this.context.targetSchema.getReferenceSync(schemaName) === undefined) {\n          return `${targetItemKey.schemaName}.${itemName}`;\n        }\n        return newValue;\n      },\n    };\n  }\n}\n"]}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"PrimitiveOrEnumPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/PrimitiveOrEnumPropertyMerger.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 { Enumeration, EnumerationProperty, EnumerationPropertyProps, PrimitiveOrEnumPropertyBase, PrimitiveProperty, PrimitivePropertyProps, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\r\nimport { PropertyEditResults } from \"../Editing/Editor\";\r\nimport { MutablePrimitiveOrEnumPropertyBase } from \"../Editing/Mutable/MutablePrimitiveOrEnumProperty\";\r\n\r\n/**\r\n * @internal\r\n */\r\nabstract class PrimitiveOrEnumPropertyMerger<TPrimitiveOrEnumPropertyBase extends PrimitiveOrEnumPropertyBase> extends AnyPropertyMerger<TPrimitiveOrEnumPropertyBase> {\r\n  public override async mergeAttributes(property: TPrimitiveOrEnumPropertyBase, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\r\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\r\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\r\n      return results;\r\n    }\r\n\r\n    const mutableProperty = property as unknown as MutablePrimitiveOrEnumPropertyBase;\r\n    switch (attributeName) {\r\n      case \"extendedTypeName\": {\r\n        mutableProperty.setExtendedTypeName(attributeNewValue);\r\n        return true;\r\n      }\r\n      case \"minLength\": {\r\n        mutableProperty.setMinLength(attributeNewValue);\r\n        return true;\r\n      }\r\n      case \"maxLength\": {\r\n        mutableProperty.setMaxLength(attributeNewValue);\r\n        return true;\r\n      }\r\n      case \"minValue\": {\r\n        mutableProperty.setMinValue(attributeNewValue);\r\n        return true;\r\n      }\r\n      case \"maxValue\": {\r\n        mutableProperty.setMaxValue(attributeNewValue);\r\n        return true;\r\n      }\r\n    }\r\n    return false;\r\n  }\r\n}\r\n\r\n/**\r\n * @internal\r\n */\r\nexport class PrimitivePropertyMerger extends PrimitiveOrEnumPropertyMerger<PrimitiveProperty> {\r\n  public override async createFromProps(classKey: SchemaItemKey, property: PrimitiveProperty): Promise<PropertyEditResults> {\r\n    const results = await super.getPropertyProps(property);\r\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\r\n      return results;\r\n    }\r\n\r\n    const props: PrimitivePropertyProps = {\r\n      ...property.toJSON(),\r\n      ...results,\r\n    };\r\n    return this.context.editor.entities.createPrimitivePropertyFromProps(classKey, property.name, property.primitiveType, props);\r\n  }\r\n}\r\n\r\n/**\r\n * @internal\r\n */\r\nexport class EnumerationPropertyMerger extends PrimitiveOrEnumPropertyMerger<EnumerationProperty> {\r\n  public override async mergeAttributes(property: EnumerationProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\r\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\r\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\r\n      return results;\r\n    }\r\n\r\n    switch (attributeName) {\r\n      case \"enumeration\": {\r\n        if (attributeOldValue !== undefined) {\r\n          return { errorMessage: `Changing the property '${property.name}' enumeration is not supported.` };\r\n        }\r\n        return true;\r\n      }\r\n    }\r\n    return false;\r\n  }\r\n\r\n  public override async createFromProps(classKey: SchemaItemKey, property: EnumerationProperty): Promise<PropertyEditResults> {\r\n    const results = await super.getPropertyProps(property);\r\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\r\n      return results;\r\n    }\r\n\r\n    if (property.enumeration === undefined) {\r\n      return { errorMessage: `Property ${property.fullName} is missing the required 'enumeration' attribute.` };\r\n    }\r\n\r\n    const enumeration = await property.enumeration;\r\n    const itemKey = new SchemaItemKey(enumeration.name, this.context.sourceSchema.schemaKey.matches(enumeration.schema.schemaKey)\r\n      ? this.context.targetSchema.schemaKey\r\n      : enumeration.schema.schemaKey,\r\n    );\r\n    const type = await this.context.targetSchema.lookupItem<Enumeration>(itemKey);\r\n    if (type === undefined) {\r\n      return { errorMessage: `Unable to locate the enumeration class ${enumeration.name} in the merged schema.` };\r\n    }\r\n\r\n    const props: EnumerationPropertyProps = {\r\n      ...property.toJSON(),\r\n      ...results,\r\n      typeName: type.fullName,\r\n    };\r\n    return this.context.editor.entities.createEnumerationPropertyFromProps(classKey, property.name, type, props);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"PrimitiveOrEnumPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/PrimitiveOrEnumPropertyMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { Enumeration, EnumerationProperty, EnumerationPropertyProps, PrimitiveOrEnumPropertyBase, PrimitiveProperty, PrimitivePropertyProps, SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\nimport { PropertyEditResults } from \"../Editing/Editor\";\nimport { MutablePrimitiveOrEnumPropertyBase } from \"../Editing/Mutable/MutablePrimitiveOrEnumProperty\";\n\n/**\n * @internal\n */\nabstract class PrimitiveOrEnumPropertyMerger<TPrimitiveOrEnumPropertyBase extends PrimitiveOrEnumPropertyBase> extends AnyPropertyMerger<TPrimitiveOrEnumPropertyBase> {\n  public override async mergeAttributes(property: TPrimitiveOrEnumPropertyBase, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const mutableProperty = property as unknown as MutablePrimitiveOrEnumPropertyBase;\n    switch (attributeName) {\n      case \"extendedTypeName\": {\n        mutableProperty.setExtendedTypeName(attributeNewValue);\n        return true;\n      }\n      case \"minLength\": {\n        mutableProperty.setMinLength(attributeNewValue);\n        return true;\n      }\n      case \"maxLength\": {\n        mutableProperty.setMaxLength(attributeNewValue);\n        return true;\n      }\n      case \"minValue\": {\n        mutableProperty.setMinValue(attributeNewValue);\n        return true;\n      }\n      case \"maxValue\": {\n        mutableProperty.setMaxValue(attributeNewValue);\n        return true;\n      }\n    }\n    return false;\n  }\n}\n\n/**\n * @internal\n */\nexport class PrimitivePropertyMerger extends PrimitiveOrEnumPropertyMerger<PrimitiveProperty> {\n  public override async createFromProps(classKey: SchemaItemKey, property: PrimitiveProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const props: PrimitivePropertyProps = {\n      ...property.toJSON(),\n      ...results,\n    };\n    return this.context.editor.entities.createPrimitivePropertyFromProps(classKey, property.name, property.primitiveType, props);\n  }\n}\n\n/**\n * @internal\n */\nexport class EnumerationPropertyMerger extends PrimitiveOrEnumPropertyMerger<EnumerationProperty> {\n  public override async mergeAttributes(property: EnumerationProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch (attributeName) {\n      case \"enumeration\": {\n        if (attributeOldValue !== undefined) {\n          return { errorMessage: `Changing the property '${property.name}' enumeration is not supported.` };\n        }\n        return true;\n      }\n    }\n    return false;\n  }\n\n  public override async createFromProps(classKey: SchemaItemKey, property: EnumerationProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    if (property.enumeration === undefined) {\n      return { errorMessage: `Property ${property.fullName} is missing the required 'enumeration' attribute.` };\n    }\n\n    const enumeration = await property.enumeration;\n    const itemKey = new SchemaItemKey(enumeration.name, this.context.sourceSchema.schemaKey.matches(enumeration.schema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : enumeration.schema.schemaKey,\n    );\n    const type = await this.context.targetSchema.lookupItem<Enumeration>(itemKey);\n    if (type === undefined) {\n      return { errorMessage: `Unable to locate the enumeration class ${enumeration.name} in the merged schema.` };\n    }\n\n    const props: EnumerationPropertyProps = {\n      ...property.toJSON(),\n      ...results,\n      typeName: type.fullName,\n    };\n    return this.context.editor.entities.createEnumerationPropertyFromProps(classKey, property.name, type, props);\n  }\n}\n"]}

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,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"}
+{"version":3,"file":"SchemaItemFactory.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyH,UAAU,EAAE,aAAa,EAAsC,MAAM,0BAA0B,CAAC;AAEhO,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;CA0DF"}

package/lib/cjs/Merging/SchemaItemFactory.js

@@ -55,6 +55,16 @@ var SchemaItemFactory;
                 : phenomenon.key;
             return editor.constants.create(targetSchemaKey, template.name, itemKey, template.definition);
         }
+        if (is(template, ecschema_metadata_1.KindOfQuantity)) {
+            if (template.persistenceUnit === undefined) {
+                throw new Error(`Invalid KindOfQuantity ${template.name} has no persistenceUnit defined`);
+            }
+            const persistenceUnit = await template.persistenceUnit;
+            const itemKey = persistenceUnit.key.schemaKey.matches(template.key.schemaKey)
+                ? new ecschema_metadata_1.SchemaItemKey(persistenceUnit.name, targetSchemaKey)
+                : persistenceUnit.key;
+            return editor.kindOfQuantities.create(targetSchemaKey, template.name, itemKey);
+        }
         if (is(template, ecschema_metadata_1.UnitSystem))
             return editor.unitSystems.create(targetSchemaKey, template.name);
         throw new Error(`Unsupported Schema Item Type: ${template.constructor.name}`);

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

@@ -1 +1 @@
-{"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"]}
+{"version":3,"file":"SchemaItemFactory.js","sourceRoot":"","sources":["../../../src/Merging/SchemaItemFactory.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { Constant, CustomAttributeClass, EntityClass, Enumeration, KindOfQuantity, Phenomenon, PrimitiveType, PropertyCategory, SchemaItem, SchemaItemKey, SchemaKey, StructClass, UnitSystem } from \"@itwin/ecschema-metadata\";\nimport { SchemaContextEditor, SchemaItemEditResults } from \"../Editing/Editor\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\n/**\n * @internal\n */\nexport namespace SchemaItemFactory {\n\n  /**\n   * Creates a new Schema Item based on the given template instance.\n   * @param context   The current merging context.\n   * @param template  The Schema Items Template\n   * @returns         The SchemaItemKey of the created item.\n   */\n  export async function create(context: SchemaMergeContext, template: SchemaItem): Promise<SchemaItemKey> {\n    const result = await createItem(context.editor, context.targetSchema.schemaKey, template);\n    if(result.errorMessage) {\n      throw new Error(result.errorMessage);\n    }\n    return result.itemKey!;\n  }\n\n  /**\n   * Creates a new Schema Item in the SchemaContextEditor.\n   * @param editor          The SchemaContextEditor\n   * @param targetSchemaKey The key of the target schema the item shall be created in.\n   * @param template        The Schema Items Template\n   * @returns               A SchemaItemEditResults with a schema key if the item could be created.\n   */\n  async function createItem(editor: SchemaContextEditor, targetSchemaKey: SchemaKey, template: SchemaItem): Promise<SchemaItemEditResults> {\n    if (is(template, Enumeration))\n      return editor.enumerations.create(targetSchemaKey, template.name, template.isInt ? PrimitiveType.Integer : PrimitiveType.String, template.label, template.isStrict);\n    if (is(template, EntityClass))\n      return editor.entities.create(targetSchemaKey, template.name, template.modifier);\n    if (is(template, StructClass))\n      return editor.structs.create(targetSchemaKey, template.name);\n    if (is(template, CustomAttributeClass))\n      return editor.customAttributes.create(targetSchemaKey, template.name, template.containerType);\n    if(is(template, PropertyCategory))\n      return editor.propertyCategories.create(targetSchemaKey, template.name, template.priority);\n    if (is(template, Phenomenon))\n      return editor.phenomenons.create(targetSchemaKey, template.name, template.definition);\n    if (is(template, Constant)) {\n      if(template.phenomenon === undefined) {\n        throw new Error(`Invalid Constant ${template.name} has no phenomenon defined`);\n      }\n      const phenomenon = await template.phenomenon;\n      const itemKey = phenomenon.key.schemaKey.matches(template.key.schemaKey)\n        ? new SchemaItemKey(phenomenon.name, targetSchemaKey)\n        : phenomenon.key;\n\n      return editor.constants.create(targetSchemaKey, template.name, itemKey, template.definition);\n    }\n    if (is(template, KindOfQuantity)) {\n      if(template.persistenceUnit === undefined) {\n        throw new Error(`Invalid KindOfQuantity ${template.name} has no persistenceUnit defined`);\n      }\n      const persistenceUnit = await template.persistenceUnit;\n      const itemKey = persistenceUnit.key.schemaKey.matches(template.key.schemaKey)\n        ? new SchemaItemKey(persistenceUnit.name, targetSchemaKey)\n        : persistenceUnit.key;\n      return editor.kindOfQuantities.create(targetSchemaKey, template.name, itemKey);\n    }\n    if (is(template, UnitSystem))\n      return editor.unitSystems.create(targetSchemaKey, template.name);\n\n    throw new Error(`Unsupported Schema Item Type: ${template.constructor.name}`);\n  }\n\n  /**\n   * Type Guard to \"cast\" a given schema item into an implementation\n   * @param item  Item to be checked\n   * @param type  The desired implementation.\n   * @returns     true if the item could be casted, otherwise false.\n   */\n  function is<T extends SchemaItem>(item: SchemaItem, type: new (...args: any) => T ): item is T {\n    return item instanceof type;\n  }\n}\n"]}

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

@@ -6,7 +6,7 @@ import { SchemaMergeContext } from "./SchemaMerger";
  * @internal
  */
 export type PropertyValueResolver<T extends SchemaItem, TProps = MutableSchemaItemProps<T>> = {
-    [P in keyof TProps]?: (value: any, item: SchemaItemKey) => any;
+    [P in keyof TProps]?: (newValue: any, item: SchemaItemKey, oldValue?: any) => any;
 };
 /**
  * Defines a Mutable Schema Props interface.
@@ -43,6 +43,7 @@ export declare class SchemaItemMerger<TItem extends SchemaItem> {
      * @param _change   The schema item change to be applied.
      */
     protected merge(_itemKey: SchemaItemKey, _source: TItem, _change: SchemaItemChanges): Promise<void>;
+    protected lookup<T extends SchemaItem>(schemaItem: T): Promise<T | undefined>;
     /**
      * Merges the given schema item changes in the current context.
      * @param context             The merging context

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,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"}
+{"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,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,GAAG,KAAK,GAAG;CAClF,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;cAIzE,MAAM,CAAC,CAAC,SAAS,UAAU,EAAE,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAQnF;;;;OAIG;WACiB,YAAY,CAAC,OAAO,SAAS,iBAAiB,EAAE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC;IAyBrI;;;;OAIG;YACW,uBAAuB;CAoBtC"}

package/lib/cjs/Merging/SchemaItemMerger.js

@@ -43,6 +43,12 @@ class SchemaItemMerger {
     async merge(_itemKey, _source, _change) {
         // Can be overriden for complex merging
     }
+    async lookup(schemaItem) {
+        const itemKey = new ecschema_metadata_1.SchemaItemKey(schemaItem.name, this.context.sourceSchema.schemaKey.matches(schemaItem.schema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : schemaItem.schema.schemaKey);
+        return this.context.targetSchema.lookupItem(itemKey);
+    }
     /**
      * Merges the given schema item changes in the current context.
      * @param context             The merging context
@@ -79,14 +85,15 @@ class SchemaItemMerger {
         if (changes.length === 0) {
             return;
         }
-        const jsonProps = {};
+        const targetItem = (await this.context.targetSchema.lookupItem(targetItemKey));
+        const jsonProps = (targetItem?.toJSON() ?? {});
         const propertyResolver = await this.createPropertyValueResolver();
         for (const change of changes) {
-            const [propertyName, propertyValue] = change.diagnostic.messageArgs;
+            const [propertyName, propertyNewValue, propertyOldValue] = change.diagnostic.messageArgs;
             const resolver = propertyResolver[propertyName];
             jsonProps[propertyName] = resolver !== undefined
-                ? resolver(propertyValue, targetItemKey)
-                : propertyValue;
+                ? resolver(propertyNewValue, targetItemKey, propertyOldValue)
+                : propertyNewValue;
         }
         await this.context.editor.schemaItems.applyProps(targetItemKey, jsonProps);
     }