@itwin/ecschema-editing 5.0.0-dev.4 → 5.0.0-dev.40

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

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

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

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

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

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

package/lib/cjs/Merging/InvertedUnitMerger.js

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

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

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

package/lib/cjs/Merging/KindOfQuantityMerger.js

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

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":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { Format, InvertedUnit, OverrideFormat, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new KindOfQuantity into the target schema.\n * @internal\n */\nexport async function addKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference) {\n  if (change.difference.persistenceUnit === undefined) {\n    throw new Error(\"KindOfQuantity must define persistenceUnit\");\n  }\n  if (change.difference.relativeError === undefined) {\n    throw new Error(\"KindOfQuantity must define relativeError\");\n  }\n  change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\n  if(change.difference.presentationUnits) {\n    if(Array.isArray(change.difference.presentationUnits)) {\n      for(let index = 0; index < change.difference.presentationUnits.length; index++) {\n        const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\n        change.difference.presentationUnits[index] = presentationFormat.fullName;\n      }\n    } else {\n      const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits);\n      change.difference.presentationUnits = presentationFormat.name;\n    }\n  }\n\n  await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    persistenceUnit: change.difference.persistenceUnit,\n    presentationUnits: change.difference.presentationUnits,\n    relativeError: change.difference.relativeError,\n  });\n}\n\n/**\n * Merges differences to an existing KindOfQuantity in the target schema.\n * @internal\n */\nexport async function modifyKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference, itemKey: SchemaItemKey) {\n  const kindOfQuantity = await context.targetSchema.lookupItem(itemKey) as MutableKindOfQuantity;\n  if(change.difference.label !== undefined) {\n    await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.relativeError !== undefined) {\n    kindOfQuantity.setRelativeError(change.difference.relativeError);\n  }\n  if(change.difference.persistenceUnit !== undefined) {\n    // TODO: It should be checked if the unit is the same, but referring to the source schema.\n    throw new Error(`Changing the kind of quantity '${itemKey.name}' persistenceUnit is not supported.`);\n  }\n}\n/**\n * Merges a new presentation format into the target kind of quantity\n * @internal\n*/\nexport async function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference) {\n  for (const formatString of change.difference) {\n    const koqKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n    const presentationFormat = await updateOverrideFormat(context, formatString);\n    if (OverrideFormat.isOverrideFormat(presentationFormat)) {\n      await context.editor.kindOfQuantities.addPresentationOverrideFormat(koqKey, presentationFormat);\n    } else {\n      await context.editor.kindOfQuantities.addPresentationFormat(koqKey, presentationFormat.key);\n    }\n  }\n}\n\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string): Promise<Format | OverrideFormat> {\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\n  const match = OverrideFormat.parseFormatString(formatString);\n  const formatKey = await updateSchemaItemKey(context, match.name);\n  const format = await context.targetSchema.lookupItem(formatKey) as Format;\n\n  if (undefined === match.precision && undefined === match.unitAndLabels)\n    return format;\n\n  let unitAndLabels: Array<[Unit | InvertedUnit, string | undefined]> | undefined;\n  if (undefined !== match.unitAndLabels) {\n    unitAndLabels = [];\n    for (const unitOverride of match.unitAndLabels) {\n      const unitKey = await updateSchemaItemKey(context, unitOverride[0]);\n      const unit = await context.targetSchema.lookupItem(unitKey) as Unit | InvertedUnit;\n      unitAndLabels.push([unit, unitOverride[1]]);\n    }\n  }\n  return context.editor.kindOfQuantities.createFormatOverride(formatKey, match.precision, unitAndLabels);\n}\n"]}
+{"version":3,"file":"KindOfQuantityMerger.js","sourceRoot":"","sources":["../../../src/Merging/KindOfQuantityMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { KindOfQuantityDifference, KindOfQuantityPresentationFormatDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableKindOfQuantity } from \"../Editing/Mutable/MutableKindOfQuantity\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { Format, InvertedUnit, OverrideFormat, SchemaItemKey, Unit } from \"@itwin/ecschema-metadata\";\nimport { toItemKey, updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\n\n/**\n * Merges a new KindOfQuantity into the target schema.\n * @internal\n */\nexport async function addKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference) {\n  if (change.difference.persistenceUnit === undefined) {\n    throw new Error(\"KindOfQuantity must define persistenceUnit\");\n  }\n  if (change.difference.relativeError === undefined) {\n    throw new Error(\"KindOfQuantity must define relativeError\");\n  }\n  change.difference.persistenceUnit = await updateSchemaItemFullName(context, change.difference.persistenceUnit);\n  if(change.difference.presentationUnits) {\n    if(Array.isArray(change.difference.presentationUnits)) {\n      for(let index = 0; index < change.difference.presentationUnits.length; index++) {\n        const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits[index]);\n        change.difference.presentationUnits[index] = presentationFormat.fullName;\n      }\n    } else {\n      const presentationFormat = await updateOverrideFormat(context, change.difference.presentationUnits);\n      change.difference.presentationUnits = presentationFormat.name;\n    }\n  }\n\n  await context.editor.kindOfQuantities.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    persistenceUnit: change.difference.persistenceUnit,\n    presentationUnits: change.difference.presentationUnits,\n    relativeError: change.difference.relativeError,\n  });\n}\n\n/**\n * Merges differences to an existing KindOfQuantity in the target schema.\n * @internal\n */\nexport async function modifyKindOfQuantity(context: SchemaMergeContext, change: KindOfQuantityDifference, itemKey: SchemaItemKey) {\n  const kindOfQuantity = await context.targetSchema.lookupItem(itemKey) as MutableKindOfQuantity;\n  if(change.difference.label !== undefined) {\n    await context.editor.kindOfQuantities.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.kindOfQuantities.setDescription(itemKey, change.difference.description);\n  }\n  if(change.difference.relativeError !== undefined) {\n    kindOfQuantity.setRelativeError(change.difference.relativeError);\n  }\n  if(change.difference.persistenceUnit !== undefined) {\n    // TODO: It should be checked if the unit is the same, but referring to the source schema.\n    throw new Error(`Changing the kind of quantity '${change.itemName}' persistenceUnit is not supported.`);\n  }\n}\n/**\n * Merges a new presentation format into the target kind of quantity\n * @internal\n*/\nexport async function addPresentationFormat(context: SchemaMergeContext, change: KindOfQuantityPresentationFormatDifference) {\n  for (const formatString of change.difference) {\n    const koqKey = toItemKey(context, change.itemName);\n    const presentationFormat = await updateOverrideFormat(context, formatString);\n    if (OverrideFormat.isOverrideFormat(presentationFormat)) {\n      await context.editor.kindOfQuantities.addPresentationOverrideFormat(koqKey, presentationFormat);\n    } else {\n      await context.editor.kindOfQuantities.addPresentationFormat(koqKey, presentationFormat.key);\n    }\n  }\n}\n\nasync function updateOverrideFormat(context: SchemaMergeContext, formatString: string): Promise<Format | OverrideFormat> {\n  // https://www.itwinjs.org/v1/bis/ec/kindofquantity/#format-string\n  const match = OverrideFormat.parseFormatString(formatString);\n  const formatKey = await updateSchemaItemKey(context, match.name);\n  const format = await context.targetSchema.lookupItem(formatKey) as Format;\n\n  if (undefined === match.precision && undefined === match.unitAndLabels)\n    return format;\n\n  let unitAndLabels: Array<[Unit | InvertedUnit, string | undefined]> | undefined;\n  if (undefined !== match.unitAndLabels) {\n    unitAndLabels = [];\n    for (const unitOverride of match.unitAndLabels) {\n      const unitKey = await updateSchemaItemKey(context, unitOverride[0]);\n      const unit = await context.targetSchema.lookupItem(unitKey) as Unit | InvertedUnit;\n      unitAndLabels.push([unit, unitOverride[1]]);\n    }\n  }\n  return context.editor.kindOfQuantities.createFormatOverride(formatKey, match.precision, unitAndLabels);\n}\n"]}

