@itwin/ecschema-editing 4.10.0-dev.1 → 4.10.0-dev.10

package/lib/cjs/Merging/KindOfQuantityMerger.js

@@ -1,55 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kindOfQuantityMerger = void 0;
-const SchemaItemMerger_1 = require("./SchemaItemMerger");
+exports.modifyKindOfQuantity = exports.addKindOfQuantity = void 0;
+const Utils_1 = require("./Utils");
 /**
- * Defines a merge handler to merge KindOfQuantity schema items.
+ * Merges a new KindOfQuantity into the target schema.
  * @internal
  */
-exports.kindOfQuantityMerger = {
-    async add(context, change) {
-        if (change.difference.persistenceUnit === undefined) {
-            throw new Error("KindOfQuantity must define persistenceUnit");
-        }
-        if (change.difference.relativeError === undefined) {
-            throw new Error("KindOfQuantity must define relativeError");
-        }
-        change.difference.persistenceUnit = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, change.difference.persistenceUnit);
-        if (change.difference.presentationUnits) {
-            if (Array.isArray(change.difference.presentationUnits)) {
-                for (let index = 0; index < change.difference.presentationUnits.length; index++) {
-                    change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);
-                }
-            }
-            else {
-                change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);
+async function addKindOfQuantity(context, change) {
+    if (change.difference.persistenceUnit === undefined) {
+        throw new Error("KindOfQuantity must define persistenceUnit");
+    }
+    if (change.difference.relativeError === undefined) {
+        throw new Error("KindOfQuantity must define relativeError");
+    }
+    change.difference.persistenceUnit = await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.persistenceUnit);
+    if (change.difference.presentationUnits) {
+        if (Array.isArray(change.difference.presentationUnits)) {
+            for (let index = 0; index < change.difference.presentationUnits.length; index++) {
+                change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);
             }
         }
-        return context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-            persistenceUnit: change.difference.persistenceUnit,
-            presentationUnits: change.difference.presentationUnits,
-            relativeError: change.difference.relativeError,
-        });
-    },
-    async modify(_context, change, itemKey, item) {
-        if (change.difference.label !== undefined) {
-            item.setDisplayLabel(change.difference.label);
+        else {
+            change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);
         }
-        if (change.difference.description !== undefined) {
-            item.setDescription(change.difference.description);
-        }
-        if (change.difference.relativeError !== undefined) {
-            item.setRelativeError(change.difference.relativeError);
-        }
-        if (change.difference.persistenceUnit !== undefined) {
-            // TODO: It should be checked if the unit is the same, but referring to the source schema.
-            throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);
-        }
-    },
-};
+    }
+    await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        persistenceUnit: change.difference.persistenceUnit,
+        presentationUnits: change.difference.presentationUnits,
+        relativeError: change.difference.relativeError,
+    });
+}
+exports.addKindOfQuantity = addKindOfQuantity;
+/**
+ * Merges differences to an existing KindOfQuantity in the target schema.
+ * @internal
+ */
+async function modifyKindOfQuantity(context, change, itemKey) {
+    const kindOfQuantity = await context.targetSchema.lookupItem(itemKey);
+    if (change.difference.label !== undefined) {
+        await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);
+    }
+    if (change.difference.relativeError !== undefined) {
+        kindOfQuantity.setRelativeError(change.difference.relativeError);
+    }
+    if (change.difference.persistenceUnit !== undefined) {
+        // TODO: It should be checked if the unit is the same, but referring to the source schema.
+        throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);
+    }
+}
+exports.modifyKindOfQuantity = modifyKindOfQuantity;
 async function updateOverrideFormat(context, formatString) {
     // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string
     const match = formatString.match(/^([^(]+)\((\d+)\)\[(.*)\]$/);
@@ -57,11 +62,11 @@ async function updateOverrideFormat(context, formatString) {
         return formatString;
     }
     const originalFormat = match[1];
-    const updatedFormat = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, originalFormat);
+    const updatedFormat = await (0, Utils_1.updateSchemaItemFullName)(context, originalFormat);
     const unitOverrides = match[3].split("][");
     for (let index = 0; index < unitOverrides.length; index++) {
         const [unit, label] = unitOverrides[index].split("|");
-        const updatedUnit = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, unit);
+        const updatedUnit = await (0, Utils_1.updateSchemaItemFullName)(context, unit);
         unitOverrides[index] = `${updatedUnit}${label ? `|${label}` : ""}`;
     }
     return `${updatedFormat}(${match[2]})[${unitOverrides.join("][")}]`;

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

