@itwin/ecschema-editing 5.0.0-dev.8 → 5.0.0-dev.82

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

@@ -1,4 +1,4 @@
-import { AnySchemaDifference, ClassPropertyDifference, ConstantDifference, CustomAttributeClassDifference, CustomAttributeDifference, EntityClassDifference, EntityClassMixinDifference, EnumerationDifference, EnumeratorDifference, FormatDifference, InvertedUnitDifference, KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference, MixinClassDifference, PhenomenonDifference, PropertyCategoryDifference, RelationshipClassDifference, RelationshipConstraintClassDifference, RelationshipConstraintDifference, SchemaDifference, SchemaReferenceDifference, StructClassDifference, UnitDifference, UnitSystemDifference } from "../Differencing/SchemaDifference";
+import { AnySchemaDifference, ClassPropertyDifference, ConstantDifference, CustomAttributeClassDifference, CustomAttributeDifference, EntityClassDifference, EntityClassMixinDifference, EnumerationDifference, EnumeratorDifference, FormatDifference, FormatUnitDifference, FormatUnitLabelDifference, InvertedUnitDifference, KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference, MixinClassDifference, PhenomenonDifference, PropertyCategoryDifference, RelationshipClassDifference, RelationshipConstraintClassDifference, RelationshipConstraintDifference, SchemaDifference, SchemaReferenceDifference, StructClassDifference, UnitDifference, UnitSystemDifference } from "../Differencing/SchemaDifference";
 import { SchemaDifferenceVisitor } from "../Differencing/SchemaDifferenceVisitor";
 import { SchemaMergeContext } from "./SchemaMerger";
 /**
@@ -12,10 +12,6 @@ export declare class SchemaMergingVisitor implements SchemaDifferenceVisitor {
      * Initializes a new instance of SchemaMergingVisitor class.
      */
     constructor(context: SchemaMergeContext);
-    /**
-     * Gets a SchemaItemKey for the given item name.
-     */
-    private toItemKey;
     /**
      * Shared merging logic for all types of ClassItemDifference union.
      */
@@ -59,12 +55,22 @@ export declare class SchemaMergingVisitor implements SchemaDifferenceVisitor {
      * Visitor implementation for handling FormatDifference.
      * @internal
      */
-    visitFormatDifference(_entry: FormatDifference): Promise<void>;
+    visitFormatDifference(entry: FormatDifference): Promise<void>;
+    /**
+     * Visitor implementation for handling FormatUnitDifference.
+     * @internal
+     */
+    visitFormatUnitDifference(entry: FormatUnitDifference): Promise<void>;
+    /**
+     * Visitor implementation for handling FormatUnitLabelDifference.
+     * @internal
+     */
+    visitFormatUnitLabelDifference(entry: FormatUnitLabelDifference): Promise<void>;
     /**
      * Visitor implementation for handling InvertedUnitDifference.
      * @internal
      */
-    visitInvertedUnitDifference(_entry: InvertedUnitDifference): Promise<void>;
+    visitInvertedUnitDifference(entry: InvertedUnitDifference): Promise<void>;
     /**
      * Visitor implementation for handling KindOfQuantityDifference.
      * @internal
@@ -128,7 +134,7 @@ export declare class SchemaMergingVisitor implements SchemaDifferenceVisitor {
      * Visitor implementation for handling UnitDifference.
      * @internal
      */
-    visitUnitDifference(_entry: UnitDifference): Promise<void>;
+    visitUnitDifference(entry: UnitDifference): Promise<void>;
     /**
      * Visitor implementation for handling UnitSystemDifference.
      * @internal

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMergingVisitor.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaMergingVisitor.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingVisitor.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,mBAAmB,EAA2B,uBAAuB,EACpG,kBAAkB,EAAE,8BAA8B,EAAE,yBAAyB,EAAE,qBAAqB,EACpG,0BAA0B,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAoB,EAC/G,yBAAyB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,0CAA0C,EACvH,oBAAoB,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,2BAA2B,EACnG,qCAAqC,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,yBAAyB,EACpH,qBAAqB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAiBxG,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAYpD;;;;GAIG;AACH,qBAAa,oBAAqB,YAAW,uBAAuB;IAElE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAE9C;;OAEG;gBACS,OAAO,EAAE,kBAAkB;IAIvC;;OAEG;YACW,oBAAoB;IAmClC;;;OAGG;IACU,uBAAuB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9E;;;OAGG;IACU,mCAAmC,CAAC,KAAK,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnJ;;;OAGG;IACU,sCAAsC,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMpG;;;OAGG;IACU,0BAA0B,CAAC,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjI;;;OAGG;IACU,+BAA+B,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F;;;OAGG;IACU,0BAA0B,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpF;;;OAGG;IACU,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF;;;OAGG;IACU,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1E;;;OAGG;IACU,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF;;;OAGG;IACU,8BAA8B,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5F;;;OAGG;IACU,2BAA2B,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtF;;;OAGG;IACU,6BAA6B,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1F;;;OAGG;IACU,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1H;;;OAGG;IACU,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF;;;OAGG;IACU,+BAA+B,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9F;;;OAGG;IACU,uBAAuB,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInF;;;OAGG;IACU,gCAAgC,CAAC,KAAK,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7I;;;OAGG;IACU,0CAA0C,CAAC,KAAK,EAAE,qCAAqC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpH;;;OAGG;IACU,qCAAqC,CAAC,KAAK,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1G;;;OAGG;IACU,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IASnF;;OAEG;YACW,yBAAyB;IAevC;;;OAGG;IACU,8BAA8B,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5F;;;OAGG;IACU,0BAA0B,CAAC,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjI;;;OAGG;IACU,mBAAmB,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtE;;;OAGG;IACU,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF;;;MAGE;IACW,+CAA+C,CAAC,KAAK,EAAE,0CAA0C,GAAG,OAAO,CAAC,IAAI,CAAC;CAK/H"}

package/lib/cjs/Merging/SchemaMergingVisitor.js

@@ -17,25 +17,23 @@ const StructClassMerger_1 = require("./StructClassMerger");
 const UnitSystemMerger_1 = require("./UnitSystemMerger");
 const PropertyMerger_1 = require("./PropertyMerger");
 const Utils_1 = require("../Differencing/Utils");
-const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const Utils_2 = require("./Utils");
+const UnitMerger_1 = require("./UnitMerger");
+const InvertedUnitMerger_1 = require("./InvertedUnitMerger");
+const FormatMerger_1 = require("./FormatMerger");
 /**
  * Implementation of ISchemaDifferenceVisitor that can be used to traverse schema
  * differences to call the appropriated merger methods.
  * @internal
  */
 class SchemaMergingVisitor {
+    _context;
     /**
      * Initializes a new instance of SchemaMergingVisitor class.
      */
     constructor(context) {
         this._context = context;
     }
-    /**
-     * Gets a SchemaItemKey for the given item name.
-     */
-    toItemKey(itemName) {
-        return new ecschema_metadata_1.SchemaItemKey(itemName, this._context.targetSchemaKey);
-    }
     /**
      * Shared merging logic for all types of ClassItemDifference union.
      */
@@ -65,7 +63,7 @@ class SchemaMergingVisitor {
                 }
                 // Now both a modification change or the second add iteration is a modification of an existing class.
                 // So, regardless of the actual change type, modify is called.
-                return handler.modify(this._context, entry, this.toItemKey(entry.itemName));
+                return handler.modify(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
             },
             modify: handler.modify,
         });
