@itwin/ecschema-editing 4.4.0-dev.3 → 4.4.0-dev.31

package/lib/cjs/Merging/PrimitiveOrEnumPropertyMerger.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnumerationPropertyMerger = exports.PrimitivePropertyMerger = void 0;
+/*---------------------------------------------------------------------------------------------
+* 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 AnyPropertyMerger_1 = require("./AnyPropertyMerger");
+/**
+ * @internal
+ */
+class PrimitiveOrEnumPropertyMerger extends AnyPropertyMerger_1.AnyPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const mutableProperty = property;
+        switch (attributeName) {
+            case "extendedTypeName": {
+                mutableProperty.setExtendedTypeName(attributeNewValue);
+                return true;
+            }
+            case "minLength": {
+                mutableProperty.setMinLength(attributeNewValue);
+                return true;
+            }
+            case "maxLength": {
+                mutableProperty.setMaxLength(attributeNewValue);
+                return true;
+            }
+            case "minValue": {
+                mutableProperty.setMinValue(attributeNewValue);
+                return true;
+            }
+            case "maxValue": {
+                mutableProperty.setMaxValue(attributeNewValue);
+                return true;
+            }
+        }
+        return false;
+    }
+}
+/**
+ * @internal
+ */
+class PrimitivePropertyMerger extends PrimitiveOrEnumPropertyMerger {
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+        };
+        return this.context.editor.entities.createPrimitivePropertyFromProps(classKey, property.name, property.primitiveType, props);
+    }
+}
+exports.PrimitivePropertyMerger = PrimitivePropertyMerger;
+/**
+ * @internal
+ */
+class EnumerationPropertyMerger extends PrimitiveOrEnumPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "enumeration": {
+                if (attributeOldValue !== undefined) {
+                    return { errorMessage: `Changing the property '${property.name}' enumeration is not supported.` };
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        if (property.enumeration === undefined) {
+            return { errorMessage: `Property ${property.fullName} is missing the required 'enumeration' attribute.` };
+        }
+        const enumeration = await property.enumeration;
+        const itemKey = new ecschema_metadata_1.SchemaItemKey(enumeration.name, this.context.sourceSchema.schemaKey.matches(enumeration.schema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : enumeration.schema.schemaKey);
+        const type = await this.context.targetSchema.lookupItem(itemKey);
+        if (type === undefined) {
+            return { errorMessage: `Unable to locate the enumeration class ${enumeration.name} in the merged schema.` };
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+            typeName: type.fullName,
+        };
+        return this.context.editor.entities.createEnumerationPropertyFromProps(classKey, property.name, type, props);
+    }
+}
+exports.EnumerationPropertyMerger = EnumerationPropertyMerger;
+//# sourceMappingURL=PrimitiveOrEnumPropertyMerger.js.map

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

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

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

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

package/lib/cjs/Merging/SchemaItemFactory.js

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

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

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

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

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

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

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

package/lib/cjs/Merging/SchemaItemMerger.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaItemMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaItemMerger.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAAqE;AACrE,+DAAiG;AACjG,2DAAwD;AAkBxD;;;;;;GAMG;AACH,MAAa,gBAAgB;IAI3B;;;;OAIG;IACH,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,2BAA2B;QACzC,sDAAsD;QACtD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,KAAK,CAAC,QAAuB,EAAE,OAAc,EAAE,OAA0B;QACvF,uCAAuC;IACzC,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAoC,OAA2B,EAAE,iBAAoC;QACnI,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,KAAI,MAAM,MAAM,IAAI,iBAAiB,EAAE;YAErC,yFAAyF;YACzF,MAAM,UAAU,GAAG,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAa,MAAM,CAAC,UAAU,CAAC,CAAE,CAAC;YACxF,IAAI,aAAa,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAEzF,gFAAgF;YAChF,2EAA2E;YAC3E,IAAG,MAAM,CAAC,iBAAiB,EAAE,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAC9D,iFAAiF;gBACjF,sBAAsB;gBACtB,IAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;oBACrE,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,YAAY,CAAC,IAAI,mCAAmC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;iBAC7G;gBAED,sFAAsF;gBACtF,aAAa,GAAG,MAAM,qCAAiB,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;aACrE;YAED,MAAM,MAAM,CAAC,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACjF,MAAM,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;SACvD;IACH,CAAC;IACD;;;;OAIG;IACK,KAAK,CAAC,uBAAuB,CAAC,aAA4B,EAAE,OAA8B;QAChG,uDAAuD;QACvD,IAAG,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO;SACR;QAED,MAAM,SAAS,GAAG,EAAmC,CAAC;QACtD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAElE,KAAI,MAAM,MAAM,IAAI,OAAO,EAAE;YAC3B,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAA6C,CAAC;YACtG,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAChD,SAAS,CAAC,YAAY,CAAC,GAAG,QAAQ,KAAK,SAAS;gBAC9C,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;gBACxC,CAAC,CAAC,aAAa,CAAC;SACnB;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC7E,CAAC;CACF;AAxFD,4CAwFC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { SchemaItem, SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { ChangeType, PropertyValueChange, SchemaItemChanges } from \"../Validation/SchemaChanges\";\r\nimport { SchemaItemFactory } from \"./SchemaItemFactory\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * Defines a type-safe interface of Property Value resolver.\r\n * @internal\r\n */\r\nexport type PropertyValueResolver<T extends SchemaItem, TProps=MutableSchemaItemProps<T>> = {\r\n  [P in keyof TProps]?: (value: any, item: SchemaItemKey) => any;\r\n};\r\n\r\n/**\r\n * Defines a Mutable Schema Props interface.\r\n */\r\ntype MutableSchemaItemProps<T extends SchemaItem> = {\r\n  -readonly [key in keyof ReturnType<T[\"toJSON\"]>]: ReturnType<T[\"toJSON\"]>[key];\r\n};\r\n\r\n/**\r\n * The SchemaItemMerger is an base class for several other mergers with the actual logic\r\n * to perform merging for a certain schema item type. The class provides the shared logics\r\n * that is shared for all schema item mergers and custom logic can be applied by overriding\r\n * the protected class members.\r\n * @internal\r\n */\r\nexport class SchemaItemMerger<TItem extends SchemaItem> {\r\n\r\n  protected readonly context: SchemaMergeContext;\r\n\r\n  /**\r\n   * Constructor of the SchemaItemMerger class. This should not be overriden or extended\r\n   * by sub-implementations.\r\n   * @param context   The current merging context.\r\n   */\r\n  constructor(context: SchemaMergeContext) {\r\n    this.context = context;\r\n  }\r\n\r\n  /**\r\n   * This overridable method allows to create a property value resolver that gets defines\r\n   * a handler function for every possible property change. This allows adding complex handing\r\n   * if a property value requires complicated merging.\r\n   * @returns   A resolver map with resolvers for the property.\r\n   */\r\n  protected async createPropertyValueResolver(): Promise<PropertyValueResolver<TItem>> {\r\n    // Can be overriden for complex property value merging\r\n    return {};\r\n  }\r\n\r\n  /**\r\n   * This overridable method gets called for more complex merging.\r\n   * @param _itemKey  The key of the current schema item.\r\n   * @param _source   The source item that shall gets merged into.\r\n   * @param _change   The schema item change to be applied.\r\n   */\r\n  protected async merge(_itemKey: SchemaItemKey, _source: TItem, _change: SchemaItemChanges) {\r\n    // Can be overriden for complex merging\r\n  }\r\n\r\n  /**\r\n   * Merges the given schema item changes in the current context.\r\n   * @param context             The merging context\r\n   * @param schemaItemChanges   An iterable of item changes.\r\n   */\r\n  public static async mergeChanges<TChange extends SchemaItemChanges>(context: SchemaMergeContext, schemaItemChanges: Iterable<TChange>) {\r\n    const merger = new this(context);\r\n    for(const change of schemaItemChanges) {\r\n\r\n      // Gets the source and the target item. The target item could be undefined at that point.\r\n      const sourceItem = (await context.sourceSchema.getItem<SchemaItem>(change.ecTypeName))!;\r\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\r\n\r\n      // In case the schema item does not exists in the target schema, an instance for\r\n      // this schema item is created. It's properties get set by the merger then.\r\n      if(change.schemaItemMissing?.changeType === ChangeType.Missing) {\r\n        // Check for name to make sure there is no collision for items with the same name\r\n        // but different type.\r\n        if(await context.targetSchema.lookupItem(targetItemKey) !== undefined) {\r\n          throw new Error(`Schema ${context.targetSchema.name} already contains a Schema Item ${change.ecTypeName}.`);\r\n        }\r\n\r\n        // TODO: Think about renaming the Schema Item. This could be controlled though a flag.\r\n        targetItemKey = await SchemaItemFactory.create(context, sourceItem);\r\n      }\r\n\r\n      await merger.mergeItemPropertyValues(targetItemKey, change.propertyValueChanges);\r\n      await merger.merge(targetItemKey, sourceItem, change);\r\n    }\r\n  }\r\n  /**\r\n   * Merges the property values.\r\n   * @param targetItem  The current schema item\r\n   * @param changes     The property changes.\r\n   */\r\n  private async mergeItemPropertyValues(targetItemKey: SchemaItemKey, changes: PropertyValueChange[]) {\r\n    // No need to process anything if no properties differ.\r\n    if(changes.length === 0) {\r\n      return;\r\n    }\r\n\r\n    const jsonProps = {} as MutableSchemaItemProps<TItem>;\r\n    const propertyResolver = await this.createPropertyValueResolver();\r\n\r\n    for(const change of changes) {\r\n      const [propertyName, propertyValue] = change.diagnostic.messageArgs! as [keyof typeof jsonProps, any];\r\n      const resolver = propertyResolver[propertyName];\r\n      jsonProps[propertyName] = resolver !== undefined\r\n        ? resolver(propertyValue, targetItemKey)\r\n        : propertyValue;\r\n    }\r\n\r\n    await this.context.editor.schemaItems.applyProps(targetItemKey, jsonProps);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"SchemaItemMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaItemMerger.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 { SchemaItem, SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { ChangeType, PropertyValueChange, SchemaItemChanges } from \"../Validation/SchemaChanges\";\nimport { SchemaItemFactory } from \"./SchemaItemFactory\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\n/**\n * Defines a type-safe interface of Property Value resolver.\n * @internal\n */\nexport type PropertyValueResolver<T extends SchemaItem, TProps=MutableSchemaItemProps<T>> = {\n  [P in keyof TProps]?: (newValue: any, item: SchemaItemKey, oldValue?: any) => any;\n};\n\n/**\n * Defines a Mutable Schema Props interface.\n */\ntype MutableSchemaItemProps<T extends SchemaItem> = {\n  -readonly [key in keyof ReturnType<T[\"toJSON\"]>]: ReturnType<T[\"toJSON\"]>[key];\n};\n\n/**\n * The SchemaItemMerger is an base class for several other mergers with the actual logic\n * to perform merging for a certain schema item type. The class provides the shared logics\n * that is shared for all schema item mergers and custom logic can be applied by overriding\n * the protected class members.\n * @internal\n */\nexport class SchemaItemMerger<TItem extends SchemaItem> {\n\n  protected readonly context: SchemaMergeContext;\n\n  /**\n   * Constructor of the SchemaItemMerger class. This should not be overriden or extended\n   * by sub-implementations.\n   * @param context   The current merging context.\n   */\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  /**\n   * This overridable method allows to create a property value resolver that gets defines\n   * a handler function for every possible property change. This allows adding complex handing\n   * if a property value requires complicated merging.\n   * @returns   A resolver map with resolvers for the property.\n   */\n  protected async createPropertyValueResolver(): Promise<PropertyValueResolver<TItem>> {\n    // Can be overriden for complex property value merging\n    return {};\n  }\n\n  /**\n   * This overridable method gets called for more complex merging.\n   * @param _itemKey  The key of the current schema item.\n   * @param _source   The source item that shall gets merged into.\n   * @param _change   The schema item change to be applied.\n   */\n  protected async merge(_itemKey: SchemaItemKey, _source: TItem, _change: SchemaItemChanges) {\n    // Can be overriden for complex merging\n  }\n\n  protected async lookup<T extends SchemaItem>(schemaItem: T): Promise<T | undefined>{\n    const itemKey = new SchemaItemKey(schemaItem.name, this.context.sourceSchema.schemaKey.matches(schemaItem.schema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : schemaItem.schema.schemaKey,\n    );\n    return this.context.targetSchema.lookupItem<T>(itemKey);\n  }\n\n  /**\n   * Merges the given schema item changes in the current context.\n   * @param context             The merging context\n   * @param schemaItemChanges   An iterable of item changes.\n   */\n  public static async mergeChanges<TChange extends SchemaItemChanges>(context: SchemaMergeContext, schemaItemChanges: Iterable<TChange>) {\n    const merger = new this(context);\n    for(const change of schemaItemChanges) {\n\n      // Gets the source and the target item. The target item could be undefined at that point.\n      const sourceItem = (await context.sourceSchema.getItem<SchemaItem>(change.ecTypeName))!;\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n\n      // In case the schema item does not exists in the target schema, an instance for\n      // this schema item is created. It's properties get set by the merger then.\n      if(change.schemaItemMissing?.changeType === ChangeType.Missing) {\n        // Check for name to make sure there is no collision for items with the same name\n        // but different type.\n        if(await context.targetSchema.lookupItem(targetItemKey) !== undefined) {\n          throw new Error(`Schema ${context.targetSchema.name} already contains a Schema Item ${change.ecTypeName}.`);\n        }\n\n        // TODO: Think about renaming the Schema Item. This could be controlled though a flag.\n        targetItemKey = await SchemaItemFactory.create(context, sourceItem);\n      }\n\n      await merger.mergeItemPropertyValues(targetItemKey, change.propertyValueChanges);\n      await merger.merge(targetItemKey, sourceItem, change);\n    }\n  }\n  /**\n   * Merges the property values.\n   * @param targetItem  The current schema item\n   * @param changes     The property changes.\n   */\n  private async mergeItemPropertyValues(targetItemKey: SchemaItemKey, changes: PropertyValueChange[]) {\n    // No need to process anything if no properties differ.\n    if(changes.length === 0) {\n      return;\n    }\n\n    const targetItem = (await this.context.targetSchema.lookupItem<SchemaItem>(targetItemKey));\n    const jsonProps = (targetItem?.toJSON() ?? {}) as MutableSchemaItemProps<TItem>;\n    const propertyResolver = await this.createPropertyValueResolver();\n\n    for(const change of changes) {\n      const [propertyName, propertyNewValue, propertyOldValue] = change.diagnostic.messageArgs! as [keyof typeof jsonProps, any, any];\n      const resolver = propertyResolver[propertyName];\n      jsonProps[propertyName] = resolver !== undefined\n        ? resolver(propertyNewValue, targetItemKey, propertyOldValue)\n        : propertyNewValue;\n    }\n\n    await this.context.editor.schemaItems.applyProps(targetItemKey, jsonProps);\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAkB,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AASxD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;CACtC;AAED;;;;GAIG;AACH,qBAAa,YAAY;IACvB;;;;;;;OAOG;YACW,gBAAgB;IAW9B;;;;;OAKG;IACU,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CA2BhF"}
+{"version":3,"file":"SchemaMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAkB,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAaxD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;CACtC;AAED;;;;GAIG;AACH,qBAAa,YAAY;IACvB;;;;;;;OAOG;YACW,gBAAgB;IAW9B;;;;;OAKG;IACU,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAkChF"}

package/lib/cjs/Merging/SchemaMerger.js

@@ -13,10 +13,14 @@ const SchemaComparer_1 = require("../Validation/SchemaComparer");
 const Editor_1 = require("../Editing/Editor");
 const SchemaItemMerger_1 = require("./SchemaItemMerger");
 const SchemaReferenceMerger_1 = require("./SchemaReferenceMerger");
-const ClassMerger_1 = require("./ClassMerger");
 const CAClassMerger_1 = require("./CAClassMerger");
 const EnumerationMerger_1 = require("./EnumerationMerger");
 const ConstantMerger_1 = require("./ConstantMerger");
+const EntityClassMerger_1 = require("./EntityClassMerger");
+const StructClassMerger_1 = require("./StructClassMerger");
+const MixinMerger_1 = require("./MixinMerger");
+const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
+const KindOfQuantityMerger_1 = require("./KindOfQuantityMerger");
 /**
  * Class to merge two schemas together.
  * @see [[merge]] to merge the schemas.
@@ -59,10 +63,16 @@ class SchemaMerger {
         await SchemaItemMerger_1.SchemaItemMerger.mergeChanges(mergeContext, itemChanges.unitSystems);
         await SchemaItemMerger_1.SchemaItemMerger.mergeChanges(mergeContext, itemChanges.phenomenons);
         await ConstantMerger_1.default.mergeChanges(mergeContext, itemChanges.constants);
+        await KindOfQuantityMerger_1.default.mergeChanges(mergeContext, itemChanges.kindOfQuantities);
         // TODO: For now we just do simple copy and merging of properties and classes. For more complex types
         //       with bases classes or relationships, this might need to get extended.
         await CAClassMerger_1.default.mergeChanges(mergeContext, itemChanges.customAttributeClasses);
-        await ClassMerger_1.default.mergeChanges(mergeContext, itemChanges.classes);
+        await StructClassMerger_1.default.mergeChanges(mergeContext, itemChanges.structClasses);
+        await EntityClassMerger_1.default.mergeChanges(mergeContext, itemChanges.entityClasses);
+        await MixinMerger_1.default.mergeChanges(mergeContext, itemChanges.mixins);
+        await (0, CustomAttributeMerger_1.mergeCustomAttributes)(mergeContext, schemaChanges.customAttributeChanges.values(), async (ca) => {
+            return mergeContext.editor.addCustomAttribute(mergeContext.targetSchema.schemaKey, ca);
+        });
         // TODO: For now we directly manipulate the target schema. For error handing purposes, we should first
         //       merge into a temporary schema and eventually swap that with the given instance.
         return targetSchema;
@@ -75,13 +85,16 @@ exports.SchemaMerger = SchemaMerger;
  */
 function getSchemaItemChanges(schemaChanges) {
     return {
-        get classes() { return filterChangesByItemType(schemaChanges.classChanges, ecschema_metadata_1.SchemaItemType.EntityClass, ecschema_metadata_1.SchemaItemType.StructClass); },
+        get entityClasses() { return filterChangesByItemType(schemaChanges.classChanges, ecschema_metadata_1.SchemaItemType.EntityClass); },
         get constants() { return filterChangesByItemType(schemaChanges.schemaItemChanges, ecschema_metadata_1.SchemaItemType.Constant); },
         get customAttributeClasses() { return filterChangesByItemType(schemaChanges.classChanges, ecschema_metadata_1.SchemaItemType.CustomAttributeClass); },
         get enumeratations() { return schemaChanges.enumerationChanges.values(); },
+        get kindOfQuantities() { return schemaChanges.kindOfQuantityChanges.values(); },
         get phenomenons() { return filterChangesByItemType(schemaChanges.schemaItemChanges, ecschema_metadata_1.SchemaItemType.Phenomenon); },
         get propertyCategories() { return filterChangesByItemType(schemaChanges.schemaItemChanges, ecschema_metadata_1.SchemaItemType.PropertyCategory); },
         get unitSystems() { return filterChangesByItemType(schemaChanges.schemaItemChanges, ecschema_metadata_1.SchemaItemType.UnitSystem); },
+        get structClasses() { return filterChangesByItemType(schemaChanges.classChanges, ecschema_metadata_1.SchemaItemType.StructClass); },
+        get mixins() { return filterChangesByItemType(schemaChanges.classChanges, ecschema_metadata_1.SchemaItemType.Mixin); },
     };
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Merging\r\n */\r\n\r\nimport { Schema, SchemaItemType } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaChanges, SchemaItemChanges } from \"../Validation/SchemaChanges\";\r\nimport { SchemaComparer } from \"../Validation/SchemaComparer\";\r\nimport { SchemaContextEditor } from \"../Editing/Editor\";\r\nimport { SchemaItemMerger } from \"./SchemaItemMerger\";\r\n\r\nimport mergeSchemaReferences from \"./SchemaReferenceMerger\";\r\nimport ClassMerger from \"./ClassMerger\";\r\nimport CAClassMerger from \"./CAClassMerger\";\r\nimport EnumerationMerger from \"./EnumerationMerger\";\r\nimport ConstantsMerger from \"./ConstantMerger\";\r\n\r\n/**\r\n * Defines the context of a Schema merging run.\r\n * @beta\r\n */\r\nexport interface SchemaMergeContext {\r\n  readonly targetSchema: Schema;\r\n  readonly sourceSchema: Schema;\r\n  readonly editor: SchemaContextEditor;\r\n}\r\n\r\n/**\r\n * Class to merge two schemas together.\r\n * @see [[merge]] to merge the schemas.\r\n * @beta\r\n */\r\nexport class SchemaMerger {\r\n  /**\r\n   * Gets the @see SchemaChanges between the two given Schemas from perspective of the source\r\n   * to the target schema. For example if source contains a class which does not exists in the\r\n   * target one, it would be listed as missing.\r\n   * @param targetSchema  The schema the differences gets merged into.\r\n   * @param sourceSchema  The schema to compare.\r\n   * @returns             An instance of @see SchemaChanges between the two schemas.\r\n   */\r\n  private async getSchemaChanges(targetSchema: Schema, sourceSchema: Schema): Promise<SchemaChanges> {\r\n    const changesList: SchemaChanges[] = [];\r\n    const schemaComparer = new SchemaComparer({ report: changesList.push.bind(changesList) });\r\n\r\n    // It is important to compare the schema items by name, not full name as otherwise\r\n    // we'd often see differences when comparing two different schemas.\r\n    await schemaComparer.compareSchemas(sourceSchema, targetSchema);\r\n\r\n    return changesList[0];\r\n  }\r\n\r\n  /**\r\n   * Copy the SchemaItems of the source schemas to the target schema.\r\n   * @param targetSchema  The schema the SchemaItems gets merged to.\r\n   * @param sourceSchema  The schema the SchemaItems gets copied from.\r\n   * @returns             The merged target schema.\r\n   */\r\n  public async merge(targetSchema: Schema, sourceSchema: Schema): Promise<Schema> {\r\n    const schemaChanges = await this.getSchemaChanges(targetSchema, sourceSchema);\r\n    const mergeContext: SchemaMergeContext = {\r\n      editor: new SchemaContextEditor(targetSchema.context),\r\n      targetSchema,\r\n      sourceSchema,\r\n    };\r\n\r\n    await mergeSchemaReferences(mergeContext, schemaChanges);\r\n\r\n    const itemChanges = getSchemaItemChanges(schemaChanges);\r\n    await EnumerationMerger.mergeChanges(mergeContext, itemChanges.enumeratations);\r\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.propertyCategories);\r\n\r\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.unitSystems);\r\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.phenomenons);\r\n    await ConstantsMerger.mergeChanges(mergeContext, itemChanges.constants);\r\n\r\n    // TODO: For now we just do simple copy and merging of properties and classes. For more complex types\r\n    //       with bases classes or relationships, this might need to get extended.\r\n    await CAClassMerger.mergeChanges(mergeContext, itemChanges.customAttributeClasses);\r\n    await ClassMerger.mergeChanges(mergeContext, itemChanges.classes);\r\n\r\n    // TODO: For now we directly manipulate the target schema. For error handing purposes, we should first\r\n    //       merge into a temporary schema and eventually swap that with the given instance.\r\n    return targetSchema;\r\n  }\r\n}\r\n\r\n/**\r\n * This helper method composes the different schema change objects to a single easier\r\n * to use object that should improve readability when the methods get called.\r\n */\r\nfunction getSchemaItemChanges(schemaChanges: SchemaChanges) {\r\n  return {\r\n    get classes() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.EntityClass, SchemaItemType.StructClass); },\r\n    get constants() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.Constant); },\r\n    get customAttributeClasses() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.CustomAttributeClass); },\r\n    get enumeratations() { return schemaChanges.enumerationChanges.values(); },\r\n    get phenomenons() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.Phenomenon); },\r\n    get propertyCategories() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.PropertyCategory); },\r\n    get unitSystems() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.UnitSystem); },\r\n  };\r\n}\r\n\r\n/**\r\n * Filters and returns the changed items by its schema item type.\r\n * @param changes   A map of changed schema items.\r\n * @param types     A list of schema item types to filter.\r\n * @returns         An Iterable with the filtered schema items.\r\n */\r\nfunction * filterChangesByItemType<TChange extends SchemaItemChanges>(changes: Map<string, TChange>, ...types: SchemaItemType[]): Iterable<TChange> {\r\n  for(const change of changes.values()) {\r\n    if (types.includes(change.schemaItemType)) {\r\n      yield change;\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"SchemaMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.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 { Schema, SchemaItemType } from \"@itwin/ecschema-metadata\";\nimport { SchemaChanges, SchemaItemChanges } from \"../Validation/SchemaChanges\";\nimport { SchemaComparer } from \"../Validation/SchemaComparer\";\nimport { SchemaContextEditor } from \"../Editing/Editor\";\nimport { SchemaItemMerger } from \"./SchemaItemMerger\";\n\nimport mergeSchemaReferences from \"./SchemaReferenceMerger\";\nimport CAClassMerger from \"./CAClassMerger\";\nimport EnumerationMerger from \"./EnumerationMerger\";\nimport ConstantsMerger from \"./ConstantMerger\";\nimport EntityClassMerger from \"./EntityClassMerger\";\nimport StructClassMerger from \"./StructClassMerger\";\nimport MixinMerger from \"./MixinMerger\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\nimport KindOfQuantityMerger from \"./KindOfQuantityMerger\";\n\n/**\n * Defines the context of a Schema merging run.\n * @beta\n */\nexport interface SchemaMergeContext {\n  readonly targetSchema: Schema;\n  readonly sourceSchema: Schema;\n  readonly editor: SchemaContextEditor;\n}\n\n/**\n * Class to merge two schemas together.\n * @see [[merge]] to merge the schemas.\n * @beta\n */\nexport class SchemaMerger {\n  /**\n   * Gets the @see SchemaChanges between the two given Schemas from perspective of the source\n   * to the target schema. For example if source contains a class which does not exists in the\n   * target one, it would be listed as missing.\n   * @param targetSchema  The schema the differences gets merged into.\n   * @param sourceSchema  The schema to compare.\n   * @returns             An instance of @see SchemaChanges between the two schemas.\n   */\n  private async getSchemaChanges(targetSchema: Schema, sourceSchema: Schema): Promise<SchemaChanges> {\n    const changesList: SchemaChanges[] = [];\n    const schemaComparer = new SchemaComparer({ report: changesList.push.bind(changesList) });\n\n    // It is important to compare the schema items by name, not full name as otherwise\n    // we'd often see differences when comparing two different schemas.\n    await schemaComparer.compareSchemas(sourceSchema, targetSchema);\n\n    return changesList[0];\n  }\n\n  /**\n   * Copy the SchemaItems of the source schemas to the target schema.\n   * @param targetSchema  The schema the SchemaItems gets merged to.\n   * @param sourceSchema  The schema the SchemaItems gets copied from.\n   * @returns             The merged target schema.\n   */\n  public async merge(targetSchema: Schema, sourceSchema: Schema): Promise<Schema> {\n    const schemaChanges = await this.getSchemaChanges(targetSchema, sourceSchema);\n    const mergeContext: SchemaMergeContext = {\n      editor: new SchemaContextEditor(targetSchema.context),\n      targetSchema,\n      sourceSchema,\n    };\n\n    await mergeSchemaReferences(mergeContext, schemaChanges);\n\n    const itemChanges = getSchemaItemChanges(schemaChanges);\n    await EnumerationMerger.mergeChanges(mergeContext, itemChanges.enumeratations);\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.propertyCategories);\n\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.unitSystems);\n    await SchemaItemMerger.mergeChanges(mergeContext, itemChanges.phenomenons);\n    await ConstantsMerger.mergeChanges(mergeContext, itemChanges.constants);\n    await KindOfQuantityMerger.mergeChanges(mergeContext, itemChanges.kindOfQuantities);\n\n    // TODO: For now we just do simple copy and merging of properties and classes. For more complex types\n    //       with bases classes or relationships, this might need to get extended.\n    await CAClassMerger.mergeChanges(mergeContext, itemChanges.customAttributeClasses);\n    await StructClassMerger.mergeChanges(mergeContext, itemChanges.structClasses);\n    await EntityClassMerger.mergeChanges(mergeContext, itemChanges.entityClasses);\n    await MixinMerger.mergeChanges(mergeContext, itemChanges.mixins);\n\n    await mergeCustomAttributes(mergeContext, schemaChanges.customAttributeChanges.values(), async (ca) => {\n      return mergeContext.editor.addCustomAttribute(mergeContext.targetSchema.schemaKey, ca);\n    });\n\n    // TODO: For now we directly manipulate the target schema. For error handing purposes, we should first\n    //       merge into a temporary schema and eventually swap that with the given instance.\n    return targetSchema;\n  }\n}\n\n/**\n * This helper method composes the different schema change objects to a single easier\n * to use object that should improve readability when the methods get called.\n */\nfunction getSchemaItemChanges(schemaChanges: SchemaChanges) {\n  return {\n    get entityClasses() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.EntityClass); },\n    get constants() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.Constant); },\n    get customAttributeClasses() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.CustomAttributeClass); },\n    get enumeratations() { return schemaChanges.enumerationChanges.values(); },\n    get kindOfQuantities() { return schemaChanges.kindOfQuantityChanges.values(); },\n    get phenomenons() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.Phenomenon); },\n    get propertyCategories() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.PropertyCategory); },\n    get unitSystems() { return filterChangesByItemType(schemaChanges.schemaItemChanges, SchemaItemType.UnitSystem); },\n    get structClasses() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.StructClass); },\n    get mixins() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.Mixin); },\n  };\n}\n\n/**\n * Filters and returns the changed items by its schema item type.\n * @param changes   A map of changed schema items.\n * @param types     A list of schema item types to filter.\n * @returns         An Iterable with the filtered schema items.\n */\nfunction * filterChangesByItemType<TChange extends SchemaItemChanges>(changes: Map<string, TChange>, ...types: SchemaItemType[]): Iterable<TChange> {\n  for(const change of changes.values()) {\n    if (types.includes(change.schemaItemType)) {\n      yield change;\n    }\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaReferenceMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAmE;AAInE;;;;;GAKG;AACY,KAAK,UAAU,qBAAqB,CAAC,YAAgC,EAAE,OAAsB;IAC1G,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;IAE/C,kFAAkF;IAClF,4FAA4F;IAC5F,KAAI,MAAM,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,EAAE;QACnE,MAAM,CAAC,gBAAgB,CAAC,GAAG,sBAAsB,CAAC,UAAU,CAAC,WAAwB,CAAC;QACtF,MAAM,YAAY,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;KACxF;IAED,iFAAiF;IACjF,qFAAqF;IACrF,qFAAqF;IACrF,8BAA8B;IAC9B,KAAI,MAAM,wBAAwB,IAAI,OAAO,CAAC,qBAAqB,EAAE;QACnE,MAAM,CAAC,gBAAgB,CAAC,GAAG,wBAAwB,CAAC,UAAU,CAAC,WAAwB,CAAC;QACxF,MAAM,cAAc,GAAG,CAAC,MAAM,YAAY,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAE,CAAC;QAEjF,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACzE,IAAG,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,mCAAe,CAAC,qBAAqB,CAAC,EAAE;YACpF,MAAM,IAAI,KAAK,CAAC,yBAAyB,gBAAgB,CAAC,IAAI,gCAAgC,KAAK,CAAC,SAAS,CAAC,OAAO,QAAQ,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1J;QACD,IAAG,MAAM,KAAK,cAAc,EAAE;YAC5B,SAAS;SACV;QAED,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC;QAC7F,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEzC,MAAM,YAAY,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;KACxF;AACH,CAAC;AA/BD,wCA+BC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,IAAY,EAAE,KAAa;IACjD,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;QACzD,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACf,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACpB,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { Schema, SchemaMatchType } from \"@itwin/ecschema-metadata\";\r\nimport { SchemaChanges } from \"../Validation/SchemaChanges\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * Merges the schema references of two schemas.\r\n * @param mergeContext  current merge context\r\n * @param changes       schema changes.\r\n * @internal\r\n */\r\nexport default async function mergeSchemaReferences(mergeContext: SchemaMergeContext, changes: SchemaChanges) {\r\n  const targetSchema = mergeContext.targetSchema;\r\n\r\n  // If the target schema does not have a reference to a schema yet, it can be added\r\n  // but should be checked if it's schema references have collisions with existing references.\r\n  for(const missingSchemaReference of changes.missingSchemaReferences) {\r\n    const [referencedSchema] = missingSchemaReference.diagnostic.messageArgs! as [Schema];\r\n    await mergeContext.editor.addSchemaReference(targetSchema.schemaKey, referencedSchema);\r\n  }\r\n\r\n  // If the source schema referenced a schema that is also referenced by the target\r\n  // schema but in a different version, it is marked as delta. Here we need to check if\r\n  // the source schema is compatible to the existing one. This is not be checked by the\r\n  // schema instance when added.\r\n  for(const differentSchemaReference of changes.schemaReferenceDeltas) {\r\n    const [referencedSchema] = differentSchemaReference.diagnostic.messageArgs! as [Schema];\r\n    const existingSchema = (await targetSchema.getReference(referencedSchema.name))!;\r\n\r\n    const [older, latest] = compareSchemas(existingSchema, referencedSchema);\r\n    if(!latest.schemaKey.matches(older.schemaKey, SchemaMatchType.LatestWriteCompatible)) {\r\n      throw new Error(`Schemas references of ${referencedSchema.name} have incompatible versions: ${older.schemaKey.version} and ${latest.schemaKey.version}`);\r\n    }\r\n    if(latest === existingSchema) {\r\n      continue;\r\n    }\r\n\r\n    const index = targetSchema.references.findIndex((reference) => reference === existingSchema);\r\n    targetSchema.references.splice(index, 1);\r\n\r\n    await mergeContext.editor.addSchemaReference(targetSchema.schemaKey, referencedSchema);\r\n  }\r\n}\r\n\r\n/**\r\n * Compares the schemas and return them in order of their versions [older, latest].\r\n * @param left    The first schema to be added.\r\n * @param right   The second schema to be added.\r\n * @returns       The schemas in order.\r\n */\r\nfunction compareSchemas(left: Schema, right: Schema): [Schema, Schema] {\r\n  return left.schemaKey.compareByVersion(right.schemaKey) < 0\r\n    ? [left, right]\r\n    : [right, left];\r\n}\r\n"]}
+{"version":3,"file":"SchemaReferenceMerger.js","sourceRoot":"","sources":["../../../src/Merging/SchemaReferenceMerger.ts"],"names":[],"mappings":";;AAAA;;;+FAG+F;AAC/F,gEAAmE;AAInE;;;;;GAKG;AACY,KAAK,UAAU,qBAAqB,CAAC,YAAgC,EAAE,OAAsB;IAC1G,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;IAE/C,kFAAkF;IAClF,4FAA4F;IAC5F,KAAI,MAAM,sBAAsB,IAAI,OAAO,CAAC,uBAAuB,EAAE;QACnE,MAAM,CAAC,gBAAgB,CAAC,GAAG,sBAAsB,CAAC,UAAU,CAAC,WAAwB,CAAC;QACtF,MAAM,YAAY,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;KACxF;IAED,iFAAiF;IACjF,qFAAqF;IACrF,qFAAqF;IACrF,8BAA8B;IAC9B,KAAI,MAAM,wBAAwB,IAAI,OAAO,CAAC,qBAAqB,EAAE;QACnE,MAAM,CAAC,gBAAgB,CAAC,GAAG,wBAAwB,CAAC,UAAU,CAAC,WAAwB,CAAC;QACxF,MAAM,cAAc,GAAG,CAAC,MAAM,YAAY,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAE,CAAC;QAEjF,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACzE,IAAG,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,mCAAe,CAAC,qBAAqB,CAAC,EAAE;YACpF,MAAM,IAAI,KAAK,CAAC,yBAAyB,gBAAgB,CAAC,IAAI,gCAAgC,KAAK,CAAC,SAAS,CAAC,OAAO,QAAQ,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1J;QACD,IAAG,MAAM,KAAK,cAAc,EAAE;YAC5B,SAAS;SACV;QAED,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC;QAC7F,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEzC,MAAM,YAAY,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;KACxF;AACH,CAAC;AA/BD,wCA+BC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,IAAY,EAAE,KAAa;IACjD,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC;QACzD,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC;QACf,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACpB,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 { Schema, SchemaMatchType } from \"@itwin/ecschema-metadata\";\nimport { SchemaChanges } from \"../Validation/SchemaChanges\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\n\n/**\n * Merges the schema references of two schemas.\n * @param mergeContext  current merge context\n * @param changes       schema changes.\n * @internal\n */\nexport default async function mergeSchemaReferences(mergeContext: SchemaMergeContext, changes: SchemaChanges) {\n  const targetSchema = mergeContext.targetSchema;\n\n  // If the target schema does not have a reference to a schema yet, it can be added\n  // but should be checked if it's schema references have collisions with existing references.\n  for(const missingSchemaReference of changes.missingSchemaReferences) {\n    const [referencedSchema] = missingSchemaReference.diagnostic.messageArgs! as [Schema];\n    await mergeContext.editor.addSchemaReference(targetSchema.schemaKey, referencedSchema);\n  }\n\n  // If the source schema referenced a schema that is also referenced by the target\n  // schema but in a different version, it is marked as delta. Here we need to check if\n  // the source schema is compatible to the existing one. This is not be checked by the\n  // schema instance when added.\n  for(const differentSchemaReference of changes.schemaReferenceDeltas) {\n    const [referencedSchema] = differentSchemaReference.diagnostic.messageArgs! as [Schema];\n    const existingSchema = (await targetSchema.getReference(referencedSchema.name))!;\n\n    const [older, latest] = compareSchemas(existingSchema, referencedSchema);\n    if(!latest.schemaKey.matches(older.schemaKey, SchemaMatchType.LatestWriteCompatible)) {\n      throw new Error(`Schemas references of ${referencedSchema.name} have incompatible versions: ${older.schemaKey.version} and ${latest.schemaKey.version}`);\n    }\n    if(latest === existingSchema) {\n      continue;\n    }\n\n    const index = targetSchema.references.findIndex((reference) => reference === existingSchema);\n    targetSchema.references.splice(index, 1);\n\n    await mergeContext.editor.addSchemaReference(targetSchema.schemaKey, referencedSchema);\n  }\n}\n\n/**\n * Compares the schemas and return them in order of their versions [older, latest].\n * @param left    The first schema to be added.\n * @param right   The second schema to be added.\n * @returns       The schemas in order.\n */\nfunction compareSchemas(left: Schema, right: Schema): [Schema, Schema] {\n  return left.schemaKey.compareByVersion(right.schemaKey) < 0\n    ? [left, right]\n    : [right, left];\n}\n"]}

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

