@itwin/ecschema-editing 4.4.0-dev.8 → 4.5.0-dev.0

package/lib/cjs/Editing/Mutable/MutableRelationshipClass.d.ts

@@ -1,10 +1,16 @@
-import { CustomAttribute, NavigationProperty, RelationshipClass, RelationshipConstraint, StrengthDirection, StrengthType } from "@itwin/ecschema-metadata";
+import { CustomAttribute, EntityClass, LazyLoadedRelationshipConstraintClass, Mixin, NavigationProperty, RelationshipClass, RelationshipConstraint, RelationshipEnd, RelationshipMultiplicity, StrengthDirection, StrengthType } from "@itwin/ecschema-metadata";
 /**
  * Hackish approach that works like a "friend class" so we can access protected members without making them public.
  * @internal
  */
 export declare abstract class MutableRelationshipConstraint extends RelationshipConstraint {
     abstract addCustomAttribute(customAttribute: CustomAttribute): void;
+    abstract set multiplicity(multiplicity: RelationshipMultiplicity);
+    abstract set polymorphic(polymorphic: boolean);
+    abstract set roleLabel(roleLabel: string | undefined);
+    abstract set relationshipEnd(relationshipEnd: RelationshipEnd);
+    abstract set abstractConstraint(abstractConstraint: LazyLoadedRelationshipConstraintClass | undefined);
+    abstract removeClass(constraint: EntityClass | Mixin | RelationshipClass): void;
 }
 /**
  * @internal
@@ -15,6 +21,8 @@ export declare abstract class MutableRelationshipClass extends RelationshipClass
     get target(): MutableRelationshipConstraint;
     abstract setStrength(strength: StrengthType): void;
     abstract setStrengthDirection(direction: StrengthDirection): void;
+    abstract setSourceConstraint(source: RelationshipConstraint): void;
+    abstract setTargetConstraint(target: RelationshipConstraint): void;
     abstract createNavigationProperty(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<NavigationProperty>;
     abstract createNavigationPropertySync(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): NavigationProperty;
     abstract setDisplayLabel(displayLabel: string): void;

package/lib/cjs/Editing/Mutable/MutableRelationshipClass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MutableRelationshipClass.d.ts","sourceRoot":"","sources":["../../../../src/Editing/Mutable/MutableRelationshipClass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE3J;;;GAGG;AACH,8BAAsB,6BAA8B,SAAQ,sBAAsB;aACvD,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAEpF;AAED;;;GAGG;AACH,8BAAsB,wBAAyB,SAAQ,iBAAiB;IACtE,IAAoB,MAAM,kCAA4D;IACtF,IAAoB,MAAM,kCAA4D;aAC7D,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;aACzC,oBAAoB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;aACxD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;aACpJ,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,kBAAkB;aAC/I,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CACrE"}
+{"version":3,"file":"MutableRelationshipClass.d.ts","sourceRoot":"","sources":["../../../../src/Editing/Mutable/MutableRelationshipClass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,qCAAqC,EAAE,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,eAAe,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEjQ;;;GAGG;AACH,8BAAsB,6BAA8B,SAAQ,sBAAsB;aACvD,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IACnF,aAA6B,YAAY,CAAC,YAAY,EAAE,wBAAwB,EAAE;IAClF,aAA6B,WAAW,CAAC,WAAW,EAAE,OAAO,EAAE;IAC/D,aAA6B,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE;IACtE,aAA6B,eAAe,CAAC,eAAe,EAAE,eAAe,EAAG;IAChF,aAA6B,kBAAkB,CAAC,kBAAkB,EAAE,qCAAqC,GAAG,SAAS,EAAE;aAC9F,WAAW,CAAC,UAAU,EAAE,WAAW,GAAG,KAAK,GAAG,iBAAiB,GAAG,IAAI;CAChG;AAED;;;GAGG;AACH,8BAAsB,wBAAyB,SAAQ,iBAAiB;IACtE,IAAoB,MAAM,kCAA4D;IACtF,IAAoB,MAAM,kCAA4D;aAC7D,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;aACzC,oBAAoB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;aACxD,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;aACzD,mBAAmB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;aACzD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;aACpJ,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,kBAAkB;aAC/I,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CACrE"}

package/lib/cjs/Editing/Mutable/MutableRelationshipClass.js.map

@@ -1 +1 @@
-{"version":3,"file":"MutableRelationshipClass.js","sourceRoot":"","sources":["../../../../src/Editing/Mutable/MutableRelationshipClass.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAA2J;AAE3J;;;GAGG;AACH,MAAsB,6BAA8B,SAAQ,0CAAsB;CAGjF;AAHD,sEAGC;AAED;;;GAGG;AACH,MAAsB,wBAAyB,SAAQ,qCAAiB;IACtE,IAAoB,MAAM,KAAK,OAAO,IAAI,CAAC,OAAwC,CAAC,CAAC,CAAC;IACtF,IAAoB,MAAM,KAAK,OAAO,IAAI,CAAC,OAAwC,CAAC,CAAC,CAAC;CAMvF;AARD,4DAQC","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 { CustomAttribute, NavigationProperty, RelationshipClass, RelationshipConstraint, StrengthDirection, StrengthType } from \"@itwin/ecschema-metadata\";\n\n/**\n * Hackish approach that works like a \"friend class\" so we can access protected members without making them public.\n * @internal\n */\nexport abstract class MutableRelationshipConstraint extends RelationshipConstraint {\n  public abstract override addCustomAttribute(customAttribute: CustomAttribute): void;\n\n}\n\n/**\n * @internal\n * An abstract class used for schema editing.\n */\nexport abstract class MutableRelationshipClass extends RelationshipClass {\n  public override get source() { return this._source as MutableRelationshipConstraint; }\n  public override get target() { return this._target as MutableRelationshipConstraint; }\n  public abstract override setStrength(strength: StrengthType): void;\n  public abstract override setStrengthDirection(direction: StrengthDirection): void;\n  public abstract override createNavigationProperty(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<NavigationProperty>;\n  public abstract override createNavigationPropertySync(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): NavigationProperty;\n  public abstract override setDisplayLabel(displayLabel: string): void;\n}\n"]}
+{"version":3,"file":"MutableRelationshipClass.js","sourceRoot":"","sources":["../../../../src/Editing/Mutable/MutableRelationshipClass.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAAiQ;AAEjQ;;;GAGG;AACH,MAAsB,6BAA8B,SAAQ,0CAAsB;CAQjF;AARD,sEAQC;AAED;;;GAGG;AACH,MAAsB,wBAAyB,SAAQ,qCAAiB;IACtE,IAAoB,MAAM,KAAK,OAAO,IAAI,CAAC,OAAwC,CAAC,CAAC,CAAC;IACtF,IAAoB,MAAM,KAAK,OAAO,IAAI,CAAC,OAAwC,CAAC,CAAC,CAAC;CAQvF;AAVD,4DAUC","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 { CustomAttribute, EntityClass, LazyLoadedRelationshipConstraintClass, Mixin, NavigationProperty, RelationshipClass, RelationshipConstraint, RelationshipEnd, RelationshipMultiplicity, StrengthDirection, StrengthType } from \"@itwin/ecschema-metadata\";\n\n/**\n * Hackish approach that works like a \"friend class\" so we can access protected members without making them public.\n * @internal\n */\nexport abstract class MutableRelationshipConstraint extends RelationshipConstraint {\n  public abstract override addCustomAttribute(customAttribute: CustomAttribute): void;\n  public abstract override set multiplicity(multiplicity: RelationshipMultiplicity);\n  public abstract override set polymorphic(polymorphic: boolean);\n  public abstract override set roleLabel(roleLabel: string | undefined);\n  public abstract override set relationshipEnd(relationshipEnd: RelationshipEnd) ;\n  public abstract override set abstractConstraint(abstractConstraint: LazyLoadedRelationshipConstraintClass | undefined);\n  public abstract override removeClass(constraint: EntityClass | Mixin | RelationshipClass): void;\n}\n\n/**\n * @internal\n * An abstract class used for schema editing.\n */\nexport abstract class MutableRelationshipClass extends RelationshipClass {\n  public override get source() { return this._source as MutableRelationshipConstraint; }\n  public override get target() { return this._target as MutableRelationshipConstraint; }\n  public abstract override setStrength(strength: StrengthType): void;\n  public abstract override setStrengthDirection(direction: StrengthDirection): void;\n  public abstract override setSourceConstraint(source: RelationshipConstraint): void;\n  public abstract override setTargetConstraint(target: RelationshipConstraint): void;\n  public abstract override createNavigationProperty(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<NavigationProperty>;\n  public abstract override createNavigationPropertySync(name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): NavigationProperty;\n  public abstract override setDisplayLabel(displayLabel: string): void;\n}\n"]}

package/lib/cjs/Editing/RelationshipClasses.d.ts

@@ -1,16 +1,39 @@
 /** @packageDocumentation
  * @module Editing
  */
-import { RelationshipClass, RelationshipClassProps, SchemaItemKey, SchemaKey, StrengthDirection } from "@itwin/ecschema-metadata";
+import { ECClassModifier, EntityClass, Mixin, NavigationPropertyProps, RelationshipClass, RelationshipClassProps, RelationshipConstraint, RelationshipEnd, RelationshipMultiplicity, SchemaItemKey, SchemaKey, StrengthDirection, StrengthType } from "@itwin/ecschema-metadata";
 import { PropertyEditResults, SchemaContextEditor, SchemaItemEditResults } from "./Editor";
 import { ECClasses } from "./ECClasses";
 /**
  * @alpha
  * A class extending ECClasses allowing you to create schema items of type RelationshipClass.
- * Can only create RelationshipClass objects using RelationshipClassProps for now.
  */
 export declare class RelationshipClasses extends ECClasses {
     constructor(_schemaEditor: SchemaContextEditor);
+    /**
+     * Creates a RelationshipClass.
+     * @param schemaKey a SchemaKey of the Schema that will house the new object.
+     * @param name The name of the new class.
+     * @param modifier The ECClassModifier of the new class.
+     * @param strength The relationship StrengthType of the class.
+     * @param StrengthDirection The relationship StrengthDirection of the class.
+     * @param baseClassKey An optional SchemaItemKey that specifies the base relationship class.
+     */
+    create(schemaKey: SchemaKey, name: string, modifier: ECClassModifier, strength: StrengthType, direction: StrengthDirection, baseClassKey?: SchemaItemKey): Promise<SchemaItemEditResults>;
+    /**
+     * Sets the source RelationshipConstraint on the relationship.
+     * @param relationshipKey The SchemaItemKey for the relationship.
+     * @param source The RelationshipConstraint to add.
+     * @returns A promise of type SchemaItemEditResults.
+     */
+    setSourceConstraint(relationshipKey: SchemaItemKey, source: RelationshipConstraint): Promise<SchemaItemEditResults>;
+    /**
+     * Sets the target RelationshipConstraint on the relationship.
+     * @param relationshipKey The SchemaItemKey for the relationship.
+     * @param target The RelationshipConstraint to add.
+     * @returns A promise of type SchemaItemEditResults.
+     */
+    setTargetConstraint(relationshipKey: SchemaItemKey, target: RelationshipConstraint): Promise<SchemaItemEditResults>;
     /**
      * Creates a RelationshipClass through a RelationshipClassProps.
      * @param schemaKey a SchemaKey of the Schema that will house the new object.
@@ -18,5 +41,13 @@ export declare class RelationshipClasses extends ECClasses {
      */
     createFromProps(schemaKey: SchemaKey, relationshipProps: RelationshipClassProps): Promise<SchemaItemEditResults>;
     createNavigationProperty(relationshipKey: SchemaItemKey, name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<PropertyEditResults>;
+    createNavigationPropertyFromProps(relationshipKey: SchemaItemKey, navigationProps: NavigationPropertyProps): Promise<PropertyEditResults>;
+    setConstraintMultiplicity(constraint: RelationshipConstraint, multiplicity: RelationshipMultiplicity): Promise<SchemaItemEditResults>;
+    setConstraintPolymorphic(constraint: RelationshipConstraint, polymorphic: boolean): Promise<SchemaItemEditResults>;
+    setConstraintRelationshipEnd(constraint: RelationshipConstraint, relationshipEnd: RelationshipEnd): Promise<SchemaItemEditResults>;
+    setAbstractConstraint(constraint: RelationshipConstraint, abstractConstraint?: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults>;
+    addConstraintClass(constraint: RelationshipConstraint, ecClass: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults>;
+    removeConstraintClass(constraint: RelationshipConstraint, ecClass: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults>;
+    private validate;
 }
 //# sourceMappingURL=RelationshipClasses.d.ts.map

package/lib/cjs/Editing/RelationshipClasses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RelationshipClasses.d.ts","sourceRoot":"","sources":["../../../src/Editing/RelationshipClasses.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAC4B,iBAAiB,EAAE,sBAAsB,EAAE,aAAa,EACzF,SAAS,EAAE,iBAAiB,EAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;gBAC7B,aAAa,EAAE,mBAAmB;IAyBrD;;;;OAIG;IACU,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAmBhH,wBAAwB,CAAC,eAAe,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAYnM"}
+{"version":3,"file":"RelationshipClasses.d.ts","sourceRoot":"","sources":["../../../src/Editing/RelationshipClasses.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EACoB,eAAe,EAAE,WAAW,EAAyC,KAAK,EAAE,uBAAuB,EAC5H,iBAAiB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,eAAe,EAAE,wBAAwB,EAAE,aAAa,EAC3H,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAC3C,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKxC;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;gBAC7B,aAAa,EAAE,mBAAmB;IAIrD;;;;;;;;OAQG;IACU,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA6BtM;;;;;OAKG;IACU,mBAAmB,CAAC,eAAe,EAAE,aAAa,EAAE,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAUhI;;;;;OAKG;IACU,mBAAmB,CAAC,eAAe,EAAE,aAAa,EAAE,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAUhI;;;;OAIG;IACU,eAAe,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAgBhH,wBAAwB,CAAC,eAAe,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAarL,iCAAiC,CAAC,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,uBAAuB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAczI,yBAAyB,CAAC,UAAU,EAAE,sBAAsB,EAAE,YAAY,EAAE,wBAAwB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAMrI,wBAAwB,CAAC,UAAU,EAAE,sBAAsB,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAMlH,4BAA4B,CAAC,UAAU,EAAE,sBAAsB,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAMlI,qBAAqB,CAAC,UAAU,EAAE,sBAAsB,EAAE,kBAAkB,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAyBvJ,kBAAkB,CAAC,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,WAAW,GAAG,KAAK,GAAG,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAmBxI,qBAAqB,CAAC,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,WAAW,GAAG,KAAK,GAAG,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC;YAa1I,QAAQ;CAoBvB"}

package/lib/cjs/Editing/RelationshipClasses.js

@@ -10,32 +10,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationshipClasses = void 0;
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const ECClasses_1 = require("./ECClasses");
+const Rules = require("../Validation/ECRules");
 /**
  * @alpha
  * A class extending ECClasses allowing you to create schema items of type RelationshipClass.
- * Can only create RelationshipClass objects using RelationshipClassProps for now.
  */
 class RelationshipClasses extends ECClasses_1.ECClasses {
     constructor(_schemaEditor) {
         super(_schemaEditor);
     }
-    // // TODO: Add relationshipConstraint, multiplicity arguments.
-    // // Note: This method is not done yet, there's a lot of arguments.
-    // public async create(schemaKey: SchemaKey, name: string, modifier: ECClassModifier, strength: StrengthType, direction: StrengthDirection, sourceMultiplicity: RelationshipMultiplicity, targetMultiplicity: RelationshipMultiplicity, baseClass?: SchemaItemKey) {
-    //   const schema = await this._schemaEditor.getSchema(schemaKey);
-    //   if (schema === undefined) return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };
-    //   const newClass = (await schema.createRelationshipClass(name, modifier)) as MutableRelationshipClass;
-    //   if (newClass === undefined) {
-    //     return { errorMessage: `Failed to create class ${name} in schema ${schemaKey.toString(true)}.` };
-    //   }
-    //   if (baseClass !== undefined) {
-    //     const baseClassItem = await schema.lookupItem(baseClass) as RelationshipClass;
-    //     newClass.baseClass = new DelayedPromiseWithProps<SchemaItemKey, ECClass>(baseClass, async () => baseClassItem);
-    //   }
-    //   newClass.setStrength(strength);
-    //   newClass.setStrengthDirection(direction);
-    //   return { itemKey: newClass.key };
-    // }
+    /**
+     * Creates a RelationshipClass.
+     * @param schemaKey a SchemaKey of the Schema that will house the new object.
+     * @param name The name of the new class.
+     * @param modifier The ECClassModifier of the new class.
+     * @param strength The relationship StrengthType of the class.
+     * @param StrengthDirection The relationship StrengthDirection of the class.
+     * @param baseClassKey An optional SchemaItemKey that specifies the base relationship class.
+     */
+    async create(schemaKey, name, modifier, strength, direction, baseClassKey) {
+        const schema = await this._schemaEditor.getSchema(schemaKey);
+        if (schema === undefined) {
+            return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };
+        }
+        const newClass = (await schema.createRelationshipClass(name, modifier));
+        if (baseClassKey !== undefined) {
+            const baseClassSchema = !baseClassKey.schemaKey.matches(schema.schemaKey) ? await this._schemaEditor.getSchema(baseClassKey.schemaKey) : schema;
+            if (baseClassSchema === undefined) {
+                return { errorMessage: `Schema Key ${baseClassKey.schemaKey.toString(true)} not found in context` };
+            }
+            const baseClassItem = await baseClassSchema.lookupItem(baseClassKey);
+            if (baseClassItem === undefined)
+                return { errorMessage: `Unable to locate base class ${baseClassKey.fullName} in schema ${baseClassSchema.fullName}.` };
+            if (baseClassItem.schemaItemType !== ecschema_metadata_1.SchemaItemType.RelationshipClass)
+                return { errorMessage: `${baseClassItem.fullName} is not of type Relationship Class.` };
+            newClass.baseClass = new ecschema_metadata_1.DelayedPromiseWithProps(baseClassKey, async () => baseClassItem);
+        }
+        newClass.setStrength(strength);
+        newClass.setStrengthDirection(direction);
+        return { itemKey: newClass.key };
+    }
+    /**
+     * Sets the source RelationshipConstraint on the relationship.
+     * @param relationshipKey The SchemaItemKey for the relationship.
+     * @param source The RelationshipConstraint to add.
+     * @returns A promise of type SchemaItemEditResults.
+     */
+    async setSourceConstraint(relationshipKey, source) {
+        const relationship = (await this._schemaEditor.schemaContext.getSchemaItem(relationshipKey));
+        if (relationship === undefined)
+            return { itemKey: relationshipKey, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };
+        relationship.setSourceConstraint(source);
+        return { itemKey: relationshipKey };
+    }
+    /**
+     * Sets the target RelationshipConstraint on the relationship.
+     * @param relationshipKey The SchemaItemKey for the relationship.
+     * @param target The RelationshipConstraint to add.
+     * @returns A promise of type SchemaItemEditResults.
+     */
+    async setTargetConstraint(relationshipKey, target) {
+        const relationship = (await this._schemaEditor.schemaContext.getSchemaItem(relationshipKey));
+        if (relationship === undefined)
+            return { itemKey: relationshipKey, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };
+        relationship.setTargetConstraint(target);
+        return { itemKey: relationshipKey };
+    }
     /**
      * Creates a RelationshipClass through a RelationshipClassProps.
      * @param schemaKey a SchemaKey of the Schema that will house the new object.
@@ -48,8 +88,6 @@ class RelationshipClasses extends ECClasses_1.ECClasses {
         if (relationshipProps.name === undefined)
             return { errorMessage: `No name was supplied within props.` };
         const newClass = (await schema.createRelationshipClass(relationshipProps.name));
-        if (newClass === undefined)
-            return { errorMessage: `Failed to create class ${relationshipProps.name} in schema ${schemaKey.toString(true)}.` };
         await newClass.fromJSON(relationshipProps);
         await newClass.source.fromJSON(relationshipProps.source);
         await newClass.target.fromJSON(relationshipProps.target);
@@ -58,12 +96,100 @@ class RelationshipClasses extends ECClasses_1.ECClasses {
     async createNavigationProperty(relationshipKey, name, relationship, direction) {
         const relationshipClass = (await this._schemaEditor.schemaContext.getSchemaItem(relationshipKey));
         if (relationshipClass === undefined)
-            throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.ClassNotFound, `Relationship Class ${relationshipKey.fullName} not found in schema context.`);
+            return { itemKey: relationshipKey, propertyName: name, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };
         if (relationshipClass.schemaItemType !== ecschema_metadata_1.SchemaItemType.RelationshipClass)
-            throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.InvalidSchemaItemType, `Expected ${relationshipKey.fullName} to be of type Relationship Class.`);
+            return { itemKey: relationshipKey, propertyName: name, errorMessage: `Expected ${relationshipKey.fullName} to be of type Relationship Class.` };
         await relationshipClass.createNavigationProperty(name, relationship, direction);
         return { itemKey: relationshipKey, propertyName: name };
     }
+    async createNavigationPropertyFromProps(relationshipKey, navigationProps) {
+        const relationshipClass = (await this._schemaEditor.schemaContext.getSchemaItem(relationshipKey));
+        if (relationshipClass === undefined)
+            return { itemKey: relationshipKey, propertyName: navigationProps.name, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };
+        if (relationshipClass.schemaItemType !== ecschema_metadata_1.SchemaItemType.RelationshipClass)
+            return { itemKey: relationshipKey, propertyName: navigationProps.name, errorMessage: `Expected ${relationshipKey.fullName} to be of type Relationship Class.` };
+        const property = await relationshipClass.createNavigationProperty(navigationProps.name, navigationProps.relationshipName, navigationProps.direction);
+        await property.fromJSON(navigationProps);
+        return { itemKey: relationshipKey, propertyName: navigationProps.name };
+    }
+    async setConstraintMultiplicity(constraint, multiplicity) {
+        const mutableConstraint = constraint;
+        mutableConstraint.multiplicity = multiplicity;
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async setConstraintPolymorphic(constraint, polymorphic) {
+        const mutableConstraint = constraint;
+        mutableConstraint.polymorphic = polymorphic;
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async setConstraintRelationshipEnd(constraint, relationshipEnd) {
+        const mutableConstraint = constraint;
+        mutableConstraint.relationshipEnd = relationshipEnd;
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async setAbstractConstraint(constraint, abstractConstraint) {
+        const existing = constraint.abstractConstraint;
+        const mutableConstraint = constraint;
+        if (undefined === abstractConstraint) {
+            mutableConstraint.abstractConstraint = undefined;
+        }
+        else {
+            mutableConstraint.abstractConstraint = new ecschema_metadata_1.DelayedPromiseWithProps(abstractConstraint.key, async () => abstractConstraint);
+        }
+        let result = await this.validate(constraint.relationshipClass);
+        if (result.errorMessage) {
+            mutableConstraint.abstractConstraint = existing;
+            return result;
+        }
+        result = await this.validate(constraint);
+        if (result.errorMessage) {
+            mutableConstraint.abstractConstraint = existing;
+            return result;
+        }
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async addConstraintClass(constraint, ecClass) {
+        const mutableConstraint = constraint;
+        mutableConstraint.addClass(ecClass);
+        let result = await this.validate(constraint.relationshipClass);
+        if (result.errorMessage) {
+            mutableConstraint.removeClass(ecClass);
+            return result;
+        }
+        result = await this.validate(constraint);
+        if (result.errorMessage) {
+            mutableConstraint.removeClass(ecClass);
+            return result;
+        }
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async removeConstraintClass(constraint, ecClass) {
+        const mutableConstraint = constraint;
+        mutableConstraint.removeClass(ecClass);
+        const result = await this.validate(constraint);
+        if (result.errorMessage) {
+            mutableConstraint.addClass(ecClass);
+            return result;
+        }
+        return { itemKey: constraint.relationshipClass.key };
+    }
+    async validate(relationshipOrConstraint) {
+        let diagnostics;
+        if (relationshipOrConstraint instanceof ecschema_metadata_1.RelationshipClass) {
+            diagnostics = Rules.validateRelationship(relationshipOrConstraint);
+        }
+        else {
+            diagnostics = Rules.validateRelationshipConstraint(relationshipOrConstraint);
+        }
+        const errorMessages = [];
+        for await (const diagnostic of diagnostics) {
+            errorMessages.push(`${diagnostic.code}: ${diagnostic.messageText}`);
+        }
+        if (errorMessages.length > 0) {
+            return { errorMessage: errorMessages.join("\r\n") };
+        }
+        return {};
+    }
 }
 exports.RelationshipClasses = RelationshipClasses;
 //# sourceMappingURL=RelationshipClasses.js.map

package/lib/cjs/Editing/RelationshipClasses.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationshipClasses.js","sourceRoot":"","sources":["../../../src/Editing/RelationshipClasses.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,gEAGkC;AAElC,2CAAwC;AAGxC;;;;GAIG;AACH,MAAa,mBAAoB,SAAQ,qBAAS;IAChD,YAAmB,aAAkC;QACnD,KAAK,CAAC,aAAa,CAAC,CAAC;IACvB,CAAC;IAED,+DAA+D;IAC/D,oEAAoE;IACpE,oQAAoQ;IACpQ,kEAAkE;IAClE,sHAAsH;IAEtH,yGAAyG;IACzG,kCAAkC;IAClC,wGAAwG;IACxG,MAAM;IAEN,mCAAmC;IACnC,qFAAqF;IACrF,sHAAsH;IACtH,MAAM;IACN,oCAAoC;IACpC,8CAA8C;IAE9C,sCAAsC;IACtC,IAAI;IAEJ;;;;OAIG;IACI,KAAK,CAAC,eAAe,CAAC,SAAoB,EAAE,iBAAyC;QAC1F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,MAAM,KAAK,SAAS;YACtB,OAAO,EAAE,YAAY,EAAE,cAAc,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAEzF,IAAI,iBAAiB,CAAC,IAAI,KAAK,SAAS;YACtC,OAAO,EAAE,YAAY,EAAE,oCAAoC,EAAE,CAAC;QAEhE,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAA6B,CAAC;QAC5G,IAAI,QAAQ,KAAK,SAAS;YACxB,OAAO,EAAE,YAAY,EAAE,0BAA0B,iBAAiB,CAAC,IAAI,cAAc,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QAErH,MAAM,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAC3C,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEzD,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,wBAAwB,CAAC,eAA8B,EAAE,IAAY,EAAE,YAAwC,EAAE,SAAqC;QACjK,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,aAAa,CAA2B,eAAe,CAAC,CAAC,CAAC;QAE5H,IAAI,iBAAiB,KAAK,SAAS;YACjC,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,sBAAsB,eAAe,CAAC,QAAQ,+BAA+B,CAAC,CAAC;QAEzI,IAAI,iBAAiB,CAAC,cAAc,KAAK,kCAAc,CAAC,iBAAiB;YACvE,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,qBAAqB,EAAE,YAAY,eAAe,CAAC,QAAQ,oCAAoC,CAAC,CAAC;QAE5I,MAAM,iBAAiB,CAAC,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAChF,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1D,CAAC;CACF;AA9DD,kDA8DC","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 Editing\n */\n\nimport {\n  ECObjectsError, ECObjectsStatus, RelationshipClass, RelationshipClassProps, SchemaItemKey, SchemaItemType,\n  SchemaKey, StrengthDirection,\n} from \"@itwin/ecschema-metadata\";\nimport { PropertyEditResults, SchemaContextEditor, SchemaItemEditResults } from \"./Editor\";\nimport { ECClasses } from \"./ECClasses\";\nimport { MutableRelationshipClass } from \"./Mutable/MutableRelationshipClass\";\n\n/**\n * @alpha\n * A class extending ECClasses allowing you to create schema items of type RelationshipClass.\n * Can only create RelationshipClass objects using RelationshipClassProps for now.\n */\nexport class RelationshipClasses extends ECClasses {\n  public constructor(_schemaEditor: SchemaContextEditor) {\n    super(_schemaEditor);\n  }\n\n  // // TODO: Add relationshipConstraint, multiplicity arguments.\n  // // Note: This method is not done yet, there's a lot of arguments.\n  // public async create(schemaKey: SchemaKey, name: string, modifier: ECClassModifier, strength: StrengthType, direction: StrengthDirection, sourceMultiplicity: RelationshipMultiplicity, targetMultiplicity: RelationshipMultiplicity, baseClass?: SchemaItemKey) {\n  //   const schema = await this._schemaEditor.getSchema(schemaKey);\n  //   if (schema === undefined) return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };\n\n  //   const newClass = (await schema.createRelationshipClass(name, modifier)) as MutableRelationshipClass;\n  //   if (newClass === undefined) {\n  //     return { errorMessage: `Failed to create class ${name} in schema ${schemaKey.toString(true)}.` };\n  //   }\n\n  //   if (baseClass !== undefined) {\n  //     const baseClassItem = await schema.lookupItem(baseClass) as RelationshipClass;\n  //     newClass.baseClass = new DelayedPromiseWithProps<SchemaItemKey, ECClass>(baseClass, async () => baseClassItem);\n  //   }\n  //   newClass.setStrength(strength);\n  //   newClass.setStrengthDirection(direction);\n\n  //   return { itemKey: newClass.key };\n  // }\n\n  /**\n   * Creates a RelationshipClass through a RelationshipClassProps.\n   * @param schemaKey a SchemaKey of the Schema that will house the new object.\n   * @param relationshipProps a json object that will be used to populate the new RelationshipClass. Needs a name value passed in.\n   */\n  public async createFromProps(schemaKey: SchemaKey, relationshipProps: RelationshipClassProps): Promise<SchemaItemEditResults> {\n    const schema = await this._schemaEditor.getSchema(schemaKey);\n    if (schema === undefined)\n      return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };\n\n    if (relationshipProps.name === undefined)\n      return { errorMessage: `No name was supplied within props.` };\n\n    const newClass = (await schema.createRelationshipClass(relationshipProps.name)) as MutableRelationshipClass;\n    if (newClass === undefined)\n      return { errorMessage: `Failed to create class ${relationshipProps.name} in schema ${schemaKey.toString(true)}.` };\n\n    await newClass.fromJSON(relationshipProps);\n    await newClass.source.fromJSON(relationshipProps.source);\n    await newClass.target.fromJSON(relationshipProps.target);\n\n    return { itemKey: newClass.key };\n  }\n\n  public async createNavigationProperty(relationshipKey: SchemaItemKey, name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<PropertyEditResults> {\n    const relationshipClass = (await this._schemaEditor.schemaContext.getSchemaItem<MutableRelationshipClass>(relationshipKey));\n\n    if (relationshipClass === undefined)\n      throw new ECObjectsError(ECObjectsStatus.ClassNotFound, `Relationship Class ${relationshipKey.fullName} not found in schema context.`);\n\n    if (relationshipClass.schemaItemType !== SchemaItemType.RelationshipClass)\n      throw new ECObjectsError(ECObjectsStatus.InvalidSchemaItemType, `Expected ${relationshipKey.fullName} to be of type Relationship Class.`);\n\n    await relationshipClass.createNavigationProperty(name, relationship, direction);\n    return { itemKey: relationshipKey, propertyName: name };\n  }\n}\n"]}
+{"version":3,"file":"RelationshipClasses.js","sourceRoot":"","sources":["../../../src/Editing/RelationshipClasses.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 Editing\n */\n\nimport {\n  DelayedPromiseWithProps, ECClassModifier, EntityClass, LazyLoadedRelationshipConstraintClass, Mixin, NavigationPropertyProps,\n  RelationshipClass, RelationshipClassProps, RelationshipConstraint, RelationshipEnd, RelationshipMultiplicity, SchemaItemKey, SchemaItemType,\n  SchemaKey, StrengthDirection, StrengthType,\n} from \"@itwin/ecschema-metadata\";\nimport { PropertyEditResults, SchemaContextEditor, SchemaItemEditResults } from \"./Editor\";\nimport { ECClasses } from \"./ECClasses\";\nimport { MutableRelationshipClass, MutableRelationshipConstraint } from \"./Mutable/MutableRelationshipClass\";\nimport * as Rules from \"../Validation/ECRules\";\nimport { RelationshipConstraintDiagnostic, SchemaItemDiagnostic } from \"../Validation/Diagnostic\";\n\n/**\n * @alpha\n * A class extending ECClasses allowing you to create schema items of type RelationshipClass.\n */\nexport class RelationshipClasses extends ECClasses {\n  public constructor(_schemaEditor: SchemaContextEditor) {\n    super(_schemaEditor);\n  }\n\n  /**\n   * Creates a RelationshipClass.\n   * @param schemaKey a SchemaKey of the Schema that will house the new object.\n   * @param name The name of the new class.\n   * @param modifier The ECClassModifier of the new class.\n   * @param strength The relationship StrengthType of the class.\n   * @param StrengthDirection The relationship StrengthDirection of the class.\n   * @param baseClassKey An optional SchemaItemKey that specifies the base relationship class.\n   */\n  public async create(schemaKey: SchemaKey, name: string, modifier: ECClassModifier, strength: StrengthType, direction: StrengthDirection, baseClassKey?: SchemaItemKey): Promise<SchemaItemEditResults> {\n    const schema = await this._schemaEditor.getSchema(schemaKey);\n    if (schema === undefined) {\n      return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };\n    }\n\n    const newClass = (await schema.createRelationshipClass(name, modifier)) as MutableRelationshipClass;\n    if (baseClassKey !== undefined) {\n      const baseClassSchema = !baseClassKey.schemaKey.matches(schema.schemaKey) ? await this._schemaEditor.getSchema(baseClassKey.schemaKey) : schema;\n      if (baseClassSchema === undefined) {\n        return { errorMessage: `Schema Key ${baseClassKey.schemaKey.toString(true)} not found in context` };\n      }\n\n      const baseClassItem = await baseClassSchema.lookupItem<RelationshipClass>(baseClassKey);\n      if (baseClassItem === undefined)\n        return { errorMessage: `Unable to locate base class ${baseClassKey.fullName} in schema ${baseClassSchema.fullName}.` };\n\n      if (baseClassItem.schemaItemType !== SchemaItemType.RelationshipClass)\n        return { errorMessage: `${baseClassItem.fullName} is not of type Relationship Class.` };\n\n      newClass.baseClass = new DelayedPromiseWithProps<SchemaItemKey, RelationshipClass>(baseClassKey, async () => baseClassItem);\n    }\n\n    newClass.setStrength(strength);\n    newClass.setStrengthDirection(direction);\n\n    return { itemKey: newClass.key };\n  }\n\n  /**\n   * Sets the source RelationshipConstraint on the relationship.\n   * @param relationshipKey The SchemaItemKey for the relationship.\n   * @param source The RelationshipConstraint to add.\n   * @returns A promise of type SchemaItemEditResults.\n   */\n  public async setSourceConstraint(relationshipKey: SchemaItemKey, source: RelationshipConstraint): Promise<SchemaItemEditResults> {\n    const relationship = (await this._schemaEditor.schemaContext.getSchemaItem<MutableRelationshipClass>(relationshipKey));\n\n    if (relationship === undefined)\n      return { itemKey: relationshipKey, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };\n\n    relationship.setSourceConstraint(source);\n    return { itemKey: relationshipKey };\n  }\n\n  /**\n   * Sets the target RelationshipConstraint on the relationship.\n   * @param relationshipKey The SchemaItemKey for the relationship.\n   * @param target The RelationshipConstraint to add.\n   * @returns A promise of type SchemaItemEditResults.\n   */\n  public async setTargetConstraint(relationshipKey: SchemaItemKey, target: RelationshipConstraint): Promise<SchemaItemEditResults> {\n    const relationship = (await this._schemaEditor.schemaContext.getSchemaItem<MutableRelationshipClass>(relationshipKey));\n\n    if (relationship === undefined)\n      return { itemKey: relationshipKey, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };\n\n    relationship.setTargetConstraint(target);\n    return { itemKey: relationshipKey };\n  }\n\n  /**\n   * Creates a RelationshipClass through a RelationshipClassProps.\n   * @param schemaKey a SchemaKey of the Schema that will house the new object.\n   * @param relationshipProps a json object that will be used to populate the new RelationshipClass. Needs a name value passed in.\n   */\n  public async createFromProps(schemaKey: SchemaKey, relationshipProps: RelationshipClassProps): Promise<SchemaItemEditResults> {\n    const schema = await this._schemaEditor.getSchema(schemaKey);\n    if (schema === undefined)\n      return { errorMessage: `Schema Key ${schemaKey.toString(true)} not found in context` };\n\n    if (relationshipProps.name === undefined)\n      return { errorMessage: `No name was supplied within props.` };\n\n    const newClass = (await schema.createRelationshipClass(relationshipProps.name)) as MutableRelationshipClass;\n    await newClass.fromJSON(relationshipProps);\n    await newClass.source.fromJSON(relationshipProps.source);\n    await newClass.target.fromJSON(relationshipProps.target);\n\n    return { itemKey: newClass.key };\n  }\n\n  public async createNavigationProperty(relationshipKey: SchemaItemKey, name: string, relationship: string | RelationshipClass, direction: string | StrengthDirection): Promise<PropertyEditResults> {\n    const relationshipClass = (await this._schemaEditor.schemaContext.getSchemaItem<MutableRelationshipClass>(relationshipKey));\n\n    if (relationshipClass === undefined)\n      return { itemKey: relationshipKey, propertyName: name, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };\n\n    if (relationshipClass.schemaItemType !== SchemaItemType.RelationshipClass)\n      return { itemKey: relationshipKey, propertyName: name, errorMessage: `Expected ${relationshipKey.fullName} to be of type Relationship Class.` };\n\n    await relationshipClass.createNavigationProperty(name, relationship, direction);\n    return { itemKey: relationshipKey, propertyName: name };\n  }\n\n  public async createNavigationPropertyFromProps(relationshipKey: SchemaItemKey, navigationProps: NavigationPropertyProps): Promise<PropertyEditResults> {\n    const relationshipClass = (await this._schemaEditor.schemaContext.getSchemaItem<MutableRelationshipClass>(relationshipKey));\n\n    if (relationshipClass === undefined)\n      return { itemKey: relationshipKey, propertyName: navigationProps.name, errorMessage: `Relationship Class ${relationshipKey.fullName} not found in schema context.` };\n\n    if (relationshipClass.schemaItemType !== SchemaItemType.RelationshipClass)\n      return { itemKey: relationshipKey, propertyName: navigationProps.name, errorMessage: `Expected ${relationshipKey.fullName} to be of type Relationship Class.` };\n\n    const property = await relationshipClass.createNavigationProperty(navigationProps.name, navigationProps.relationshipName, navigationProps.direction);\n    await property.fromJSON(navigationProps);\n    return { itemKey: relationshipKey, propertyName: navigationProps.name };\n  }\n\n  public async setConstraintMultiplicity(constraint: RelationshipConstraint, multiplicity: RelationshipMultiplicity): Promise<SchemaItemEditResults> {\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n    mutableConstraint.multiplicity = multiplicity;\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  public async setConstraintPolymorphic(constraint: RelationshipConstraint, polymorphic: boolean): Promise<SchemaItemEditResults> {\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n    mutableConstraint.polymorphic = polymorphic;\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  public async setConstraintRelationshipEnd(constraint: RelationshipConstraint, relationshipEnd: RelationshipEnd): Promise<SchemaItemEditResults> {\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n    mutableConstraint.relationshipEnd = relationshipEnd;\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  public async setAbstractConstraint(constraint: RelationshipConstraint, abstractConstraint?: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults> {\n    const existing: LazyLoadedRelationshipConstraintClass | undefined  = constraint.abstractConstraint;\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n\n    if (undefined === abstractConstraint) {\n      mutableConstraint.abstractConstraint = undefined;\n    } else {\n      mutableConstraint.abstractConstraint = new DelayedPromiseWithProps(abstractConstraint.key, async () => abstractConstraint);\n    }\n\n    let result = await this.validate(constraint.relationshipClass);\n    if (result.errorMessage) {\n      mutableConstraint.abstractConstraint = existing;\n      return result;\n    }\n\n    result = await this.validate(constraint);\n    if (result.errorMessage) {\n      mutableConstraint.abstractConstraint = existing;\n      return result;\n    }\n\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  public async addConstraintClass(constraint: RelationshipConstraint, ecClass: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults> {\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n    mutableConstraint.addClass(ecClass);\n\n    let result = await this.validate(constraint.relationshipClass);\n    if (result.errorMessage) {\n      mutableConstraint.removeClass(ecClass);\n      return result;\n    }\n\n    result = await this.validate(constraint);\n    if (result.errorMessage) {\n      mutableConstraint.removeClass(ecClass);\n      return result;\n    }\n\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  public async removeConstraintClass(constraint: RelationshipConstraint, ecClass: EntityClass | Mixin | RelationshipClass): Promise<SchemaItemEditResults> {\n    const mutableConstraint = constraint as MutableRelationshipConstraint;\n    mutableConstraint.removeClass(ecClass);\n\n    const result = await this.validate(constraint);\n    if (result.errorMessage) {\n      mutableConstraint.addClass(ecClass);\n      return result;\n    }\n\n    return { itemKey: constraint.relationshipClass.key };\n  }\n\n  private async validate(relationshipOrConstraint: RelationshipClass | RelationshipConstraint): Promise<SchemaItemEditResults> {\n    let diagnostics: AsyncIterable<SchemaItemDiagnostic<RelationshipClass, any[]>> | AsyncIterable<RelationshipConstraintDiagnostic<any[]>>;\n\n    if (relationshipOrConstraint instanceof RelationshipClass) {\n      diagnostics = Rules.validateRelationship(relationshipOrConstraint);\n    } else {\n      diagnostics = Rules.validateRelationshipConstraint(relationshipOrConstraint);\n    }\n\n    const errorMessages = [];\n    for await (const diagnostic of diagnostics) {\n      errorMessages.push(`${diagnostic.code}: ${diagnostic.messageText}`);\n    }\n\n    if (errorMessages.length > 0) {\n      return { errorMessage: errorMessages.join(\"\\r\\n\") };\n    }\n\n    return {};\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAmB,KAAK,EAAsB,aAAa,EAA0B,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACjJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAA8B,YAAY,EAA2C,MAAM,6BAA6B,CAAC;AAGhI;;GAEG;AACH,qBAAa,WAAW,CAAC,MAAM,SAAS,OAAO;IAC7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEnC,OAAO,EAAE,kBAAkB;cAIvB,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAgCjK,SAAS,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,qBAAqB;YAI3D,YAAY;YAwBZ,SAAS;YAkBT,0BAA0B;WAmBpB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;CA0CnG"}
+{"version":3,"file":"ClassMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAmB,KAAK,EAAsB,aAAa,EAA0B,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACjJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAA8B,YAAY,EAA2C,MAAM,6BAA6B,CAAC;AAIhI;;GAEG;AACH,qBAAa,WAAW,CAAC,MAAM,SAAS,OAAO;IAC7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEnC,OAAO,EAAE,kBAAkB;cAIvB,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,QAAQ,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC;cAI9E,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,iBAAiB,EAAE,GAAG,GAAG,OAAO,CAAC,qBAAqB,GAAG,OAAO,CAAC;IAgCjK,SAAS,CAAC,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,qBAAqB;YAI3D,YAAY;YAwBZ,SAAS;YAkBT,0BAA0B;WAmBpB,YAAY,CAAC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,CAAC;CAmDnG"}

package/lib/cjs/Merging/ClassMerger.js

@@ -8,6 +8,7 @@ exports.ClassMerger = void 0;
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 const SchemaChanges_1 = require("../Validation/SchemaChanges");
 const ClassPropertyMerger_1 = require("./ClassPropertyMerger");
+const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
 /**
  * @internal
  */
@@ -134,7 +135,14 @@ class ClassMerger {
                 }
             }
             await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);
-            const mergeResults = await ClassPropertyMerger_1.ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());
+            let mergeResults = await ClassPropertyMerger_1.ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());
+            if (mergeResults.errorMessage !== undefined) {
+                throw new Error(mergeResults.errorMessage);
+            }
+            // merge custom attributes
+            mergeResults = await (0, CustomAttributeMerger_1.mergeCustomAttributes)(merger.context, change.customAttributeChanges.values(), async (ca) => {
+                return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);
+            });
             if (mergeResults.errorMessage !== undefined) {
                 throw new Error(mergeResults.errorMessage);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { ECClass, ECClassModifier, Mixin, parseClassModifier, SchemaItemKey, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { BaseClassDelta, ChangeType, ClassChanges, EntityMixinChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { ClassPropertyMerger } from \"./ClassPropertyMerger\";\n\n/**\n * @internal\n */\nexport class ClassMerger<TClass extends ECClass> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\n  }\n\n  protected async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };\n  }\n\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const mutableClass = ecClass as unknown as MutableClass;\n    switch(attributeName) {\n      case \"schemaItemType\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\n        }\n        return true;\n\n      case \"label\":\n        mutableClass.setDisplayLabel(attributeNewValue);\n        return true;\n\n      case \"description\":\n        mutableClass.setDescription(attributeNewValue);\n        return true;\n\n      case \"modifier\":\n        const modifier = parseClassModifier(attributeNewValue);\n        if (modifier === undefined) {\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\n        }\n\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\n          mutableClass.setModifier(modifier);\n          return true;\n        }\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\n    }\n    return false;\n  }\n\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\n    if (sourceBaseClass !== undefined) {\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceBaseClass.schema.schemaKey);\n\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\n        return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n      }\n\n      if (targetBaseClass !== undefined) {\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\n        if (baseClass === undefined) {\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\n        }\n        if (await baseClass.is(targetBaseClass)) {\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n        }\n      }\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\n  }\n\n  private async addMixins(itemKey: SchemaItemKey, entityMixinChanges: Iterable<EntityMixinChanges>, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    if (changeType === ChangeType.Missing) {\n      for (const entityMixinChange of entityMixinChanges) {\n        for (const change of entityMixinChange.entityMixinChange) {\n          const mixins = change.diagnostic.messageArgs! as unknown as [Mixin];\n          for (const mixin of mixins) {\n            const result = await this.addMixin(itemKey, mixin);\n            if (result.errorMessage !== undefined) {\n              return result;\n            }\n          }\n        }\n      }\n      return {};\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.`};\n  }\n\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]) {\n    if (propertyValueChanges.length === 0) {\n      return;\n    }\n\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n    if (targetItem === undefined) {\n      throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);\n    }\n\n    for (const change of propertyValueChanges) {\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n      const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\n      if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n        throw new Error(results.errorMessage);\n      }\n    }\n  }\n\n  public static async mergeChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\n    const merger = new this(context);\n\n    for (const change of classChanges) {\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (changeType === ChangeType.Missing) {\n\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\n        }\n\n        const results = await merger.create(context.targetSchema.schemaKey, sourceItem);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n        targetItemKey = results.itemKey!;\n      }\n\n      if (change.baseClassDelta !== undefined) {\n        const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      if (change.entityMixinChanges.size > 0) {\n        const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);\n      const mergeResults  = await ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"ClassMerger.js","sourceRoot":"","sources":["../../../src/Merging/ClassMerger.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,gEAAiJ;AAIjJ,+DAAgI;AAChI,+DAA4D;AAC5D,mEAAgE;AAEhE;;GAEG;AACH,MAAa,WAAW;IAGtB,YAAY,OAA2B;QACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,MAAM,CAAC,UAAqB,EAAE,OAAe;QAC3D,OAAO,EAAE,YAAY,EAAE,GAAG,IAAA,0CAAsB,EAAC,OAAO,CAAC,cAAc,CAAC,iCAAiC,EAAC,CAAC;IAC7G,CAAC;IAES,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,KAAY;QAC3D,OAAO,EAAE,YAAY,EAAE,iBAAiB,KAAK,CAAC,IAAI,SAAS,OAAO,CAAC,IAAI,6BAA6B,EAAE,CAAC;IACzG,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAe,EAAE,aAAqB,EAAE,iBAAsB,EAAE,iBAAsB;QACpH,MAAM,YAAY,GAAG,OAAkC,CAAC;QACxD,QAAO,aAAa,EAAE;YACpB,KAAK,gBAAgB;gBACnB,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,iBAAiB,EAAE;oBAC9E,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,0BAA0B,EAAE,CAAC;iBACxF;gBACD,OAAO,IAAI,CAAC;YAEd,KAAK,OAAO;gBACV,YAAY,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;YAEd,KAAK,aAAa;gBAChB,YAAY,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;gBAC/C,OAAO,IAAI,CAAC;YAEd,KAAK,UAAU;gBACb,MAAM,QAAQ,GAAG,IAAA,sCAAkB,EAAC,iBAAiB,CAAC,CAAC;gBACvD,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,OAAO,EAAE,YAAY,EAAE,8CAA8C,EAAE,CAAC;iBACzE;gBAED,IAAI,iBAAiB,KAAK,SAAS,IAAI,QAAQ,KAAK,mCAAe,CAAC,IAAI,EAAE;oBACxE,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;oBACnC,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,8BAA8B,EAAE,CAAC;SAC9F;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,uBAAuB,CAAC,GAAQ;QACxC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,cAAc,IAAI,GAAG,CAAC;IAC1D,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAsB,EAAE,cAA8B,EAAE,UAAuB;QACxG,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,WAAkC,CAAC;QACxG,IAAI,eAAe,KAAK,SAAS,EAAE;YACjC,MAAM,YAAY,GAAG,IAAI,iCAAa,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC;gBACxI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS;gBACrC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAEtC,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,IAAI,eAAe,KAAK,SAAS,EAAE;gBACtE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;aACzE;YAED,IAAI,eAAe,KAAK,SAAS,EAAE;gBACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAU,YAAY,CAAC,CAAC;gBACpF,IAAI,SAAS,KAAK,SAAS,EAAE;oBAC3B,OAAO,EAAE,YAAY,EAAE,IAAI,YAAY,CAAC,IAAI,oDAAoD,EAAC,CAAC;iBACnG;gBACD,IAAI,MAAM,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;oBACvC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;iBACzE;aACF;SACF;QACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,EAAC,CAAC;IAC7F,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,OAAsB,EAAE,kBAAgD,EAAE,UAAuB;QACvH,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;YACrC,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE;gBAClD,KAAK,MAAM,MAAM,IAAI,iBAAiB,CAAC,iBAAiB,EAAE;oBACxD,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,WAAkC,CAAC;oBACpE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;wBAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;wBACnD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE;4BACrC,OAAO,MAAM,CAAC;yBACf;qBACF;iBACF;aACF;YACD,OAAO,EAAE,CAAC;SACX;QACD,OAAO,EAAE,YAAY,EAAE,uBAAuB,OAAO,CAAC,IAAI,4BAA4B,EAAC,CAAC;IAC1F,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,OAAsB,EAAE,oBAA2C;QAC1G,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE;YACrC,OAAO;SACR;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAS,OAAO,CAAC,CAAC;QAC/E,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,oDAAoD,CAAC,CAAC;SACvF;QAED,KAAK,MAAM,MAAM,IAAI,oBAAoB,EAAE;YACzC,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAAY,CAAC;YAC7F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;YAC5G,IAAI,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC/E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvC;SACF;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAA2B,EAAE,YAAoC;QAChG,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE;YACjC,MAAM,UAAU,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAU,MAAM,CAAC,UAAU,CAAC,CAAE,CAAC;YAC9E,IAAI,aAAa,GAAG,IAAI,iCAAa,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACzF,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;YAExD,IAAI,UAAU,KAAK,0BAAU,CAAC,OAAO,EAAE;gBAErC,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAU,aAAa,CAAC,KAAK,SAAS,EAAE;oBAC/E,MAAM,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;iBACnF;gBAED,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAChF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;gBACD,aAAa,GAAG,OAAO,CAAC,OAAQ,CAAC;aAClC;YAED,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE;gBACvC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAC5F,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;aACF;YAED,IAAI,MAAM,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC;gBACtG,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvC;aACF;YAED,MAAM,MAAM,CAAC,0BAA0B,CAAC,aAAa,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC;YACpF,IAAI,YAAY,GAAI,MAAM,yCAAmB,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YACpH,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aAC5C;YAED,0BAA0B;YAC1B,YAAY,GAAG,MAAM,IAAA,6CAAqB,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,sBAAsB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC9G,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YAEH,IAAI,YAAY,CAAC,YAAY,KAAK,SAAS,EAAE;gBAC3C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aAC5C;SACF;IACH,CAAC;CACF;AAnKD,kCAmKC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { ECClass, ECClassModifier, Mixin, parseClassModifier, SchemaItemKey, schemaItemTypeToString, SchemaKey } from \"@itwin/ecschema-metadata\";\nimport { SchemaItemEditResults } from \"../Editing/Editor\";\nimport { MutableClass } from \"../Editing/Mutable/MutableClass\";\nimport { SchemaMergeContext } from \"./SchemaMerger\";\nimport { BaseClassDelta, ChangeType, ClassChanges, EntityMixinChanges, PropertyValueChange } from \"../Validation/SchemaChanges\";\nimport { ClassPropertyMerger } from \"./ClassPropertyMerger\";\nimport { mergeCustomAttributes } from \"./CustomAttributeMerger\";\n\n/**\n * @internal\n */\nexport class ClassMerger<TClass extends ECClass> {\n  protected readonly context: SchemaMergeContext;\n\n  constructor(context: SchemaMergeContext) {\n    this.context = context;\n  }\n\n  protected async create(_schemaKey: SchemaKey, ecClass: TClass): Promise<SchemaItemEditResults> {\n    return { errorMessage: `${schemaItemTypeToString(ecClass.schemaItemType)} class type is not implemented.`};\n  }\n\n  protected async addMixin(itemKey: SchemaItemKey, mixin: Mixin): Promise<SchemaItemEditResults> {\n    return { errorMessage: `Adding mixin '${mixin.name}' to '${itemKey.name}' class is not implemented.` };\n  }\n\n  protected async mergeAttributes(ecClass: TClass, attributeName: string, attributeNewValue: any, attributeOldValue: any): Promise<SchemaItemEditResults | boolean> {\n    const mutableClass = ecClass as unknown as MutableClass;\n    switch(attributeName) {\n      case \"schemaItemType\":\n        if (attributeOldValue !== undefined && attributeOldValue !== attributeNewValue) {\n          return { errorMessage: `Changing the class '${ecClass.name}' type is not supported.` };\n        }\n        return true;\n\n      case \"label\":\n        mutableClass.setDisplayLabel(attributeNewValue);\n        return true;\n\n      case \"description\":\n        mutableClass.setDescription(attributeNewValue);\n        return true;\n\n      case \"modifier\":\n        const modifier = parseClassModifier(attributeNewValue);\n        if (modifier === undefined) {\n          return { errorMessage: \"An invalid class modifier has been provided.\" };\n        }\n\n        if (attributeOldValue === undefined || modifier === ECClassModifier.None) {\n          mutableClass.setModifier(modifier);\n          return true;\n        }\n        return { errorMessage: `Changing the class '${ecClass.name}' modifier is not supported.` };\n    }\n    return false;\n  }\n\n  protected isSchemaItemEditResults(obj: any): obj is SchemaItemEditResults {\n    return typeof obj === \"object\" && \"errorMessage\" in obj;\n  }\n\n  private async setBaseClass(itemKey: SchemaItemKey, baseClassDelta: BaseClassDelta, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    const [sourceBaseClass, targetBaseClass] = baseClassDelta.diagnostic.messageArgs! as [ECClass, ECClass];\n    if (sourceBaseClass !== undefined) {\n      const baseClassKey = new SchemaItemKey(sourceBaseClass.name, sourceBaseClass.schema.schemaKey.matches(this.context.sourceSchema.schemaKey)\n        ? this.context.targetSchema.schemaKey\n        : sourceBaseClass.schema.schemaKey);\n\n      if (changeType === ChangeType.Missing && targetBaseClass === undefined) {\n        return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n      }\n\n      if (targetBaseClass !== undefined) {\n        const baseClass = await this.context.targetSchema.lookupItem<ECClass>(baseClassKey);\n        if (baseClass === undefined) {\n          return { errorMessage: `'${baseClassKey.name}' class could not be located in the merged schema.`};\n        }\n        if (await baseClass.is(targetBaseClass)) {\n          return this.context.editor.entities.setBaseClass(itemKey, baseClassKey);\n        }\n      }\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' baseClass is not supported.`};\n  }\n\n  private async addMixins(itemKey: SchemaItemKey, entityMixinChanges: Iterable<EntityMixinChanges>, changeType?: ChangeType): Promise<SchemaItemEditResults> {\n    if (changeType === ChangeType.Missing) {\n      for (const entityMixinChange of entityMixinChanges) {\n        for (const change of entityMixinChange.entityMixinChange) {\n          const mixins = change.diagnostic.messageArgs! as unknown as [Mixin];\n          for (const mixin of mixins) {\n            const result = await this.addMixin(itemKey, mixin);\n            if (result.errorMessage !== undefined) {\n              return result;\n            }\n          }\n        }\n      }\n      return {};\n    }\n    return { errorMessage: `Changing the class '${itemKey.name}' mixins is not supported.`};\n  }\n\n  private async mergeAttributeValueChanges(itemKey: SchemaItemKey, propertyValueChanges: PropertyValueChange[]) {\n    if (propertyValueChanges.length === 0) {\n      return;\n    }\n\n    const targetItem = await this.context.targetSchema.lookupItem<TClass>(itemKey);\n    if (targetItem === undefined) {\n      throw new Error(`'${itemKey.name}' class could not be located in the merged schema.`);\n    }\n\n    for (const change of propertyValueChanges) {\n      const [attributeName, attributeNewValue, attributeOldValue] = change.diagnostic.messageArgs!;\n      const results = await this.mergeAttributes(targetItem, attributeName, attributeNewValue, attributeOldValue);\n      if (this.isSchemaItemEditResults(results) && results.errorMessage !== undefined) {\n        throw new Error(results.errorMessage);\n      }\n    }\n  }\n\n  public static async mergeChanges(context: SchemaMergeContext, classChanges: Iterable<ClassChanges>) {\n    const merger = new this(context);\n\n    for (const change of classChanges) {\n      const sourceItem = (await change.schema.getItem<ECClass>(change.ecTypeName))!;\n      let targetItemKey = new SchemaItemKey(change.ecTypeName, context.targetSchema.schemaKey);\n      const changeType = change.schemaItemMissing?.changeType;\n\n      if (changeType === ChangeType.Missing) {\n\n        if (await context.targetSchema.lookupItem<ECClass>(targetItemKey) !== undefined) {\n          throw new Error(`Merged schema already contains a class '${change.ecTypeName}'.`);\n        }\n\n        const results = await merger.create(context.targetSchema.schemaKey, sourceItem);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n        targetItemKey = results.itemKey!;\n      }\n\n      if (change.baseClassDelta !== undefined) {\n        const results = await merger.setBaseClass(targetItemKey, change.baseClassDelta, changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      if (change.entityMixinChanges.size > 0) {\n        const results = await merger.addMixins(targetItemKey, change.entityMixinChanges.values(), changeType);\n        if (results.errorMessage !== undefined) {\n          throw new Error(results.errorMessage);\n        }\n      }\n\n      await merger.mergeAttributeValueChanges(targetItemKey, change.propertyValueChanges);\n      let mergeResults  = await ClassPropertyMerger.mergeChanges(context, targetItemKey, change.propertyChanges.values());\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n\n      // merge custom attributes\n      mergeResults = await mergeCustomAttributes(merger.context, change.customAttributeChanges.values(), async (ca) => {\n        return merger.context.editor.entities.addCustomAttribute(targetItemKey, ca);\n      });\n\n      if (mergeResults.errorMessage !== undefined) {\n        throw new Error(mergeResults.errorMessage);\n      }\n    }\n  }\n}\n"]}

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

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

package/lib/cjs/Merging/ClassPropertyMerger.js

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

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

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

package/lib/cjs/Merging/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"}