@@ -1 +1 @@
-{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type KindOfQuantityDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName } from \"./SchemaItemMerger\";\r\nimport { type MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\r\nimport { SchemaMergeContext } from \"./SchemaMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge KindOfQuantity schema items.\r\n * @internal\r\n */\r\nexport const kindOfQuantityMerger: SchemaItemMergerHandler<KindOfQuantityDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.persistenceUnit === undefined) {\r\n      throw new Error(\"KindOfQuantity must define persistenceUnit\");\r\n    }\r\n    if (change.difference.relativeError === undefined) {\r\n      throw new Error(\"KindOfQuantity must define relativeError\");\r\n    }\r\n    change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\r\n    if(change.difference.presentationUnits) {\r\n      if(Array.isArray(change.difference.presentationUnits)) {\r\n        for(let index = 0; index < change.difference.presentationUnits.length; index++) {\r\n          change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\r\n        }\r\n      } else {\r\n        change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);\r\n      }\r\n    }\r\n\r\n    return context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      persistenceUnit: change.difference.persistenceUnit,\r\n      presentationUnits: change.difference.presentationUnits,\r\n      relativeError: change.difference.relativeError,\r\n    });\r\n  },\r\n  async modify(_context, change, itemKey, item: MutableKindOfQuantity) {\r\n    if(change.difference.label !== undefined) {\r\n      item.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      item.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.relativeError !== undefined) {\r\n      item.setRelativeError(change.difference.relativeError);\r\n    }\r\n    if(change.difference.persistenceUnit !== undefined) {\r\n      // TODO: It should be checked if the unit is the same, but referring to the source schema.\r\n      throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\r\n    }\r\n  },\r\n};\r\n\r\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string) {\r\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\r\n  const match = formatString.match(/^([^(]+)\\((\\d+)\\)\\[(.*)\\]$/);\r\n  if(match === null) {\r\n    return formatString;\r\n  }\r\n\r\n  const originalFormat = match[1];\r\n  const updatedFormat = await updateSchemaItemFullName(context, originalFormat);\r\n\r\n  const unitOverrides  = match[3].split(\"][\");\r\n  for(let index=0; index< unitOverrides.length; index++) {\r\n    const [unit, label] = unitOverrides[index].split(\"|\");\r\n    const updatedUnit = await updateSchemaItemFullName(context, unit);\r\n    unitOverrides[index] = `${updatedUnit}${label ? `|${label}` : \"\"}`;\r\n  }\r\n\r\n  return `${updatedFormat}(${match[2]})[${unitOverrides.join(\"][\")}]`;\r\n}\r\n"]}
+{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { KindOfQuantityDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { updateSchemaItemFullName } from \"./Utils\";\r\n\r\n/**\r\n * Merges a new KindOfQuantity into the target schema.\r\n * @internal\r\n */\r\nexport async function addKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference) {\r\n  if (change.difference.persistenceUnit === undefined) {\r\n    throw new Error(\"KindOfQuantity must define persistenceUnit\");\r\n  }\r\n  if (change.difference.relativeError === undefined) {\r\n    throw new Error(\"KindOfQuantity must define relativeError\");\r\n  }\r\n  change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\r\n  if(change.difference.presentationUnits) {\r\n    if(Array.isArray(change.difference.presentationUnits)) {\r\n      for(let index = 0; index < change.difference.presentationUnits.length; index++) {\r\n        change.difference.presentationUnits[index] = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\r\n      }\r\n    } else {\r\n      change.difference.presentationUnits = await updateOverrideFormat(context, change.difference.presentationUnits);\r\n    }\r\n  }\r\n\r\n  await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\r\n    ...change.difference,\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n    persistenceUnit: change.difference.persistenceUnit,\r\n    presentationUnits: change.difference.presentationUnits,\r\n    relativeError: change.difference.relativeError,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing KindOfQuantity in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference, itemKey: SchemaItemKey) {\r\n  const kindOfQuantity = await context.targetSchema.lookupItem(itemKey) as MutableKindOfQuantity;\r\n  if(change.difference.label !== undefined) {\r\n    await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);\r\n  }\r\n  if(change.difference.description !== undefined) {\r\n    await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);\r\n  }\r\n  if(change.difference.relativeError !== undefined) {\r\n    kindOfQuantity.setRelativeError(change.difference.relativeError);\r\n  }\r\n  if(change.difference.persistenceUnit !== undefined) {\r\n    // TODO: It should be checked if the unit is the same, but referring to the source schema.\r\n    throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\r\n  }\r\n}\r\n\r\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string) {\r\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\r\n  const match = formatString.match(/^([^(]+)\\((\\d+)\\)\\[(.*)\\]$/);\r\n  if(match === null) {\r\n    return formatString;\r\n  }\r\n\r\n  const originalFormat = match[1];\r\n  const updatedFormat = await updateSchemaItemFullName(context, originalFormat);\r\n\r\n  const unitOverrides  = match[3].split(\"][\");\r\n  for(let index=0; index< unitOverrides.length; index++) {\r\n    const [unit, label] = unitOverrides[index].split(\"|\");\r\n    const updatedUnit = await updateSchemaItemFullName(context, unit);\r\n    unitOverrides[index] = `${updatedUnit}${label ? `|${label}` : \"\"}`;\r\n  }\r\n\r\n  return `${updatedFormat}(${match[2]})[${unitOverrides.join(\"][\")}]`;\r\n}\r\n"]}

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

