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

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

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

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

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

package/lib/cjs/Merging/EntityClassMerger.js

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

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

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

package/lib/cjs/Merging/EnumerationMerger.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":";;AAaA,wCAmBC;AAMD,8CAcC;AApDD;;;+FAG+F;AAC/F,gEAAqF;AAKrF;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAA6B;IAC7F,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACzE,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;QACpC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAA6B,EAAE,OAAsB;IACxH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAuB,CAAC;IACzF,IAAG,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,CAAC,IAAI,0CAA0C,IAAA,yCAAqB,EAAC,WAAW,CAAC,IAAK,CAAC,WAAW,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC;IAC1K,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACtF,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3F,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5C,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { primitiveTypeToString, type SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport type { EnumerationDifference } from \"../Differencing/SchemaDifference\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { MutableEnumeration } from \"../Editing/Mutable/MutableEnumeration\";\n\n/**\n * Merges a new Enumeration into the target schema.\n * @internal\n */\nexport async function addEnumeration(context: SchemaMergeContext, change: EnumerationDifference) {\n  if (change.difference.type === undefined) {\n    throw new Error(\"Enumerations must define a type property\");\n  }\n  if (change.difference.isStrict === undefined) {\n    throw new Error(\"Enumerations must define whether enumeration is strict.\");\n  }\n  if (change.difference.enumerators === undefined) {\n    throw new Error(\"Enumerations must define at least ine enumerator.\");\n  }\n\n  await context.editor.enumerations.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    type: change.difference.type,\n    isStrict: change.difference.isStrict,\n    enumerators: change.difference.enumerators,\n  });\n}\n\n/**\n * Merges differences to an existing Enumeration in the target schema.\n * @internal\n */\nexport async function modifyEnumeration(context: SchemaMergeContext, change: EnumerationDifference, itemKey: SchemaItemKey) {\n  const enumeration = await context.targetSchema.lookupItem(itemKey) as MutableEnumeration;\n  if(change.difference.type !== undefined) {\n    throw new Error(`The Enumeration ${itemKey.name} has an incompatible type. It must be \"${primitiveTypeToString(enumeration.type!)}\", not \"${change.difference.type}\".`);\n  }\n  if(change.difference.label !== undefined) {\n    await context.editor.enumerations.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.enumerations.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.isStrict !== undefined) {\n    enumeration.setIsStrict(change.difference.isStrict);\n  }\n}\n"]}
+{"version":3,"file":"EnumerationMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumerationMerger.ts"],"names":[],"mappings":";;AAaA,wCAmBC;AAMD,8CAcC;AApDD;;;+FAG+F;AAC/F,gEAAqF;AAKrF;;;GAGG;AACI,KAAK,UAAU,cAAc,CAAC,OAA2B,EAAE,MAA6B;IAC7F,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACzE,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;QACpC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAA6B,EAAE,OAAsB;IACxH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAuB,CAAC;IACzF,IAAG,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,CAAC,IAAI,0CAA0C,IAAA,yCAAqB,EAAC,WAAW,CAAC,IAAK,CAAC,WAAW,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC;IAC1K,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACtF,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3F,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5C,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { primitiveTypeToString, type SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport type { EnumerationDifference } from \"../Differencing/SchemaDifference\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { MutableEnumeration } from \"../Editing/Mutable/MutableEnumeration\";\n\n/**\n * Merges a new Enumeration into the target schema.\n * @internal\n */\nexport async function addEnumeration(context: SchemaMergeContext, change: EnumerationDifference) {\n  if (change.difference.type === undefined) {\n    throw new Error(\"Enumerations must define a type property\");\n  }\n  if (change.difference.isStrict === undefined) {\n    throw new Error(\"Enumerations must define whether enumeration is strict.\");\n  }\n  if (change.difference.enumerators === undefined) {\n    throw new Error(\"Enumerations must define at least one enumerator.\");\n  }\n\n  await context.editor.enumerations.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    type: change.difference.type,\n    isStrict: change.difference.isStrict,\n    enumerators: change.difference.enumerators,\n  });\n}\n\n/**\n * Merges differences to an existing Enumeration in the target schema.\n * @internal\n */\nexport async function modifyEnumeration(context: SchemaMergeContext, change: EnumerationDifference, itemKey: SchemaItemKey) {\n  const enumeration = await context.targetSchema.lookupItem(itemKey) as MutableEnumeration;\n  if(change.difference.type !== undefined) {\n    throw new Error(`The Enumeration ${itemKey.name} has an incompatible type. It must be \"${primitiveTypeToString(enumeration.type!)}\", not \"${change.difference.type}\".`);\n  }\n  if(change.difference.label !== undefined) {\n    await context.editor.enumerations.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.enumerations.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.isStrict !== undefined) {\n    enumeration.setIsStrict(change.difference.isStrict);\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"EnumeratorMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumeratorMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD;;;GAGG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,iBAe5F;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAUvH"}
+{"version":3,"file":"EnumeratorMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EnumeratorMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;GAGG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,iBAe5F;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAUvH"}

