@itwin/ecschema-editing 4.3.2 → 4.4.0-dev.10

package/lib/cjs/Merging/ClassPropertyMerger.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassPropertyMerger = 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 SchemaChanges_1 = require("../Validation/SchemaChanges");
+const StructPropertyMerger_1 = require("./StructPropertyMerger");
+const ArrayPropertyMerger_1 = require("./ArrayPropertyMerger");
+const PrimitiveOrEnumPropertyMerger_1 = require("./PrimitiveOrEnumPropertyMerger");
+const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
+/**
+ * @internal
+ */
+class ClassPropertyMerger {
+    constructor(context) {
+        this.context = context;
+    }
+    getPropertyMerger(property) {
+        if (property.isEnumeration()) {
+            if (property.isArray()) {
+                return new ArrayPropertyMerger_1.EnumerationArrayPropertyMerger(this.context);
+            }
+            return new PrimitiveOrEnumPropertyMerger_1.EnumerationPropertyMerger(this.context);
+        }
+        if (property.isPrimitive()) {
+            if (property.isArray()) {
+                return new ArrayPropertyMerger_1.PrimitiveArraPropertyMerger(this.context);
+            }
+            return new PrimitiveOrEnumPropertyMerger_1.PrimitivePropertyMerger(this.context);
+        }
+        if (property.isStruct()) {
+            if (property.isArray()) {
+                return new ArrayPropertyMerger_1.StructArrayPropertyMerger(this.context);
+            }
+            return new StructPropertyMerger_1.StructPropertyMerger(this.context);
+        }
+        throw new Error(`Unsupported Property Type: ${(0, ecschema_metadata_1.propertyTypeToString)(property.propertyType)}`);
+    }
+    isPropertyEditResults(obj) {
+        return typeof obj === "object" && "errorMessage" in obj;
+    }
+    async mergeAttributeValueChanges(targetProperty, propertyValueChanges) {
+        if (propertyValueChanges.length === 0)
+            return;
+        const merger = this.getPropertyMerger(targetProperty);
+        for (const change of propertyValueChanges) {
+            const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs;
+            const results = await merger.mergeAttributes(targetProperty, attributeName, attributeNewValue, attributeOldValue);
+            if (this.isPropertyEditResults(results) && results.errorMessage !== undefined) {
+                throw new Error(results.errorMessage);
+            }
+        }
+    }
+    static async mergeChanges(context, classKey, propertyChanges) {
+        const merger = new this(context);
+        for (const change of propertyChanges) {
+            const targetItem = await context.targetSchema.lookupItem(classKey);
+            if (targetItem === undefined) {
+                return { errorMessage: `'${classKey.name}' class could not be located in the merged schema.` };
+            }
+            if (change.propertyMissing?.changeType === SchemaChanges_1.ChangeType.Missing) {
+                const sourceProperty = change.propertyMissing.diagnostic.ecDefinition;
+                if (await targetItem.getProperty(change.ecTypeName) !== undefined) {
+                    return { errorMessage: `Merged schema already contains a class '${classKey.name}' property '${change.ecTypeName}'.` };
+                }
+                const propertyMerger = merger.getPropertyMerger(sourceProperty);
+                const results = await propertyMerger.createFromProps(classKey, sourceProperty);
+                if (results.errorMessage !== undefined) {
+                    return { errorMessage: results.errorMessage };
+                }
+            }
+            else {
+                const targetProperty = (await targetItem.getProperty(change.ecTypeName));
+                await merger.mergeAttributeValueChanges(targetProperty, change.propertyValueChanges);
+            }
+            const mergeResults = await (0, CustomAttributeMerger_1.mergeCustomAttributes)(merger.context, change.customAttributeChanges.values(), async (ca) => {
+                return merger.context.editor.entities.addCustomAttributeToProperty(classKey, change.ecTypeName, ca);
+            });
+            if (mergeResults.errorMessage !== undefined) {
+                return { errorMessage: mergeResults.errorMessage };
+            }
+        }
+        return { itemKey: classKey };
+    }
+}
+exports.ClassPropertyMerger = ClassPropertyMerger;
+//# sourceMappingURL=ClassPropertyMerger.js.map

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

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

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

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

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

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

package/lib/cjs/Merging/CustomAttributeMerger.js

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

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"EntityClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/EntityClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACxF,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;cAC5C,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAIlF,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;CASxG"}