@@ -1,8 +1,14 @@
-import { type MixinClassDifference } from "../Differencing/SchemaDifference";
-import { type SchemaItemMergerHandler } from "./SchemaItemMerger";
+import type { MixinClassDifference } from "../Differencing/SchemaDifference";
+import type { SchemaMergeContext } from "./SchemaMerger";
+import type { SchemaItemKey } from "@itwin/ecschema-metadata";
 /**
- * Defines a merge handler to merge Mixin schema items.
+ * Merges a new Mixin into the target schema.
  * @internal
  */
-export declare const mixinClassMerger: SchemaItemMergerHandler<MixinClassDifference>;
+export declare function addMixinClass(context: SchemaMergeContext, change: MixinClassDifference): Promise<void>;
+/**
+ * Merges differences to an existing Mixin in the target schema.
+ * @internal
+ */
+export declare function modifyMixinClass(context: SchemaMergeContext, change: MixinClassDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=MixinMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,KAAK,uBAAuB,EAAiD,MAAM,oBAAoB,CAAC;AAIjH;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CAsB1E,CAAC"}
+{"version":3,"file":"MixinMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAI9D;;;GAGG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,iBAU5F;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAWvH"}

package/lib/cjs/Merging/MixinMerger.js

@@ -1,33 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixinClassMerger = void 0;
-const SchemaItemMerger_1 = require("./SchemaItemMerger");
+exports.modifyMixinClass = exports.addMixinClass = void 0;
+const Utils_1 = require("./Utils");
 const ClassMerger_1 = require("./ClassMerger");
 /**
- * Defines a merge handler to merge Mixin schema items.
+ * Merges a new Mixin into the target schema.
  * @internal
  */
-exports.mixinClassMerger = {
-    async add(context, change) {
-        if (change.difference.appliesTo === undefined) {
-            throw new Error("Mixin must define appliesTo");
-        }
-        return context.editor.mixins.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-            appliesTo: await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, change.difference.appliesTo),
-        });
-    },
-    async modify(context, change, itemKey, item) {
-        if (change.difference.appliesTo !== undefined) {
-            const appliesTo = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, change.difference.appliesTo);
-            const currentValue = await item.appliesTo;
-            if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {
-                throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);
-            }
+async function addMixinClass(context, change) {
+    if (change.difference.appliesTo === undefined) {
+        throw new Error("Mixin must define appliesTo");
+    }
+    await context.editor.mixins.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        appliesTo: await (0, Utils_1.updateSchemaItemFullName)(context, change.difference.appliesTo),
+    });
+}
+exports.addMixinClass = addMixinClass;
+/**
+ * Merges differences to an existing Mixin in the target schema.
+ * @internal
+ */
+async function modifyMixinClass(context, change, itemKey) {
+    const mixin = await context.targetSchema.lookupItem(itemKey);
+    if (change.difference.appliesTo !== undefined) {
+        const appliesTo = await (0, Utils_1.updateSchemaItemKey)(context, change.difference.appliesTo);
+        const currentValue = await mixin.appliesTo;
+        if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {
+            throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);
         }
-        return (0, ClassMerger_1.modifyClass)(context, change, itemKey, item);
-    },
-};
+    }
+    return (0, ClassMerger_1.modifyClass)(context, change, itemKey, mixin);
+}
+exports.modifyMixinClass = modifyMixinClass;
 //# sourceMappingURL=MixinMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;;AAKA,yDAAiH;AAEjH,+CAA4C;AAE5C;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACpE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,SAAS,EAAE,MAAM,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;SAChF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAkB;QACvD,IAAG,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAClF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvE,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;QACD,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type MixinClassDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler, updateSchemaItemFullName, updateSchemaItemKey } from \"./SchemaItemMerger\";\r\nimport { type MutableMixin } from \"../Editing/Mutable/MutableMixin\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge Mixin schema items.\r\n * @internal\r\n */\r\nexport const mixinClassMerger: SchemaItemMergerHandler<MixinClassDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.appliesTo === undefined) {\r\n      throw new Error(\"Mixin must define appliesTo\");\r\n    }\r\n    return context.editor.mixins.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutableMixin) {\r\n    if(change.difference.appliesTo !== undefined) {\r\n      const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\r\n      const currentValue = await item.appliesTo;\r\n      if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\r\n        throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);\r\n      }\r\n    }\r\n    return modifyClass(context, change, itemKey, item);\r\n  },\r\n};\r\n\r\n"]}