@@ -0,0 +1,10 @@
+import { SchemaKey, StructClass } from "@itwin/ecschema-metadata";
+import { ClassMerger } from "./ClassMerger";
+import { SchemaItemEditResults } from "../Editing/Editor";
+/**
+ * @internal
+ */
+export default class StructClassMerger extends ClassMerger<StructClass> {
+    protected create(schemaKey: SchemaKey, ecClass: StructClass): Promise<SchemaItemEditResults>;
+}
+//# sourceMappingURL=StructClassMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/StructClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,WAAW,CAAC,WAAW,CAAC;cAE5C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAG5G"}

package/lib/cjs/Merging/StructClassMerger.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ClassMerger_1 = require("./ClassMerger");
+/**
+ * @internal
+ */
+class StructClassMerger extends ClassMerger_1.ClassMerger {
+    async create(schemaKey, ecClass) {
+        return this.context.editor.structs.create(schemaKey, ecClass.name);
+    }
+}
+exports.default = StructClassMerger;
+//# sourceMappingURL=StructClassMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/StructClassMerger.ts"],"names":[],"mappings":";;AAKA,+CAA4C;AAG5C;;GAEG;AACH,MAAqB,iBAAkB,SAAQ,yBAAwB;IAElD,KAAK,CAAC,MAAM,CAAC,SAAoB,EAAE,OAAoB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,CAAC;CACF;AALD,oCAKC","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 { SchemaKey, StructClass } from \"@itwin/ecschema-metadata\";\nimport { ClassMerger } from \"./ClassMerger\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\n\n/**\n * @internal\n */\nexport default class StructClassMerger extends ClassMerger<StructClass> {\n\n  protected override async create(schemaKey: SchemaKey, ecClass: StructClass): Promise<SchemaItemEditResults> {\n    return this.context.editor.structs.create(schemaKey, ecClass.name);\n  }\n}\n"]}

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