package/lib/cjs/Merging/MixinMerger.js

@@ -29,7 +29,7 @@ async function modifyMixinClass(context, change, itemKey) {
         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.`);
+            throw new Error(`Changing the mixin '${change.itemName}' appliesTo is not supported.`);
         }
     }
     return (0, ClassMerger_1.modifyClass)(context, change, itemKey, mixin);

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

@@ -1 +1 @@
-{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;AAeA,sCAUC;AAMD,4CAWC;AAlCD,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;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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { MixinClassDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableMixin } from \"../Editing/Mutable/MutableMixin\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\nimport { modifyClass } from \"./ClassMerger\";\n\n/**\n * Merges a new Mixin into the target schema.\n * @internal\n */\nexport async function addMixinClass(context: SchemaMergeContext, change: MixinClassDifference) {\n  if (change.difference.appliesTo === undefined) {\n    throw new Error(\"Mixin must define appliesTo\");\n  }\n  await context.editor.mixins.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\n  });\n}\n\n/**\n * Merges differences to an existing Mixin in the target schema.\n * @internal\n */\nexport async function modifyMixinClass(context: SchemaMergeContext, change: MixinClassDifference, itemKey: SchemaItemKey) {\n  const mixin = await context.targetSchema.lookupItem(itemKey) as MutableMixin;\n  if(change.difference.appliesTo !== undefined) {\n    const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\n    const currentValue = await mixin.appliesTo;\n    if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\n      throw new Error(`Changing the mixin '${itemKey.name}' appliesTo is not supported.`);\n    }\n  }\n\n  return modifyClass(context, change, itemKey, mixin);\n}\n"]}
+{"version":3,"file":"MixinMerger.js","sourceRoot":"","sources":["../../../src/Merging/MixinMerger.ts"],"names":[],"mappings":";;AAeA,sCAUC;AAMD,4CAWC;AAlCD,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;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,MAAM,CAAC,QAAQ,+BAA+B,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,OAAO,IAAA,yBAAW,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { MixinClassDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutableMixin } from \"../Editing/Mutable/MutableMixin\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { SchemaItemKey } from \"@itwin/ecschema-metadata\";\nimport { updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\nimport { modifyClass } from \"./ClassMerger\";\n\n/**\n * Merges a new Mixin into the target schema.\n * @internal\n */\nexport async function addMixinClass(context: SchemaMergeContext, change: MixinClassDifference) {\n  if (change.difference.appliesTo === undefined) {\n    throw new Error(\"Mixin must define appliesTo\");\n  }\n  await context.editor.mixins.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    appliesTo: await updateSchemaItemFullName(context, change.difference.appliesTo),\n  });\n}\n\n/**\n * Merges differences to an existing Mixin in the target schema.\n * @internal\n */\nexport async function modifyMixinClass(context: SchemaMergeContext, change: MixinClassDifference, itemKey: SchemaItemKey) {\n  const mixin = await context.targetSchema.lookupItem(itemKey) as MutableMixin;\n  if(change.difference.appliesTo !== undefined) {\n    const appliesTo = await updateSchemaItemKey(context, change.difference.appliesTo);\n    const currentValue = await mixin.appliesTo;\n    if (currentValue !== undefined && !appliesTo.matches(currentValue.key)) {\n      throw new Error(`Changing the mixin '${change.itemName}' appliesTo is not supported.`);\n    }\n  }\n\n  return modifyClass(context, change, itemKey, mixin);\n}\n"]}

package/lib/cjs/Merging/PhenomenonMerger.js

@@ -33,7 +33,7 @@ async function modifyPhenomenon(context, change, itemKey) {
     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.`);
+            throw new ecschema_metadata_1.ECObjectsError(ecschema_metadata_1.ECObjectsStatus.InvalidECJson, `The Phenomenon ${change.itemName} has an invalid 'definition' attribute.`);
         await phenomenon.setDefinition(change.difference.definition);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;AAaA,sCAWC;AAMD,4CAgBC;AAvCD,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;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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { PhenomenonDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { ECObjectsError, ECObjectsStatus, type SchemaItemKey } from \"@itwin/ecschema-metadata\";\n\n/**\n * Merges a new Phenomenon into the target schema.\n * @internal\n */\nexport async function addPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference) {\n  if (change.difference.definition === undefined) {\n    throw new Error(\"Phenomenon must define definition\");\n  }\n\n  await context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    definition: change.difference.definition,\n  });\n}\n\n/**\n * Merges differences to an existing Phenomenon in the target schema.\n * @internal\n */\nexport async function modifyPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference, itemKey: SchemaItemKey) {\n  const phenomenon = await context.targetSchema.lookupItem(itemKey) as MutablePhenomenon;\n  if(change.difference.label !== undefined) {\n    await context.editor.phenomenons.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.phenomenons.setDescription(itemKey, change.difference.description);\n  }\n\n  if(change.difference.definition !== undefined) {\n    // It would be better if the validation would be part of phenomenon.setDefinition.\n    if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\n      throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${itemKey.name} has an invalid 'definition' attribute.`);\n\n    await phenomenon.setDefinition(change.difference.definition);\n  }\n}\n"]}