+{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;;AAQA,mCAAwE;AACxE,+CAA4C;AAE5C;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,OAA2B,EAAE,MAA4B;IAC3F,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACnE,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,SAAS,EAAE,MAAM,IAAA,gCAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;KAChF,CAAC,CAAC;AACL,CAAC;AAVD,sCAUC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAA4B,EAAE,OAAsB;IACtH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAiB,CAAC;IAC7E,IAAG,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAClF,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC;QAC3C,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,CAAC,IAAI,+BAA+B,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC;AAXD,4CAWC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { MixinClassDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { MutableMixin } from \"../Editing/Mutable/MutableMixin\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\r\nimport { modifyClass } from \"./ClassMerger\";\r\n\r\n/**\r\n * Merges a new Mixin into the target schema.\r\n * @internal\r\n */\r\nexport async function addMixinClass(context: SchemaMergeContext, change: MixinClassDifference) {\r\n  if (change.difference.appliesTo === undefined) {\r\n    throw new Error(\"Mixin must define appliesTo\");\r\n  }\r\n  await context.editor.mixins.createFromProps(context.targetSchemaKey, {\r\n    ...change.difference,\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n    appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing Mixin in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyMixinClass(context: SchemaMergeContext, change: MixinClassDifference, itemKey: SchemaItemKey) {\r\n  const mixin = await context.targetSchema.lookupItem(itemKey) as MutableMixin;\r\n  if(change.difference.appliesTo !== undefined) {\r\n    const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\r\n    const currentValue = await mixin.appliesTo;\r\n    if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\r\n      throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);\r\n    }\r\n  }\r\n\r\n  return modifyClass(context, change, itemKey, mixin);\r\n}\r\n"]}

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

@@ -1,8 +1,14 @@
-import { type PhenomenonDifference } from "../Differencing/SchemaDifference";
-import { type SchemaItemMergerHandler } from "./SchemaItemMerger";
+import type { PhenomenonDifference } from "../Differencing/SchemaDifference";
+import type { SchemaMergeContext } from "./SchemaMerger";
+import { type SchemaItemKey } from "@itwin/ecschema-metadata";
 /**
- * Defines a merge handler to merge Phenomenon schema items.
+ * Merges a new Phenomenon into the target schema.
  * @internal
  */
-export declare const phenomenonMerger: SchemaItemMergerHandler<PhenomenonDifference>;
+export declare function addPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference): Promise<void>;
+/**
+ * Merges differences to an existing Phenomenon in the target schema.
+ * @internal
+ */
+export declare function modifyPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=PhenomenonMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PhenomenonMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,OAAO,EAAE,KAAK,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAGjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAAuB,CAAC,oBAAoB,CA4B1E,CAAC"}
+{"version":3,"file":"PhenomenonMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE/F;;;GAGG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,iBAW5F;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,iBAgBvH"}

package/lib/cjs/Merging/PhenomenonMerger.js

@@ -1,36 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.phenomenonMerger = void 0;
+exports.modifyPhenomenon = exports.addPhenomenon = void 0;
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
 /**
- * Defines a merge handler to merge Phenomenon schema items.
+ * Merges a new Phenomenon into the target schema.
  * @internal
  */