package/lib/cjs/Merging/EnumeratorMerger.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addEnumerator = addEnumerator;
 exports.modifyEnumerator = modifyEnumerator;
-const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const Utils_1 = require("./Utils");
 /**
  * Merges a new Enumerator into the target schema.
  * @internal
@@ -14,7 +14,7 @@ async function addEnumerator(context, change) {
     if (change.difference.value === undefined) {
         throw new Error("Enumerators must define a value");
     }
-    const itemKey = new ecschema_metadata_1.SchemaItemKey(change.itemName, context.targetSchemaKey);
+    const itemKey = (0, Utils_1.toItemKey)(context, change.itemName);
     await context.editor.enumerations.addEnumerator(itemKey, {
         name: change.difference.name,
         value: change.difference.value,

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

@@ -1 +1 @@
-{"version":3,"file":"EnumeratorMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumeratorMerger.ts"],"names":[],"mappings":";;AAYA,sCAeC;AAMD,4CAUC;AArCD,gEAAyD;AAEzD;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,OAA2B,EAAE,MAA4B;IAC3F,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE;QACvD,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;QAC9B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;QAC9B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAA4B,EAAE,OAAsB;IACtH,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,qDAAqD,MAAM,CAAC,IAAI,yBAAyB,CAAC,CAAC;IAC7G,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAClH,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACtG,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { EnumeratorDifference } from \"../Differencing/SchemaDifference\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\n\n/**\n * Merges a new Enumerator into the target schema.\n * @internal\n */\nexport async function addEnumerator(context: SchemaMergeContext, change: EnumeratorDifference) {\n  if (change.difference.name === undefined) {\n    throw new Error(\"Enumerators must define a name\");\n  }\n  if (change.difference.value === undefined) {\n    throw new Error(\"Enumerators must define a value\");\n  }\n\n  const itemKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n  await context.editor.enumerations.addEnumerator(itemKey, {\n    name: change.difference.name,\n    value: change.difference.value,\n    label: change.difference.label,\n    description: change.difference.description,\n  });\n}\n\n/**\n * Merges differences to an existing Enumerator in the target schema.\n * @internal\n */\nexport async function modifyEnumerator(context: SchemaMergeContext, change: EnumeratorDifference, itemKey: SchemaItemKey) {\n  if(change.difference.value !== undefined) {\n    throw new Error(`Failed to merge enumerator attribute, Enumerator \"${change.path}\" has different values.`);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.enumerations.setEnumeratorDescription(itemKey, change.path, change.difference.description);\n  }\n  if(change.difference.label !== undefined) {\n    await context.editor.enumerations.setEnumeratorLabel(itemKey, change.path, change.difference.label);\n  }\n}\n"]}
+{"version":3,"file":"EnumeratorMerger.js","sourceRoot":"","sources":["../../../src/Merging/EnumeratorMerger.ts"],"names":[],"mappings":";;AAaA,sCAeC;AAMD,4CAUC;AArCD,mCAAoC;AAEpC;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,OAA2B,EAAE,MAA4B;IAC3F,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE;QACvD,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;QAC9B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;QAC9B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAA4B,EAAE,OAAsB;IACtH,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,qDAAqD,MAAM,CAAC,IAAI,yBAAyB,CAAC,CAAC;IAC7G,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAClH,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACtG,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { EnumeratorDifference } from \"../Differencing/SchemaDifference\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { toItemKey } from \"./Utils\";\n\n/**\n * Merges a new Enumerator into the target schema.\n * @internal\n */\nexport async function addEnumerator(context: SchemaMergeContext, change: EnumeratorDifference) {\n  if (change.difference.name === undefined) {\n    throw new Error(\"Enumerators must define a name\");\n  }\n  if (change.difference.value === undefined) {\n    throw new Error(\"Enumerators must define a value\");\n  }\n\n  const itemKey = toItemKey(context, change.itemName);\n  await context.editor.enumerations.addEnumerator(itemKey, {\n    name: change.difference.name,\n    value: change.difference.value,\n    label: change.difference.label,\n    description: change.difference.description,\n  });\n}\n\n/**\n * Merges differences to an existing Enumerator in the target schema.\n * @internal\n */\nexport async function modifyEnumerator(context: SchemaMergeContext, change: EnumeratorDifference, itemKey: SchemaItemKey) {\n  if(change.difference.value !== undefined) {\n    throw new Error(`Failed to merge enumerator attribute, Enumerator \"${change.path}\" has different values.`);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.enumerations.setEnumeratorDescription(itemKey, change.path, change.difference.description);\n  }\n  if(change.difference.label !== undefined) {\n    await context.editor.enumerations.setEnumeratorLabel(itemKey, change.path, change.difference.label);\n  }\n}\n"]}

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