+{"version":3,"file":"PhenomenonMerger.js","sourceRoot":"","sources":["../../../src/Merging/PhenomenonMerger.ts"],"names":[],"mappings":";;AAaA,sCAWC;AAMD,4CAgBC;AAvCD,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;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,MAAM,CAAC,QAAQ,yCAAyC,CAAC,CAAC;QAEtI,MAAM,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { PhenomenonDifference } from \"../Differencing/SchemaDifference\";\nimport type { MutablePhenomenon } from \"../Editing/Mutable/MutablePhenomenon\";\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport { ECObjectsError, ECObjectsStatus, type SchemaItemKey } from \"@itwin/ecschema-metadata\";\n\n/**\n * Merges a new Phenomenon into the target schema.\n * @internal\n */\nexport async function addPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference) {\n  if (change.difference.definition === undefined) {\n    throw new Error(\"Phenomenon must define definition\");\n  }\n\n  await context.editor.phenomenons.createFromProps(context.targetSchemaKey, {\n    ...change.difference,\n    name: change.itemName,\n    schemaItemType: change.schemaType,\n    definition: change.difference.definition,\n  });\n}\n\n/**\n * Merges differences to an existing Phenomenon in the target schema.\n * @internal\n */\nexport async function modifyPhenomenon(context: SchemaMergeContext, change: PhenomenonDifference, itemKey: SchemaItemKey) {\n  const phenomenon = await context.targetSchema.lookupItem(itemKey) as MutablePhenomenon;\n  if(change.difference.label !== undefined) {\n    await context.editor.phenomenons.setDisplayLabel(itemKey, change.difference.label);\n  }\n  if(change.difference.description !== undefined) {\n    await context.editor.phenomenons.setDescription(itemKey, change.difference.description);\n  }\n\n  if(change.difference.definition !== undefined) {\n    // It would be better if the validation would be part of phenomenon.setDefinition.\n    if (phenomenon.definition !== \"\" && change.difference.definition.toLowerCase() !== phenomenon.definition.toLowerCase())\n      throw new ECObjectsError(ECObjectsStatus.InvalidECJson, `The Phenomenon ${change.itemName} has an invalid 'definition' attribute.`);\n\n    await phenomenon.setDefinition(change.difference.definition);\n  }\n}\n"]}

package/lib/cjs/Merging/PropertyMerger.js

@@ -29,17 +29,18 @@ async function mergeClassProperty(context, change, itemKey, property) {
         : modifyClassProperty(context, itemKey, property);
 }
 async function addClassProperty(context, itemKey, property) {
+    const ecClass = await context.targetSchema.lookupItem((0, Utils_1.toItemKey)(context, itemKey.name));
     if (property.category !== undefined) {
         property.category = await (0, Utils_1.updateSchemaItemFullName)(context, property.category);
     }
     if (property.kindOfQuantity !== undefined) {
         property.kindOfQuantity = await (0, Utils_1.updateSchemaItemFullName)(context, property.kindOfQuantity);
     }
-    await createProperty(context, itemKey, property);
+    await createProperty(context, ecClass.key, property);
     if (property.customAttributes !== undefined) {
         await (0, CustomAttributeMerger_1.applyCustomAttributes)(context, property.customAttributes, async (ca) => {
-            const classEditor = await (0, Utils_1.getClassEditor)(context, itemKey);
-            await classEditor.properties.addCustomAttribute(itemKey, property.name, ca);
+            const classEditor = await (0, Utils_1.getClassEditor)(context, ecClass.key);
+            await classEditor.properties.addCustomAttribute(ecClass.key, property.name, ca);
         });
     }
 }