-exports.phenomenonMerger = {
-    add: async (context, change) => {
-        if (change.difference.definition === undefined) {
-            throw new Error("Phenomenon must define definition");
-        }
-        return context.editor.phenomenons.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-            definition: change.difference.definition,
-        });
-    },
-    modify: async (_context, change, itemKey, phenomenon) => {
-        if (change.difference.label !== undefined) {
-            phenomenon.setDisplayLabel(change.difference.label);
-        }
-        if (change.difference.description !== undefined) {
-            phenomenon.setDescription(change.difference.description);
-        }
-        if (change.difference.definition !== undefined) {
-            // It would be better if the validation would be part of phenomenon.setDefinition.
-            if (phenomenon.definition !== "" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())
-                throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);
-            await phenomenon.setDefinition(change.difference.definition);
-        }
-    },
-};
+async function addPhenomenon(context, change) {
+    if (change.difference.definition === undefined) {
+        throw new Error("Phenomenon must define definition");
+    }
+    await context.editor.phenomenons.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        definition: change.difference.definition,
+    });
+}
+exports.addPhenomenon = addPhenomenon;
+/**
+ * Merges differences to an existing Phenomenon in the target schema.
+ * @internal
+ */
+async function modifyPhenomenon(context, change, itemKey) {
+    const phenomenon = await context.targetSchema.lookupItem(itemKey);
+    if (change.difference.label !== undefined) {
+        await context.editor.phenomenons.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.phenomenons.setDescription(itemKey, change.difference.description);
+    }
+    if (change.difference.definition !== undefined) {
+        // It would be better if the validation would be part of phenomenon.setDefinition.
+        if (phenomenon.definition !== "" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())
+            throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);
+        await phenomenon.setDefinition(change.difference.definition);
+    }
+}
+exports.modifyPhenomenon = modifyPhenomenon;
 //# sourceMappingURL=PhenomenonMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;;AAOA,gEAA2E;AAE3E;;;GAGG;AACU,QAAA,gBAAgB,GAAkD;IAC7E,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7B,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YACzE,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;SACzC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAA6B,EAAE,EAAE;QACzE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAC9C,kFAAkF;YAClF,IAAI,UAAU,CAAC,UAAU,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;gBACpH,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,kBAAkB,OAAO,CAAC,IAAI,yCAAyC,CAAC,CAAC;YAEnI,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type PhenomenonDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\r\nimport { type SchemaItemMergerHandler} from \"./SchemaItemMerger\";\r\nimport { ECObjectsError, ECObjectsStatus } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Defines a merge handler to merge Phenomenon schema items.\r\n * @internal\r\n */\r\nexport const phenomenonMerger: SchemaItemMergerHandler<PhenomenonDifference> = {\r\n  add: async (context, change) => {\r\n    if (change.difference.definition === undefined) {\r\n      throw new Error(\"Phenomenon must define definition\");\r\n    }\r\n\r\n    return context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      definition: change.difference.definition,\r\n    });\r\n  },\r\n  modify: async (_context, change, itemKey, phenomenon: MutablePhenomenon) => {\r\n    if(change.difference.label !== undefined) {\r\n      phenomenon.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      phenomenon.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.definition !== undefined) {\r\n      // It would be better if the validation would be part of phenomenon.setDefinition.\r\n      if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\r\n        throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);\r\n\r\n      await phenomenon.setDefinition(change.difference.definition);\r\n    }\r\n  },\r\n};\r\n"]}