@@ -0,0 +1,24 @@
+import { SchemaItemKey } from "@itwin/ecschema-metadata";
+import { FormatDifference, FormatUnitDifference, FormatUnitLabelDifference } from "../Differencing/SchemaDifference";
+import { SchemaMergeContext } from "./SchemaMerger";
+/**
+ * Merges a new Format into the target schema.
+ * @internal
+ */
+export declare function addFormat(context: SchemaMergeContext, change: FormatDifference): Promise<void>;
+/**
+ * Merges differences to an existing Format in the target schema.
+ * @internal
+ */
+export declare function modifyFormat(context: SchemaMergeContext, change: FormatDifference, itemKey: SchemaItemKey): Promise<void>;
+/**
+ * Merges source format units into the target format
+ * @internal
+*/
+export declare function modifyFormatUnit(context: SchemaMergeContext, change: FormatUnitDifference, itemKey: SchemaItemKey): Promise<void>;
+/**
+ * Overrides format unit label
+ * @internal
+*/
+export declare function modifyFormatUnitLabel(context: SchemaMergeContext, change: FormatUnitLabelDifference, itemKey: SchemaItemKey): Promise<void>;
+//# sourceMappingURL=FormatMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FormatMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/FormatMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,aAAa,EAAQ,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAErH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,iBAsBpF;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa,iBAwD/G;AAED;;;EAGE;AACF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAavH;AAED;;;EAGE;AACF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,yBAAyB,EAAE,OAAO,EAAE,aAAa,iBAYjI"}