@@ -0,0 +1,11 @@
+import { SchemaItemKey, StructProperty } from "@itwin/ecschema-metadata";
+import { AnyPropertyMerger } from "./AnyPropertyMerger";
+import { PropertyEditResults } from "../Editing/Editor";
+/**
+ * @internal
+ */
+export declare class StructPropertyMerger extends AnyPropertyMerger<StructProperty> {
+    mergeAttributes(property: StructProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean>;
+    createFromProps(classKey: SchemaItemKey, property: StructProperty): Promise<PropertyEditResults>;
+}
+//# sourceMappingURL=StructPropertyMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructPropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/StructPropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAe,cAAc,EAAuB,MAAM,0BAA0B,CAAC;AAC3G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB,CAAC,cAAc,CAAC;IACnD,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;IAcxJ,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsBvH"}

package/lib/cjs/Merging/StructPropertyMerger.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructPropertyMerger = void 0;
+/*---------------------------------------------------------------------------------------------
+* 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 AnyPropertyMerger_1 = require("./AnyPropertyMerger");
+/**
+ * @internal
+ */
+class StructPropertyMerger extends AnyPropertyMerger_1.AnyPropertyMerger {
+    async mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "structClass": {
+                return { errorMessage: `Changing the property '${property.name}' structClass is not supported.` };
+            }
+        }
+        return false;
+    }
+    async createFromProps(classKey, property) {
+        const results = await super.getPropertyProps(property);
+        if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        const itemKey = new ecschema_metadata_1.SchemaItemKey(property.structClass.name, this.context.sourceSchema.schemaKey.matches(property.structClass.schema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : property.structClass.schema.schemaKey);
+        const type = await this.context.targetSchema.lookupItem(itemKey);
+        if (type === undefined) {
+            return { errorMessage: `Unable to locate the struct class ${property.structClass.name} in the merged schema.` };
+        }
+        const props = {
+            ...property.toJSON(),
+            ...results,
+            typeName: type.fullName,
+        };
+        return this.context.editor.entities.createStructPropertyFromProps(classKey, property.name, type, props);
+    }
+}
+exports.StructPropertyMerger = StructPropertyMerger;
+//# sourceMappingURL=StructPropertyMerger.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StructPropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/StructPropertyMerger.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAA2G;AAC3G,2DAAwD;AAGxD;;GAEG;AACH,MAAa,oBAAqB,SAAQ,qCAAiC;IACzD,KAAK,CAAC,eAAe,CAAC,QAAwB,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QACnI,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;QAC3G,IAAI,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;YACjG,OAAO,OAAO,CAAC;SAChB;QAED,QAAQ,aAAa,EAAE;YACrB,KAAK,aAAa,CAAC,CAAC;gBAClB,OAAO,EAAE,YAAY,EAAE,0BAA0B,QAAQ,CAAC,IAAI,iCAAiC,EAAE,CAAC;aACnG;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEe,KAAK,CAAC,eAAe,CAAC,QAAuB,EAAE,QAAwB;QACrF,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;YAC7E,OAAO,OAAO,CAAC;SAChB;QAED,MAAM,OAAO,GAAG,IAAI,iCAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC;YAC7I,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;YACrC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CACxC,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAc,OAAO,CAAC,CAAC;QAC9E,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO,EAAE,YAAY,EAAE,qCAAqC,QAAQ,CAAC,WAAW,CAAC,IAAI,wBAAwB,EAAE,CAAC;SACjH;QAED,MAAM,KAAK,GAAwB;YACjC,GAAG,QAAQ,CAAC,MAAM,EAAE;YACpB,GAAG,OAAO;YACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1G,CAAC;CACF;AArCD,oDAqCC","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, StructClass, StructProperty, StructPropertyProps } from \"@itwin/ecschema-metadata\";\nimport { AnyPropertyMerger } from \"./AnyPropertyMerger\";\nimport { PropertyEditResults } from \"../Editing/Editor\";\n\n/**\n * @internal\n */\nexport class StructPropertyMerger extends AnyPropertyMerger<StructProperty> {\n  public override async mergeAttributes(property: StructProperty, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<PropertyEditResults | boolean> {\n    const results = await super.mergeAttributes(property, attributeName, attributeNewValue, attributeOldValue);\n    if (results === true || this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    switch (attributeName) {\n      case \"structClass\": {\n        return { errorMessage: `Changing the property '${property.name}' structClass is not supported.` };\n      }\n    }\n    return false;\n  }\n\n  public override async createFromProps(classKey: SchemaItemKey, property: StructProperty): Promise<PropertyEditResults> {\n    const results = await super.getPropertyProps(property);\n    if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {\n      return results;\n    }\n\n    const itemKey = new SchemaItemKey(property.structClass.name, this.context.sourceSchema.schemaKey.matches(property.structClass.schema.schemaKey)\n      ? this.context.targetSchema.schemaKey\n      : property.structClass.schema.schemaKey,\n    );\n    const type = await this.context.targetSchema.lookupItem<StructClass>(itemKey);\n    if (type === undefined) {\n      return { errorMessage: `Unable to locate the struct class ${property.structClass.name} in the merged schema.` };\n    }\n\n    const props: StructPropertyProps = {\n      ...property.toJSON(),\n      ...results,\n      typeName: type.fullName,\n    };\n    return this.context.editor.entities.createStructPropertyFromProps(classKey, property.name, type, props);\n  }\n}\n"]}