+{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;;AAOA,gEAA+F;AAE/F;;;GAGG;AACI,KAAK,UAAU,aAAa,CAAC,OAA2B,EAAE,MAA4B;IAC3F,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QACxE,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU;KACzC,CAAC,CAAC;AACL,CAAC;AAXD,sCAWC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CAAC,OAA2B,EAAE,MAA4B,EAAE,OAAsB;IACtH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAsB,CAAC;IACvF,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC1F,CAAC;IAED,IAAG,MAAM,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9C,kFAAkF;QAClF,IAAI,UAAU,CAAC,UAAU,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;YACpH,MAAM,IAAI,kCAAc,CAAC,mCAAe,CAAC,aAAa,EAAE,kBAAkB,OAAO,CAAC,IAAI,yCAAyC,CAAC,CAAC;QAEnI,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAhBD,4CAgBC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { PhenomenonDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport { ECObjectsError, ECObjectsStatus, type SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Merges a new Phenomenon into the target schema.\r\n * @internal\r\n */\r\nexport async function addPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference) {\r\n  if (change.difference.definition === undefined) {\r\n    throw new Error(\"Phenomenon must define definition\");\r\n  }\r\n\r\n  await context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\r\n    ...change.difference,\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n    definition: change.difference.definition,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing Phenomenon in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference, itemKey: SchemaItemKey) {\r\n  const phenomenon = await context.targetSchema.lookupItem(itemKey) as MutablePhenomenon;\r\n  if(change.difference.label !== undefined) {\r\n    await context.editor.phenomenons.setDisplayLabel(itemKey, change.difference.label);\r\n  }\r\n  if(change.difference.description !== undefined) {\r\n    await context.editor.phenomenons.setDescription(itemKey, change.difference.description);\r\n  }\r\n\r\n  if(change.difference.definition !== undefined) {\r\n    // It would be better if the validation would be part of phenomenon.setDefinition.\r\n    if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\r\n      throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);\r\n\r\n    await phenomenon.setDefinition(change.difference.definition);\r\n  }\r\n}\r\n"]}

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

@@ -1,8 +1,14 @@
-import { type PropertyCategoryDifference } from "../Differencing/SchemaDifference";
-import { type SchemaItemMergerHandler } from "./SchemaItemMerger";
+import type { PropertyCategoryDifference } from "../Differencing/SchemaDifference";
+import type { SchemaMergeContext } from "./SchemaMerger";
+import type { SchemaItemKey } from "@itwin/ecschema-metadata";
 /**
- * Defines a merge handler to merge PropertyCategory schema items.
+ * Merges a new PropertyCategory into the target schema.
  * @internal
  */
-export declare const propertyCategoryMerger: SchemaItemMergerHandler<PropertyCategoryDifference>;
+export declare function addPropertyCategory(context: SchemaMergeContext, change: PropertyCategoryDifference): Promise<void>;
+/**
+ * Merges differences to an existing PropertyCategory in the target schema.
+ * @internal
+ */
+export declare function modifyPropertyCategory(context: SchemaMergeContext, change: PropertyCategoryDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=PropertyCategoryMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyCategoryMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,uBAAuB,CAAC,0BAA0B,CAyBtF,CAAC"}
+{"version":3,"file":"PropertyCategoryMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,0BAA0B,iBAWxG;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,0BAA0B,EAAE,OAAO,EAAE,aAAa,iBAUnI"}

package/lib/cjs/Merging/PropertyCategoryMerger.js

@@ -1,33 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.propertyCategoryMerger = void 0;
+exports.modifyPropertyCategory = exports.addPropertyCategory = void 0;
 /**
- * Defines a merge handler to merge PropertyCategory schema items.
+ * Merges a new PropertyCategory into the target schema.
  * @internal
  */
-exports.propertyCategoryMerger = {
-    async add(context, change) {
-        if (change.difference.priority === undefined) {
-            throw new Error("PropertyCategory must define priority");
-        }
-        return context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {
-            ...change.difference,
-            name: change.itemName,
-            schemaItemType: change.schemaType,
-            priority: change.difference.priority,
-        });
-    },
-    async modify(context, change, itemKey, item) {
-        if (change.difference.label !== undefined) {
-            item.setDisplayLabel(change.difference.label);
-        }
-        if (change.difference.description !== undefined) {
-            item.setDescription(change.difference.description);
-        }
-        if (change.difference.priority !== undefined) {
-            // TODO: inconsistency: setPriority does not return a result whether the priority was set successfully.
-            await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);
-        }
-    },
-};
+async function addPropertyCategory(context, change) {
+    if (change.difference.priority === undefined) {
+        throw new Error("PropertyCategory must define priority");
+    }
+    await context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {
+        ...change.difference,
+        name: change.itemName,
+        schemaItemType: change.schemaType,
+        priority: change.difference.priority,
+    });
+}
+exports.addPropertyCategory = addPropertyCategory;
+/**
+ * Merges differences to an existing PropertyCategory in the target schema.
+ * @internal
+ */
+async function modifyPropertyCategory(context, change, itemKey) {
+    if (change.difference.label !== undefined) {
+        await context.editor.propertyCategories.setDisplayLabel(itemKey, change.difference.label);
+    }
+    if (change.difference.description !== undefined) {
+        await context.editor.propertyCategories.setDescription(itemKey, change.difference.description);
+    }
+    if (change.difference.priority !== undefined) {
+        await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);
+    }
+}
+exports.modifyPropertyCategory = modifyPropertyCategory;
 //# sourceMappingURL=PropertyCategoryMerger.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyCategoryMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACU,QAAA,sBAAsB,GAAwD;IACzF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM;QACvB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;YAChF,GAAG,MAAM,CAAC,UAAU;YACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,cAAc,EAAE,MAAM,CAAC,UAAU;YACjC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;SACrC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAA6B;QAClE,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5C,uGAAuG;YACvG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { type MutablePropertyCategory } from \"../Editing/Mutable/MutablePropertyCategory\";\r\nimport { type PropertyCategoryDifference } from \"../Differencing/SchemaDifference\";\r\nimport { type SchemaItemMergerHandler } from \"./SchemaItemMerger\";\r\n\r\n/**\r\n * Defines a merge handler to merge PropertyCategory schema items.\r\n * @internal\r\n */\r\nexport const propertyCategoryMerger: SchemaItemMergerHandler<PropertyCategoryDifference> = {\r\n  async add(context, change) {\r\n    if (change.difference.priority === undefined) {\r\n      throw new Error(\"PropertyCategory must define priority\");\r\n    }\r\n\r\n    return context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {\r\n      ...change.difference,\r\n      name: change.itemName,\r\n      schemaItemType: change.schemaType,\r\n      priority: change.difference.priority,\r\n    });\r\n  },\r\n  async modify(context, change, itemKey, item: MutablePropertyCategory) {\r\n    if(change.difference.label !== undefined) {\r\n      item.setDisplayLabel(change.difference.label);\r\n    }\r\n    if(change.difference.description !== undefined) {\r\n      item.setDescription(change.difference.description);\r\n    }\r\n    if(change.difference.priority !== undefined) {\r\n      // TODO: inconsistency: setPriority does not return a result whether the priority was set successfully.\r\n      await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);\r\n    }\r\n  },\r\n};\r\n"]}