package/lib/cjs/Merging/FormatMerger.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFormat = addFormat;
+exports.modifyFormat = modifyFormat;
+exports.modifyFormatUnit = modifyFormatUnit;
+exports.modifyFormatUnitLabel = modifyFormatUnitLabel;
+/*---------------------------------------------------------------------------------------------
+* 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 core_quantity_1 = require("@itwin/core-quantity");
+const Utils_1 = require("./Utils");
+/**
+ * Merges a new Format into the target schema.
+ * @internal
+ */
+async function addFormat(context, change) {
+    if (change.difference.type === undefined) {
+        throw new Error("Format must define type");
+    }
+    if (change.difference.composite && change.difference.composite.units) {
+        for (let index = 0; index < change.difference.composite.units.length; index++) {
+            const compositeUnitName = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.composite.units[index].name);
+            change.difference.composite.units[index] = {
+                name: compositeUnitName,
+                label: change.difference.composite.units[index].label,
+            };
+        }
+    }
+    await context.editor.formats.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        type: change.difference.type,
+        composite: change.difference.composite,
+    });
+}
+/**
+ * Merges differences to an existing Format in the target schema.
+ * @internal
+ */
+async function modifyFormat(context, change, itemKey) {
+    const format = await context.targetSchema.lookupItem(itemKey);
+    if (change.difference.type !== undefined) {
+        throw new Error(`Changing the format '${change.itemName}' type is not supported.`);
+    }
+    if (change.difference.label !== undefined) {
+        await context.editor.formats.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.formats.setDescription(itemKey, change.difference.description);
+    }
+    if (change.difference.precision !== undefined) {
+        format.setPrecision(change.difference.precision);
+    }
+    if (change.difference.roundFactor !== undefined) {
+        format.setRoundFactor(change.difference.roundFactor);
+    }
+    if (change.difference.minWidth !== undefined) {
+        format.setMinWidth(change.difference.minWidth);
+    }
+    if (change.difference.showSignOption !== undefined) {
+        const showSignOption = (0, core_quantity_1.parseShowSignOption)(change.difference.showSignOption, change.itemName);
+        format.setShowSignOption(showSignOption);
+    }
+    if (change.difference.formatTraits !== undefined) {
+        const formatTraits = parseFormatTraits(change.difference.formatTraits, change.itemName);
+        format.setFormatTraits(formatTraits);
+    }
+    if (change.difference.decimalSeparator !== undefined) {
+        format.setDecimalSeparator(change.difference.decimalSeparator);
+    }
+    if (change.difference.thousandSeparator !== undefined) {
+        format.setThousandSeparator(change.difference.thousandSeparator);
+    }
+    if (change.difference.uomSeparator !== undefined) {
+        format.setUomSeparator(change.difference.uomSeparator);
+    }
+    if (change.difference.scientificType !== undefined) {
+        const scientificType = (0, core_quantity_1.parseScientificType)(change.difference.scientificType, change.itemName);
+        format.setScientificType(scientificType);
+    }
+    if (change.difference.stationOffsetSize !== undefined) {
+        format.setStationOffsetSize(change.difference.stationOffsetSize);
+    }
+    if (change.difference.stationSeparator !== undefined) {
+        format.setStationSeparator(change.difference.stationSeparator);
+    }
+    if (change.difference.composite !== undefined) {
+        if (change.difference.composite.includeZero !== undefined) {
+            format.setIncludeZero(change.difference.composite.includeZero);
+        }
+        if (change.difference.composite.spacer !== undefined) {
+            format.setSpacer(change.difference.composite.spacer);
+        }
+    }
+}
+/**
+ * Merges source format units into the target format
+ * @internal
+*/
+async function modifyFormatUnit(context, change, itemKey) {
+    const format = await context.targetSchema.lookupItem(itemKey);
+    const units = [];
+    for (const { name, label } of change.difference) {
+        const lookupKey = await (0, Utils_1.updateSchemaItemKey)(context, name);
+        const formatUnit = await context.editor.schemaContext.getSchemaItem(lookupKey);
+        if (formatUnit === undefined || (!ecschema_metadata_1.Unit.isUnit(formatUnit) && !ecschema_metadata_1.InvertedUnit.isInvertedUnit(formatUnit))) {
+            throw new Error(`Could not find format unit ${lookupKey.fullName} in the current context`);
+        }
+        units.push([formatUnit, label]);
+    }
+    format.setUnits(units);
+}
+/**
+ * Overrides format unit label
+ * @internal
+*/
+async function modifyFormatUnitLabel(context, change, itemKey) {
+    const format = await context.targetSchema.lookupItem(itemKey);
+    if (format.units !== undefined) {
+        const unitKey = await (0, Utils_1.updateSchemaItemKey)(context, change.path);
+        /* eslint-disable @typescript-eslint/prefer-for-of */
+        for (let index = 0; index < format.units.length; index++) {
+            if (format.units[index][0].key.matches(unitKey)) {
+                format.units[index][1] = change.difference.label;
+            }
+        }
+    }
+}
+function parseFormatTraits(formatTraitsFromJson, formatName) {
+    let formatTraits = core_quantity_1.FormatTraits.Uninitialized;
+    const formatTraitIterable = Array.isArray(formatTraitsFromJson)
+        ? formatTraitsFromJson
+        : formatTraitsFromJson.split(/,|;|\|/);
+    for (const formatTraitsString of formatTraitIterable) {
+        const formatTrait = (0, core_quantity_1.parseFormatTrait)(formatTraitsString, formatName);
+        formatTraits = formatTraits | formatTrait;
+    }
+    return formatTraits;
+}
+//# sourceMappingURL=FormatMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FormatMerger.js","sourceRoot":"","sources":["../../../src/Merging/FormatMerger.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 { InvertedUnit, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { FormatTraits, parseFormatTrait, parseScientificType, parseShowSignOption } from \"@itwin/core-quantity\";\nimport { FormatDifference, FormatUnitDifference, FormatUnitLabelDifference } from \"../Differencing/SchemaDifference\";\nimport { MutableFormat } from \"../Editing/Mutable/MutableFormat\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new Format into the target schema.\n * @internal\n */\nexport async function addFormat(context: SchemaMergeContext, change: FormatDifference) {\n  if (change.difference.type === undefined) {\n    throw new Error(\"Format must define type\");\n  }\n\n  if (change.difference.composite && change.difference.composite.units) {\n    for (let index = 0; index < change.difference.composite.units.length; index++) {\n      const compositeUnitName = await updateSchemaItemFullName(context, change.difference.composite.units[index].name);\n      change.difference.composite.units[index] = {\n        name: compositeUnitName,\n        label: change.difference.composite.units[index].label,\n      }\n    }\n  }\n\n  await context.editor.formats.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    type: change.difference.type,\n    composite: change.difference.composite,\n  });\n}\n\n/**\n * Merges differences to an existing Format in the target schema.\n * @internal\n */\nexport async function modifyFormat(context: SchemaMergeContext, change: FormatDifference, itemKey: SchemaItemKey) {\n  const format = await context.targetSchema.lookupItem(itemKey) as MutableFormat;\n  if (change.difference.type !== undefined) {\n    throw new Error(`Changing the format '${change.itemName}' type is not supported.`);\n  }\n\n  if (change.difference.label !== undefined) {\n    await context.editor.formats.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if (change.difference.description !== undefined) {\n    await context.editor.formats.setDescription(itemKey, change.difference.description);\n  }\n  if (change.difference.precision !== undefined) {\n    format.setPrecision(change.difference.precision);\n  }\n  if (change.difference.roundFactor !== undefined) {\n    format.setRoundFactor(change.difference.roundFactor);\n  }\n  if (change.difference.minWidth !== undefined) {\n    format.setMinWidth(change.difference.minWidth);\n  }\n  if (change.difference.showSignOption !== undefined) {\n    const showSignOption = parseShowSignOption(change.difference.showSignOption, change.itemName);\n    format.setShowSignOption(showSignOption);\n  }\n  if (change.difference.formatTraits !== undefined) {\n    const formatTraits = parseFormatTraits(change.difference.formatTraits, change.itemName);\n    format.setFormatTraits(formatTraits);\n  }\n  if (change.difference.decimalSeparator !== undefined) {\n    format.setDecimalSeparator(change.difference.decimalSeparator);\n  }\n  if (change.difference.thousandSeparator !== undefined) {\n    format.setThousandSeparator(change.difference.thousandSeparator);\n  }\n  if (change.difference.uomSeparator !== undefined) {\n    format.setUomSeparator(change.difference.uomSeparator);\n  }\n  if (change.difference.scientificType !== undefined) {\n    const scientificType = parseScientificType(change.difference.scientificType, change.itemName);\n    format.setScientificType(scientificType);\n  }\n  if (change.difference.stationOffsetSize !== undefined) {\n    format.setStationOffsetSize(change.difference.stationOffsetSize);\n  }\n  if (change.difference.stationSeparator !== undefined) {\n    format.setStationSeparator(change.difference.stationSeparator);\n  }\n  if (change.difference.composite !== undefined) {\n    if (change.difference.composite.includeZero !== undefined) {\n      format.setIncludeZero(change.difference.composite.includeZero);\n    }\n    if (change.difference.composite.spacer !== undefined) {\n      format.setSpacer(change.difference.composite.spacer);\n    }\n  }\n}\n\n/**\n * Merges source format units into the target format\n * @internal\n*/\nexport async function modifyFormatUnit(context: SchemaMergeContext, change: FormatUnitDifference, itemKey: SchemaItemKey) {\n  const format = await context.targetSchema.lookupItem(itemKey) as MutableFormat;\n\n  const units: [Unit | InvertedUnit, string | undefined][] = [];\n  for (const { name, label } of change.difference) {\n    const lookupKey = await updateSchemaItemKey(context, name);\n    const formatUnit = await context.editor.schemaContext.getSchemaItem(lookupKey);\n    if (formatUnit === undefined || (!Unit.isUnit(formatUnit) && !InvertedUnit.isInvertedUnit(formatUnit))) {\n      throw new Error(`Could not find format unit ${lookupKey.fullName} in the current context`);\n    }\n    units.push([formatUnit, label]);\n  }\n  format.setUnits(units);\n}\n\n/**\n * Overrides format unit label\n * @internal\n*/\nexport async function modifyFormatUnitLabel(context: SchemaMergeContext, change: FormatUnitLabelDifference, itemKey: SchemaItemKey) {\n  const format = await context.targetSchema.lookupItem(itemKey) as MutableFormat;\n\n  if (format.units !== undefined) {\n    const unitKey = await updateSchemaItemKey(context, change.path);\n    /* eslint-disable @typescript-eslint/prefer-for-of */\n    for (let index = 0; index < format.units.length; index++) {\n      if (format.units[index][0].key.matches(unitKey)) {\n        format.units[index][1] = change.difference.label;\n      }\n    }\n  }\n}\n\nfunction parseFormatTraits(formatTraitsFromJson: string | string[], formatName: string): FormatTraits {\n  let formatTraits: FormatTraits = FormatTraits.Uninitialized;\n  const formatTraitIterable = Array.isArray(formatTraitsFromJson)\n    ? formatTraitsFromJson\n    : formatTraitsFromJson.split(/,|;|\\|/);\n  for (const formatTraitsString of formatTraitIterable) {\n    const formatTrait = parseFormatTrait(formatTraitsString, formatName);\n    formatTraits = formatTraits | formatTrait;\n  }\n  return formatTraits;\n}\n"]}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"InvertedUnitMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/InvertedUnitMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpD;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,iBAkBhG;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,aAAa,iBAc3H"}