package/lib/cjs/Merging/EntityClassMerger.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const ClassMerger_1 = require("./ClassMerger");
+/**
+ * @internal
+ */
+class EntityClassMerger extends ClassMerger_1.ClassMerger {
+    async create(schemaKey, ecClass) {
+        return this.context.editor.entities.create(schemaKey, ecClass.name, ecClass.modifier);
+    }
+    async addMixin(itemKey, mixin) {
+        const mixinKey = new ecschema_metadata_1.SchemaItemKey(mixin.name, mixin.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : mixin.schema.schemaKey);
+        // addMixin should return results instead of throwing exception
+        await this.context.editor.entities.addMixin(itemKey, mixinKey);
+        return {};
+    }
+}
+exports.default = EntityClassMerger;
+//# sourceMappingURL=EntityClassMerger.js.map

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

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

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

@@ -0,0 +1,11 @@
+import { Mixin, SchemaKey } from "@itwin/ecschema-metadata";
+import { SchemaItemEditResults } from "../Editing/Editor";
+import { ClassMerger } from "./ClassMerger";
+/**
+ * @internal
+ */
+export default class MixinMerger extends ClassMerger<Mixin> {
+    protected create(schemaKey: SchemaKey, ecClass: Mixin): Promise<SchemaItemEditResults>;
+    protected mergeAttributes(ecClass: Mixin, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean>;
+}
+//# sourceMappingURL=MixinMerger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MixinMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAiB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,KAAK,CAAC;cAEhC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAW5E,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;CAe1K"}

package/lib/cjs/Merging/MixinMerger.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
+const ClassMerger_1 = require("./ClassMerger");
+/**
+ * @internal
+ */
+class MixinMerger extends ClassMerger_1.ClassMerger {
+    async create(schemaKey, ecClass) {
+        if (ecClass.appliesTo === undefined) {
+            return { errorMessage: `The Mixin ${ecClass.fullName} is missing the required 'appliesTo' attribute.` };
+        }
+        const appliesTo = new ecschema_metadata_1.SchemaItemKey(ecClass.appliesTo.name, this.context.sourceSchema.schemaKey.matches(ecClass.appliesTo.schemaKey)
+            ? this.context.targetSchema.schemaKey
+            : ecClass.appliesTo.schemaKey);
+        return this.context.editor.mixins.create(schemaKey, ecClass.name, appliesTo);
+    }
+    async mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue) {
+        const results = await super.mergeAttributes(ecClass, attributeName, attributeNewValue, attributeOldValue);
+        if (results === true || this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {
+            return results;
+        }
+        switch (attributeName) {
+            case "appliesTo":
+                if (attributeOldValue !== undefined) {
+                    return { errorMessage: `Changing the mixin '${ecClass.name}' appliesTo is not supported.` };
+                }
+                return true;
+        }
+        return false;
+    }
+}
+exports.default = MixinMerger;
+//# sourceMappingURL=MixinMerger.js.map

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"PrimitiveOrEnumPropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PrimitiveOrEnumPropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,mBAAmB,EAA4B,2BAA2B,EAAE,iBAAiB,EAA0B,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC7L,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD;;GAEG;AACH,uBAAe,6BAA6B,CAAC,4BAA4B,SAAS,2BAA2B,CAAE,SAAQ,iBAAiB,CAAC,4BAA4B,CAAC;IAC9I,eAAe,CAAC,QAAQ,EAAE,4BAA4B,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;CA+B7L;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAA6B,CAAC,iBAAiB,CAAC;IACrE,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAY1H;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,6BAA6B,CAAC,mBAAmB,CAAC;IACzE,eAAe,CAAC,QAAQ,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC;IAiB7J,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA2B5H"}

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/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;AAYxD;;;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;CAiChF"}

package/lib/cjs/Merging/SchemaMerger.js

@@ -13,10 +13,13 @@ 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");
 /**
  * Class to merge two schemas together.
  * @see [[merge]] to merge the schemas.
@@ -62,7 +65,12 @@ class SchemaMerger {
         // 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 +83,15 @@ 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 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":["/*---------------------------------------------------------------------------------------------\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 ClassMerger from \"./ClassMerger\";\nimport CAClassMerger from \"./CAClassMerger\";\nimport EnumerationMerger from \"./EnumerationMerger\";\nimport ConstantsMerger from \"./ConstantMerger\";\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\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 ClassMerger.mergeChanges(mergeContext, itemChanges.classes);\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 classes() { return filterChangesByItemType(schemaChanges.classChanges, SchemaItemType.EntityClass, SchemaItemType.StructClass); },\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 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  };\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"]}
+{"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\";\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\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 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/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"]}