@@ -59,48 +60,49 @@ async function createProperty(context, itemKey, property) {
     return {};
 }
 async function modifyClassProperty(context, itemKey, propertyProps) {
-    const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey);
-    const property = await ecClass.getProperty(propertyProps.name);
+    const ecClass = await context.targetSchema.lookupItem((0, Utils_1.toItemKey)(context, itemKey.name));
+    const propertyKey = (0, Utils_1.toPropertyKey)(context, itemKey.name, propertyProps.name);
+    const property = await ecClass.getProperty(propertyKey.propertyName);
     if (property === undefined) {
-        throw new Error(`Couldn't find property ${propertyProps.name} on class ${itemKey.name}`);
+        throw new Error(`Couldn't find property ${propertyKey.propertyName} on class ${ecClass.key.name}`);
     }
     if (propertyProps.type !== undefined) {
         throw new Error(`Changing the property '${property.fullName}' type is not supported.`);
     }
     const classEditor = await (0, Utils_1.getClassEditor)(context, ecClass);
     if (propertyProps.description !== undefined) {
-        await classEditor.properties.setDescription(itemKey, propertyProps.name, propertyProps.description);
+        await classEditor.properties.setDescription(ecClass.key, property.name, propertyProps.description);
     }
     if (propertyProps.label !== undefined) {
-        await classEditor.properties.setLabel(itemKey, propertyProps.name, propertyProps.label);
+        await classEditor.properties.setLabel(ecClass.key, property.name, propertyProps.label);
     }
     if (propertyProps.isReadOnly !== undefined) {
-        await classEditor.properties.setIsReadOnly(itemKey, propertyProps.name, propertyProps.isReadOnly);
+        await classEditor.properties.setIsReadOnly(ecClass.key, property.name, propertyProps.isReadOnly);
     }
     if (propertyProps.priority !== undefined) {
-        await classEditor.properties.setPriority(itemKey, propertyProps.name, propertyProps.priority);
+        await classEditor.properties.setPriority(ecClass.key, property.name, propertyProps.priority);
     }
     if (propertyProps.kindOfQuantity !== undefined) {
-        await classEditor.properties.setKindOfQuantity(itemKey, propertyProps.name, await (0, Utils_1.updateSchemaItemKey)(context, propertyProps.kindOfQuantity));
+        await classEditor.properties.setKindOfQuantity(ecClass.key, property.name, await (0, Utils_1.updateSchemaItemKey)(context, propertyProps.kindOfQuantity));
     }
     if (property.isArray()) {
-        await arrayProperty.merge(context, itemKey, property.name, propertyProps);
+        await arrayProperty.merge(context, ecClass.key, property.name, propertyProps);
     }
     if (propertyProps.category !== undefined) {
         const categoryKey = await (0, Utils_1.updateSchemaItemKey)(context, propertyProps.category);
-        await classEditor.properties.setCategory(itemKey, property.name, categoryKey);
+        await classEditor.properties.setCategory(ecClass.key, property.name, categoryKey);
     }
     if (property.isEnumeration()) {
-        return enumerationProperty.merge(context, itemKey, property, propertyProps);
+        return enumerationProperty.merge(context, ecClass.key, property, propertyProps);
     }
     if (property.isNavigation()) {
-        return navigationProperty.merge(context, itemKey, property, propertyProps);
+        return navigationProperty.merge(context, ecClass.key, property, propertyProps);
     }
     if (property.isPrimitive()) {
-        return primitiveProperty.merge(context, itemKey, property, propertyProps);
+        return primitiveProperty.merge(context, ecClass.key, property, propertyProps);
     }
     if (property.isStruct()) {
-        return structProperty.merge(context, itemKey, property, propertyProps);
+        return structProperty.merge(context, ecClass.key, property, propertyProps);
     }
 }
 const arrayProperty = {
@@ -127,7 +129,7 @@ const enumerationProperty = {
         if (enumerationType === undefined) {
             throw new Error(`Unable to locate the enumeration class ${enumerationKey.name} in the context schema.`);
         }
-        property.typeName = enumerationKey.fullName;
+        property.typeName = enumerationType.fullName;
         const classEditor = await (0, Utils_1.getClassEditor)(context, itemKey);
         arrayProperty.is(property)
             ? await classEditor.createEnumerationArrayPropertyFromProps(itemKey, property.name, enumerationType, property)
@@ -150,14 +152,14 @@ const navigationProperty = {
         if (relationshipType === undefined) {
             throw new Error(`Unable to locate the relationship class ${relationshipKey.name} in the context schema.`);
         }
-        property.relationshipName = relationshipKey.fullName;
+        property.relationshipName = relationshipType.fullName;
         const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey);
         if (ecClass.schemaItemType === ecschema_metadata_1.SchemaItemType.EntityClass)
-            return context.editor.entities.createNavigationPropertyFromProps(itemKey, property);
+            return context.editor.entities.createNavigationPropertyFromProps(ecClass.key, property);
         if (ecClass.schemaItemType === ecschema_metadata_1.SchemaItemType.Mixin)
-            return context.editor.mixins.createNavigationPropertyFromProps(itemKey, property);
+            return context.editor.mixins.createNavigationPropertyFromProps(ecClass.key, property);
         if (ecClass.schemaItemType === ecschema_metadata_1.SchemaItemType.RelationshipClass)
-            return context.editor.relationships.createNavigationPropertyFromProps(itemKey, property);
+            return context.editor.relationships.createNavigationPropertyFromProps(ecClass.key, property);
         throw new Error(`Navigation property can't be added to ${ecClass.schemaItemType}.`);
     },
     async merge(_context, _itemKey, property, props) {
@@ -215,7 +217,7 @@ const structProperty = {
         if (structType === undefined) {
             throw new Error(`Unable to locate the struct ${structKey.name} in the context schema.`);
         }
-        property.typeName = structKey.fullName;
+        property.typeName = structType.fullName;
         const classEditor = await (0, Utils_1.getClassEditor)(context, itemKey);
         return arrayProperty.is(property)
             ? classEditor.createStructArrayPropertyFromProps(itemKey, property.name, structType, property)

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

@@ -1 +1 @@
-{"version":3,"file":"PropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { AnyClassItemDifference, ClassPropertyDifference, DifferenceType } from \"../Differencing/SchemaDifference\";\nimport { AnyProperty, AnyPropertyProps, ArrayPropertyProps, CustomAttribute, ECClass, Enumeration, EnumerationPropertyProps, NavigationPropertyProps, parsePrimitiveType, PrimitivePropertyProps, RelationshipClass, SchemaItemKey, SchemaItemType, StructClass, StructPropertyProps } from \"@itwin/ecschema-metadata\";\nimport { getClassEditor, updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\nimport { MutableProperty } from \"../Editing/Mutable/MutableProperty\";\nimport { applyCustomAttributes } from \"./CustomAttributeMerger\";\n\ntype PartialEditable<T> = {\n  -readonly [P in keyof T]: T[P];\n};\n\ninterface PropertyMerger<T extends AnyPropertyProps> {\n  is(property: AnyPropertyProps): property is T;\n  add(context: SchemaMergeContext, itemKey: SchemaItemKey, props: PartialEditable<T>): Promise<void>;\n  merge(context: SchemaMergeContext, itemKey: SchemaItemKey, property: AnyProperty, props: T): Promise<void>;\n}\n\n/**\n * @internal\n */\nexport async function mergePropertyDifference(context: SchemaMergeContext, change: ClassPropertyDifference): Promise<void> {\n  const classKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n  return mergeClassProperty(context, change, classKey, {\n    ...change.difference,\n    name: change.path,\n  } as AnyPropertyProps);\n}\n\n/**\n * @internal\n */\nexport async function mergeClassProperties(context: SchemaMergeContext, change: AnyClassItemDifference, itemKey: SchemaItemKey): Promise<void> {\n  for (const property of change.difference.properties || []) {\n    await mergeClassProperty(context, change, itemKey, property);\n  }\n}\n\nasync function mergeClassProperty(context: SchemaMergeContext, change: { changeType: DifferenceType }, itemKey: SchemaItemKey, property: AnyPropertyProps) {\n  return change.changeType === \"add\"\n    ? addClassProperty(context, itemKey, property)\n    : modifyClassProperty(context, itemKey, property);\n}\n\nasync function addClassProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, property: PartialEditable<AnyPropertyProps>): Promise<void> {\n  if (property.category !== undefined) {\n    property.category = await updateSchemaItemFullName(context, property.category);\n  }\n\n  if (property.kindOfQuantity !== undefined) {\n    property.kindOfQuantity = await updateSchemaItemFullName(context, property.kindOfQuantity);\n  }\n\n  await createProperty(context, itemKey, property);\n\n  if (property.customAttributes !== undefined) {\n    await applyCustomAttributes(context, property.customAttributes as CustomAttribute[], async (ca) => {\n      const classEditor = await getClassEditor(context, itemKey);\n      await classEditor.properties.addCustomAttribute(itemKey, property.name, ca);\n    });\n  }\n}\n\nasync function createProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, property: PartialEditable<AnyPropertyProps>) {\n  if (enumerationProperty.is(property)) {\n    return enumerationProperty.add(context, itemKey, property);\n  }\n  if (navigationProperty.is(property)) {\n    return navigationProperty.add(context, itemKey, property);\n  }\n  if (primitiveProperty.is(property)) {\n    return primitiveProperty.add(context, itemKey, property);\n  }\n  if (structProperty.is(property)) {\n    return structProperty.add(context, itemKey, property);\n  }\n  return {};\n}\n\nasync function modifyClassProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, propertyProps: AnyPropertyProps): Promise<void> {\n  const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey) as ECClass;\n  const property = await ecClass.getProperty(propertyProps.name) as MutableProperty;\n  if (property === undefined) {\n    throw new Error(`Couldn't find property ${propertyProps.name} on class ${itemKey.name}`);\n  }\n\n  if (propertyProps.type !== undefined) {\n    throw new Error(`Changing the property '${property.fullName}' type is not supported.`);\n  }\n\n  const classEditor = await getClassEditor(context, ecClass);\n\n  if (propertyProps.description !== undefined) {\n    await classEditor.properties.setDescription(itemKey, propertyProps.name, propertyProps.description);\n  }\n  if (propertyProps.label !== undefined) {\n    await classEditor.properties.setLabel(itemKey, propertyProps.name, propertyProps.label);\n  }\n  if (propertyProps.isReadOnly !== undefined) {\n    await classEditor.properties.setIsReadOnly(itemKey, propertyProps.name, propertyProps.isReadOnly);\n  }\n  if (propertyProps.priority !== undefined) {\n    await classEditor.properties.setPriority(itemKey, propertyProps.name, propertyProps.priority);\n  }\n  if (propertyProps.kindOfQuantity !== undefined) {\n    await classEditor.properties.setKindOfQuantity(itemKey, propertyProps.name, await updateSchemaItemKey(context, propertyProps.kindOfQuantity));\n  }\n\n  if (property.isArray()) {\n    await arrayProperty.merge(context, itemKey, property.name, propertyProps);\n  }\n\n  if (propertyProps.category !== undefined) {\n    const categoryKey = await updateSchemaItemKey(context, propertyProps.category);\n    await classEditor.properties.setCategory(itemKey, property.name, categoryKey);\n  }\n\n  if (property.isEnumeration()) {\n    return enumerationProperty.merge(context, itemKey, property, propertyProps as any);\n  }\n  if (property.isNavigation()) {\n    return navigationProperty.merge(context, itemKey, property, propertyProps as any);\n  }\n  if (property.isPrimitive()) {\n    return primitiveProperty.merge(context, itemKey, property, propertyProps as any);\n  }\n  if (property.isStruct()) {\n    return structProperty.merge(context, itemKey, property, propertyProps as any);\n  }\n}\n\nconst arrayProperty = {\n  is(property: AnyPropertyProps): boolean {\n    return \"minOccurs\" in property && \"maxOccurs\" in property;\n  },\n  async merge(context: SchemaMergeContext, itemKey: SchemaItemKey, propertyName: string, props: ArrayPropertyProps) {\n    const classEditor = await getClassEditor(context, itemKey);\n    if (props.minOccurs !== undefined) {\n      await classEditor.arrayProperties.setMinOccurs(itemKey, propertyName, props.minOccurs);\n    }\n    if (props.maxOccurs !== undefined) {\n      await classEditor.arrayProperties.setMaxOccurs(itemKey, propertyName, props.maxOccurs);\n    }\n  },\n};\n\nconst enumerationProperty: PropertyMerger<EnumerationPropertyProps> = {\n  is(property): property is EnumerationPropertyProps {\n    return primitiveProperty.is(property) && property.typeName.includes(\".\");\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const enumerationKey = await updateSchemaItemKey(context, property.typeName);\n    const enumerationType = await context.editor.schemaContext.getSchemaItem<Enumeration>(enumerationKey);\n    if (enumerationType === undefined) {\n      throw new Error(`Unable to locate the enumeration class ${enumerationKey.name} in the context schema.`);\n    }\n\n    property.typeName = enumerationKey.fullName;\n\n    const classEditor = await getClassEditor(context, itemKey);\n\n    arrayProperty.is(property)\n      ? await classEditor.createEnumerationArrayPropertyFromProps(itemKey, property.name, enumerationType, property)\n      : await classEditor.createEnumerationPropertyFromProps(itemKey, property.name, enumerationType, property);\n  },\n  async merge(context, itemKey, property, props) {\n    if (\"enumeration\" in props && props.enumeration !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' enumeration is not supported.`);\n    }\n    return primitiveProperty.merge(context, itemKey, property, props);\n  },\n};\n\nconst navigationProperty: PropertyMerger<NavigationPropertyProps> = {\n  is(property): property is NavigationPropertyProps {\n    return property.type === \"NavigationProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const relationshipKey = await updateSchemaItemKey(context, property.relationshipName);\n    const relationshipType = await context.editor.schemaContext.getSchemaItem<RelationshipClass>(relationshipKey);\n    if (relationshipType === undefined) {\n      throw new Error(`Unable to locate the relationship class ${relationshipKey.name} in the context schema.`);\n    }\n\n    property.relationshipName = relationshipKey.fullName;\n\n    const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey) as ECClass;\n    if (ecClass.schemaItemType === SchemaItemType.EntityClass)\n      return context.editor.entities.createNavigationPropertyFromProps(itemKey, property);\n    if (ecClass.schemaItemType === SchemaItemType.Mixin)\n      return context.editor.mixins.createNavigationPropertyFromProps(itemKey, property);\n    if (ecClass.schemaItemType === SchemaItemType.RelationshipClass)\n      return context.editor.relationships.createNavigationPropertyFromProps(itemKey, property);\n    throw new Error(`Navigation property can't be added to ${ecClass.schemaItemType}.`);\n  },\n  async merge(_context, _itemKey, property, props) {\n    if (props.direction !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' direction is not supported.`);\n    }\n    if (\"relationshipClass\" in props && props.relationshipClass !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' relationship class is not supported.`);\n    }\n  },\n};\n\nconst primitiveProperty: PropertyMerger<PrimitivePropertyProps> = {\n  is(property): property is PrimitivePropertyProps {\n    return property.type === \"PrimitiveProperty\" || property.type === \"PrimitiveArrayProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const propertyType = parsePrimitiveType(property.typeName);\n    if (propertyType === undefined) {\n      throw new Error(`Invalid property type ${property.typeName} on property ${property.name}`);\n    }\n\n    const classEditor = await getClassEditor(context, itemKey);\n    return arrayProperty.is(property)\n      ? classEditor.createPrimitiveArrayPropertyFromProps(itemKey, property.name, propertyType, property)\n      : classEditor.createPrimitivePropertyFromProps(itemKey, property.name, propertyType, property);\n  },\n  async merge(context, itemKey, property, props) {\n    if (props.typeName) {\n      throw new Error(`Changing the property '${property.fullName}' primitiveType is not supported.`);\n    }\n\n    const classEditor = await getClassEditor(context, itemKey);\n    if (props.extendedTypeName !== undefined) {\n      await classEditor.primitiveProperties.setExtendedTypeName(itemKey, property.name, props.extendedTypeName);\n    }\n    if (props.minLength !== undefined) {\n      await classEditor.primitiveProperties.setMinLength(itemKey, property.name, props.minLength);\n    }\n    if (props.maxLength !== undefined) {\n      await classEditor.primitiveProperties.setMaxLength(itemKey, property.name, props.maxLength);\n    }\n    if (props.minValue !== undefined) {\n      await classEditor.primitiveProperties.setMinValue(itemKey, property.name, props.minValue);\n    }\n    if (props.maxValue !== undefined) {\n      await classEditor.primitiveProperties.setMaxValue(itemKey, property.name, props.maxValue);\n    }\n  },\n};\n\nconst structProperty: PropertyMerger<StructPropertyProps> = {\n  is(property): property is StructPropertyProps {\n    return property.type === \"StructProperty\" || property.type === \"StructArrayProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const structKey = await updateSchemaItemKey(context, property.typeName);\n    const structType = await context.editor.schemaContext.getSchemaItem<StructClass>(structKey);\n    if (structType === undefined) {\n      throw new Error(`Unable to locate the struct ${structKey.name} in the context schema.`);\n    }\n\n    property.typeName = structKey.fullName;\n\n    const classEditor = await getClassEditor(context, itemKey);\n    return arrayProperty.is(property)\n      ? classEditor.createStructArrayPropertyFromProps(itemKey, property.name, structType, property)\n      : classEditor.createStructPropertyFromProps(itemKey, property.name, structType, property);\n  },\n  async merge(_context, _itemKey, property, props) {\n    if (\"structClass\" in props && props.structClass !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' structClass is not supported.`);\n    }\n  },\n};\n"]}
+{"version":3,"file":"PropertyMerger.js","sourceRoot":"","sources":["../../../src/Merging/PropertyMerger.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport type { SchemaMergeContext } from \"./SchemaMerger\";\nimport type { AnyClassItemDifference, ClassPropertyDifference, DifferenceType } from \"../Differencing/SchemaDifference\";\nimport { AnyProperty, AnyPropertyProps, ArrayPropertyProps, CustomAttribute, ECClass, Enumeration, EnumerationPropertyProps, NavigationPropertyProps, parsePrimitiveType, PrimitivePropertyProps, RelationshipClass, SchemaItemKey, SchemaItemType, StructClass, StructPropertyProps } from \"@itwin/ecschema-metadata\";\nimport { getClassEditor, toItemKey, toPropertyKey, updateSchemaItemFullName, updateSchemaItemKey } from \"./Utils\";\nimport { MutableProperty } from \"../Editing/Mutable/MutableProperty\";\nimport { applyCustomAttributes } from \"./CustomAttributeMerger\";\n\ntype PartialEditable<T> = {\n  -readonly [P in keyof T]: T[P];\n};\n\ninterface PropertyMerger<T extends AnyPropertyProps> {\n  is(property: AnyPropertyProps): property is T;\n  add(context: SchemaMergeContext, itemKey: SchemaItemKey, props: PartialEditable<T>): Promise<void>;\n  merge(context: SchemaMergeContext, itemKey: SchemaItemKey, property: AnyProperty, props: T): Promise<void>;\n}\n\n/**\n * @internal\n */\nexport async function mergePropertyDifference(context: SchemaMergeContext, change: ClassPropertyDifference): Promise<void> {\n  const classKey = new SchemaItemKey(change.itemName, context.targetSchemaKey);\n  return mergeClassProperty(context, change, classKey, {\n    ...change.difference,\n    name: change.path,\n  } as AnyPropertyProps);\n}\n\n/**\n * @internal\n */\nexport async function mergeClassProperties(context: SchemaMergeContext, change: AnyClassItemDifference, itemKey: SchemaItemKey): Promise<void> {\n  for (const property of change.difference.properties || []) {\n    await mergeClassProperty(context, change, itemKey, property);\n  }\n}\n\nasync function mergeClassProperty(context: SchemaMergeContext, change: { changeType: DifferenceType }, itemKey: SchemaItemKey, property: AnyPropertyProps) {\n  return change.changeType === \"add\"\n    ? addClassProperty(context, itemKey, property)\n    : modifyClassProperty(context, itemKey, property);\n}\n\nasync function addClassProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, property: PartialEditable<AnyPropertyProps>): Promise<void> {\n  const ecClass = await context.targetSchema.lookupItem(toItemKey(context, itemKey.name)) as ECClass;\n\n  if (property.category !== undefined) {\n    property.category = await updateSchemaItemFullName(context, property.category);\n  }\n\n  if (property.kindOfQuantity !== undefined) {\n    property.kindOfQuantity = await updateSchemaItemFullName(context, property.kindOfQuantity);\n  }\n\n  await createProperty(context, ecClass.key, property);\n\n  if (property.customAttributes !== undefined) {\n    await applyCustomAttributes(context, property.customAttributes as CustomAttribute[], async (ca) => {\n      const classEditor = await getClassEditor(context, ecClass.key);\n      await classEditor.properties.addCustomAttribute(ecClass.key, property.name, ca);\n    });\n  }\n}\n\nasync function createProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, property: PartialEditable<AnyPropertyProps>) {\n  if (enumerationProperty.is(property)) {\n    return enumerationProperty.add(context, itemKey, property);\n  }\n  if (navigationProperty.is(property)) {\n    return navigationProperty.add(context, itemKey, property);\n  }\n  if (primitiveProperty.is(property)) {\n    return primitiveProperty.add(context, itemKey, property);\n  }\n  if (structProperty.is(property)) {\n    return structProperty.add(context, itemKey, property);\n  }\n  return {};\n}\n\nasync function modifyClassProperty(context: SchemaMergeContext, itemKey: SchemaItemKey, propertyProps: AnyPropertyProps): Promise<void> {\n  const ecClass = await context.targetSchema.lookupItem(toItemKey(context, itemKey.name)) as ECClass;\n  const propertyKey = toPropertyKey(context, itemKey.name, propertyProps.name);\n  const property = await ecClass.getProperty(propertyKey.propertyName) as MutableProperty;\n\n  if (property === undefined) {\n    throw new Error(`Couldn't find property ${propertyKey.propertyName} on class ${ecClass.key.name}`);\n  }\n\n  if (propertyProps.type !== undefined) {\n    throw new Error(`Changing the property '${property.fullName}' type is not supported.`);\n  }\n\n  const classEditor = await getClassEditor(context, ecClass);\n\n  if (propertyProps.description !== undefined) {\n    await classEditor.properties.setDescription(ecClass.key, property.name, propertyProps.description);\n  }\n  if (propertyProps.label !== undefined) {\n    await classEditor.properties.setLabel(ecClass.key, property.name, propertyProps.label);\n  }\n  if (propertyProps.isReadOnly !== undefined) {\n    await classEditor.properties.setIsReadOnly(ecClass.key, property.name, propertyProps.isReadOnly);\n  }\n  if (propertyProps.priority !== undefined) {\n    await classEditor.properties.setPriority(ecClass.key, property.name, propertyProps.priority);\n  }\n  if (propertyProps.kindOfQuantity !== undefined) {\n    await classEditor.properties.setKindOfQuantity(ecClass.key, property.name, await updateSchemaItemKey(context, propertyProps.kindOfQuantity));\n  }\n\n  if (property.isArray()) {\n    await arrayProperty.merge(context, ecClass.key, property.name, propertyProps);\n  }\n\n  if (propertyProps.category !== undefined) {\n    const categoryKey = await updateSchemaItemKey(context, propertyProps.category);\n    await classEditor.properties.setCategory(ecClass.key, property.name, categoryKey);\n  }\n\n  if (property.isEnumeration()) {\n    return enumerationProperty.merge(context, ecClass.key, property, propertyProps as any);\n  }\n  if (property.isNavigation()) {\n    return navigationProperty.merge(context, ecClass.key, property, propertyProps as any);\n  }\n  if (property.isPrimitive()) {\n    return primitiveProperty.merge(context, ecClass.key, property, propertyProps as any);\n  }\n  if (property.isStruct()) {\n    return structProperty.merge(context, ecClass.key, property, propertyProps as any);\n  }\n}\n\nconst arrayProperty = {\n  is(property: AnyPropertyProps): boolean {\n    return \"minOccurs\" in property && \"maxOccurs\" in property;\n  },\n  async merge(context: SchemaMergeContext, itemKey: SchemaItemKey, propertyName: string, props: ArrayPropertyProps) {\n    const classEditor = await getClassEditor(context, itemKey);\n    if (props.minOccurs !== undefined) {\n      await classEditor.arrayProperties.setMinOccurs(itemKey, propertyName, props.minOccurs);\n    }\n    if (props.maxOccurs !== undefined) {\n      await classEditor.arrayProperties.setMaxOccurs(itemKey, propertyName, props.maxOccurs);\n    }\n  },\n};\n\nconst enumerationProperty: PropertyMerger<EnumerationPropertyProps> = {\n  is(property): property is EnumerationPropertyProps {\n    return primitiveProperty.is(property) && property.typeName.includes(\".\");\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const enumerationKey = await updateSchemaItemKey(context, property.typeName);\n    const enumerationType = await context.editor.schemaContext.getSchemaItem<Enumeration>(enumerationKey);\n    if (enumerationType === undefined) {\n      throw new Error(`Unable to locate the enumeration class ${enumerationKey.name} in the context schema.`);\n    }\n\n    property.typeName = enumerationType.fullName;\n\n    const classEditor = await getClassEditor(context, itemKey);\n\n    arrayProperty.is(property)\n      ? await classEditor.createEnumerationArrayPropertyFromProps(itemKey, property.name, enumerationType, property)\n      : await classEditor.createEnumerationPropertyFromProps(itemKey, property.name, enumerationType, property);\n  },\n  async merge(context, itemKey, property, props) {\n    if (\"enumeration\" in props && props.enumeration !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' enumeration is not supported.`);\n    }\n    return primitiveProperty.merge(context, itemKey, property, props);\n  },\n};\n\nconst navigationProperty: PropertyMerger<NavigationPropertyProps> = {\n  is(property): property is NavigationPropertyProps {\n    return property.type === \"NavigationProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const relationshipKey = await updateSchemaItemKey(context, property.relationshipName);\n    const relationshipType = await context.editor.schemaContext.getSchemaItem<RelationshipClass>(relationshipKey);\n    if (relationshipType === undefined) {\n      throw new Error(`Unable to locate the relationship class ${relationshipKey.name} in the context schema.`);\n    }\n\n    property.relationshipName = relationshipType.fullName; \n\n    const ecClass = await context.editor.schemaContext.getSchemaItem(itemKey) as ECClass;\n    if (ecClass.schemaItemType === SchemaItemType.EntityClass)\n      return context.editor.entities.createNavigationPropertyFromProps(ecClass.key, property);\n    if (ecClass.schemaItemType === SchemaItemType.Mixin)\n      return context.editor.mixins.createNavigationPropertyFromProps(ecClass.key, property);\n    if (ecClass.schemaItemType === SchemaItemType.RelationshipClass)\n      return context.editor.relationships.createNavigationPropertyFromProps(ecClass.key, property);\n    throw new Error(`Navigation property can't be added to ${ecClass.schemaItemType}.`);\n  },\n  async merge(_context, _itemKey, property, props) {\n    if (props.direction !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' direction is not supported.`);\n    }\n    if (\"relationshipClass\" in props && props.relationshipClass !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' relationship class is not supported.`);\n    }\n  },\n};\n\nconst primitiveProperty: PropertyMerger<PrimitivePropertyProps> = {\n  is(property): property is PrimitivePropertyProps {\n    return property.type === \"PrimitiveProperty\" || property.type === \"PrimitiveArrayProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const propertyType = parsePrimitiveType(property.typeName);\n    if (propertyType === undefined) {\n      throw new Error(`Invalid property type ${property.typeName} on property ${property.name}`);\n    }\n\n    const classEditor = await getClassEditor(context, itemKey);\n    return arrayProperty.is(property)\n      ? classEditor.createPrimitiveArrayPropertyFromProps(itemKey, property.name, propertyType, property)\n      : classEditor.createPrimitivePropertyFromProps(itemKey, property.name, propertyType, property);\n  },\n  async merge(context, itemKey, property, props) {\n    if (props.typeName) {\n      throw new Error(`Changing the property '${property.fullName}' primitiveType is not supported.`);\n    }\n\n    const classEditor = await getClassEditor(context, itemKey);\n    if (props.extendedTypeName !== undefined) {\n      await classEditor.primitiveProperties.setExtendedTypeName(itemKey, property.name, props.extendedTypeName);\n    }\n    if (props.minLength !== undefined) {\n      await classEditor.primitiveProperties.setMinLength(itemKey, property.name, props.minLength);\n    }\n    if (props.maxLength !== undefined) {\n      await classEditor.primitiveProperties.setMaxLength(itemKey, property.name, props.maxLength);\n    }\n    if (props.minValue !== undefined) {\n      await classEditor.primitiveProperties.setMinValue(itemKey, property.name, props.minValue);\n    }\n    if (props.maxValue !== undefined) {\n      await classEditor.primitiveProperties.setMaxValue(itemKey, property.name, props.maxValue);\n    }\n  },\n};\n\nconst structProperty: PropertyMerger<StructPropertyProps> = {\n  is(property): property is StructPropertyProps {\n    return property.type === \"StructProperty\" || property.type === \"StructArrayProperty\";\n  },\n  async add(context, itemKey, property): Promise<void> {\n    const structKey = await updateSchemaItemKey(context, property.typeName);\n    const structType = await context.editor.schemaContext.getSchemaItem<StructClass>(structKey);\n    if (structType === undefined) {\n      throw new Error(`Unable to locate the struct ${structKey.name} in the context schema.`);\n    }\n\n    property.typeName = structType.fullName;\n\n    const classEditor = await getClassEditor(context, itemKey);\n    return arrayProperty.is(property)\n      ? classEditor.createStructArrayPropertyFromProps(itemKey, property.name, structType, property)\n      : classEditor.createStructPropertyFromProps(itemKey, property.name, structType, property);\n  },\n  async merge(_context, _itemKey, property, props) {\n    if (\"structClass\" in props && props.structClass !== undefined) {\n      throw new Error(`Changing the property '${property.fullName}' structClass is not supported.`);\n    }\n  },\n};\n"]}

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

@@ -1,10 +1,11 @@
 /** @packageDocumentation
  * @module Merging
  */
-import { Schema, type SchemaContext, SchemaKey } from "@itwin/ecschema-metadata";
+import { Schema, SchemaContext, SchemaKey } from "@itwin/ecschema-metadata";
 import { SchemaContextEditor } from "../Editing/Editor";
 import { type SchemaDifferenceResult } from "../Differencing/SchemaDifference";
-import type { SchemaEdits } from "./Edits/SchemaEdits";
+import { SchemaEdits } from "./Edits/SchemaEdits";
+import { NameMapping } from "./Edits/NameMapping";
 /**
  * Defines the context of a Schema merging run.
  * @internal
@@ -14,6 +15,7 @@ export interface SchemaMergeContext {
     readonly targetSchemaKey: SchemaKey;
     readonly sourceSchemaKey: SchemaKey;
     readonly editor: SchemaContextEditor;
+    readonly nameMapping: NameMapping;
 }
 /**
  * Class to merge two schemas together.
@@ -21,7 +23,7 @@ export interface SchemaMergeContext {
  * @beta
  */
 export declare class SchemaMerger {
-    private readonly _editor;
+    private readonly _editingContext;
     /**
      * Constructs a new instance of the SchemaMerger object.
      * @param editingContext  The schema contexts that holds the schema to be edited.

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

@@ -1 +1 @@
-{"version":3,"file":"SchemaMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAGrG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;CACtC;AAED;;;;GAIG;AACH,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAE9C;;;OAGG;gBACS,cAAc,EAAE,aAAa;IAIzC;;;;;;;OAOG;IACU,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3G;;;;;OAKG;IACU,KAAK,CAAC,gBAAgB,EAAE,sBAAsB,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CA2CnG"}
+{"version":3,"file":"SchemaMerger.d.ts","sourceRoot":"","sources":["../../../src/Merging/SchemaMerger.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,aAAa,EAA6B,SAAS,EAAmB,MAAM,0BAA0B,CAAC;AACxH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAwB,KAAK,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAGrG,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED;;;;GAIG;AACH,qBAAa,YAAY;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAgB;IAEhD;;;OAGG;gBACS,cAAc,EAAE,aAAa;IAIzC;;;;;;;OAOG;IACU,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3G;;;;;OAKG;IACU,KAAK,CAAC,gBAAgB,EAAE,sBAAsB,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CA+CnG"}

package/lib/cjs/Merging/SchemaMerger.js

@@ -15,6 +15,7 @@ const SchemaDifference_1 = require("../Differencing/SchemaDifference");
 const SchemaMergingVisitor_1 = require("./SchemaMergingVisitor");
 const SchemaMergingWalker_1 = require("./SchemaMergingWalker");
 const Exception_1 = require("../Editing/Exception");
+const NameMapping_1 = require("./Edits/NameMapping");
 /**
  * Class to merge two schemas together.
  * @see [[merge]] or [[mergeSchemas]] to merge two schemas together.
@@ -26,7 +27,7 @@ class SchemaMerger {
      * @param editingContext  The schema contexts that holds the schema to be edited.
      */
     constructor(editingContext) {
-        this._editor = new Editor_1.SchemaContextEditor(editingContext);
+        this._editingContext = editingContext;
     }
     /**
      * Copy the SchemaItems of the source schemas to the target schema.
@@ -37,7 +38,7 @@ class SchemaMerger {
      * @alpha
      */
     async mergeSchemas(targetSchema, sourceSchema, edits) {
-        return this.merge(await (0, SchemaDifference_1.getSchemaDifferences)(targetSchema, sourceSchema), edits);
+        return this.merge(await (0, SchemaDifference_1.getSchemaDifferences)(targetSchema, sourceSchema, edits), edits);
     }
     /**
      * Merges the schema differences into the target schema context.
@@ -48,15 +49,17 @@ class SchemaMerger {
     async merge(differenceResult, edits) {
         const targetSchemaKey = ecschema_metadata_1.SchemaKey.parseString(differenceResult.targetSchemaName);
         const sourceSchemaKey = ecschema_metadata_1.SchemaKey.parseString(differenceResult.sourceSchemaName);
+        const nameMapping = new NameMapping_1.NameMapping();
+        const editor = new Editor_1.SchemaContextEditor(new MergingSchemaContext(this._editingContext, nameMapping));
         // If schema changes were provided, they'll get applied and a new SchemaDifferenceResult is returned
         // to prevent altering the differenceResult the caller passed in.
         if (edits) {
-            await edits.applyTo(differenceResult = { ...differenceResult });
+            await edits.applyTo(differenceResult = { ...differenceResult }, nameMapping);
         }
         if (differenceResult.conflicts && differenceResult.conflicts.length > 0) {
             throw new Errors_1.SchemaConflictsError("Schema's can't be merged if there are unresolved conflicts.", differenceResult.conflicts, sourceSchemaKey, targetSchemaKey);
         }
-        const schema = await this._editor.getSchema(targetSchemaKey).catch((error) => {
+        const schema = await editor.getSchema(targetSchemaKey).catch((error) => {
             if (error instanceof Exception_1.SchemaEditingError && error.errorNumber === Exception_1.ECEditingStatus.SchemaNotFound) {
                 throw new Error(`The target schema '${targetSchemaKey.name}' could not be found in the editing context.`);
             }
@@ -66,10 +69,11 @@ class SchemaMerger {
             throw new Error(`The target schema '${targetSchemaKey.name}' is not dynamic. Only dynamic schemas are supported for merging.`);
         }
         const visitor = new SchemaMergingVisitor_1.SchemaMergingVisitor({
-            editor: this._editor,
+            editor,
             targetSchema: schema,
             targetSchemaKey,
             sourceSchemaKey,
+            nameMapping,
         });
         const walker = new SchemaMergingWalker_1.SchemaMergingWalker(visitor);
         await walker.traverse(differenceResult.differences, "add");
@@ -78,4 +82,30 @@ class SchemaMerger {
     }
 }
 exports.SchemaMerger = SchemaMerger;
+/**
+ * SchemaContext implementation that overrides certain methods to allow to apply name mappings
+ * for certain schema elements during the schema merging process.
+ *
+ * @internal
+ */
+class MergingSchemaContext extends ecschema_metadata_1.SchemaContext {
+    constructor(internalContext, nameMapping) {
+        super();
+        this._internalContext = internalContext;
+        this._nameMappings = nameMapping;
+    }
+    async getCachedSchema(schemaKey, matchType) {
+        return this._internalContext.getCachedSchema(schemaKey, matchType);
+    }
+    async getSchema(schemaKey, matchType) {
+        return this._internalContext.getSchema(schemaKey, matchType);
+    }
+    async getSchemaItem(schemaItemKey) {
+        const mappedKey = this._nameMappings.resolveItemKey(schemaItemKey);
+        if (mappedKey !== undefined) {
+            schemaItemKey = mappedKey;
+        }
+        return this._internalContext.getSchemaItem(schemaItemKey);
+    }
+}
 //# sourceMappingURL=SchemaMerger.js.map