package/lib/cjs/Merging/InvertedUnitMerger.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addInvertedUnit = addInvertedUnit;
+exports.modifyInvertedUnit = modifyInvertedUnit;
+const Utils_1 = require("./Utils");
+/**
+ * Merges a new InvertedUnit into the target schema.
+ * @internal
+ */
+async function addInvertedUnit(context, change) {
+    if (change.difference.unitSystem === undefined) {
+        throw new Error("InvertedUnit must define unitSystem");
+    }
+    if (change.difference.invertsUnit === undefined) {
+        throw new Error("InvertedUnit must define invertsUnit");
+    }
+    change.difference.unitSystem = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.unitSystem);
+    change.difference.invertsUnit = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.invertsUnit);
+    await context.editor.invertedUnits.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        unitSystem: change.difference.unitSystem,
+        invertsUnit: change.difference.invertsUnit,
+    });
+}
+/**
+ * Merges differences to an existing InvertedUnit in the target schema.
+ * @internal
+ */
+async function modifyInvertedUnit(context, change, itemKey) {
+    if (change.difference.unitSystem !== undefined) {
+        throw new Error(`Changing the invertedUnit '${change.itemName}' unitSystem is not supported.`);
+    }
+    if (change.difference.invertsUnit !== undefined) {
+        throw new Error(`Changing the invertedUnit '${change.itemName}' invertsUnit is not supported.`);
+    }
+    if (change.difference.label !== undefined) {
+        await context.editor.invertedUnits.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.invertedUnits.setDescription(itemKey, change.difference.description);
+    }
+}
+//# sourceMappingURL=InvertedUnitMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"InvertedUnitMerger.js","sourceRoot":"","sources":["../../../src/Merging/InvertedUnitMerger.ts"],"names":[],"mappings":";;AAaA,0CAkBC;AAMD,gDAcC;AA5CD,mCAAmD;AAEnD;;;GAGG;AACI,KAAK,UAAU,eAAe,CAAC,OAA2B,EAAE,MAA8B;IAC/F,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,UAAU,GAAG,MAAM,IAAA,gCAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACrG,MAAM,CAAC,UAAU,CAAC,WAAW,GAAG,MAAM,IAAA,gCAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QAC1E,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;QACxC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAA2B,EAAE,MAA8B,EAAE,OAAsB;IAC1H,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,QAAQ,gCAAgC,CAAC,CAAC;IACjG,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,QAAQ,iCAAiC,CAAC,CAAC;IAClG,CAAC;IAED,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC5F,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { InvertedUnitDifference } from \"../Differencing/SchemaDifference\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { updateSchemaItemFullName } from \"./Utils\";\n\n/**\n * Merges a new InvertedUnit into the target schema.\n * @internal\n */\nexport async function addInvertedUnit(context: SchemaMergeContext, change: InvertedUnitDifference) {\n  if (change.difference.unitSystem === undefined) {\n    throw new Error(\"InvertedUnit must define unitSystem\");\n  }\n  if (change.difference.invertsUnit === undefined) {\n    throw new Error(\"InvertedUnit must define invertsUnit\");\n  }\n\n  change.difference.unitSystem = await updateSchemaItemFullName(context, change.difference.unitSystem);\n  change.difference.invertsUnit = await updateSchemaItemFullName(context, change.difference.invertsUnit);\n\n  await context.editor.invertedUnits.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    unitSystem: change.difference.unitSystem,\n    invertsUnit: change.difference.invertsUnit,\n  });\n}\n\n/**\n * Merges differences to an existing InvertedUnit in the target schema.\n * @internal\n */\nexport async function modifyInvertedUnit(context: SchemaMergeContext, change: InvertedUnitDifference, itemKey: SchemaItemKey) {\n  if (change.difference.unitSystem !== undefined) {\n    throw new Error(`Changing the invertedUnit '${change.itemName}' unitSystem is not supported.`);\n  }\n  if (change.difference.invertsUnit !== undefined) {\n    throw new Error(`Changing the invertedUnit '${change.itemName}' invertsUnit is not supported.`);\n  }\n\n  if (change.difference.label !== undefined) {\n    await context.editor.invertedUnits.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if (change.difference.description !== undefined) {\n    await context.editor.invertedUnits.setDescription(itemKey, change.difference.description);\n  }\n}\n"]}

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