@@ -135,22 +133,46 @@ class SchemaMergingVisitor {
     async visitEnumeratorDifference(entry) {
         switch (entry.changeType) {
             case "add": return (0, EnumeratorMerger_1.addEnumerator)(this._context, entry);
-            case "modify": return (0, EnumeratorMerger_1.modifyEnumerator)(this._context, entry, this.toItemKey(entry.itemName));
+            case "modify": return (0, EnumeratorMerger_1.modifyEnumerator)(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
         }
     }
     /**
      * Visitor implementation for handling FormatDifference.
      * @internal
      */
-    async visitFormatDifference(_entry) {
-        // TODO: Add merger handler...
+    async visitFormatDifference(entry) {
+        return this.visitSchemaItemDifference(entry, {
+            add: FormatMerger_1.addFormat,
+            modify: FormatMerger_1.modifyFormat,
+        });
+    }
+    /**
+     * Visitor implementation for handling FormatUnitDifference.
+     * @internal
+     */
+    async visitFormatUnitDifference(entry) {
+        switch (entry.changeType) {
+            case "modify": return (0, FormatMerger_1.modifyFormatUnit)(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
+        }
+    }
+    /**
+     * Visitor implementation for handling FormatUnitLabelDifference.
+     * @internal
+     */
+    async visitFormatUnitLabelDifference(entry) {
+        switch (entry.changeType) {
+            case "modify": return (0, FormatMerger_1.modifyFormatUnitLabel)(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
+        }
     }
     /**
      * Visitor implementation for handling InvertedUnitDifference.
      * @internal
      */
-    async visitInvertedUnitDifference(_entry) {
-        // TODO: Add merger handler...
+    async visitInvertedUnitDifference(entry) {
+        return this.visitSchemaItemDifference(entry, {
+            add: InvertedUnitMerger_1.addInvertedUnit,
+            modify: InvertedUnitMerger_1.modifyInvertedUnit,
+        });
     }
     /**
      * Visitor implementation for handling KindOfQuantityDifference.
@@ -248,7 +270,7 @@ class SchemaMergingVisitor {
                     if ("schemaItemType" in entry.difference && entry.difference.schemaItemType !== entry.schemaType) {
                         throw new Error(`Changing the type of item '${entry.itemName}' not supported.`);
                     }
-                    return handler.modify(this._context, entry, this.toItemKey(entry.itemName));
+                    return handler.modify(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
                 }
                 ;
         }
@@ -277,8 +299,11 @@ class SchemaMergingVisitor {
      * Visitor implementation for handling UnitDifference.
      * @internal
      */
-    async visitUnitDifference(_entry) {
-        // TODO: Add merger handler...
+    async visitUnitDifference(entry) {
+        return this.visitSchemaItemDifference(entry, {
+            add: UnitMerger_1.addUnit,
+            modify: UnitMerger_1.modifyUnit,
+        });
     }
     /**
      * Visitor implementation for handling UnitSystemDifference.
@@ -296,7 +321,7 @@ class SchemaMergingVisitor {
     */
     async visitKindOfQuantityPresentationFormatDifference(entry) {
         switch (entry.changeType) {
-            case "add": return (0, KindOfQuantityMerger_1.addPresentationFormat)(this._context, entry);
+            case "add": return (0, KindOfQuantityMerger_1.addPresentationFormat)(this._context, entry, (0, Utils_2.toItemKey)(this._context, entry.itemName));
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMergingVisitor.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingVisitor.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 { AnyClassItemDifference, AnySchemaDifference, AnySchemaItemDifference, ClassPropertyDifference, ConstantDifference, CustomAttributeClassDifference, CustomAttributeDifference, EntityClassDifference, EntityClassMixinDifference, EnumerationDifference, EnumeratorDifference, FormatDifference, InvertedUnitDifference, KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference, MixinClassDifference, PhenomenonDifference, PropertyCategoryDifference, RelationshipClassDifference, RelationshipConstraintClassDifference, RelationshipConstraintDifference, SchemaDifference, SchemaReferenceDifference, StructClassDifference, UnitDifference, UnitSystemDifference } from \"../Differencing/SchemaDifference\";\nimport { addConstant, modifyConstant } from \"./ConstantMerger\";\nimport { addCustomAttribute } from \"./CustomAttributeMerger\";\nimport { addCustomAttributeClass, modifyCustomAttributeClass } from \"./CustomAttributeClassMerger\";\nimport { addClassMixins, addEntityClass, modifyEntityClass } from \"./EntityClassMerger\";\nimport { addEnumeration, modifyEnumeration } from \"./EnumerationMerger\";\nimport { addEnumerator, modifyEnumerator } from \"./EnumeratorMerger\";\nimport { addKindOfQuantity, addPresentationFormat, modifyKindOfQuantity } from \"./KindOfQuantityMerger\";\nimport { addMixinClass, modifyMixinClass } from \"./MixinMerger\";\nimport { addPhenomenon, modifyPhenomenon } from \"./PhenomenonMerger\";\nimport { addPropertyCategory, modifyPropertyCategory } from \"./PropertyCategoryMerger\";\nimport { addRelationshipClass, mergeRelationshipClassConstraint, mergeRelationshipConstraint, modifyRelationshipClass } from \"./RelationshipClassMerger\";\nimport { addSchemaReferences, modifySchemaReferences } from \"./SchemaReferenceMerger\";\nimport { addStructClass, modifyStructClass } from \"./StructClassMerger\";\nimport { addUnitSystem, modifyUnitSystem } from \"./UnitSystemMerger\";\nimport { mergePropertyDifference } from \"./PropertyMerger\";\nimport { isClassDifference } from \"../Differencing/Utils\";\nimport { SchemaDifferenceVisitor } from \"../Differencing/SchemaDifferenceVisitor\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\n/** Definition of schema items change type handler array. */\ninterface ItemChangeTypeHandler<T extends AnySchemaDifference> {\n  add: (context: SchemaMergeContext, entry: T) => Promise<void>;\n  modify: (context: SchemaMergeContext, entry: T, key: SchemaItemKey) => Promise<void>;\n}\n\n/**\n * Implementation of ISchemaDifferenceVisitor that can be used to traverse schema\n * differences to call the appropriated merger methods.\n * @internal\n */\nexport class SchemaMergingVisitor implements SchemaDifferenceVisitor {\n\n  private readonly _context: SchemaMergeContext;\n\n  /**\n   * Initializes a new instance of SchemaMergingVisitor class.\n   */\n  constructor(context: SchemaMergeContext) {\n    this._context = context;\n  }\n\n  /**\n   * Gets a SchemaItemKey for the given item name.\n   */\n  private toItemKey(itemName: string): SchemaItemKey {\n    return new SchemaItemKey(itemName, this._context.targetSchemaKey);\n  }\n\n  /**\n   * Shared merging logic for all types of ClassItemDifference union.\n   */\n  private async visitClassDifference<T extends AnyClassItemDifference>(entry: T, index: number, array: AnySchemaDifference[], handler: ItemChangeTypeHandler<T>) {\n    return this.visitSchemaItemDifference(entry, {\n      add: async (context) => {\n        // To add classes a slightly different approach is done. In fact the class entries gets processed\n        // two times. The first time, a stub with the bare minimum is added to the schema. The second time,\n        // the class gets completed with all properties, mixins, etc...\n        if(entry.changeType === \"add\" && !await context.targetSchema.getItem(entry.itemName)) {\n          await handler.add(this._context, {\n            ...entry,\n            difference: {\n              ...entry.difference,\n              // Remove everything we want to validate before setting, this is done in the second iteration.\n              baseClass: undefined,\n              mixins: undefined,\n              properties: undefined,\n              customAttributes: undefined,\n            },\n          });\n\n          // Searches for the last class difference and adds the entry after it. That way,\n          // the class is completed before class related entries get processed.\n          const insertIndex = findIndexOf(array, (e) => !isClassDifference(e), index) || array.length;\n          array.splice(insertIndex, 0, entry);\n\n          return;\n        }\n\n        // Now both a modification change or the second add iteration is a modification of an existing class.\n        // So, regardless of the actual change type, modify is called.\n        return handler.modify(this._context, entry, this.toItemKey(entry.itemName));\n      },\n      modify: handler.modify,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling ConstantDifference.\n   * @internal\n   */\n  public async visitConstantDifference(entry: ConstantDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addConstant,\n      modify: modifyConstant,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling CustomAttributeClassDifference.\n   * @internal\n   */\n  public async visitCustomAttributeClassDifference(entry: CustomAttributeClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addCustomAttributeClass,\n      modify: modifyCustomAttributeClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling CustomAttributeDifference.\n   * @internal\n   */\n  public async visitCustomAttributeInstanceDifference(entry: CustomAttributeDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addCustomAttribute(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling EntityClassDifference.\n   * @internal\n   */\n  public async visitEntityClassDifference(entry: EntityClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addEntityClass,\n      modify: modifyEntityClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling EntityClassMixinDifference.\n   * @internal\n   */\n  public async visitEntityClassMixinDifference(entry: EntityClassMixinDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addClassMixins(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling EnumerationDifference.\n   * @internal\n   */\n  public async visitEnumerationDifference(entry: EnumerationDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addEnumeration,\n      modify: modifyEnumeration,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling EnumeratorDifference.\n   * @internal\n   */\n  public async visitEnumeratorDifference(entry: EnumeratorDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addEnumerator(this._context, entry);\n      case \"modify\": return modifyEnumerator(this._context, entry, this.toItemKey(entry.itemName));\n    }\n  }\n\n  /**\n   * Visitor implementation for handling FormatDifference.\n   * @internal\n   */\n  public async visitFormatDifference(_entry: FormatDifference): Promise<void> {\n    // TODO: Add merger handler...\n  }\n\n  /**\n   * Visitor implementation for handling InvertedUnitDifference.\n   * @internal\n   */\n  public async visitInvertedUnitDifference(_entry: InvertedUnitDifference): Promise<void> {\n    // TODO: Add merger handler...\n  }\n\n  /**\n   * Visitor implementation for handling KindOfQuantityDifference.\n   * @internal\n   */\n  public async visitKindOfQuantityDifference(entry: KindOfQuantityDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addKindOfQuantity,\n      modify: modifyKindOfQuantity,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling MixinClassDifference.\n   * @internal\n   */\n  public async visitMixinDifference(entry: MixinClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addMixinClass,\n      modify: modifyMixinClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling PhenomenonDifference.\n   * @internal\n   */\n  public async visitPhenomenonDifference(entry: PhenomenonDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addPhenomenon,\n      modify: modifyPhenomenon,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling PropertyCategoryDifference.\n   * @internal\n   */\n  public async visitPropertyCategoryDifference(entry: PropertyCategoryDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addPropertyCategory,\n      modify: modifyPropertyCategory,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling ClassPropertyDifference.\n   * @internal\n   */\n  public async visitPropertyDifference(entry: ClassPropertyDifference): Promise<void> {\n    await mergePropertyDifference(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipClassDifference.\n   * @internal\n   */\n  public async visitRelationshipClassDifference(entry: RelationshipClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addRelationshipClass,\n      modify: modifyRelationshipClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipConstraintClassDifference.\n   * @internal\n   */\n  public async visitRelationshipConstraintClassDifference(entry: RelationshipConstraintClassDifference): Promise<void> {\n    await mergeRelationshipClassConstraint(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipConstraintDifference.\n   * @internal\n   */\n  public async visitRelationshipConstraintDifference(entry: RelationshipConstraintDifference): Promise<void> {\n    await mergeRelationshipConstraint(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling SchemaDifference.\n   * @internal\n   */\n  public async visitSchemaDifference({ difference }: SchemaDifference): Promise<void> {\n    if (difference.label !== undefined) {\n      await this._context.editor.setDisplayLabel(this._context.targetSchemaKey, difference.label);\n    }\n    if (difference.description !== undefined) {\n      await this._context.editor.setDescription(this._context.targetSchemaKey, difference.description);\n    }\n  }\n\n  /**\n   * Shared merging logic for all types of AnySchemaItemDifference union.\n   */\n  private async visitSchemaItemDifference<T extends AnySchemaItemDifference>(entry: T, handler: ItemChangeTypeHandler<T>) {\n    switch(entry.changeType) {\n      case \"add\": {\n        return handler.add(this._context, entry);\n      }\n      case \"modify\": {\n        if(\"schemaItemType\" in entry.difference && entry.difference.schemaItemType !== entry.schemaType) {\n          throw new Error(`Changing the type of item '${entry.itemName}' not supported.`);\n        }\n\n        return handler.modify(this._context, entry, this.toItemKey(entry.itemName));\n      };\n    }\n  }\n\n  /**\n   * Visitor implementation for handling SchemaReferenceDifference.\n   * @internal\n   */\n  public async visitSchemaReferenceDifference(entry: SchemaReferenceDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addSchemaReferences(this._context, entry);\n      case \"modify\": return modifySchemaReferences(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling StructClassDifference.\n   * @internal\n   */\n  public async visitStructClassDifference(entry: StructClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addStructClass,\n      modify: modifyStructClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling UnitDifference.\n   * @internal\n   */\n  public async visitUnitDifference(_entry: UnitDifference): Promise<void> {\n    // TODO: Add merger handler...\n  }\n\n  /**\n   * Visitor implementation for handling UnitSystemDifference.\n   * @internal\n   */\n  public async visitUnitSystemDifference(entry: UnitSystemDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addUnitSystem,\n      modify: modifyUnitSystem,\n    });\n  }\n\n  /**\n  * Visitor implementation for handling KindOfQuantityPresentationFormatDifference.\n  * @internal\n  */\n  public async visitKindOfQuantityPresentationFormatDifference(entry: KindOfQuantityPresentationFormatDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addPresentationFormat(this._context, entry);\n    }\n  }\n}\n\n/**\n * Helper method to get the index of the first element in the array that satisfies the provided testing function.\n * @param array     Array to search.\n * @param predicate Function to execute on each value in the array.\n * @param fromIndex The index to start the search at.\n * @returns         An index in the array if an element passes the test; otherwise, false.\n */\nfunction findIndexOf(array: AnySchemaDifference[], predicate: (entry: AnySchemaDifference) => boolean, fromIndex: number) {\n  for (let i = fromIndex; i < array.length; i++) {\n    if (predicate(array[i]))\n      return i;\n  }\n  return false;\n}\n"]}
+{"version":3,"file":"SchemaMergingVisitor.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingVisitor.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 { AnyClassItemDifference, AnySchemaDifference, AnySchemaItemDifference, ClassPropertyDifference, \n  ConstantDifference, CustomAttributeClassDifference, CustomAttributeDifference, EntityClassDifference, \n  EntityClassMixinDifference, EnumerationDifference, EnumeratorDifference, FormatDifference, FormatUnitDifference, \n  FormatUnitLabelDifference, InvertedUnitDifference, KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference, \n  MixinClassDifference, PhenomenonDifference, PropertyCategoryDifference, RelationshipClassDifference, \n  RelationshipConstraintClassDifference, RelationshipConstraintDifference, SchemaDifference, SchemaReferenceDifference, \n  StructClassDifference, UnitDifference, UnitSystemDifference } from \"../Differencing/SchemaDifference\";\nimport { addConstant, modifyConstant } from \"./ConstantMerger\";\nimport { addCustomAttribute } from \"./CustomAttributeMerger\";\nimport { addCustomAttributeClass, modifyCustomAttributeClass } from \"./CustomAttributeClassMerger\";\nimport { addClassMixins, addEntityClass, modifyEntityClass } from \"./EntityClassMerger\";\nimport { addEnumeration, modifyEnumeration } from \"./EnumerationMerger\";\nimport { addEnumerator, modifyEnumerator } from \"./EnumeratorMerger\";\nimport { addKindOfQuantity, addPresentationFormat, modifyKindOfQuantity } from \"./KindOfQuantityMerger\";\nimport { addMixinClass, modifyMixinClass } from \"./MixinMerger\";\nimport { addPhenomenon, modifyPhenomenon } from \"./PhenomenonMerger\";\nimport { addPropertyCategory, modifyPropertyCategory } from \"./PropertyCategoryMerger\";\nimport { addRelationshipClass, mergeRelationshipClassConstraint, mergeRelationshipConstraint, modifyRelationshipClass } from \"./RelationshipClassMerger\";\nimport { addSchemaReferences, modifySchemaReferences } from \"./SchemaReferenceMerger\";\nimport { addStructClass, modifyStructClass } from \"./StructClassMerger\";\nimport { addUnitSystem, modifyUnitSystem } from \"./UnitSystemMerger\";\nimport { mergePropertyDifference } from \"./PropertyMerger\";\nimport { isClassDifference } from \"../Differencing/Utils\";\nimport { SchemaDifferenceVisitor } from \"../Differencing/SchemaDifferenceVisitor\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { toItemKey } from \"./Utils\";\nimport { addUnit, modifyUnit } from \"./UnitMerger\";\nimport { addInvertedUnit, modifyInvertedUnit } from \"./InvertedUnitMerger\";\nimport { addFormat, modifyFormat, modifyFormatUnit, modifyFormatUnitLabel } from \"./FormatMerger\";\n\n/** Definition of schema items change type handler array. */\ninterface ItemChangeTypeHandler<T extends AnySchemaDifference> {\n  add: (context: SchemaMergeContext, entry: T) => Promise<void>;\n  modify: (context: SchemaMergeContext, entry: T, key: SchemaItemKey) => Promise<void>;\n}\n\n/**\n * Implementation of ISchemaDifferenceVisitor that can be used to traverse schema\n * differences to call the appropriated merger methods.\n * @internal\n */\nexport class SchemaMergingVisitor implements SchemaDifferenceVisitor {\n\n  private readonly _context: SchemaMergeContext;\n\n  /**\n   * Initializes a new instance of SchemaMergingVisitor class.\n   */\n  constructor(context: SchemaMergeContext) {\n    this._context = context;\n  }\n\n  /**\n   * Shared merging logic for all types of ClassItemDifference union.\n   */\n  private async visitClassDifference<T extends AnyClassItemDifference>(entry: T, index: number, array: AnySchemaDifference[], handler: ItemChangeTypeHandler<T>) {\n    return this.visitSchemaItemDifference(entry, {\n      add: async (context) => {\n        // To add classes a slightly different approach is done. In fact the class entries gets processed\n        // two times. The first time, a stub with the bare minimum is added to the schema. The second time,\n        // the class gets completed with all properties, mixins, etc...\n        if(entry.changeType === \"add\" && !await context.targetSchema.getItem(entry.itemName)) {\n          await handler.add(this._context, {\n            ...entry,\n            difference: {\n              ...entry.difference,\n              // Remove everything we want to validate before setting, this is done in the second iteration.\n              baseClass: undefined,\n              mixins: undefined,\n              properties: undefined,\n              customAttributes: undefined,\n            },\n          });\n\n          // Searches for the last class difference and adds the entry after it. That way,\n          // the class is completed before class related entries get processed.\n          const insertIndex = findIndexOf(array, (e) => !isClassDifference(e), index) || array.length;\n          array.splice(insertIndex, 0, entry);\n\n          return;\n        }\n\n        // Now both a modification change or the second add iteration is a modification of an existing class.\n        // So, regardless of the actual change type, modify is called.\n        return handler.modify(this._context, entry, toItemKey(this._context, entry.itemName));\n      },\n      modify: handler.modify,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling ConstantDifference.\n   * @internal\n   */\n  public async visitConstantDifference(entry: ConstantDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addConstant,\n      modify: modifyConstant,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling CustomAttributeClassDifference.\n   * @internal\n   */\n  public async visitCustomAttributeClassDifference(entry: CustomAttributeClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addCustomAttributeClass,\n      modify: modifyCustomAttributeClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling CustomAttributeDifference.\n   * @internal\n   */\n  public async visitCustomAttributeInstanceDifference(entry: CustomAttributeDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addCustomAttribute(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling EntityClassDifference.\n   * @internal\n   */\n  public async visitEntityClassDifference(entry: EntityClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addEntityClass,\n      modify: modifyEntityClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling EntityClassMixinDifference.\n   * @internal\n   */\n  public async visitEntityClassMixinDifference(entry: EntityClassMixinDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addClassMixins(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling EnumerationDifference.\n   * @internal\n   */\n  public async visitEnumerationDifference(entry: EnumerationDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addEnumeration,\n      modify: modifyEnumeration,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling EnumeratorDifference.\n   * @internal\n   */\n  public async visitEnumeratorDifference(entry: EnumeratorDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addEnumerator(this._context, entry);\n      case \"modify\": return modifyEnumerator(this._context, entry, toItemKey(this._context, entry.itemName));\n    }\n  }\n\n  /**\n   * Visitor implementation for handling FormatDifference.\n   * @internal\n   */\n  public async visitFormatDifference(entry: FormatDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addFormat,\n      modify: modifyFormat,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling FormatUnitDifference.\n   * @internal\n   */\n  public async visitFormatUnitDifference(entry: FormatUnitDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"modify\": return modifyFormatUnit(this._context, entry, toItemKey(this._context, entry.itemName));\n    }\n  }\n\n  /**\n   * Visitor implementation for handling FormatUnitLabelDifference.\n   * @internal\n   */\n  public async visitFormatUnitLabelDifference(entry: FormatUnitLabelDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"modify\": return modifyFormatUnitLabel(this._context, entry, toItemKey(this._context, entry.itemName));\n    }\n  }\n\n  /**\n   * Visitor implementation for handling InvertedUnitDifference.\n   * @internal\n   */\n  public async visitInvertedUnitDifference(entry: InvertedUnitDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addInvertedUnit,\n      modify: modifyInvertedUnit,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling KindOfQuantityDifference.\n   * @internal\n   */\n  public async visitKindOfQuantityDifference(entry: KindOfQuantityDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addKindOfQuantity,\n      modify: modifyKindOfQuantity,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling MixinClassDifference.\n   * @internal\n   */\n  public async visitMixinDifference(entry: MixinClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addMixinClass,\n      modify: modifyMixinClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling PhenomenonDifference.\n   * @internal\n   */\n  public async visitPhenomenonDifference(entry: PhenomenonDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addPhenomenon,\n      modify: modifyPhenomenon,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling PropertyCategoryDifference.\n   * @internal\n   */\n  public async visitPropertyCategoryDifference(entry: PropertyCategoryDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addPropertyCategory,\n      modify: modifyPropertyCategory,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling ClassPropertyDifference.\n   * @internal\n   */\n  public async visitPropertyDifference(entry: ClassPropertyDifference): Promise<void> {\n    await mergePropertyDifference(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipClassDifference.\n   * @internal\n   */\n  public async visitRelationshipClassDifference(entry: RelationshipClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addRelationshipClass,\n      modify: modifyRelationshipClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipConstraintClassDifference.\n   * @internal\n   */\n  public async visitRelationshipConstraintClassDifference(entry: RelationshipConstraintClassDifference): Promise<void> {\n    await mergeRelationshipClassConstraint(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling RelationshipConstraintDifference.\n   * @internal\n   */\n  public async visitRelationshipConstraintDifference(entry: RelationshipConstraintDifference): Promise<void> {\n    await mergeRelationshipConstraint(this._context, entry);\n  }\n\n  /**\n   * Visitor implementation for handling SchemaDifference.\n   * @internal\n   */\n  public async visitSchemaDifference({ difference }: SchemaDifference): Promise<void> {\n    if (difference.label !== undefined) {\n      await this._context.editor.setDisplayLabel(this._context.targetSchemaKey, difference.label);\n    }\n    if (difference.description !== undefined) {\n      await this._context.editor.setDescription(this._context.targetSchemaKey, difference.description);\n    }\n  }\n\n  /**\n   * Shared merging logic for all types of AnySchemaItemDifference union.\n   */\n  private async visitSchemaItemDifference<T extends AnySchemaItemDifference>(entry: T, handler: ItemChangeTypeHandler<T>) {\n    switch(entry.changeType) {\n      case \"add\": {\n        return handler.add(this._context, entry);\n      }\n      case \"modify\": {\n        if(\"schemaItemType\" in entry.difference && entry.difference.schemaItemType !== entry.schemaType) {\n          throw new Error(`Changing the type of item '${entry.itemName}' not supported.`);\n        }\n\n        return handler.modify(this._context, entry, toItemKey(this._context, entry.itemName));\n      };\n    }\n  }\n\n  /**\n   * Visitor implementation for handling SchemaReferenceDifference.\n   * @internal\n   */\n  public async visitSchemaReferenceDifference(entry: SchemaReferenceDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addSchemaReferences(this._context, entry);\n      case \"modify\": return modifySchemaReferences(this._context, entry);\n    }\n  }\n\n  /**\n   * Visitor implementation for handling StructClassDifference.\n   * @internal\n   */\n  public async visitStructClassDifference(entry: StructClassDifference, index: number, array: AnySchemaDifference[]): Promise<void> {\n    return this.visitClassDifference(entry, index, array, {\n      add: addStructClass,\n      modify: modifyStructClass,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling UnitDifference.\n   * @internal\n   */\n  public async visitUnitDifference(entry: UnitDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addUnit,\n      modify: modifyUnit,\n    });\n  }\n\n  /**\n   * Visitor implementation for handling UnitSystemDifference.\n   * @internal\n   */\n  public async visitUnitSystemDifference(entry: UnitSystemDifference): Promise<void> {\n    return this.visitSchemaItemDifference(entry, {\n      add: addUnitSystem,\n      modify: modifyUnitSystem,\n    });\n  }\n\n  /**\n  * Visitor implementation for handling KindOfQuantityPresentationFormatDifference.\n  * @internal\n  */\n  public async visitKindOfQuantityPresentationFormatDifference(entry: KindOfQuantityPresentationFormatDifference): Promise<void> {\n    switch(entry.changeType) {\n      case \"add\": return addPresentationFormat(this._context, entry, toItemKey(this._context, entry.itemName));\n    }\n  }\n}\n\n/**\n * Helper method to get the index of the first element in the array that satisfies the provided testing function.\n * @param array     Array to search.\n * @param predicate Function to execute on each value in the array.\n * @param fromIndex The index to start the search at.\n * @returns         An index in the array if an element passes the test; otherwise, false.\n */\nfunction findIndexOf(array: AnySchemaDifference[], predicate: (entry: AnySchemaDifference) => boolean, fromIndex: number) {\n  for (let i = fromIndex; i < array.length; i++) {\n    if (predicate(array[i]))\n      return i;\n  }\n  return false;\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMergingWalker.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingWalker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAgC,MAAM,kCAAkC,CAAC;AAErH;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D;;;;;;;OAOG;IACmB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,mBAAmB,CAAC,EAAE,UAAU,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAyCpH"}
+{"version":3,"file":"SchemaMergingWalker.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingWalker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAgC,MAAM,kCAAkC,CAAC;AAErH;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D;;;;;;;OAOG;IACmB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,mBAAmB,CAAC,EAAE,UAAU,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CpH"}

package/lib/cjs/Merging/SchemaMergingWalker.js

@@ -41,6 +41,8 @@ class SchemaMergingWalker extends SchemaDifferenceVisitor_1.SchemaDifferenceWalk
             ...differences.filter(filterByType(ecschema_metadata_1.SchemaItemType.Unit)),
             ...differences.filter(filterByType(ecschema_metadata_1.SchemaItemType.InvertedUnit)),
             ...differences.filter(filterByType(ecschema_metadata_1.SchemaItemType.Format)),
+            ...differences.filter(filterByType(SchemaDifference_1.SchemaOtherTypes.FormatUnit)),
+            ...differences.filter(filterByType(SchemaDifference_1.SchemaOtherTypes.FormatUnitLabel)),
             ...differences.filter(filterByType(ecschema_metadata_1.SchemaItemType.KindOfQuantity)),
             ...differences.filter(filterByType(ecschema_metadata_1.SchemaItemType.Constant)),
             ...differences.filter(filterByType(SchemaDifference_1.SchemaOtherTypes.KindOfQuantityPresentationFormat)),

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMergingWalker.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingWalker.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 { SchemaItemType } from \"@itwin/ecschema-metadata\";\nimport { SchemaDifferenceWalker } from \"../Differencing/SchemaDifferenceVisitor\";\nimport { AnySchemaDifference, DifferenceType, SchemaOtherTypes, SchemaType } from \"../Differencing/SchemaDifference\";\n\n/**\n * A walker that traverses the schema differences in a certain oder and invokes the appropriate\n * visitor method for each kind of schema difference.\n * @internal\n */\nexport class SchemaMergingWalker extends SchemaDifferenceWalker {\n\n  /**\n   * Traverses the schema differences and calls the appropriate method on the visitor.\n   * This method overrides the derived class method to apply some ordering how the\n   * differences are traversed.\n   *\n   * @param differences The differences to traverse.\n   * @param changeType  Optional type of change to filter by.\n   */\n  public override async traverse(differences: Array<AnySchemaDifference>, changeType?: DifferenceType): Promise<void> {\n\n    const filterByType = (schemaType: SchemaType) => {\n      return (entry: AnySchemaDifference) => {\n        return entry.schemaType === schemaType && (!changeType || entry.changeType === changeType);\n      };\n    };\n\n    return super.traverse([\n      // First the schema related differences are traversed...\n      ...differences.filter(filterByType(SchemaOtherTypes.Schema)),\n      ...differences.filter(filterByType(SchemaOtherTypes.SchemaReference)),\n\n      // Then the schema items (excluding classes)...\n      ...differences.filter(filterByType(SchemaItemType.UnitSystem)),\n      ...differences.filter(filterByType(SchemaItemType.PropertyCategory)),\n      ...differences.filter(filterByType(SchemaItemType.Enumeration)),\n      ...differences.filter(filterByType(SchemaOtherTypes.Enumerator)),\n      ...differences.filter(filterByType(SchemaItemType.Phenomenon)),\n      ...differences.filter(filterByType(SchemaItemType.Unit)),\n      ...differences.filter(filterByType(SchemaItemType.InvertedUnit)),\n      ...differences.filter(filterByType(SchemaItemType.Format)),\n      ...differences.filter(filterByType(SchemaItemType.KindOfQuantity)),\n      ...differences.filter(filterByType(SchemaItemType.Constant)),\n      ...differences.filter(filterByType(SchemaOtherTypes.KindOfQuantityPresentationFormat)),\n\n      // Followed by classes and class related differences...\n      ...differences.filter(filterByType(SchemaItemType.CustomAttributeClass)),\n      ...differences.filter(filterByType(SchemaItemType.Mixin)),\n      ...differences.filter(filterByType(SchemaItemType.StructClass)),\n      ...differences.filter(filterByType(SchemaItemType.EntityClass)),\n      ...differences.filter(filterByType(SchemaItemType.RelationshipClass)),\n      ...differences.filter(filterByType(SchemaOtherTypes.EntityClassMixin)),\n      ...differences.filter(filterByType(SchemaOtherTypes.RelationshipConstraint)),\n      ...differences.filter(filterByType(SchemaOtherTypes.RelationshipConstraintClass)),\n      ...differences.filter(filterByType(SchemaOtherTypes.Property)),\n\n      // And then the custom attributes.\n      ...differences.filter(filterByType(SchemaOtherTypes.CustomAttributeInstance)),\n    ]);\n  }\n}\n"]}
+{"version":3,"file":"SchemaMergingWalker.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMergingWalker.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAA0D;AAC1D,qFAAiF;AACjF,uEAAqH;AAErH;;;;GAIG;AACH,MAAa,mBAAoB,SAAQ,gDAAsB;IAE7D;;;;;;;OAOG;IACa,KAAK,CAAC,QAAQ,CAAC,WAAuC,EAAE,UAA2B;QAEjG,MAAM,YAAY,GAAG,CAAC,UAAsB,EAAE,EAAE;YAC9C,OAAO,CAAC,KAA0B,EAAE,EAAE;gBACpC,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,IAAI,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;YAC7F,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO,KAAK,CAAC,QAAQ,CAAC;YACpB,wDAAwD;YACxD,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,MAAM,CAAC,CAAC;YAC5D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,eAAe,CAAC,CAAC;YAErE,+CAA+C;YAC/C,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,UAAU,CAAC,CAAC;YAC9D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,gBAAgB,CAAC,CAAC;YACpE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,WAAW,CAAC,CAAC;YAC/D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,UAAU,CAAC,CAAC;YAChE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,UAAU,CAAC,CAAC;YAC9D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,IAAI,CAAC,CAAC;YACxD,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,YAAY,CAAC,CAAC;YAChE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,MAAM,CAAC,CAAC;YAC1D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,UAAU,CAAC,CAAC;YAChE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,eAAe,CAAC,CAAC;YACrE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,cAAc,CAAC,CAAC;YAClE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,QAAQ,CAAC,CAAC;YAC5D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,gCAAgC,CAAC,CAAC;YAEtF,uDAAuD;YACvD,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,oBAAoB,CAAC,CAAC;YACxE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,KAAK,CAAC,CAAC;YACzD,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,WAAW,CAAC,CAAC;YAC/D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,WAAW,CAAC,CAAC;YAC/D,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,kCAAc,CAAC,iBAAiB,CAAC,CAAC;YACrE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,gBAAgB,CAAC,CAAC;YACtE,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,sBAAsB,CAAC,CAAC;YAC5E,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,2BAA2B,CAAC,CAAC;YACjF,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,QAAQ,CAAC,CAAC;YAE9D,kCAAkC;YAClC,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,mCAAgB,CAAC,uBAAuB,CAAC,CAAC;SAC9E,CAAC,CAAC;IACL,CAAC;CACF;AArDD,kDAqDC","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 { SchemaItemType } from \"@itwin/ecschema-metadata\";\nimport { SchemaDifferenceWalker } from \"../Differencing/SchemaDifferenceVisitor\";\nimport { AnySchemaDifference, DifferenceType, SchemaOtherTypes, SchemaType } from \"../Differencing/SchemaDifference\";\n\n/**\n * A walker that traverses the schema differences in a certain oder and invokes the appropriate\n * visitor method for each kind of schema difference.\n * @internal\n */\nexport class SchemaMergingWalker extends SchemaDifferenceWalker {\n\n  /**\n   * Traverses the schema differences and calls the appropriate method on the visitor.\n   * This method overrides the derived class method to apply some ordering how the\n   * differences are traversed.\n   *\n   * @param differences The differences to traverse.\n   * @param changeType  Optional type of change to filter by.\n   */\n  public override async traverse(differences: Array<AnySchemaDifference>, changeType?: DifferenceType): Promise<void> {\n\n    const filterByType = (schemaType: SchemaType) => {\n      return (entry: AnySchemaDifference) => {\n        return entry.schemaType === schemaType && (!changeType || entry.changeType === changeType);\n      };\n    };\n\n    return super.traverse([\n      // First the schema related differences are traversed...\n      ...differences.filter(filterByType(SchemaOtherTypes.Schema)),\n      ...differences.filter(filterByType(SchemaOtherTypes.SchemaReference)),\n\n      // Then the schema items (excluding classes)...\n      ...differences.filter(filterByType(SchemaItemType.UnitSystem)),\n      ...differences.filter(filterByType(SchemaItemType.PropertyCategory)),\n      ...differences.filter(filterByType(SchemaItemType.Enumeration)),\n      ...differences.filter(filterByType(SchemaOtherTypes.Enumerator)),\n      ...differences.filter(filterByType(SchemaItemType.Phenomenon)),\n      ...differences.filter(filterByType(SchemaItemType.Unit)),\n      ...differences.filter(filterByType(SchemaItemType.InvertedUnit)),\n      ...differences.filter(filterByType(SchemaItemType.Format)),\n      ...differences.filter(filterByType(SchemaOtherTypes.FormatUnit)),\n      ...differences.filter(filterByType(SchemaOtherTypes.FormatUnitLabel)),\n      ...differences.filter(filterByType(SchemaItemType.KindOfQuantity)),\n      ...differences.filter(filterByType(SchemaItemType.Constant)),\n      ...differences.filter(filterByType(SchemaOtherTypes.KindOfQuantityPresentationFormat)),\n\n      // Followed by classes and class related differences...\n      ...differences.filter(filterByType(SchemaItemType.CustomAttributeClass)),\n      ...differences.filter(filterByType(SchemaItemType.Mixin)),\n      ...differences.filter(filterByType(SchemaItemType.StructClass)),\n      ...differences.filter(filterByType(SchemaItemType.EntityClass)),\n      ...differences.filter(filterByType(SchemaItemType.RelationshipClass)),\n      ...differences.filter(filterByType(SchemaOtherTypes.EntityClassMixin)),\n      ...differences.filter(filterByType(SchemaOtherTypes.RelationshipConstraint)),\n      ...differences.filter(filterByType(SchemaOtherTypes.RelationshipConstraintClass)),\n      ...differences.filter(filterByType(SchemaOtherTypes.Property)),\n\n      // And then the custom attributes.\n      ...differences.filter(filterByType(SchemaOtherTypes.CustomAttributeInstance)),\n    ]);\n  }\n}\n"]}

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

@@ -0,0 +1,14 @@
+import { SchemaItemKey } from "@itwin/ecschema-metadata";
+import { UnitDifference } from "../Differencing/SchemaDifference";
+import { SchemaMergeContext } from "./SchemaMerger";
+/**
+ * Merges a new Unit into the target schema.
+ * @internal
+ */
+export declare function addUnit(context: SchemaMergeContext, change: UnitDifference): Promise<void>;
+/**
+ * Merges differences to an existing Unit in the target schema.
+ * @internal
+ */
+export declare function modifyUnit(context: SchemaMergeContext, change: UnitDifference, itemKey: SchemaItemKey): Promise<void>;
+//# sourceMappingURL=UnitMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UnitMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/UnitMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD;;;GAGG;AACH,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,iBAsBhF;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,iBA2B3G"}

package/lib/cjs/Merging/UnitMerger.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addUnit = addUnit;
+exports.modifyUnit = modifyUnit;
+const Utils_1 = require("./Utils");
+/**
+ * Merges a new Unit into the target schema.
+ * @internal
+ */
+async function addUnit(context, change) {
+    if (change.difference.phenomenon === undefined) {
+        throw new Error("Unit must define phenomenon");
+    }
+    if (change.difference.unitSystem === undefined) {
+        throw new Error("Unit must define unitSystem");
+    }
+    if (change.difference.definition === undefined) {
+        throw new Error("Unit must define definition");
+    }
+    change.difference.phenomenon = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.phenomenon);
+    change.difference.unitSystem = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.unitSystem);
+    await context.editor.units.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        phenomenon: change.difference.phenomenon,
+        unitSystem: change.difference.unitSystem,
+        definition: change.difference.definition,
+    });
+}
+/**
+ * Merges differences to an existing Unit in the target schema.
+ * @internal
+ */
+async function modifyUnit(context, change, itemKey) {
+    if (change.difference.unitSystem !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' unitSystem is not supported.`);
+    }
+    if (change.difference.phenomenon !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' phenomenon is not supported.`);
+    }
+    if (change.difference.definition !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' definition is not supported.`);
+    }
+    // we have consider later should we allow to change these values on merging
+    if (change.difference.denominator !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' denominator is not supported.`);
+    }
+    if (change.difference.numerator !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' numerator is not supported.`);
+    }
+    if (change.difference.offset !== undefined) {
+        throw new Error(`Changing the unit '${change.itemName}' offset is not supported.`);
+    }
+    if (change.difference.label !== undefined) {
+        await context.editor.units.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.units.setDescription(itemKey, change.difference.description);
+    }
+}
+//# sourceMappingURL=UnitMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"UnitMerger.js","sourceRoot":"","sources":["../../../src/Merging/UnitMerger.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 { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { UnitDifference } from \"../Differencing/SchemaDifference\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { updateSchemaItemFullName } from \"./Utils\";\n\n/**\n * Merges a new Unit into the target schema.\n * @internal\n */\nexport async function addUnit(context: SchemaMergeContext, change: UnitDifference) {\n  if (change.difference.phenomenon === undefined) {\n    throw new Error(\"Unit must define phenomenon\");\n  }\n  if (change.difference.unitSystem === undefined) {\n    throw new Error(\"Unit must define unitSystem\");\n  }\n  if (change.difference.definition === undefined) {\n    throw new Error(\"Unit must define definition\");\n  }\n\n  change.difference.phenomenon = await updateSchemaItemFullName(context, change.difference.phenomenon);\n  change.difference.unitSystem = await updateSchemaItemFullName(context, change.difference.unitSystem);\n\n  await context.editor.units.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    phenomenon: change.difference.phenomenon,\n    unitSystem: change.difference.unitSystem,\n    definition: change.difference.definition,\n  });\n}\n\n/**\n * Merges differences to an existing Unit in the target schema.\n * @internal\n */\nexport async function modifyUnit(context: SchemaMergeContext, change: UnitDifference, itemKey: SchemaItemKey) {\n  if (change.difference.unitSystem !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' unitSystem is not supported.`);\n  }\n  if (change.difference.phenomenon !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' phenomenon is not supported.`);\n  }\n  if (change.difference.definition !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' definition is not supported.`);\n  }\n  // we have consider later should we allow to change these values on merging\n  if (change.difference.denominator !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' denominator is not supported.`);\n  }\n  if (change.difference.numerator !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' numerator is not supported.`);\n  }\n  if (change.difference.offset !== undefined) {\n    throw new Error(`Changing the unit '${change.itemName}' offset is not supported.`);\n  }\n\n  if (change.difference.label !== undefined) {\n    await context.editor.units.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if (change.difference.description !== undefined) {\n    await context.editor.units.setDescription(itemKey, change.difference.description);\n  }\n}\n"]}

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