+{"version":3,"file":"PropertyCategoryMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyCategoryMerger.ts"],"names":[],"mappings":";;;AAQA;;;GAGG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAA2B,EAAE,MAAkC;IACvG,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE;QAC/E,GAAG,MAAM,CAAC,UAAU;QACpB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,cAAc,EAAE,MAAM,CAAC,UAAU;QACjC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;KACrC,CAAC,CAAC;AACL,CAAC;AAXD,kDAWC;AAED;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAAC,OAA2B,EAAE,MAAkC,EAAE,OAAsB;IAClI,IAAG,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5F,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACjG,CAAC;IACD,IAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC3F,CAAC;AACH,CAAC;AAVD,wDAUC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport type { PropertyCategoryDifference } from \"../Differencing/SchemaDifference\";\r\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\r\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\r\n\r\n/**\r\n * Merges a new PropertyCategory into the target schema.\r\n * @internal\r\n */\r\nexport async function addPropertyCategory(context: SchemaMergeContext, change: PropertyCategoryDifference) {\r\n  if (change.difference.priority === undefined) {\r\n    throw new Error(\"PropertyCategory must define priority\");\r\n  }\r\n\r\n  await context.editor.propertyCategories.createFromProps(context.targetSchemaKey, {\r\n    ...change.difference,\r\n    name: change.itemName,\r\n    schemaItemType: change.schemaType,\r\n    priority: change.difference.priority,\r\n  });\r\n}\r\n\r\n/**\r\n * Merges differences to an existing PropertyCategory in the target schema.\r\n * @internal\r\n */\r\nexport async function modifyPropertyCategory(context: SchemaMergeContext, change: PropertyCategoryDifference, itemKey: SchemaItemKey) {\r\n  if(change.difference.label !== undefined) {\r\n    await context.editor.propertyCategories.setDisplayLabel(itemKey, change.difference.label);\r\n  }\r\n  if(change.difference.description !== undefined) {\r\n    await context.editor.propertyCategories.setDescription(itemKey, change.difference.description);\r\n  }\r\n  if(change.difference.priority !== undefined) {\r\n    await context.editor.propertyCategories.setPriority(itemKey, change.difference.priority);\r\n  }\r\n}\r\n"]}

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

@@ -1,5 +1,5 @@
 import type { SchemaMergeContext } from "./SchemaMerger";
-import type { ClassItemDifference, ClassPropertyDifference } from "../Differencing/SchemaDifference";
+import type { AnyClassItemDifference, ClassPropertyDifference } from "../Differencing/SchemaDifference";
 import { SchemaItemKey } from "@itwin/ecschema-metadata";
 /**
  * @internal
@@ -8,5 +8,5 @@ export declare function mergePropertyDifference(context: SchemaMergeContext, cha
 /**
  * @internal
  */
-export declare function mergeClassProperties(context: SchemaMergeContext, change: ClassItemDifference, itemKey: SchemaItemKey): Promise<void>;
+export declare function mergeClassProperties(context: SchemaMergeContext, change: AnyClassItemDifference, itemKey: SchemaItemKey): Promise<void>;
 //# sourceMappingURL=PropertyMerger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAkB,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAA8M,aAAa,EAAoD,MAAM,0BAA0B,CAAC;AAgBvT;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1I"}