@@ -15,5 +15,5 @@ export declare function modifyKindOfQuantity(context: SchemaMergeContext, change
  * Merges a new presentation format into the target kind of quantity
  * @internal
 */
-export declare function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference): Promise<void>;
+export declare function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=KindOfQuantityMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"KindOfQuantityMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,0CAA0C,EAAE,MAAM,kCAAkC,CAAC;AAE7H,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAwC,aAAa,EAAQ,MAAM,0BAA0B,CAAC;AAGrG;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,iBA4BpG;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,EAAE,OAAO,EAAE,aAAa,iBAe/H;AACD;;;EAGE;AACF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,0CAA0C,iBAU1H"}
+{"version":3,"file":"KindOfQuantityMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,0CAA0C,EAAE,MAAM,kCAAkC,CAAC;AAE7H,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAwC,aAAa,EAAQ,MAAM,0BAA0B,CAAC;AAGrG;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,iBA4BpG;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,wBAAwB,EAAE,OAAO,EAAE,aAAa,iBAe/H;AACD;;;EAGE;AACF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,0CAA0C,EAAE,OAAO,EAAE,aAAa,iBASlJ"}

package/lib/cjs/Merging/KindOfQuantityMerger.js

@@ -55,22 +55,21 @@ async function modifyKindOfQuantity(context, change, itemKey) {
     }
     if (change.difference.persistenceUnit !== undefined) {
         // TODO: It should be checked if the unit is the same, but referring to the source schema.
-        throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);
+        throw new Error(`Changing the kind of quantity '${change.itemName}' persistenceUnit is not supported.`);
     }
 }
 /**
  * Merges a new presentation format into the target kind of quantity
  * @internal
 */