@@ -1,6 +1,17 @@
 import { ECClasses } from "../Editing/ECClasses";
+import { PropertyKey } from "./Edits/NameMapping";
 import type { SchemaMergeContext } from "./SchemaMerger";
 import { ECClass, SchemaItem, SchemaItemKey } from "@itwin/ecschema-metadata";
+/**
+ * Resolves a SchemaItemKey for the given item name.
+ * @internal
+ */
+export declare function toItemKey(context: SchemaMergeContext, itemName: string): SchemaItemKey;
+/**
+ * Resolves a SchemaItemKey for the given class property name.
+ * @internal
+ */
+export declare function toPropertyKey(context: SchemaMergeContext, itemName: string, propertyName: string): PropertyKey;
 /**
  * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.
  * @internal

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

@@ -1 +1 @@
-{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../../src/Merging/Utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAkD,UAAU,EAAE,aAAa,EAAkB,MAAM,0BAA0B,CAAC;AAE9I;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAG5F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAYvF;AAgBD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAQvG;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAmBtH"}
+{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../../src/Merging/Utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAkD,UAAU,EAAE,aAAa,EAAkB,MAAM,0BAA0B,CAAC;AAE9I;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,GAAG,aAAa,CAGtF;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,WAAW,CAG9G;AAED;;;GAGG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,mBAG5F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,0BAavF;AAgBD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uBAQvG;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAmBtH"}

package/lib/cjs/Merging/Utils.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toItemKey = toItemKey;
+exports.toPropertyKey = toPropertyKey;
 exports.updateSchemaItemFullName = updateSchemaItemFullName;
 exports.updateSchemaItemKey = updateSchemaItemKey;
 exports.locateSchemaItem = locateSchemaItem;
 exports.getClassEditor = getClassEditor;
+const NameMapping_1 = require("./Edits/NameMapping");
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+/**
+ * Resolves a SchemaItemKey for the given item name.
+ * @internal
+ */
+function toItemKey(context, itemName) {
+    const classKey = context.nameMapping.resolveItemKey(new ecschema_metadata_1.SchemaItemKey(itemName, context.sourceSchemaKey));
+    return new ecschema_metadata_1.SchemaItemKey(classKey.name, context.targetSchemaKey);
+}
+/**
+ * Resolves a SchemaItemKey for the given class property name.
+ * @internal
+ */
+function toPropertyKey(context, itemName, propertyName) {
+    const classKey = new ecschema_metadata_1.SchemaItemKey(itemName, context.sourceSchemaKey);
+    return context.nameMapping.resolvePropertyKey(new NameMapping_1.PropertyKey(propertyName, classKey));
+}
 /**
  * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.
  * @internal
@@ -21,7 +40,8 @@ async function updateSchemaItemFullName(context, reference) {
 async function updateSchemaItemKey(context, reference) {
     const [schemaName, itemName] = ecschema_metadata_1.SchemaItem.parseFullName(reference);
     if (context.sourceSchemaKey.compareByName(schemaName)) {
-        return resolveSchemaItemKey(context.editor.schemaContext, new ecschema_metadata_1.SchemaItemKey(itemName, context.targetSchemaKey));
+        const schemaItemKey = toItemKey(context, itemName);
+        return resolveSchemaItemKey(context.editor.schemaContext, schemaItemKey);
     }
     const referencedSchema = await context.targetSchema.getReference(schemaName);
     if (referencedSchema !== undefined) {
@@ -46,7 +66,7 @@ async function resolveSchemaItemKey(schemaContext, itemKey) {
  * @internal
  */
 async function locateSchemaItem(context, itemName, schemaType) {
-    const schemaItemKey = new ecschema_metadata_1.SchemaItemKey(itemName, context.targetSchemaKey);
+    const schemaItemKey = toItemKey(context, itemName);
     const schemaItem = await context.editor.schemaContext.getSchemaItem(schemaItemKey);
     if (schemaItem === undefined) {
         throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.ClassNotFound, `${schemaType} ${schemaItemKey.fullName} not found in schema context.`);
@@ -59,7 +79,7 @@ async function locateSchemaItem(context, itemName, schemaType) {
 async function getClassEditor(context, ecClass) {
     const schemaItemType = ecschema_metadata_1.ECClass.isECClass(ecClass)
         ? ecClass.schemaItemType
-        : (await context.editor.schemaContext.getSchemaItem(ecClass))?.schemaItemType;
+        : (await context.editor.schemaContext.getSchemaItem(ecClass, ecschema_metadata_1.ECClass))?.schemaItemType;
     switch (schemaItemType) {
         case ecschema_metadata_1.SchemaItemType.EntityClass:
             return context.editor.entities;

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

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Merging/Utils.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 { ECClasses } from \"../Editing/ECClasses\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { ECClass, ECObjectsError, ECObjectsStatus, SchemaContext, SchemaItem, SchemaItemKey, SchemaItemType } from \"@itwin/ecschema-metadata\";\n\n/**\n * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.\n * @internal\n */\nexport async function updateSchemaItemFullName(context: SchemaMergeContext, reference: string) {\n  const schemaItemKey = await updateSchemaItemKey(context, reference);\n  return schemaItemKey.fullName;\n}\n\n/**\n * Updates the given reference if it refers to a SchemaItem in the source Schema and\n * returns a SchemaItemKey. If any other schema is referred the reference is not change.\n * @internal\n */\nexport async function updateSchemaItemKey(context: SchemaMergeContext, reference: string) {\n  const [schemaName, itemName] = SchemaItem.parseFullName(reference);\n  if (context.sourceSchemaKey.compareByName(schemaName)) {\n    return resolveSchemaItemKey(context.editor.schemaContext, new SchemaItemKey(itemName, context.targetSchemaKey));\n  }\n\n  const referencedSchema = await context.targetSchema.getReference(schemaName);\n  if (referencedSchema !== undefined) {\n    return resolveSchemaItemKey(context.editor.schemaContext, new SchemaItemKey(itemName, referencedSchema.schemaKey));\n  }\n\n  throw new Error(`Cannot locate referenced schema item ${reference}`);\n}\n\n/**\n * To support case insensitivity for schema items, the given key is checked if there\n * exists an item for it.\n * @internal\n */\nasync function resolveSchemaItemKey(schemaContext: SchemaContext, itemKey: SchemaItemKey): Promise<SchemaItemKey> {\n  const item = await schemaContext.getSchemaItem(itemKey);\n  if (item === undefined) {\n    // If the schema item hasn't been created yet, we have to trust the given key is correctly spelled.\n    return itemKey;\n  }\n  return item.key;\n}\n\n/**\n * @internal\n */\nexport async function locateSchemaItem(context: SchemaMergeContext, itemName: string, schemaType: string) {\n  const schemaItemKey = new SchemaItemKey(itemName, context.targetSchemaKey);\n  const schemaItem = await context.editor.schemaContext.getSchemaItem(schemaItemKey);\n  if (schemaItem === undefined) {\n    throw new ECObjectsError(ECObjectsStatus.ClassNotFound, `${schemaType} ${schemaItemKey.fullName} not found in schema context.`);\n  }\n\n  return schemaItem;\n}\n\n/**\n * @internal\n */\nexport async function getClassEditor(context: SchemaMergeContext, ecClass: ECClass | SchemaItemKey): Promise<ECClasses> {\n  const schemaItemType = ECClass.isECClass(ecClass)\n    ? ecClass.schemaItemType\n    : (await context.editor.schemaContext.getSchemaItem<ECClass>(ecClass))?.schemaItemType;\n\n  switch(schemaItemType) {\n    case SchemaItemType.EntityClass:\n      return context.editor.entities;\n    case SchemaItemType.Mixin:\n      return context.editor.mixins;\n    case SchemaItemType.StructClass:\n      return context.editor.structs;\n    case SchemaItemType.CustomAttributeClass:\n      return context.editor.customAttributes;\n    case SchemaItemType.RelationshipClass:\n      return context.editor.relationships;\n    default:\n      throw new Error(\"SchemaItemType not supported\");\n  }\n}\n"]}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Merging/Utils.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 { ECClasses } from \"../Editing/ECClasses\";\nimport { PropertyKey } from \"./Edits/NameMapping\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { ECClass, ECObjectsError, ECObjectsStatus, SchemaContext, SchemaItem, SchemaItemKey, SchemaItemType } from \"@itwin/ecschema-metadata\";\n\n/**\n * Resolves a SchemaItemKey for the given item name.\n * @internal\n */\nexport function toItemKey(context: SchemaMergeContext, itemName: string): SchemaItemKey {\n  const classKey = context.nameMapping.resolveItemKey(new SchemaItemKey(itemName, context.sourceSchemaKey));\n  return new SchemaItemKey(classKey.name, context.targetSchemaKey);\n}\n\n/**\n * Resolves a SchemaItemKey for the given class property name.\n * @internal\n */\nexport function toPropertyKey(context: SchemaMergeContext, itemName: string, propertyName: string): PropertyKey {\n  const classKey = new SchemaItemKey(itemName, context.sourceSchemaKey);\n  return context.nameMapping.resolvePropertyKey(new PropertyKey(propertyName, classKey));\n}\n\n/**\n * Convenience-method around updateSchemaItemKey that returns the full name instead of a SchemaItemKey.\n * @internal\n */\nexport async function updateSchemaItemFullName(context: SchemaMergeContext, reference: string) {\n  const schemaItemKey = await updateSchemaItemKey(context, reference);\n  return schemaItemKey.fullName;\n}\n\n/**\n * Updates the given reference if it refers to a SchemaItem in the source Schema and\n * returns a SchemaItemKey. If any other schema is referred the reference is not change.\n * @internal\n */\nexport async function updateSchemaItemKey(context: SchemaMergeContext, reference: string) {\n  const [schemaName, itemName] = SchemaItem.parseFullName(reference);\n  if (context.sourceSchemaKey.compareByName(schemaName)) {\n    const schemaItemKey = toItemKey(context, itemName);\n    return resolveSchemaItemKey(context.editor.schemaContext, schemaItemKey);\n  }\n\n  const referencedSchema = await context.targetSchema.getReference(schemaName);\n  if (referencedSchema !== undefined) {\n    return resolveSchemaItemKey(context.editor.schemaContext, new SchemaItemKey(itemName, referencedSchema.schemaKey));\n  }\n\n  throw new Error(`Cannot locate referenced schema item ${reference}`);\n}\n\n/**\n * To support case insensitivity for schema items, the given key is checked if there\n * exists an item for it.\n * @internal\n */\nasync function resolveSchemaItemKey(schemaContext: SchemaContext, itemKey: SchemaItemKey): Promise<SchemaItemKey> {\n  const item = await schemaContext.getSchemaItem(itemKey);\n  if (item === undefined) {\n    // If the schema item hasn't been created yet, we have to trust the given key is correctly spelled.\n    return itemKey;\n  }\n  return item.key;\n}\n\n/**\n * @internal\n */\nexport async function locateSchemaItem(context: SchemaMergeContext, itemName: string, schemaType: string) {\n  const schemaItemKey = toItemKey(context, itemName);\n  const schemaItem = await context.editor.schemaContext.getSchemaItem(schemaItemKey);\n  if (schemaItem === undefined) {\n    throw new ECObjectsError(ECObjectsStatus.ClassNotFound, `${schemaType} ${schemaItemKey.fullName} not found in schema context.`);\n  }\n\n  return schemaItem;\n}\n\n/**\n * @internal\n */\nexport async function getClassEditor(context: SchemaMergeContext, ecClass: ECClass | SchemaItemKey): Promise<ECClasses> {\n  const schemaItemType = ECClass.isECClass(ecClass)\n    ? ecClass.schemaItemType\n    : (await context.editor.schemaContext.getSchemaItem(ecClass, ECClass))?.schemaItemType;\n\n  switch(schemaItemType) {\n    case SchemaItemType.EntityClass:\n      return context.editor.entities;\n    case SchemaItemType.Mixin:\n      return context.editor.mixins;\n    case SchemaItemType.StructClass:\n      return context.editor.structs;\n    case SchemaItemType.CustomAttributeClass:\n      return context.editor.customAttributes;\n    case SchemaItemType.RelationshipClass:\n      return context.editor.relationships;\n    default:\n      throw new Error(\"SchemaItemType not supported\");\n  }\n}\n"]}