+{"version":3,"file":"PropertyMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAkB,MAAM,kCAAkC,CAAC;AACxH,OAAO,EAA8M,aAAa,EAAoD,MAAM,0BAA0B,CAAC;AAgBvT;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7I"}

package/lib/cjs/Merging/PropertyMerger.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeClassProperties = exports.mergePropertyDifference = void 0;
 const ecschema_metadata_1 = require("@itwin/ecschema-metadata");
-const SchemaItemMerger_1 = require("./SchemaItemMerger");
+const Utils_1 = require("./Utils");
 const CustomAttributeMerger_1 = require("./CustomAttributeMerger");
 /**
  * @internal
@@ -31,10 +31,10 @@ async function mergeClassProperty(context, change, itemKey, property) {
 }
 async function addClassProperty(context, itemKey, property) {
     if (property.category !== undefined) {
-        property.category = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, property.category);
+        property.category = await (0, Utils_1.updateSchemaItemFullName)(context, property.category);
     }
     if (property.kindOfQuantity !== undefined) {
-        property.kindOfQuantity = await (0, SchemaItemMerger_1.updateSchemaItemFullName)(context, property.kindOfQuantity);
+        property.kindOfQuantity = await (0, Utils_1.updateSchemaItemFullName)(context, property.kindOfQuantity);
     }
     await createProperty(context, itemKey, property);
     if (property.customAttributes !== undefined) {
@@ -68,9 +68,6 @@ async function modifyClassProperty(context, itemKey, propertyProps) {
     if (propertyProps.type !== undefined) {
         throw new Error(`Changing the property '${property.fullName}' type is not supported.`);
     }
-    if (propertyProps.kindOfQuantity !== undefined) {
-        throw new Error(`Changing the property '${property.fullName}' kind of quantity is not supported.`);
-    }
     const classEditor = await getClassEditor(context, ecClass);
     if (propertyProps.description !== undefined) {
         await classEditor.properties.setDescription(itemKey, propertyProps.name, propertyProps.description);
@@ -84,11 +81,14 @@ async function modifyClassProperty(context, itemKey, propertyProps) {
     if (propertyProps.priority !== undefined) {
         await classEditor.properties.setPriority(itemKey, propertyProps.name, propertyProps.priority);
     }
+    if (propertyProps.kindOfQuantity !== undefined) {
+        await classEditor.properties.setKindOfQuantity(itemKey, propertyProps.name, await (0, Utils_1.updateSchemaItemKey)(context, propertyProps.kindOfQuantity));
+    }
     if (property.isArray()) {
         await arrayProperty.merge(context, itemKey, property.name, propertyProps);
     }
     if (propertyProps.category !== undefined) {
-        const categoryKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, propertyProps.category);
+        const categoryKey = await (0, Utils_1.updateSchemaItemKey)(context, propertyProps.category);
         await classEditor.properties.setCategory(itemKey, property.name, categoryKey);
     }
     if (property.isEnumeration()) {
@@ -142,7 +142,7 @@ const enumerationProperty = {
         return primitiveProperty.is(property) && property.typeName.includes(".");
     },
     async add(context, itemKey, property) {
-        const enumerationKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.typeName);
+        const enumerationKey = await (0, Utils_1.updateSchemaItemKey)(context, property.typeName);
         const enumerationType = await context.editor.schemaContext.getSchemaItem(enumerationKey);
         if (enumerationType === undefined) {
             throw new Error(`Unable to locate the enumeration class ${enumerationKey.name} in the context schema.`);
@@ -165,7 +165,7 @@ const navigationProperty = {
         return property.type === "NavigationProperty";
     },
     async add(context, itemKey, property) {
-        const relationshipKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.relationshipName);
+        const relationshipKey = await (0, Utils_1.updateSchemaItemKey)(context, property.relationshipName);
         const relationshipType = await context.editor.schemaContext.getSchemaItem(relationshipKey);
         if (relationshipType === undefined) {
             throw new Error(`Unable to locate the relationship class ${relationshipKey.name} in the context schema.`);
@@ -230,7 +230,7 @@ const structProperty = {
         return property.type === "StructProperty" || property.type === "StructArrayProperty";
     },
     async add(context, itemKey, property) {
-        const structKey = await (0, SchemaItemMerger_1.updateSchemaItemKey)(context, property.typeName);
+        const structKey = await (0, Utils_1.updateSchemaItemKey)(context, property.typeName);
         const structType = await context.editor.schemaContext.getSchemaItem(structKey);
         if (structType === undefined) {
             throw new Error(`Unable to locate the struct ${structKey.name} in the context schema.`);