-async function addPresentationFormat(context, change) {
+async function addPresentationFormat(context, change, itemKey) {
     for (const formatString of change.difference) {
-        const koqKey = new ecschema_metadata_1.SchemaItemKey(change.itemName, context.targetSchemaKey);
         const presentationFormat = await updateOverrideFormat(context, formatString);
         if (ecschema_metadata_1.OverrideFormat.isOverrideFormat(presentationFormat)) {
-            await context.editor.kindOfQuantities.addPresentationOverrideFormat(koqKey, presentationFormat);
+            await context.editor.kindOfQuantities.addPresentationOverrideFormat(itemKey, presentationFormat);
         }
         else {
-            await context.editor.kindOfQuantities.addPresentationFormat(koqKey, presentationFormat.key);
+            await context.editor.kindOfQuantities.addPresentationFormat(itemKey, presentationFormat.key);
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":";;AAcA,8CA4BC;AAMD,oDAeC;AAKD,sDAUC;AAvED,gEAAqG;AACrG,mCAAwE;AAExE;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAA2B,EAAE,MAAgC;IACnG,IAAI,MAAM,CAAC,UAAU,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,eAAe,GAAG,MAAM,IAAA,gCAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAC/G,IAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;QACvC,IAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtD,KAAI,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC/E,MAAM,kBAAkB,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3G,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC;YAC3E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,kBAAkB,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;YACpG,MAAM,CAAC,UAAU,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAChE,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QAC7E,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,eAAe;QAClD,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,iBAAiB;QACtD,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa;KAC/C,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,oBAAoB,CAAC,OAA2B,EAAE,MAAgC,EAAE,OAAsB;IAC9H,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAA0B,CAAC;IAC/F,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC/F,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACjD,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnE,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QACnD,0FAA0F;QAC1F,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,CAAC,IAAI,qCAAqC,CAAC,CAAC;IACvG,CAAC;AACH,CAAC;AACD;;;EAGE;AACK,KAAK,UAAU,qBAAqB,CAAC,OAA2B,EAAE,MAAkD;IACzH,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3E,MAAM,kBAAkB,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC7E,IAAI,kCAAc,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxD,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAClG,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,OAA2B,EAAE,YAAoB;IACnF,kEAAkE;IAClE,MAAM,KAAK,GAAG,kCAAc,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAW,CAAC;IAE1E,IAAI,SAAS,KAAK,KAAK,CAAC,SAAS,IAAI,SAAS,KAAK,KAAK,CAAC,aAAa;QACpE,OAAO,MAAM,CAAC;IAEhB,IAAI,aAA2E,CAAC;IAChF,IAAI,SAAS,KAAK,KAAK,CAAC,aAAa,EAAE,CAAC;QACtC,aAAa,GAAG,EAAE,CAAC;QACnB,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAwB,CAAC;YACnF,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AACzG,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { Format, InvertedUnit, OverrideFormat, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new KindOfQuantity into the target schema.\n * @internal\n */\nexport async function addKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference) {\n  if (change.difference.persistenceUnit === undefined) {\n    throw new Error(\"KindOfQuantity must define persistenceUnit\");\n  }\n  if (change.difference.relativeError === undefined) {\n    throw new Error(\"KindOfQuantity must define relativeError\");\n  }\n  change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\n  if(change.difference.presentationUnits) {\n    if(Array.isArray(change.difference.presentationUnits)) {\n      for(let index = 0; index < change.difference.presentationUnits.length; index++) {\n        const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\n        change.difference.presentationUnits[index] = presentationFormat.fullName;\n      }\n    } else {\n      const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits);\n      change.difference.presentationUnits = presentationFormat.name;\n    }\n  }\n\n  await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    persistenceUnit: change.difference.persistenceUnit,\n    presentationUnits: change.difference.presentationUnits,\n    relativeError: change.difference.relativeError,\n  });\n}\n\n/**\n * Merges differences to an existing KindOfQuantity in the target schema.\n * @internal\n */\nexport async function modifyKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference, itemKey: SchemaItemKey) {\n  const kindOfQuantity = await context.targetSchema.lookupItem(itemKey) as MutableKindOfQuantity;\n  if(change.difference.label !== undefined) {\n    await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.relativeError !== undefined) {\n    kindOfQuantity.setRelativeError(change.difference.relativeError);\n  }\n  if(change.difference.persistenceUnit !== undefined) {\n    // TODO: It should be checked if the unit is the same, but referring to the source schema.\n    throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\n  }\n}\n/**\n * Merges a new presentation format into the target kind of quantity\n * @internal\n*/\nexport async function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference) {\n  for (const formatString of change.difference) {\n    const koqKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n    const presentationFormat = await updateOverrideFormat(context, formatString);\n    if (OverrideFormat.isOverrideFormat(presentationFormat)) {\n      await context.editor.kindOfQuantities.addPresentationOverrideFormat(koqKey, presentationFormat);\n    } else {\n      await context.editor.kindOfQuantities.addPresentationFormat(koqKey, presentationFormat.key);\n    }\n  }\n}\n\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string): Promise<Format | OverrideFormat> {\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\n  const match = OverrideFormat.parseFormatString(formatString);\n  const formatKey = await updateSchemaItemKey(context, match.name);\n  const format = await context.targetSchema.lookupItem(formatKey) as Format;\n\n  if (undefined === match.precision && undefined === match.unitAndLabels)\n    return format;\n\n  let unitAndLabels: Array<[Unit | InvertedUnit, string | undefined]> | undefined;\n  if (undefined !== match.unitAndLabels) {\n    unitAndLabels = [];\n    for (const unitOverride of match.unitAndLabels) {\n      const unitKey = await updateSchemaItemKey(context, unitOverride[0]);\n      const unit = await context.targetSchema.lookupItem(unitKey) as Unit | InvertedUnit;\n      unitAndLabels.push([unit, unitOverride[1]]);\n    }\n  }\n  return context.editor.kindOfQuantities.createFormatOverride(formatKey, match.precision, unitAndLabels);\n}\n"]}
+{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.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 type { KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { Format, InvertedUnit, OverrideFormat, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new KindOfQuantity into the target schema.\n * @internal\n */\nexport async function addKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference) {\n  if (change.difference.persistenceUnit === undefined) {\n    throw new Error(\"KindOfQuantity must define persistenceUnit\");\n  }\n  if (change.difference.relativeError === undefined) {\n    throw new Error(\"KindOfQuantity must define relativeError\");\n  }\n  change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\n  if(change.difference.presentationUnits) {\n    if(Array.isArray(change.difference.presentationUnits)) {\n      for(let index = 0; index < change.difference.presentationUnits.length; index++) {\n        const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\n        change.difference.presentationUnits[index] = presentationFormat.fullName;\n      }\n    } else {\n      const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits);\n      change.difference.presentationUnits = presentationFormat.name;\n    }\n  }\n\n  await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    persistenceUnit: change.difference.persistenceUnit,\n    presentationUnits: change.difference.presentationUnits,\n    relativeError: change.difference.relativeError,\n  });\n}\n\n/**\n * Merges differences to an existing KindOfQuantity in the target schema.\n * @internal\n */\nexport async function modifyKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference, itemKey: SchemaItemKey) {\n  const kindOfQuantity = await context.targetSchema.lookupItem(itemKey) as MutableKindOfQuantity;\n  if(change.difference.label !== undefined) {\n    await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.relativeError !== undefined) {\n    kindOfQuantity.setRelativeError(change.difference.relativeError);\n  }\n  if(change.difference.persistenceUnit !== undefined) {\n    // TODO: It should be checked if the unit is the same, but referring to the source schema.\n    throw new Error(`Changing the kind of quantity '${change.itemName}' persistenceUnit is not supported.`);\n  }\n}\n/**\n * Merges a new presentation format into the target kind of quantity\n * @internal\n*/\nexport async function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference, itemKey: SchemaItemKey) {\n  for (const formatString of change.difference) {\n    const presentationFormat = await updateOverrideFormat(context, formatString);\n    if (OverrideFormat.isOverrideFormat(presentationFormat)) {\n      await context.editor.kindOfQuantities.addPresentationOverrideFormat(itemKey, presentationFormat);\n    } else {\n      await context.editor.kindOfQuantities.addPresentationFormat(itemKey, presentationFormat.key);\n    }\n  }\n}\n\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string): Promise<Format | OverrideFormat> {\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\n  const match = OverrideFormat.parseFormatString(formatString);\n  const formatKey = await updateSchemaItemKey(context, match.name);\n  const format = await context.targetSchema.lookupItem(formatKey) as Format;\n\n  if (undefined === match.precision && undefined === match.unitAndLabels)\n    return format;\n\n  let unitAndLabels: Array<[Unit | InvertedUnit, string | undefined]> | undefined;\n  if (undefined !== match.unitAndLabels) {\n    unitAndLabels = [];\n    for (const unitOverride of match.unitAndLabels) {\n      const unitKey = await updateSchemaItemKey(context, unitOverride[0]);\n      const unit = await context.targetSchema.lookupItem(unitKey) as Unit | InvertedUnit;\n      unitAndLabels.push([unit, unitOverride[1]]);\n    }\n  }\n  return context.editor.kindOfQuantities.createFormatOverride(formatKey, match.precision, unitAndLabels);\n}\n"]}